修改

ruoyi-ui/src/components/updateModule/k-form-design/lib/k-form-design.css

@@ -6682,7 +6682,6 @@ textarea.ant-input-number {
   top: -9999px;
   left: -9999px;
   z-index: 9999;
-  /* 修改层级 */
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   font-size: 14px;

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

@@ -12,8 +12,6 @@
           <Input v-model="selectItem.label" placeholder="请输入" />
         </a-form-item>
 
-        
-
         <!-- +++ -->
         <a-form-item
           v-if="!hideModel && isDefined(selectItem.model)"
@@ -33,6 +31,8 @@
               :key="item.tableName"
               :label="item.tableComment"
               :value="item.tableName">
+              <span style="float: left">{{ item.tableComment }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.tableName }}</span>
             </el-option>
           </el-select>
         </a-form-item>
@@ -134,8 +134,9 @@
         <a-form-item v-if="isDefined(options.dictCode)" label="dictCode">
           <Input v-model="options.dictCode" />
         </a-form-item>
+
         <!-- 选项配置及动态数据配置 start -->
-        <!-- <a-form-item v-if="isDefined(options.options)" label="选项配置">
+        <a-form-item v-if="isDefined(options.options)" label="选项配置">
           <Radio buttonStyle="solid" v-model="options.dynamic">
             <RadioButton :value="false">静态数据</RadioButton>
             <RadioButton :value="true">动态数据</RadioButton>
@@ -148,8 +149,9 @@
           />
 
           <KChangeOption v-show="!options.dynamic" v-model="options.options" />
-        </a-form-item> -->
+        </a-form-item>
         <!-- 选项配置及动态数据配置 end -->
+
         <!-- tabs配置 start -->
         <a-form-item
           v-if="['tabs', 'selectInputList'].includes(selectItem.type)"
@@ -189,6 +191,7 @@
             :count="options.max"
           />
         </a-form-item>
+        
         <a-form-item v-if="selectItem.type === 'select'" label="默认值">
           <Select
             :options="formList.listName"
@@ -203,13 +206,15 @@
               :value="item.fieldName">
             </el-option> -->
         </a-form-item>
+
         <a-form-item v-if="selectItem.type === 'radio'" label="默认值">
           <Radio :options="options.options" v-model="options.defaultValue" />
         </a-form-item>
+
         <a-form-item v-if="selectItem.type === 'checkbox'" label="默认值">
           <Checkbox :options="options.options" v-model="options.defaultValue" />
         </a-form-item>
-        <!-- 日期选择器默认值 start -->
+        <!-- 默认值 start -->
         <a-form-item v-if="selectItem.type === 'date'" label="默认值">
           <Input
             v-if="!options.range"
@@ -580,7 +585,6 @@ const ASwitch = pluginManager.getComponent("switch").component;
 
 export default {
   name: "formItemProperties",
-  dicts: ["base_table"],
   components: {
     KChangeOption,
     kCheckbox,
@@ -704,15 +708,10 @@ export default {
     },
     getFormList() {
       let par = {
-        ...this.$store.state.user.dataSource,
-      };
-      getFormName(par).then((res) => {
-        console.log(this.dict.type.base_table);
-        this.formList.formName = res.data.filter(item => {
-          return !this.dict.type.base_table.some(val => {
-            return val.value==item.tableName
-          })
-        });
+        ... this.$store.state.user.dataSource
+      }
+      getFormName(par).then(res=>{
+        this.formList.formName = res.data
       });
     },
     getListName(item) {

ruoyi-ui/src/views/dataEngine/datamodeling/index.vue

@@ -72,22 +72,22 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item>
                 <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  >删除
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  >修改
-                </el-button>
-              </el-dropdown-item>
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                >修改
+              </el-button>
+            </el-dropdown-item>
+            <el-dropdown-item>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                >删除
+              </el-button>
+            </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>