Эх сурвалжийг харах

修改源码:去掉关联自定义表格的表单项

lph 1 жил өмнө
parent
commit
0f00277c12

+ 19 - 3
zkqy-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -37,7 +37,7 @@
           </el-select>
         </a-form-item>
         <a-form-item
-          v-if="!hideModel && isDefined(selectItem.model)"
+          v-if="!hideModel && isDefined(selectItem.model) && isNeedColumn(selectItem)"
           label="列名"
         >
           <el-select v-model="selectItem.model" @change="changeModel" filterable placeholder="请选择">
@@ -727,6 +727,16 @@ export default {
     isDefined(value) {
       return typeof value !== "undefined";
     },
+    // 判断是否需要列名
+    isNeedColumn(value) {
+      console.log(value.type);
+      let notNeedColumnList = ['batch', 'selectInputList'];
+      if (notNeedColumnList.includes(value.type)) {
+        return false;
+      } else {
+        return true;
+      }
+    },
     async getFormList() {
       let par = {
         ... this.$store.state.user.dataSource
@@ -738,8 +748,14 @@ export default {
       //   this.formList.formName = res.data
       // });
     },
-    getListName(item={}) {
-    item.model=''
+    getListName(item = {}) {
+      let notNeedColumnList = ['batch', 'selectInputList'];
+      let flag=notNeedColumnList.includes(item.type)
+      if (flag) {
+      item.model='batch.'+item.tableName
+      } else {
+      item.model=''
+    }
       let par2 = {
         ... this.$store.state.user.dataSource,
         'tableName':this.selectItem.tableName

+ 25 - 2
zkqy-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formProperties.vue

@@ -28,7 +28,7 @@
           </el-select>
         </a-form-item>
         <!-- 拖拽表格 -->
-        <a-form-item
+        <!-- <a-form-item
           label="关联的自定义表格"
         >
           <el-select v-model="config.tdId" @change="relationTableChange" clearable filterable placeholder="请选择拖拽table">
@@ -37,6 +37,19 @@
               :key="item.tId"
               :label="item.dtName"
               :value="item.tId">
+            </el-option>
+          </el-select>
+        </a-form-item> -->
+        <!-- 表单类型 -->
+        <a-form-item
+          label="表单类型"
+        >
+          <el-select v-model="config.formType" clearable filterable placeholder="请选择表单类型">
+            <el-option
+              v-for="item in formTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
               <!-- <span v-show="false">{{ $sessionStorage.setItem('sqlKey',item.sqlKey) }}</span> -->
             </el-option>
           </el-select>
@@ -196,7 +209,17 @@ export default {
         nickFormName: [
             { required: true, message: '请输入表单别名', trigger: 'blur' }
           ],
-        }
+      },
+        formTypeList: [
+        {
+          value: '1',
+            label:'普通表单',
+        },
+        {
+          value: '2',
+            label:'动态表格表单',
+          }
+        ],
     }
   },
   components: {

+ 1 - 0
zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -47,6 +47,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:menu:add']"
+          v-show="queryParams.btnGroupType == 'right'"
           >新增
         </el-button>
       </el-col>