Explorar o código

更新k-form-design修改部分样式

lph hai 1 ano
pai
achega
0996c73186

+ 1 - 0
ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KDatePicker/datePicker.vue

@@ -48,6 +48,7 @@ import moment from "moment";
 import { pluginManager } from "../../utils/index";
 
 const DatePicker = pluginManager.getComponent("datePicker");
+// const DatePicker = pluginManager.getComponent("datetimePicker");
 const RangePicker = pluginManager.getComponent("rangePicker");
 const MonthPicker = pluginManager.getComponent("monthPicker");
 

+ 4 - 1
ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -46,6 +46,8 @@
               :key="item.value"
               :label="item.label"
               :value="item.value">
+              <span style="float: left">{{ item.label }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.fieldDescription }}</span>
             </el-option>
           </el-select>
         </a-form-item>
@@ -730,7 +732,8 @@ export default {
         this.formList.listName = res.map(item => {
           return {
             label: item.fieldName,
-            value: item.fieldName
+            value: item.fieldName,
+            fieldDescription:item.fieldDescription
           }
         });
       })

+ 16 - 15
ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formProperties.vue

@@ -11,7 +11,7 @@
         </a-form-item>
         <a-form-item label="绑定表名称(主表)">
             <!-- <Input style="width:100%;" v-model="config.mainTableName" /> -->
-            <el-select v-model="config.mainTableName" placeholder="请选择">
+            <el-select v-model="config.mainTableName" placeholder="请选择实际操作表">
             <el-option
               v-for="item in tableList"
               :key="item.tableName"
@@ -22,6 +22,20 @@
             </el-option>
           </el-select>
         </a-form-item>
+        <!-- 拖拽表格 -->
+        <a-form-item
+          label="关联的自定义表格"
+        >
+          <el-select v-model="config.tdId" @change="relationTableChange" filterable placeholder="请选择拖拽table">
+            <el-option
+              v-for="item in dragTableList"
+              :key="item.tId"
+              :label="item.dtName"
+              :value="item.tId">
+              <!-- <span v-show="false">{{ $sessionStorage.setItem('sqlKey',item.sqlKey) }}</span> -->
+            </el-option>
+          </el-select>
+        </a-form-item>
         <a-form-item label="表单描述">
             <Textarea v-model="config.formDescription" />
         </a-form-item>
@@ -61,20 +75,7 @@
         >
           <InputNumber v-model="config.labelWidth" />
         </a-form-item>
-        <!-- 拖拽表格 -->
-        <a-form-item
-          label="关联的自定义表格"
-        >
-          <el-select v-model="config.tdId" @change="relationTableChange" filterable placeholder="请选择">
-            <el-option
-              v-for="item in dragTableList"
-              :key="item.tId"
-              :label="item.dtName"
-              :value="item.tId">
-              <!-- <span v-show="false">{{ $sessionStorage.setItem('sqlKey',item.sqlKey) }}</span> -->
-            </el-option>
-          </el-select>
-        </a-form-item>
+        
         <a-form-item label="labelCol" v-show="config.labelLayout !== 'flex'">
           <div class="change-col-box">
             <Slider

+ 7 - 22
ruoyi-ui/src/views/dragform/index.vue

@@ -34,22 +34,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="表单sql" prop="dfFormSql">
+      <!-- <el-form-item label="表单sql" prop="dfFormSql">
         <el-input
           v-model="queryParams.dfFormSql"
           placeholder="请输入表单sql"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="节点ID" prop="dfNodeId">
+      </el-form-item> -->
+      <!-- <el-form-item label="节点ID" prop="dfNodeId">
         <el-input
           v-model="queryParams.dfNodeId"
           placeholder="请输入节点ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="数据源名称
 "
@@ -79,22 +79,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备用列" prop="spare">
-        <el-input
-          v-model="queryParams.spare"
-          placeholder="请输入备用列"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用列" prop="spare1">
-        <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入备用列"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button
           type="primary"
@@ -237,7 +222,7 @@
         prop="dfNotes"
         show-overflow-tooltip
       />
-      <el-table-column
+      <!-- <el-table-column
         label="备用列"
         align="center"
         prop="spare"
@@ -254,7 +239,7 @@
         align="center"
         prop="dfFliePath"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column
         label="操作"
         align="center"

+ 116 - 61
ruoyi-ui/src/views/system/post/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="岗位编码" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
@@ -18,7 +25,11 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="岗位状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -28,8 +39,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -42,7 +61,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:post:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +73,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:post:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -64,7 +85,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:post:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,23 +96,39 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:post:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="postList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
+      <!-- <el-table-column label="岗位编号" align="center" prop="postId" /> -->
       <el-table-column label="岗位编码" align="center" prop="postCode" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
       <el-table-column label="岗位排序" align="center" prop="postSort" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -124,21 +162,17 @@
               处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:post:edit']"
-                >修改
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   v-if="scope.row.parentId != 0"
                   size="mini"
@@ -146,11 +180,9 @@
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:post:remove']"
-                >删除
-                </el-button
-                >
-              </el-dropdown-item
-              >
+                  >删除
+                </el-button>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -158,7 +190,7 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -175,7 +207,11 @@
           <el-input v-model="form.postCode" placeholder="请输入编码名称" />
         </el-form-item>
         <el-form-item label="岗位顺序" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.postSort"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="岗位状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -183,11 +219,16 @@
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -199,11 +240,17 @@
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost } from "@/api/system/post";
+import {
+  listPost,
+  getPost,
+  delPost,
+  addPost,
+  updatePost,
+} from "@/api/system/post";
 
 export default {
   name: "Post",
-  dicts: ['sys_normal_disable'],
+  dicts: ["sys_normal_disable"],
   data() {
     return {
       // 遮罩层
@@ -230,22 +277,22 @@ export default {
         pageSize: 10,
         postCode: undefined,
         postName: undefined,
-        status: undefined
+        status: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         postName: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+          { required: true, message: "岗位名称不能为空", trigger: "blur" },
         ],
         postCode: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+          { required: true, message: "岗位编码不能为空", trigger: "blur" },
         ],
         postSort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "岗位顺序不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -255,7 +302,7 @@ export default {
     /** 查询岗位列表 */
     getList() {
       this.loading = true;
-      listPost(this.queryParams).then(response => {
+      listPost(this.queryParams).then((response) => {
         this.postList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -274,7 +321,7 @@ export default {
         postName: undefined,
         postSort: 0,
         status: "0",
-        remark: undefined
+        remark: undefined,
       };
       this.resetForm("form");
     },
@@ -290,9 +337,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.postId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.postId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -303,25 +350,25 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const postId = row.postId || this.ids
-      getPost(postId).then(response => {
+      const postId = row.postId || this.ids;
+      getPost(postId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改岗位";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.postId != undefined) {
-            updatePost(this.form).then(response => {
+            updatePost(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPost(this.form).then(response => {
+            addPost(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -333,19 +380,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const postIds = row.postId || this.ids;
-      this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?').then(function() {
-        return delPost(postIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?')
+        .then(function () {
+          return delPost(postIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/post/export', {
-        ...this.queryParams
-      }, `post_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "system/post/export",
+        {
+          ...this.queryParams,
+        },
+        `post_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>