1

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

@@ -12,31 +12,29 @@
           <Input v-model="selectItem.label" placeholder="请输入" />
         </a-form-item>
 
-        <a-form-item
-          v-if="!hideModel && isDefined(selectItem.model)"
-          label="数据字段"
-        >
-          <Input v-model="selectItem.model" placeholder="请输入" />
-        </a-form-item>
+        
+
         <!-- +++ -->
         <a-form-item
           v-if="!hideModel && isDefined(selectItem.model)"
           label="表名"
         >
         <Select
-            :options="options.options"
-            v-model="options.defaultValue"
+            :options="formList.formName"
+            v-model="formList.tableName"
             :allowClear="options.clearable"
             :mode="options.multiple ? 'multiple' : ''"
+            @change="getFormList"
           />
         </a-form-item>
         <a-form-item
           v-if="!hideModel && isDefined(selectItem.model)"
           label="列名"
         >
-        <Select
-            :options="options.options"
-            v-model="options.defaultValue"
+          <Input v-model="selectItem.model" placeholder="请输入" />
+          <Select
+            :options="formList.ListName"
+            v-model="selectItem.model"
             :allowClear="options.clearable"
             :mode="options.multiple ? 'multiple' : ''"
           />
@@ -551,6 +549,7 @@
 import KChangeOption from "../../KChangeOption/index.vue";
 import kCheckbox from "../../KCheckbox/index.vue";
 import { pluginManager } from "../../../utils/index";
+import {  getListName,  getFormName } from "@/api/dragform/form";
 const Input = pluginManager.getComponent("input").component;
 const InputNumber = pluginManager.getComponent("number").component;
 const Rate = pluginManager.getComponent("rate").component;
@@ -655,7 +654,12 @@ export default {
           value: "9pt",
           label: "小五"
         }
-      ]
+      ],
+      formList:{
+        formName:[],
+        listName:[],
+        tableName:""
+      },
     };
   },
   computed: {
@@ -680,7 +684,29 @@ export default {
      */
     isDefined(value) {
       return typeof value !== "undefined";
+    },
+    getFormList(){
+      let par = {
+        ... this.$store.state.user.dataSource
+      }
+      getFormName(par).then(res=>{
+        console.log(res.data)
+        this.formList.formName = res.data
+      });
+    },
+    getListName(){
+      let par2 = {
+        ... this.$store.state.user.dataSource,
+        'tableName':this.formList.tableName
+      }
+      
+      getListName(par2).then(res=>{
+        this.formList.listName = res.data
+      })
     }
-  }
+  },
+  mounted() {
+    this.getFormList();
+  },
 };
 </script>

ruoyi-ui/src/views/dragform/index.vue

@@ -110,7 +110,11 @@
         >
       </el-form-item>
     </el-form>
-
+<!-- v-hasPermi="['dragform:form:add']" 
+v-hasPermi="['dragform:form:edit']"
+v-hasPermi="['dragform:form:remove']"
+v-hasPermi="['dragform:form:export']"
+-->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -119,7 +123,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['dragform:form:add']"
+          
           >新增
         </el-button>
       </el-col>
@@ -131,7 +135,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['dragform:form:edit']"
+          
           >修改
         </el-button>
       </el-col>
@@ -143,7 +147,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['dragform:form:remove']"
+          
           >删除
         </el-button>
       </el-col>
@@ -154,7 +158,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['dragform:form:export']"
+          
           >导出
         </el-button>
       </el-col>
@@ -224,15 +228,19 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['dragform:form:edit']"
+            
             >修改
           </el-button>
+          <!--  v-hasPermi="['dragform:form:edit']"
+            v-hasPermi="['dragform:form:remove']"
+
+          -->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['dragform:form:remove']"
+            
             >删除
           </el-button>
         </template>

ruoyi-ui/src/views/system/fromModel/index.vue

@@ -77,7 +77,7 @@ export default {
       //
       var editorHtmlJson =
           codeHtmlFront + JSON.stringify(jsonData) + codeHtmlLast;
-      console.log(this.fid)
+      // console.log(this.fid)
       if(!this.fid){
         addForm({
           dfName:'1',