弹窗管理及表格联动bug

ruoyi-ui/src/api/dialogMange/index.js

@@ -8,4 +8,14 @@ export function addDialogGroup(data) {
     data: data,
     baseURL: process.env.VUE_APP_BASE_API3
   })
+}
+
+// 修改拖拽格组
+export function undataDialogGroup(data) {
+  return request({
+    url: '/system/group/editConfigurationGroup',
+    method: 'put',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
 }

ruoyi-ui/src/views/dialogMange/components/StyleFormPanel.vue

@@ -6,14 +6,12 @@
       label-width="100px"
       :rules="rules"
     >
-      <el-form-item label="菜单名称" prop="menuName">
-        <el-input v-model="formData.menuName"></el-input>
-      </el-form-item>
-      <el-form-item label="是否显示列表" v-if="false">
-        <el-switch v-model="formData.isShowList"></el-switch>
+      <el-form-item label="表格名称" prop="menuName">
+        <el-input v-model="formData.menuName" @input="iptChange()"></el-input>
       </el-form-item>
       <el-form-item label="时间格式" prop="timeFormate">
         <el-select
+        @input="iptChange()"
           v-model="formData.timeFormate"
           placeholder="请选择时间格式"
         >
@@ -27,6 +25,7 @@
       </el-form-item>
       <el-form-item label="表格主键" prop="primaryKey">
         <el-select
+        @input="iptChange()"
           v-model="formData.primaryKey"
           placeholder="请选择表格主键"
         >
@@ -40,6 +39,7 @@
       </el-form-item>
       <el-form-item label="操作列按钮" prop="btnGroupList">
         <el-select
+        @input="iptChange()"
           v-model="formData.btnGroupList"
           placeholder="请选择按钮组"
           clearable
@@ -55,6 +55,7 @@
       </el-form-item>
       <el-form-item label="排序依赖字段">
         <el-select
+        @input="iptChange()"
           v-model="formData.orderByColumn"
           placeholder="请选择排序依赖"
         >
@@ -74,15 +75,7 @@
           >降序</el-radio
         >
       </el-form-item>
-      <el-form-item label="依赖方式">
-        <el-select v-model="formData.relyOption" placeholder="请选择依赖方式">
-          <el-option
-            v-for="item in relyOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
+      <el-form-item label="当前表字段">
         <el-select v-model="formData.relyFile" placeholder="请选择当前表字段">
           <el-option
             v-for="item in orderByFieldList"
@@ -91,10 +84,24 @@
             :value="item.tableName + '.' + item.fieldName">
           </el-option>
         </el-select>
-        <el-input v-show="formData.relyOption === '0'" v-model="formData.relayValue" placeholder="请输入依赖值"></el-input>
-
+      </el-form-item> 
+      <!-- <el-form-item label="依赖方式">
+        <el-select v-model="formData.relyOption" placeholder="请选择依赖方式">
+          <el-option
+            v-for="item in relyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="自定义依赖值" v-show="formData.relyOption === '0'">
+        <el-input v-model="formData.relayValue" placeholder="请输入依赖值"></el-input>
+      </el-form-item> -->
+      
+      <el-form-item label="依赖表">
         <el-select
-          v-show="formData.relyOption === '1'"
           v-model="formData.relytableName"
           placeholder="请选择依赖表"
           filterable
@@ -113,9 +120,10 @@
             }}</span>
           </el-option>
         </el-select>
+      </el-form-item>
 
+      <el-form-item label="依赖表字段">
         <el-select
-            v-show="formData.relytableName && formData.relyOption === '1'"
             v-model="formData.relaykey"
             placeholder="请选择依赖字段"
           >
@@ -127,7 +135,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-               
     </el-form>
   </div>
 </template>
@@ -135,7 +142,7 @@
 <script>
 import { listType } from "@/api/system/tenant/type";
 import { getDicts } from "@/api/system/dict/data";
-
+import { listTable, removeTableList } from "@/api/dragform/tableList";
 export default {
   name: "StyleFormPanel",
   dicts: ["sys_time_format", "table_statistic_type"],
@@ -144,22 +151,28 @@ export default {
       default: [],
       type: Array,
     },
-    dragTableList: {
-      default: [],
-      type: Array,
-    },
     btnGroupOptions: {
       default: [],
       type: Array,
+    },
+    echoData:{
+      default: {},
     }
   },
   components: {},
   data() {
     return {
+      dragTableList:[],
+      dragTableFilds:[],
+      editData:{},
       dragTableFilds:{},
       rules: {},
       formData: {
-        relytableName:''
+        timeFormate:'',
+        relytableName:'',
+        isAsc: false,
+        primaryKey: "",
+        btnGroupList: [],
       },
       relyFileds: {},
       conditionDefaultValueMap: '',
@@ -173,6 +186,7 @@ export default {
           label: '依赖其他字段'
         }
       ],
+      tableList: []
     }
   },
   computed: {
@@ -180,7 +194,7 @@ export default {
       return this.tableFieldList;
     },
     primaryKeyList() {
-      console.log(this.subFieldList)
+      // console.log(this.subFieldList)
       return this.subFieldList.filter((item) => !item.isChildren);
     },
     orderByFieldList() {
@@ -222,9 +236,56 @@ export default {
       },
       immediate: true,
       deep: true,
+    },
+    echoData:{
+      handler(nval){
+          let {
+            menuName,
+            timeFormate,
+            orderByColumn,
+            isAsc,
+            primaryKey,
+            btnGroupList,
+            relyFile,
+            relytableName,
+            relaykey,
+            relyOption
+          } = nval.formData;
+          Object.assign(this.formData, {
+            menuName,
+            timeFormate,
+            orderByColumn,
+            isAsc,
+            primaryKey,
+            btnGroupList,
+            relyFile,
+            relytableName,
+            relaykey,
+            relyOption
+
+          });
+        
+        this.getdragTable()
+        this.getrelyList()
+        // this.editData = item;
+      },
+      // immediate: true,
+      deep: true,
     }
   },
   methods: {
+    iptChange(){
+	    this.$forceUpdate();  //强制刷新
+    },
+    getdragTable(){
+       let queryParams = {
+        isEnablePaging:false,
+        dtType: 0
+      }
+      listTable(queryParams).then(res => {
+        this.dragTableList = res.rows
+      })
+    },
     getrelyList() {
       this.dragTableList.forEach(item => {
         if(this.formData.relytableName == item.dtName){
@@ -239,6 +300,9 @@ export default {
       })
     },
   },
+  async mounted() {
+    this.getdragTable()
+  },
 };
 </script>
 

ruoyi-ui/src/views/dialogMange/styleMange/tablelist.vue

@@ -45,6 +45,7 @@
             <el-table-column prop="fieldDescription" label="字段描述">
               <template slot-scope="scope">
                 <input
+                @input="iptChange()"
                   :class="{
                     isNullDesc:
                       scope.row.fieldDescription == '' &&
@@ -61,6 +62,7 @@
             <el-table-column prop="relationTable" label="关联表">
               <template slot-scope="scope">
                 <el-select
+                @input="iptChange()"
                   v-model="scope.row.relationTable"
                   :disabled="
                     !scope.row.relationTableList ||
@@ -155,6 +157,7 @@ import {
 import { getTableInfo, editTable } from "@/api/system/table.js";
 import { addDragTable } from "@/api/tablelist/commonTable.js";
 import { getParticMenu, updateMenu } from "@/api/system/menu.js";
+import { addGroup, listGroup, getTable, delGroup, updataGroup} from '@/api/relateTable/index.js'
 import { getMenuList, addMenu } from "@/api/menu.js";
 import Queryfrom from "@/views/tablelist/commonTable/queryfrom.vue";
 import { mapState } from "vuex";
@@ -166,7 +169,7 @@ import { listBtn } from "@/api/system/btn";
 export default {
   name: "SubList",
   dicts: ["sys_time_format", "table_statistic_type"],
-  props: ['menudata','tableList'],
+  props: ['menudata','echoName','echoList'],
   components: { Queryfrom, Treeselect },
   data() {
     return {
@@ -191,7 +194,7 @@ export default {
       // 表格的高度
       tableKey: "",
       // tableHeight: document.documentElement.scrollHeight - 245 + "px",
-      // tableList: [], //所有表格列表
+      tableList: [], //所有表格列表
       tableFieldList: [], // 当前表格字段数据
       tableName: "", // 当前表名称
 
@@ -335,7 +338,7 @@ export default {
     };
   },
   async mounted() {
-    // this.getAllTable();
+    this.getAllTable();
     this.initDragTable();
     this.getBtnList();
     if (this.$route.query.tId) {
@@ -344,20 +347,6 @@ export default {
     }
   },
   computed: {
-    // 数据字段
-    dataArr() {
-      return this.tableFieldList.filter((item) => item.isShow);
-    },
-    // 数据统计字段表名中文
-    isShowTableName() {
-      let tableComment;
-      this.tableList.forEach(item => {
-        if(item.tableName === this.tableName){
-          tableComment = item.tableComment
-        }
-      })
-      return tableComment
-    },
     ...mapState({
       databaseName: (state) => state.user.dataSource.databaseName,
       databaseType: (state) => state.user.dataSource.databaseType,
@@ -404,6 +393,13 @@ export default {
       let targetMenu = this.getTargetMenu(this.menus);
       this.menuOrderNum = targetMenu.children ? targetMenu.children.length : 0;
     },
+    echoName: function(val){
+      if(val){
+        console.log(val);
+        this.tableName = this.echoName
+        this.tableFieldList = this.echoList
+      }
+    }
   },
   methods: {
     /** 查询列表 */
@@ -526,7 +522,28 @@ export default {
       }
       row.disableRelaType = true;
     },
+     // 修改表格回显数据
+     async initTableData(tId) {
+      let res = await getTable({id : tId});
+      if (res.code == 200) {
+        let lists = res.data.dragTables
+        let groupInfo =JSON.parse(res.data.groupTableInfo)
+
+        lists.forEach(item => {
+          if(item.tableKey == groupInfo[1].tableKey){
+            let echoData = JSON.parse(item.echoData);
+              this.tableName = echoData.tableName;
+              this.tableFieldList = echoData.tableFieldData;
 
+              this.$emit('fieldListChange', this.tableFieldList)
+              this.editData = item;
+          }
+        })
+        console.log('info', groupInfo)
+      } else {
+        this.$message.error("数据回显失败");
+      }
+    },
     // 勾选框回调
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -562,6 +579,7 @@ export default {
             value.dictValue.toLowerCase() == item.tableName.toLowerCase()
         );
       });
+
     },
     //处理表格行拖拽
     initDragTable() {
@@ -941,218 +959,6 @@ export default {
       //   }
       // });
     },
-    // 创建回调
-    async createHandle() {
-      // console.log(123);
-      // this.sqlKey = uuidv4();
-      this.isInputInvalid = true;
-      this.$refs.formData.validate(async (valid) => {
-        if (valid) {
-          // 检验表单合法性
-          let validRes = this.validateTableData(this.tableFieldList);
-          if (!validRes.val) {
-            this.$message.error(validRes.msg);
-            return;
-          }
-          let columns = [],
-            searchFieldList = [],
-            tableExportField = {};
-          this.getCol(
-            this.tableFieldList,
-            columns,
-            searchFieldList,
-            tableExportField
-          );
-
-          let echoData = {
-            tableName: this.tableName,
-            tableFieldData: this.tableFieldList,
-            formData: this.formData,
-          };
-          if (!searchFieldList.length) {
-            this.$message.warning("请至少选择一个包含查询字段");
-            return false;
-          }
-          // let validateParams = {
-          //   isFieldDescrib: false,
-          //   isRelationFieldAll: false,
-          // };
-          // this.validateField(this.tableFieldList, validateParams);
-          // console.log(validateParams);
-          // if (validateParams.isFieldDescrib) {
-          //   this.$message.error("需要显示的字段描述不能为空");
-          //   return;
-          // }
-          // if (validateParams.isRelationFieldAll) {
-          //   this.$message.error("请补全关联条件");
-          //   return;
-          // }
-          // console.log("123", columns);
-          this.uuid = uuidv4();
-          this.tableKey = uuidv4();
-          // 表单
-          let result;
-          if (this.tId) {
-            let payLoad = {
-              menuId: this.menuId,
-              menuName: this.formData.menuName,
-              parentId: this.formData.routePath,
-              component: "tablelist/commonTable/listInfo",
-              icon: "",
-              isCache: "0",
-              isFrame: "1",
-              menuType: "C",
-              orderNum: this.menuOrderNum,
-              status: "0",
-              visible: "0",
-              tenantId: this.tenantId,
-            };
-            result = await updateMenu(payLoad);
-          } else {
-            let tableKeyObj = {
-              tableKey: this.uuid,
-            };
-            // console.log(this.formData)
-            let payLoad = {
-              component: "tablelist/commonTable/listInfo",
-              icon: "",
-              isCache: "0",
-              isFrame: "1",
-              menuName: this.formData.menuName,
-              // menuId: this.formData.routePath,
-              menuType: "C",
-              orderNum: this.menuOrderNum,
-              parentId: this.formData.routePath,
-              path: this.uuid,
-              query: JSON.stringify(tableKeyObj),
-              status: "0",
-              visible: "0",
-              tenantId: this.tenantId,
-            };
-            result = await addMenu(payLoad);
-          }
-
-          if (result.code == 200) {
-            // 更新路由
-            this.reloadRouter();
-
-            // let isAsc = this.formData.isAsc == "ASC" ? 0 : 1;
-            let data = {
-              tId: this.tId,
-              dtName: this.formData.menuName,
-              menuId: this.formData.routePath,
-              tableKey: this.uuid, //  暂定
-              dtTableName: this.tableName,
-              primaryKey: this.formData.primaryKey,
-              orderByColumn: this.formData.orderByColumn,
-              sortOrder: this.formData.isAsc,
-              sqlKey: this.tableKey,
-              dtColumnName: columns, //列字段标题名称(存储显示字段信息
-              // dtColumnName: JSON.stringify(columns).replace(/"/g, "'"), //列字段标题名称(存储显示字段信息
-              timeFormat: this.formData.timeFormate,
-              searchFieldList: searchFieldList, //搜索字段数组
-              tableSql: this.getSQLStr(), //  暂定
-              tableExportField: tableExportField, //导出字段名及列名
-              echoData: JSON.stringify(echoData),
-
-              // 样式相关数据
-              // dragTableStyleList: this.$refs.styleTableRef.getSaveData(),
-            };
-
-            this.dragTableStatisticList.forEach((item) => {
-              if (this.tId == "") {
-                item.tableKey = this.tableKey;
-                this.staticSqlKey = uuidv4();
-                item.sqlKey = this.staticSqlKey;
-              }
-              if (item.sqlKey) {
-                this.staticSqlKey = item.sqlKey;
-              } else {
-                this.staticSqlKey = uuidv4();
-                item.sqlKey = this.staticSqlKey;
-              }
-
-              let key =
-                item.statisticType +
-                "(" +
-                item.statisticField +
-                ")" +
-                " as result";
-
-              this.tableSqlList.push({
-                tableSql: this.getStaticSQL(key),
-                sqlKey: this.staticSqlKey,
-              });
-              this.searchFieldList = searchFieldList;
-            });
-            let res;
-            let res1;
-            if (this.tId) {
-              data.menuId = this.menuId;
-              data.sqlKey = this.editData.sqlKey;
-              data.tableKey = this.editData.tableKey;
-              data.dragTableBtnRelevanceList = this.getBtnMapList(
-                data.tableKey
-              );
-              res = await editTable(data);
-              this.dragTableStatisticList.forEach((item) => {
-                item.tableKey = this.editData.tableKey;
-              });
-              res1 = await updateStatistic({
-                tableKey: this.editData.tableKey,
-                dragTableStatisticList: this.dragTableStatisticList,
-                tableSqlList: this.tableSqlList,
-                searchFieldList: this.searchFieldList,
-                dtTableName: this.tableName,
-              });
-            } else {
-              data.menuId = result.data;
-              data.dragTableBtnRelevanceList = this.getBtnMapList(
-                data.tableKey
-              );
-              res = await addDragTable(data);
-
-              this.dragTableStatisticList.forEach((item) => {
-                item.tableKey = this.uuid;
-              });
-              if (res.code == 200 && this.dragTableStatisticList.length !== 0) {
-                // 新增统计数据
-                res1 = addStatistic({
-                  tableKey: this.uuid,
-                  dragTableStatisticList: this.dragTableStatisticList,
-                  tableSqlList: this.tableSqlList,
-                  searchFieldList: this.searchFieldList,
-                  dtTableName: this.tableName,
-                });
-              }
-            }
-
-            // 关闭当前页面
-            if (this.tId) {
-              if (res.code == 200) {
-                this.$message.success("修改成功");
-              } else {
-                this.$message.warning("修改失败");
-              }
-              this.$tab.closePage();
-              this.$router.push({
-                path: "/system/fromModel/index/tablelist",
-              });
-            } else {
-              if (res.code == 200) {
-                this.$message.success("创建成功");
-              } else {
-                this.$message.warning("创建失败");
-              }
-              this.isShowPreview = false;
-            }
-          }
-        } else {
-          this.$message.warning("请完善表单");
-          return false;
-        }
-      });
-    },
     getBtnMapList(tableKey) {
       let res = this.formData.btnGroupList.map((item) => {
         return {
@@ -1162,52 +968,7 @@ export default {
       });
       return res;
     },
-    // 修改表格回显数据
-    async initTableData(tId) {
-      let res = await getTableInfo(tId);
-      if (res.code == 200) {
-        this.dragTableStatisticList = res.data.dragTableStatisticList;
-        // this.dragTableStyleList = res.data.dragTableStyleList;
-        let echoData = JSON.parse(res.data.echoData);
-        this.tableName = echoData.tableName;
-        this.tableFieldList = echoData.tableFieldData;
-        let {
-          isShowList,
-          timeFormate,
-          orderByColumn,
-          isAsc,
-          primaryKey,
-          menuName,
-          btnGroupList,
-        } = echoData.formData;
-        Object.assign(this.formData, {
-          menuName,
-          isShowList,
-          timeFormate,
-          orderByColumn,
-          isAsc,
-          primaryKey,
-          btnGroupList,
-        });
-        this.formData.routePath = this.getParentMenuId(
-          res.data.menuId,
-          this.menus,
-          {}
-        );
 
-        if (!this.formData.routePath) {
-          this.$message.warning("该表格菜单路由已经删除,请重新配置");
-        }
-        // this.formData.routePath
-        this.editData = res.data;
-        let val = await getParticMenu(res.data.tableKey);
-        if (val.code == 200) {
-          this.menuId = val.data.menuId;
-        }
-      } else {
-        this.$message.error("数据回显失败");
-      }
-    },
     // tab切换
     tabhandleClick() {
       this.menudata = this.activeName != "menuedit" ? true : false;
@@ -1294,16 +1055,7 @@ export default {
       this.btnGroupOptions = res.rows;
     },
   },
-  created() {},
-  async mounted() {
-    this.getAllTable();
-    this.initDragTable();
-    this.getBtnList();
-    if (this.$route.query.tId) {
-      this.tId = this.$route.query.tId;
-      this.initTableData(this.tId);
-    }
-  },
+
 };
 </script>
 

ruoyi-ui/src/views/dialogTemplate/components/index.vue

@@ -9,9 +9,9 @@
    </div>
    <div class="tableBox">
     <div class="top">
-      <div class="left">
-        <p>工序状态:</p>
-        <i>初始</i>
+      <div class="left" v-if="tableCount[0]">
+        <p>{{ tableCount[0].statisticTitle }}</p>
+        <i>{{ tableCount[0].result }}</i>
       </div>
       <div class="right">
         <p>是否外协</p>
@@ -20,73 +20,60 @@
     </div>
     <!-- 按钮组 -->
     <el-button-group>
-      <el-button icon="el-icon-caret-right" class="custom">开始</el-button>
-      <el-button icon="el-icon-switch-button" class="custom">暂停</el-button>
-      <el-button icon="el-icon-finished" class="custom">完成</el-button>
-      <el-button icon="el-icon-refresh" class="custom">重置</el-button>
+      <el-button v-for="item in controlBtnArr">
+        <template>
+          <span @click="clickHandler(item, row)"
+              ><svg-icon
+                v-if="item.btnIcon"
+                class="pre-icon"
+                slot="prefix"
+                :icon-class="item.btnIcon"
+              />{{ item.btnName }}</span
+            >
+        </template>
+      </el-button>
     </el-button-group>
     
-    <el-table
-      border
-      :data="tableData[1].data"
-      style="width: 100%">
-      <el-table-column
-       v-for="item in tableData[0].column"
-        :prop="item.key"
-        :label="item.value"
-        width="180">
-      </el-table-column>
-    </el-table>
-
     <el-form ref="tableform" :model="tableDataForm">
-      <div class="titleitem">人员及工时分配</div>
       <el-table
-      class="addTable"
-      border
-      :data="editData"
-      style="width: 100%">
-      <el-table-column
-         v-for="item in tableData[0].column"
-        :prop="item.key"
-        :label="item.value">
-        <template slot-scope="scope">
-          <el-input :v-model="scope.row[item.key]"></el-input>
-        </template>
-      </el-table-column>
-
+        border
+        :data="tableData[1].data"
+        style="width: 100%; margin-bottom: 20px">
         <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-        <template slot-scope="scope">
-          <el-dropdown>
-            <el-button type="warning" plain size="small">
-              处理<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  >修改
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  >删除
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
+          v-for="item in tableData[0].column"
+          v-if="item.key !== 'id'"
+          :prop="item.key"
+          :label="item.value"
+          width="180">
+          <template slot-scope="scope" >
+            <el-input :v-if="scope.row[item.key]" v-model="scope.row[item.key]"></el-input>
+          </template>
         </el-table-column>
+        <el-table-column
+            v-if="isShowExcuteCol"
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+
+          <template slot-scope="scope">
+            <Menu
+              :row="scope.row"
+              v-for="btnObj in excuteBtnArr"
+              :key="btnObj.id"
+              :listAll="btnObj"
+              @excuteHandler="excuteHandler"
+            ></Menu>
+          </template>
+        </el-table-column>
+
       </el-table>
 
+      <div>
+        <b>统计信息 </b>
+        <span v-for="item in subCount">{{ item.statisticTitle }}: {{ item.result }}</span>
+      </div>
+
       <el-form-item>
         <el-button class="addBtn" icon="el-icon-plus"
         @click="addBtnHandler"
@@ -100,7 +87,6 @@
     </el-form>
    
     <div>
-      
     </div>
    </div>
   </div>
@@ -109,6 +95,7 @@
 <script>
 import { dragGroupTableInfo } from "@/api/relateTable/index"
 import {
+  btnCommonApi,
   delTableData,
   dragTableInfo,
   listTable,
@@ -119,8 +106,9 @@ import {
   getStatisticList
 } from "@/api/tablelist/commonTable";
 import {camelCase} from "@/utils";
-
+import Menu from "@/views/tablelist/commonTable/BtnMenu.vue";
 export default {
+  components: { Menu },
   data () {
    return {
     // 基础信息行数据
@@ -158,55 +146,86 @@ export default {
     // 当前模版信息
     templateInfo: {},
     queryFromWhere:'',
-    condition: []
+    condition: [],
+    // 当前点击按钮的数据
+    currentBtnData: {},
+    // 操作列 按钮数据
+    excuteBtnArr: [],
+    // 新增保存的数据
+    addListData:[],
+    controlBtnArr: [],
    }
  },
+  props: ['groupKey','rowobj','tableCount','subCount', 'subTableName' ],
+  computed: {
+    isShowExcuteCol() {
+      // console.log(!this.excuteBtnArr?.every((arr) => arr.children.length == 0));
+      // return true;
+      return !this.excuteBtnArr?.every((arr) => arr.children.length == 0);
+    },
+  },
   methods: {
     // 新增
     addBtnHandler(){
-      if (this.editData == undefined) {
-        this.editData = new Array();
-      }
+      // if (this.editData == undefined) {
+      //   this.editData = new Array();
+      // }
 
       let obj = {
-        date: '',
-        name: ''
+        // id:'',
       }
-
-      this.editData.push(obj);
+      this.addListData.push(obj)
+      this.tableData[1].data.push(obj);
     },
     // 保存
     saveBtnHandler(){
-      this.editData.forEach(item => {
-        this.tableData.push(item)
+      console.log(this.addListData);
+      let data = {
+        addListMap:this.addListData,
+        basicMap:{
+          btnType: 10,
+          tableName: this.subTableName,
+          visible: true,
+        },
+        commMap: {},
+        conditionMap: {},
+      }
+      btnCommonApi(data).then(res => {
+        console.log('保存', res);
       })
-      this.editData = []
     },
-    async getLists(){
-      let res = await dragGroupTableInfo({queryMap: {groupKey: this.groupKey}})
+    async getLists(groupKey){
+      let res = await dragGroupTableInfo({queryMap: {groupKey: groupKey}})
       this.tableLists = JSON.parse(res.msg)
-      console.log(this.tableLists);
+      // console.log(this.tableLists);
 
       this.tableLists.forEach(async item => {
         if(item.sort == 0){
 
           const res = await dragTableInfo({queryMap: {tableKey : item.tableKey }})
           this.getTableHandle(res,item.sort).then(result => {
+            console.log('result:',result);
             this.infoData.push(result)
+            this.$set(this.infoData)
           })
+
         }else if(item.sort == 1){
 
           const res = await dragTableInfo({queryMap: {tableKey : item.tableKey }})
+          this.excuteBtnArr = res.data.resultMap.button;
           this.getTableHandle(res,item.sort).then(result => {
             this.tableData.push({
               column: result
             })
           })
-          console.log(this.tableData);
+          // console.log(this.tableData);
         }else if(item.sort == 2){
 
           const res = await dragTableInfo({queryMap: {tableKey : item.tableKey }})
-
+          
+          this.controlBtnArr = res.data.resultMap.button[0]
+          this.controlBtnArr = this.controlBtnArr.children
+          console.log('butt',this.controlBtnArr)
         }
       })
     },
@@ -215,7 +234,7 @@ export default {
         // 得到当前模版信息 --- sql columns queryWhere
         this.templateInfo = res.data.resultMap;
       
-        console.log(res.data.resultMap.querySql);
+        // console.log(res.data.resultMap.querySql);
         this.queryParams.orderByColumn =
           res.data.resultMap.querySql.orderByColumn;
 
@@ -232,7 +251,7 @@ export default {
         if (this.templateInfo !== {}) {
             this.tableCondition = this.templateInfo.querySql.tableCondition
             this.tableCondition = this.tableCondition.split('AND')
-            console.log(this.tableCondition);
+            // console.log(this.tableCondition);
             this.condition = [];
               
             // 调用查询需要携带当前table的唯一标识
@@ -261,24 +280,33 @@ export default {
               console.log(res);
               if(sort == 0){
                 this.infoData.push(res)
+                // this.$set(this.infoData)
               }else if(sort ==1){
                 this.tableData.push({
                   data: res
                 })
+                // this.$set(this.tableData)
               }
             })
+            // console.log('columns', this.columns);
             return this.columns
         }  
     },
     // 获取表数据
     async getDataHandler(contion){
       let con = contion.split('=')
+      // console.log(con);
       let key = con[1].trim()
-      let value = '张国荣'
-      this.queryParams.queryMap[key] = "'" + value + "'";
+      // console.log(this.rowobj);
+      // console.log(key);
+      
+      let value = key.split('.')
+
+      // console.log(value);
+      this.queryParams.queryMap[key] = "'" + this.rowobj[value[1]] + "'";
   
       let tableLists = await unionListTableData(this.queryParams)
-      console.log(tableLists.rows);
+      // console.log(tableLists.rows);
       if(tableLists.code == 200){
           this.tableList = [];
           tableLists.rows.forEach((item) => {
@@ -293,7 +321,8 @@ export default {
             }
             return kv;
           })
-          console.log(this.tableList);
+          // console.log(this.tableList);
+          // console.log('123', this.tableList);
           return this.tableList
 
       }
@@ -313,20 +342,72 @@ export default {
       });
       return resArr;
     },
+     // 操作列回调
+     excuteHandler(btnData, row) {
+      let { btnType, btnParams } = btnData;
+      this.currentBtnData = btnData;
+      switch (
+        btnType //3:内链  6:目录  7:外链  8:修改  9:删除
+      ) {
+        case "3":
+          this.routerHandler(btnData, btnType);
+          break;
+        case "7":
+          this.routerHandler(btnData, btnType);
+          break;
+        case "8":
+          this.handleUpdate(row, btnData);
+          break;
+        case "9":
+          this.handleDelete(row, btnData);
+          break;
+        default:
+          break;
+      }
+    },
+    // 内链页面跳转
+    routerHandler(btnData, type) {
+      let link = btnData.btnParams;
+      if (type == "3") {
+        this.$router.push(link);
+      } else {
+        window.open("http://" + link, "_blank");
+      }
+    },
+    handleDelete(row, btnData){
+      // console.log(row, btnData);
+      // if(row.id){
+      //   this.editData.forEach((item ,index) => {
+      //     if(item.id == row.id){
+      //       this.editData.splice(index, 1);
+      //     }
+      //   })
+      // }else{
+      //   this.$message.error("请输入id");
+      // }
+    },
+    // 修改
+    handleUpdate(row, btnData){
+      console.log(row);
+
+    },
+    // 按钮组点击
+    clickHandler(item, row){},
   },
   mounted() {
-    this.groupKey = 'd3514c56-c641-4da6-b523-5a1b0e1769ba';
-    this.getLists()
+    // this.getLists()
   },
 }
 </script>
 
 <style scoped lang="scss">
+
   .bigBox{
-    width: 800px;
     margin: auto;
     display: flex;
-  
+    ::v-deep .info[data-v-32a636fc]{
+      min-width: 200px !important;
+    }
     .info{
       margin-right: 60px;
       .tt{
@@ -340,14 +421,14 @@ export default {
         background-color: #34bfa3;
         /* width: 50px; */
         display: inline-block;
-        height: 25px;
+        /* height: 25px; */
         line-height: 1;
         padding: 5px;
         margin-bottom: 20px;
         margin-right: 5px;
         text-align: center;
         color: white;
-        /* border-radius: 20px; */
+        border-radius: 20px; 
       }
       .infostyle{
         background-color: #ebedf2;
@@ -356,7 +437,10 @@ export default {
     }
 
     .tableBox{
-      width: 500px;
+      .svg-icon[data-v-c8a70580]{
+        margin-right: 5px;
+      }
+      min-width: 300px;
       .addTable{
         margin: 0px 0px 20px 0px
       }
@@ -390,7 +474,6 @@ export default {
         background-color: white;
         
         .el-button:first-child{
-          border-radius: 20px 0px 0px 20px;
           color: blue;
           border: 1px solid blue;
         }
@@ -403,7 +486,6 @@ export default {
           border: 1px solid green;
         }
         .el-button:last-child{
-          border-radius: 0px 20px 20px 0px;
           color:burlywood;
           border: 1px solid burlywood;
         }

ruoyi-ui/src/views/dialogTemplate/indexTable.vue

@@ -49,7 +49,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
-          @click=""
+          @click="DeleteTableGroup"
           >删除</el-button
         >
       </el-col>
@@ -64,8 +64,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="表格主键" align="center" prop="id" />
       <el-table-column label="表格名称" align="center" prop="groupName" />
-      <el-table-column label="绑定表名称" align="center" prop="groupName" />
-      <el-table-column label="描述" align="center" prop="groupDescription" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
 
       <el-table-column
         label="操作"
@@ -83,7 +83,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
-                  @click=""
+                  @click="handleUpdate(scope.row)"
                   >修改
                 </el-button>
               </el-dropdown-item>
@@ -92,7 +92,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
-                  @click=""
+                  @click="DeleteTableGroup(scope.row)"
                   >删除
                 </el-button>
               </el-dropdown-item>
@@ -102,236 +102,13 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog
-      title="新增表格信息"
-      :visible.sync="dialogVisible"
-      width="30%"
-    >
-    <div class="formWrap">
-        <el-form
-          :rules="tableItemRules"
-          ref="tableItemForm"
-          style="max-width: 750px; width: 1000px"
-          :model="tableItemForm"
-          label-width="100px"
-        >
-          <el-form-item label="弹窗名称:" prop="title">
-            <el-input
-            @input="change1($evevt)"
-              v-model="tableItemForm.title"
-              style="max-width: 221px"
-              @change="iptChange()"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="绑定表名称:" prop="tableName">
-            <el-select
-              v-model="tableItemForm.tableName"
-              @change="getList()"
-              placeholder="请选择表格名称"
-            >
-              <el-option
-              v-for="item in tableList"
-              :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>
-          </el-form-item>
-          <!-- <el-form-item label="表格主键:" prop="selectFields">
-            <el-select
-              v-model="tableItemForm.selectFields"
-              placeholder="请选择表格主键"
-            >
-            <el-option
-              v-for="item in tableFieldList"
-              :key="item.fieldName"
-              :label="item.fieldDescription"
-              :value="item.fieldName"
-            >
-              <span style="float: left">{{ item.fieldDescription }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{
-                item.fieldName
-              }}</span>
-            </el-option>
-            </el-select>
-          </el-form-item> -->
-          <!-- <el-form-item label="时间格式" prop="timeFormate">
-            <el-select
-              v-model="tableItemForm.timeFormate"
-              placeholder="请选择时间格式"
-            >
-              <el-option
-                v-for="val in dict.type.sys_time_format"
-                :key="val.value"
-                :label="val.label"
-                :value="val.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排序依赖字段">
-            <el-select
-              v-model="tableItemForm.orderByColumn"
-              placeholder="请选择排序依赖"
-            >
-              <el-option
-                v-for="val in orderByFieldList"
-                :key="val.fieldName"
-                :label="val.fieldDescription"
-                :value="val.tableName + '.' + val.fieldName"
-              ></el-option>
-            </el-select>
-          </el-form-item> -->
-          <el-form-item label="绑定按钮">
-            <el-select
-              v-model="tableItemForm.bottons"
-              placeholder=""
-            >
-            
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="排序方式" v-show="tableItemForm.orderByColumn">
-            <el-radio v-model="tableItemForm.isAsc" :label="false"
-              >升序</el-radio
-            >
-            <el-radio v-model="tableItemForm.isAsc" :label="true"
-              >降序</el-radio
-            >
-          </el-form-item>
-          <el-form-item label="菜单路由" prop="routePath">
-          <div class="treeselect">
-            <treeselect
-              :append-to-body="true"
-              v-model="tableItemForm.routePath"
-              :options="menus"
-              :normalizer="normalizer"
-              :show-count="true"
-              placeholder="请选择父级路由"
-            />
-          </div>
-        </el-form-item>
-          <el-form-item label="展示字段:" prop="FieldList">
-            <el-table
-            :data="tableFieldList"
-            border
-            ref="dragTable"
-            row-key="id"
-            max-height="500px"
-            class="tablefiled"
-            >
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              class-name="allowDrag"
-            >
-            </el-table-column>
-            <el-table-column prop="fieldName" label="数据字段"></el-table-column>
-            <el-table-column prop="fieldDescription" label="字段描述">
-              <template slot-scope="scope">
-                <input
-                  :class="{
-                    isNullDesc:
-                      scope.row.fieldDescription == '' &&
-                      scope.row.isShow &&
-                      isInputInvalid
-                        ? true
-                        : false,
-                    ipt: true,
-                  }"
-                  v-model="scope.row.fieldDescription"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationTable" label="关联表">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationTable"
-                  :disabled="
-                    !scope.row.relationTableList ||
-                    !scope.row.relationTableList.length
-                  "
-                  placeholder="请选择关联的表"
-                  clearable
-                  filterable
-                  @change="ralationTableChange(scope.row)"
-                >
-                  <el-option
-                    v-for="(item, index) in scope.row.relationTableList"
-                    :key="index"
-                    :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>
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationFieldName" label="关联条件字段">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationFieldName"
-                  @change="relationFieldChange(scope.row)"
-                  :disabled="!scope.row.disableRelaFieldName"
-                  placeholder="关联字段"
-                  filterable
-                >
-                  <el-option
-                    v-for="(item, index) in scope.row.relaFieldNameList"
-                    :key="index"
-                    :label="item.fieldDescription"
-                    :value="item.fieldName"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationType" label="关联方式">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationType"
-                  placeholder="请选择关联方式"
-                  :disabled="!scope.row.disableRelaType"
-                  @change="relationTypeChangeHandler(scope.row)"
-                  filterable
-                >
-                  <el-option
-                    v-for="(item, index) in relaTypeList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="isShow" label="是否显示">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.isShow"> </el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column prop="isSearch" label="是否包含查询">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.isSearch" @change="isSearchChange($event, scope.row,  scope.$index)"> </el-switch>
-              </template>
-            </el-table-column>
-          </el-table>
-          </el-form-item> -->
-          <el-form-item class="btn">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-dialog>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getLists"
+    />
   </div>
 </template>
 
@@ -380,8 +157,9 @@ export default {
      loading: false,
 
      tableItemRules: [],
+    total: 0,
     // 新增弹框数据
-     tableItemForm: {
+    tableItemForm: {
         tId: "",
         rowId: "",
         title: "",
@@ -392,9 +170,9 @@ export default {
         orderByColumn: "",
         routePath: undefined,
       },
-     tableFieldList: [],
+    tableFieldList: [],
         // 关联方式
-      relaTypeList: [
+    relaTypeList: [
       {
         label: "等值连接",
         value: "INNER JOIN",
@@ -407,9 +185,28 @@ export default {
         label: "右连接",
         value: "RIGHT JOIN",
       },
-    ],
+      ],
+    queryParams: {
+        groupType: 1,
+        pageNum: 1,
+        pageSize: 10,
+        dtName: null,
+        dtNickname: null,
+        tableKey: null,
+        sqlKey: null,
+        dtTableName: null,
+        dtNotes: null,
+        dtColumnName: null,
+        timeFormat: null,
+        spare: null,
+        spare1: null,
+        isSelection: null,
+      },
    }
  },
+ created() {
+    this.getLists();
+  },
  computed: {
     selectRelate(){
       if(this.tableItemForm.tableName =='') return
@@ -450,6 +247,31 @@ export default {
     },
   },
   methods: {
+    getLists(){
+      this.loading = true;
+      listGroup(this.queryParams).then((response) => {
+        this.tableData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+        
+    },
+     // 删除表格组
+     DeleteTableGroup(row){
+      const fIds = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除动态单编号为"' + fIds + '"的数据项？删除后表格中所有的数据都将删除！')
+        .then(function () {
+          
+          return delGroup(fIds);
+        })
+        .then(async () => {
+          this.getLists();
+          this.$modal.msgSuccess("删除成功");
+
+        })
+        .catch(() => {});
+    },
     // 搜索
     handleQuery(){},
     // 重置
@@ -460,8 +282,19 @@ export default {
       this.$router.push({
         path: "/system/fromModel/index/dialogMange",
       });
-      this.getAllTable()
-      await this.getMenuList()
+      // this.getAllTable()
+      // await this.getMenuList()
+    },
+
+    /** 修改按钮操作 */
+    async handleUpdate(row) {
+      // 兼容勾选单个的修改
+      this.$router.push({
+        path: "/system/fromModel/index/dialogMange",
+        query: {
+          tId: row.id,
+        },
+      });
     },
     // 获取所有表格
     async getAllTable() {
@@ -480,41 +313,6 @@ export default {
         );
       });
     },
-    /** 查询列表 */
-    getList(queryParams) {
-      if (!this.tableItemForm.tableName) return;
-      let data = {
-        databaseName: this.databaseName,
-        databaseType: this.databaseType,
-        tableName: this.tableItemForm.tableName,
-      };
-      
-      // 获取当前表单结构信息
-      getListName(data).then((res) => {
-        this.tableFieldList = res.map((item, index) => {
-          return {
-            id: this.tableItemForm.tableName + "_" + item.fieldName,
-            fieldName: item.fieldName,
-            fieldDescription: item.fieldDescription,
-            relationTable: "",
-            relationFieldName: "",
-            relaFieldNameList: [],
-            disableRelaFieldName: false,
-            relationType: "",
-            relationShowField: [],
-            relationShowFiledList: [],
-            disableRelaType: false,
-            isShow: true,
-            isSearch: false,
-            isExport: true,
-            relationTableList: this.relationTableList,
-            tableName: this.tableItemForm.tableName,
-            relationFieldList: [],
-          };
-        });
-      });
-
-    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -525,83 +323,6 @@ export default {
       this.multiple = !selection.length;
     },
 
-    // 递归拼接查询语句
-    getSQLString(tableFieldList, fieldArr, tableArr, sqlType = "mysql") {
-      let prefix = "{DBNAME}.";
-      let asOrSpace = sqlType == "oracle" ? " " : " AS ";
-      for (let i = 0; i < tableFieldList.length; i++) {
-        let temp = tableFieldList[i];
-        if (temp.isShow) {
-          let tempArr = prefix + temp.tableName + "." + temp.fieldName;
-          if (temp.isChildren) {
-            tempArr += asOrSpace + temp.tableName + "_" + temp.fieldName;
-          }
-          fieldArr.push(tempArr);
-        }
-        if (temp.relationTable && temp.relationFieldName && temp.relationType) {
-          let isNeedUsername = sqlType == "oracle" ? this.username + "." : "";
-          tableArr.push(
-            temp.relationType +
-              " " +
-              isNeedUsername +
-              prefix +
-              temp.relationTable +
-              asOrSpace +
-              temp.relationTable +
-              " ON " +
-              prefix +
-              temp.relationTable +
-              "." +
-              temp.relationFieldName +
-              " = " +
-              prefix +
-              temp.tableName +
-              "." +
-              temp.fieldName
-          );
-        }
-      }
-      // 如果主键不包含显示,则添加至sql语句中
-      let isNotInclude = this.tableFieldList.find(
-        (val) => !val.isShow && val.fieldName == this.tableItemForm.selectFields
-      );
-      if (isNotInclude) {
-        fieldArr.push(
-          prefix + isNotInclude.tableName + "." + isNotInclude.fieldName
-        );
-      }
-    },
-    // 拼接查询sql语句
-    getSQLStr() {
-      let prefix = "{DBNAME}.";
-      let sqlType = this.databaseType; //数据库类型
-      // let sqlType = "oracle";
-      let sql = "";
-      // mysql
-      sql += "SELECT ";
-      let fieldNameArr = [],
-        relaTypeArr = [];
-      this.getSQLString(
-        this.tableFieldList,
-        fieldNameArr,
-        relaTypeArr,
-        sqlType
-      );
-      let isNeedUsername = sqlType == "oracle" ? this.username + "." : "";
-      let asOrSpace = sqlType == "oracle" ? " " : " AS ";
-      sql +=
-        fieldNameArr.join(",") +
-        " FROM " +
-        isNeedUsername +
-        prefix +
-        this.tableItemForm.tableName +
-        asOrSpace +
-        this.tableItemForm.tableName;
-      if (relaTypeArr.length) {
-        sql += " " + relaTypeArr.join(" ");
-      }
-      return sql;
-    },
     // 关联表变化回调
     async ralationTableChange(row) {
       this.tableFieldList = this.tableFieldList.filter((item) => {
@@ -708,69 +429,11 @@ export default {
         }
       }
     },
-    // 更新路由
-    reloadRouter() {
-      this.$store.dispatch("GenerateRoutes").then((accessRoutes) => {
-        this.$router.addRoutes(accessRoutes); // 动态添加可访问路由表
-      });
-    },
-    // 获取路由表单数据
-    async getMenuList() {
-      let res = await listGroup();
-      this.menus = this.handleTree(res.data, "menuId");
-    },
-    // 获取目标menu
-    getTargetMenu(menus) {
-      for (let i = 0; i < menus.length; i++) {
-        if (menus[i].menuId == this.groupForm.routePath) {
-          return menus[i];
-        } else if (menus.children?.length) {
-          return this.getTargetMenu(menus.children);
-        }
-      }
-      return false;
-    },
-    // 获取父级menuId
-    getParentMenuId(menuId, menus) {
-      let res;
-      for (let i = 0; i < menus.length; i++) {
-        let item = menus[i];
-        if (item.menuId == menuId) {
-          res = item.parentId;
-          break;
-        } else if (item.children?.length) {
-          if (
-            this.getParentMenuId(
-              menuId,
-              JSON.parse(JSON.stringify(item.children))
-            )
-          ) {
-            res = this.getParentMenuId(
-              menuId,
-              JSON.parse(JSON.stringify(item.children))
-            );
-          }
-        }
-      }
-      return res;
-    },
     // 获取路由表单数据
     async getMenuList() {
       let res = await getMenuList();
       this.menus = this.handleTree(res.data, "menuId");
     },
-    
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.menuId,
-        label: node.menuName,
-        children: node.children,
-      };
-    },
     // 更新路由
     reloadRouter() {
       this.$store.dispatch("GenerateRoutes").then((accessRoutes) => {

ruoyi-ui/src/views/relateTable/components/RelateTableCard.vue

@@ -192,13 +192,12 @@ export default {
     // 请求数据
     async gettableListHandler(tableKey, paramsContion = [], defaultVal ={}){
       const res = await dragTableInfo({queryMap: {tableKey : tableKey }})
-      this.getTableHandle(res,paramsContion = [],defaultVal = {})
+      this.getTableHandle(res, paramsContion = [],defaultVal = {})
     },
     async getTableHandle(res){
         this.columns = []
         // 得到当前模版信息 --- sql columns queryWhere
         this.templateInfo = res.data.resultMap;
-  
         this.queryParams.orderByColumn =
           res.data.resultMap.querySql.orderByColumn;
         this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);
@@ -231,27 +230,37 @@ export default {
               // this.queryParams.queryMap.sqlkey = this.templateInfo.template.sqlKey;
             }
             let k;
+            
             // console.log('conditions', this.tableCondition);
-            // this.tableCondition[1].
-            this.tableCondition.forEach((item, i) => {
-              let val = item.split('=')
-              if(i!==0){
+           this.contion = this.templateInfo.template.dtTableName + '.' + this.templateInfo.template.primaryKey
+            // this.tableCondition.forEach((item, i) => {
+            //   let val = item.split('=')
+            //   if(i!==0){
                 
-                k =val[0].split('.')
-                let str = k[0].trim() + '.' + k[1]
-                this.condition.push({
-                  key: k[0].trim(),
-                  value: k[1]
-                })
-              }
-            })
+            //     k =val[0].split('.')
+            //     let str = k[0].trim() + '.' + k[1]
+            //     this.condition.push({
+            //       key: k[0].trim(),
+            //       value: k[1]
+            //     })
+            //   }
+            // })
+            
         }  
     },
     // 获取表数据
     async getDataHandler(contion, list){
-      contion?.forEach(item => {
-        this.queryParams.queryMap['#{' + item.key + '.' + item.value] = "'" + list[item.value] + "'";
-      })
+      console.log(contion);
+      console.log(list);
+      if(contion){
+        let key = contion.split('.')
+        this.queryParams.queryMap['#{' + contion] = "'" + list[key[1]] + "'";
+      }
+      this.queryParams.queryMap.sqlkey = this.templateInfo.template.sqlKey;
+      
+      // contion?.forEach(item => {
+      //   this.queryParams.queryMap['#{' + item.key + '.' + item.value] = "'" + list[item.value] + "'";
+      // })
       this.tableList = [];
       let tableLists = await unionListTableData(this.queryParams)
       if(tableLists.code == 200){
@@ -268,6 +277,8 @@ export default {
             }
             return kv;
           })
+
+          console.log(this.tableList);
         }
         this.total = tableLists.total;
         this.loading = false; 
@@ -287,6 +298,7 @@ export default {
     },
     // 调用父组件方法更新表格数据
     handleCurrentChange(row,event,column,val) {
+      // console.log(row);
       this.$emit(
         "updateData",
         row,

ruoyi-ui/src/views/relateTable/index copy.vue

@@ -1,1685 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="表格组名" prop="dtName">
-        <el-input
-          v-model="queryParams.dtName"
-          placeholder="请输入表格组名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          >新增</el-button
-        >
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="DeleteTableGroup"
-          >删除</el-button
-        >
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="danger" plain size="mini" @click="handlePreview"
-          >动态页面</el-button
-        >
-      </el-col> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="tableGroupList"
-      ref="tableRef"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="表格主键" align="center" prop="id" />
-      <el-table-column label="表格组名" align="center" prop="groupName" />
-      <el-table-column label="描述" align="center" prop="groupDescription" />
-      <el-table-column label="表格数" align="center" prop="groupCount" />
-
-      <el-table-column
-        label="成员表格"
-        width="180"
-        >
-        <template slot-scope="scope">
-          <el-popover trigger="hover" placement="top">
-            <p v-for="(item,index) in scope.row.groupTableInfo"> {{ index == 0 ? '' :item.tablename }}</p>
-            
-            <div slot="reference" class="name-wrapper">
-            <el-tag size="medium">{{ scope.row.groupTableInfo[0].tablename }}</el-tag>
-            </div>
-          </el-popover>
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-dropdown>
-            <el-button type="warning" plain size="small">
-              处理<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="UpdateTableGroup(scope.row)"
-                  >修改
-                </el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="DeleteTableGroup(scope.row)"
-                  >删除
-                </el-button>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getTableList"
-    />
-
-    <!-- 新增联动表格组弹窗 -->
-    <el-dialog :title="groupTitle ? '新增动态表格组' : '修改动态表格组'" :visible.sync="isShowTable">
-      <div class="dialog_wrap">
-        <el-button
-          type="primary"
-          size="small"
-          icon="el-icon-plus"
-          @click="addOneTable"
-          class="mb10"
-          >新增</el-button
-        >
-        <el-form :model="groupForm" :rules="grouprules" ref="groupForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="表格组名" prop="groupName">
-            <el-input v-model="groupForm.groupName" placeholder="请输入表格组名"></el-input>
-          </el-form-item>
-          <el-form-item label="表格描述" prop="groupDescription">
-            <el-input v-model="groupForm.groupDescription" placeholder="请输入表格描述"></el-input>
-          </el-form-item>
-          <el-form-item label="菜单路由" prop="routePath">
-          <div class="treeselect">
-            <treeselect
-              :append-to-body="true"
-              v-model="groupForm.routePath"
-              :options="menus"
-              :normalizer="normalizer"
-              :show-count="true"
-              placeholder="请选择父级路由"
-            />
-          </div>
-           
-          </el-form-item>
-        <el-form-item>
-          <el-table
-          :data="tableDataList"
-          border
-          stripe
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column label="序号" type="index" />
-          <el-table-column label="表格标题" prop="dtName" />
-          <el-table-column
-            label="表格名称"
-            prop="dtTableName"
-          ></el-table-column>
-          <el-table-column label="表格主键" prop="primaryKey">
-            <!-- <template slot-scope="scope" v-for="item in conditionDefaultValueMap ">
-              {{ item }}
-            </template> -->
-          </el-table-column>
-
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-dropdown>
-                <el-button type="warning" plain size="small">
-                  处理<i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item>
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                      @click="relateOne(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>
-            </template>
-          </el-table-column>
-          </el-table>
-        </el-form-item>
-        
-        <el-form-item class="btn">
-          <el-button @click="cancelGroup">取消</el-button>
-          <el-button type="primary" @click="addTableGroup('groupForm')">确认</el-button>
-        </el-form-item>
-        </el-form>
-      </div>
-    </el-dialog>
-
-    <!-- 编辑某一条表格数据弹窗 -->
-    <el-dialog :title="relateTitle ? '添加关联表格' :'修改关联表格' " :visible.sync="isShowForm" >
-      <div class="formWrap">
-        <el-form
-          :rules="tableItemRules"
-          ref="tableItemForm"
-          style="max-width: 750px; width: 1000px"
-          :model="tableItemForm"
-          label-width="100px"
-        >
-          <el-form-item label="表格标题:" prop="title">
-            <el-input
-              v-model="tableItemForm.title"
-              style="max-width: 221px"
-              @change="iptChange()"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="表格名称:" prop="tableName">
-            <el-select
-              v-model="tableItemForm.tableName"
-              @change="getList()"
-              placeholder="请选择表格名称"
-            >
-              <el-option
-              v-for="item in tableList"
-              :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>
-          </el-form-item>
-          <el-form-item label="表格主键:" prop="selectFields">
-            <el-select
-              v-model="tableItemForm.selectFields"
-              placeholder="请选择表格主键"
-            >
-            <el-option
-              v-for="item in tableFieldList"
-              :key="item.fieldName"
-              :label="item.fieldDescription"
-              :value="item.fieldName"
-            >
-              <span style="float: left">{{ item.fieldDescription }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{
-                item.fieldName
-              }}</span>
-            </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="时间格式" prop="timeFormate">
-            <el-select
-              v-model="tableItemForm.timeFormate"
-              placeholder="请选择时间格式"
-            >
-              <el-option
-                v-for="val in dict.type.sys_time_format"
-                :key="val.value"
-                :label="val.label"
-                :value="val.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排序依赖字段">
-            <el-select
-              v-model="tableItemForm.orderByColumn"
-              placeholder="请选择排序依赖"
-            >
-              <el-option
-                v-for="val in orderByFieldList"
-                :key="val.fieldName"
-                :label="val.fieldDescription"
-                :value="val.tableName + '.' + val.fieldName"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排序方式" v-show="tableItemForm.orderByColumn">
-            <el-radio v-model="tableItemForm.isAsc" :label="false"
-              >升序</el-radio
-            >
-            <el-radio v-model="tableItemForm.isAsc" :label="true"
-              >降序</el-radio
-            >
-          </el-form-item>
-          <el-form-item label="展示字段:" prop="FieldList">
-            <el-table
-            :data="tableFieldList"
-            border
-            ref="dragTable"
-            row-key="id"
-            max-height="500px"
-            class="tablefiled"
-            >
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              class-name="allowDrag"
-            >
-            </el-table-column>
-            <el-table-column prop="fieldName" label="数据字段"></el-table-column>
-            <el-table-column prop="fieldDescription" label="字段描述">
-              <template slot-scope="scope">
-                <input
-                  :class="{
-                    isNullDesc:
-                      scope.row.fieldDescription == '' &&
-                      scope.row.isShow &&
-                      isInputInvalid
-                        ? true
-                        : false,
-                    ipt: true,
-                  }"
-                  v-model="scope.row.fieldDescription"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationTable" label="关联表">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationTable"
-                  :disabled="
-                    !scope.row.relationTableList ||
-                    !scope.row.relationTableList.length
-                  "
-                  placeholder="请选择关联的表"
-                  clearable
-                  filterable
-                  @change="ralationTableChange(scope.row)"
-                >
-                  <el-option
-                    v-for="(item, index) in scope.row.relationTableList"
-                    :key="index"
-                    :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>
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationFieldName" label="关联条件字段">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationFieldName"
-                  @change="relationFieldChange(scope.row)"
-                  :disabled="!scope.row.disableRelaFieldName"
-                  placeholder="关联字段"
-                  filterable
-                >
-                  <el-option
-                    v-for="(item, index) in scope.row.relaFieldNameList"
-                    :key="index"
-                    :label="item.fieldDescription"
-                    :value="item.fieldName"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column width="95px" prop="relationType" label="关联方式">
-              <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.relationType"
-                  placeholder="请选择关联方式"
-                  :disabled="!scope.row.disableRelaType"
-                  @change="relationTypeChangeHandler(scope.row)"
-                  filterable
-                >
-                  <el-option
-                    v-for="(item, index) in relaTypeList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="isShow" label="是否显示">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.isShow"> </el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column prop="isSearch" label="是否包含查询">
-              <template slot-scope="scope">
-                <el-switch v-model="scope.row.isSearch" @change="isSearchChange($event, scope.row,  scope.$index)"> </el-switch>
-              </template>
-            </el-table-column>
-          </el-table>
-          </el-form-item>
-          <el-form-item class="btn">
-            <el-button @click="cancelAddHandler">取消</el-button>
-            <el-button type="primary" @click="confirmAddHandler('tableItemForm')">确认</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-dialog>
-
-    <!-- 是否包含查询字段依赖值对话框 -->
-    <div class="isSearch">
-      <el-dialog
-      title="包含查询依赖值"
-      :visible.sync="isSearchDialog">
-      <el-select v-model="relyOption" placeholder="请选择依赖方式">
-        <el-option
-          v-for="item in relyOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-      <el-input v-show="relyOption === '0'" v-model="conditionDefaultValueMap" placeholder="请输入依赖内容"></el-input>
-
-      <el-select v-show="relyOption === '1'" v-model="conditionDefaultValueMap" placeholder="请选择依赖字段">
-        <el-option
-          v-for="item in relyFileds.tableFieldList"
-          :key="item.fieldName"
-          :label="item.fieldDescription"
-          :value="item.fieldName">
-        </el-option>
-      </el-select>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="isSearchCancel">取 消</el-button>
-        <el-button type="primary" @click="isSearchBtn">确 定</el-button>
-      </span>
-      </el-dialog>
-    </div>
-    
-  </div>
-</template>
-<script>
-import { listTable, removeTableList } from "@/api/dragform/tableList";
-import { getFormName, getListName, dragTablePreview, } from "@/api/dragform/form.js";
-import { delMenu } from "@/api/system/menu";
-import { getMenuList, addMenu} from "@/api/menu.js";
-import { getParticMenu, updateMenu } from "@/api/system/menu.js";
-import { addGroup, listGroup, getTable, delGroup, updataGroup } from '@/api/relateTable/index.js'
-import { addDragTable } from "@/api/tablelist/commonTable.js";
-import { mapGetters, mapState } from "vuex";
-import DictData from "@/components/DictData";
-import { FastBackwardFill, async } from "@/components/updateModule/k-form-design/lib/k-form-design.common";
-import { v4 as uuidv4 } from "uuid";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import json from "highlight.js/lib/languages/json";
-import { getTableInfo, editTable } from "@/api/system/table.js";
-
-export default {
-  name: "relateTable",
-  components: { Treeselect },
-  dicts: ["sys_time_format", "table_statistic_type"],
-  data() {
-    return {
-      isInputInvalid: false,
-
-      // 包含查询依赖字段dialog
-      isSearchDialog: false,
-      isSearchIndex: null,
-      // 依赖方式
-      relyOption: null,
-      relyOptions:[
-        {
-         value: '0',
-         label: '自定义依赖值'
-        },
-        {
-          value: '1',
-          label: '依赖其他字段'
-        }
-      ],
-      // 依赖值
-      conditionDefaultValueMap: '',
-      // 上个表格名称及字段
-      relyFileds: {},
-      formdata:{
-        conditionDefaultValueMap: {}
-      },
-      conditionDefault:[],
-      addDragData:[],
-      groupList:[],
-      menus: [], //路由列表数据
-      // 添加关联表格校验规则
-      tableItemRules:{
-        title:[{ required: true, message: '请输入表格标题', trigger: 'blur' }],
-        // tableName:[{ required: true, message: '请选择表格名称', trigger: 'change' }],
-        // selectFields: [{ required: true, message: '请选择关联字段', trigger: 'change' }],
-      },
-      groupForm: {
-        groupName: '',
-        groupDescription:'',
-        routePath: undefined,
-      },
-      grouprules:{
-        groupName:[{ required: true, message: '请输入表格组名', trigger: 'blur' }],
-        groupDescription:[{ required: true, message: '请输入表格描述', trigger: 'blur' }],
-        routePath: [
-          { required: true, message: "请选择路由", trigger: "change" },
-        ],
-      },
-      menuOrderNum: 0,
-      // 关联方式
-      relaTypeList: [
-        {
-          label: "等值连接",
-          value: "INNER JOIN",
-        },
-        {
-          label: "左连接",
-          value: "LEFT JOIN",
-        },
-        {
-          label: "右连接",
-          value: "RIGHT JOIN",
-        },
-      ],
-      searchFieldList: [],
-      // 依赖字段
-      relyFiledsList: [],
-      // 修改row
-      updataGroupRow:{},
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      menuIds: [],
-      // 选中数组(包含所有数据)
-      selection: [],
-      Keys: [],
-      menuIds: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      tableList: [], //所有表格列表
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dtName: null,
-        dtNickname: null,
-        tableKey: null,
-        sqlKey: null,
-        dtTableName: null,
-        dtNotes: null,
-        dtColumnName: null,
-        timeFormat: null,
-        spare: null,
-        spare1: null,
-        isSelection: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-
-      // dialog弹窗数据
-      isShowTable: false,
-      isShowForm: false,
-      // 新增关联表数据
-      tableDataList: [],
-
-      tableFieldList: [], // 当前表格字段数据
-      tableName: "", // 当前表名称
-      selectFields: '', //关联字段
-      relateTitle: true,
-      relateTableName: "", //关联表名称
-      relateFields: "", //子集关联字段
-      relateFieldList: [], //子集关联字段数据
-      groupTitle: true,
-      tableItemForm: {
-        tId: "",
-        rowId: "",
-        title: "",
-        tableName: "",
-        selectFields: "",
-        isAsc: false,
-        timeFormate: "",
-        orderByColumn: "",
-      },
-      tableGroupList: [],
-      // 成员表格提示
-      tableKeyContent: '',
-      groupsMenuId: "",
-      // 修改表格时的menuId
-      menuId: "",
-      // 修改是表格的id
-      groupId:''
-    };
-  },
-  async created() {
-    this.getTableList()
-  },
-  async mounted() {
-    await this.getMenuList();
-  },
-  computed: {
-    selectRelate(){
-      if(this.tableItemForm.tableName =='') return
-      return this.tableList.filter(item => item.tableName !== this.tableItemForm.tableName)
-    },
-    dataArr() {
-      return this.tableFieldList.filter((item) => item.isShow);
-    },
-    ...mapGetters(["addRoutes"]),
-    ...mapState({
-      databaseName: (state) => state.user.dataSource.databaseName,
-      databaseType: (state) => state.user.dataSource.databaseType,
-      username: (state) => state.user.dataSource.username,
-      tenantId: (state) => state.user.tenant.tenantId,
-    }),
-    orderByFieldList() {
-      return this.tableFieldList;
-    },
-  },
-  watch: {
-    'tableItemForm.tableName': function (val) {
-      if (val) {
-        this.relationTableList = this.tableList
-          .filter((item) => item.tableName != val)
-          .map((item) => {
-            return {
-              tableName: item.tableName,
-              tableComment: item.tableComment,
-            };
-          });
-      } else {
-        this.relationTableList = [];
-      }
-    },
-    'groupForm.routePath'(nval, oval) {
-      let targetMenu = this.getTargetMenu(this.menus);
-      this.menuOrderNum = targetMenu.children ? targetMenu.children.length : 0;
-    },
-  },
-  methods: {
-    iptChange(){
-	    this.$forceUpdate();  //强制刷新
-    },
-    async getTableList(){
-      let res = await listGroup(this.queryParams);
-      this.total = res.total;
-      let info = []
-      res.rows.forEach(item => {
-        item.groupCount = JSON.parse(item.groupTableInfo).length
-
-        info = JSON.parse(item.groupTableInfo)
-        this.groupsMenuId = info[0].menuId
-        item.menuId = info[0].menuId
-        item.groupTableInfo = info
-      })
-      console.log(info);
-      this.tableGroupList = res.rows
-      console.log(this.tableGroupList)
-    },
-    // 是否包含查询switch
-    isSearchChange(status, row,index){
-      this.isSearchDialog = status
-      if(this.isSearchDialog == true){
-        this.conditionDefaultValueMap = ''
-      }
-      this.isSearchIndex = index
-    },
-    // 添加依赖字段取消
-    isSearchCancel(){
-      this.relyOption = null
-      this.conditionDefaultValueMap = ''
-      this.isSearchDialog = false
-      this.tableFieldList[this.isSearchIndex].isSearch = false
-    },
-    isSearchBtn(){
-      if(this.relyFileds.tableName !== undefined){
-        console.log(this.relyFileds.tableName);
-        this.conditionDefault.push('#{'+this.relyFileds.tableName+'.'+this.conditionDefaultValueMap)
-      }else{
-        this.conditionDefault.push(this.conditionDefaultValueMap)
-      }
-      console.log(this.conditionDefault)
-      this.isSearchDialog = false
-      this.conditionDefaultValueMap = ''
-      this.relyFileds.tableName = ''
-    },
-    // 获取路由表单数据
-    async getMenuList() {
-    let res = await listGroup();
-    console.log('res',  res);
-    this.menus = this.handleTree(res.data, "menuId");
-    },
-    // 递归拼接查询语句
-    getSQLString(tableFieldList, fieldArr, tableArr, sqlType = "mysql") {
-      let prefix = "{DBNAME}.";
-      let asOrSpace = sqlType == "oracle" ? " " : " AS ";
-      for (let i = 0; i < tableFieldList.length; i++) {
-        let temp = tableFieldList[i];
-        if (temp.isShow) {
-          let tempArr = prefix + temp.tableName + "." + temp.fieldName;
-          if (temp.isChildren) {
-            tempArr += asOrSpace + temp.tableName + "_" + temp.fieldName;
-          }
-          fieldArr.push(tempArr);
-        }
-        if (temp.relationTable && temp.relationFieldName && temp.relationType) {
-          let isNeedUsername = sqlType == "oracle" ? this.username + "." : "";
-          tableArr.push(
-            temp.relationType +
-              " " +
-              isNeedUsername +
-              prefix +
-              temp.relationTable +
-              asOrSpace +
-              temp.relationTable +
-              " ON " +
-              prefix +
-              temp.relationTable +
-              "." +
-              temp.relationFieldName +
-              " = " +
-              prefix +
-              temp.tableName +
-              "." +
-              temp.fieldName
-          );
-        }
-      }
-      // 如果主键不包含显示,则添加至sql语句中
-      let isNotInclude = this.tableFieldList.find(
-        (val) => !val.isShow && val.fieldName == this.tableItemForm.selectFields
-      );
-      if (isNotInclude) {
-        fieldArr.push(
-          prefix + isNotInclude.tableName + "." + isNotInclude.fieldName
-        );
-      }
-    },
-    // 拼接查询sql语句
-    getSQLStr() {
-      let prefix = "{DBNAME}.";
-      let sqlType = this.databaseType; //数据库类型
-      // let sqlType = "oracle";
-      let sql = "";
-      // mysql
-      sql += "SELECT ";
-      let fieldNameArr = [],
-        relaTypeArr = [];
-      this.getSQLString(
-        this.tableFieldList,
-        fieldNameArr,
-        relaTypeArr,
-        sqlType
-      );
-      let isNeedUsername = sqlType == "oracle" ? this.username + "." : "";
-      let asOrSpace = sqlType == "oracle" ? " " : " AS ";
-      sql +=
-        fieldNameArr.join(",") +
-        " FROM " +
-        isNeedUsername +
-        prefix +
-        this.tableItemForm.tableName +
-        asOrSpace +
-        this.tableItemForm.tableName;
-      if (relaTypeArr.length) {
-        sql += " " + relaTypeArr.join(" ");
-      }
-      return sql;
-    },
-    /** 查询列表 */
-    getList(queryParams) {
-      if (!this.tableItemForm.tableName) return;
-      let data = {
-        databaseName: this.databaseName,
-        databaseType: this.databaseType,
-        tableName: this.tableItemForm.tableName,
-      };
-      
-      // 获取当前表单结构信息
-      getListName(data).then((res) => {
-        this.tableFieldList = res.map((item, index) => {
-          return {
-            id: this.tableItemForm.tableName + "_" + item.fieldName,
-            fieldName: item.fieldName,
-            fieldDescription: item.fieldDescription,
-            relationTable: "",
-            relationFieldName: "",
-            relaFieldNameList: [],
-            disableRelaFieldName: false,
-            relationType: "",
-            relationShowField: [],
-            relationShowFiledList: [],
-            disableRelaType: false,
-            isShow: true,
-            isSearch: false,
-            isExport: true,
-            relationTableList: this.relationTableList,
-            tableName: this.tableItemForm.tableName,
-            relationFieldList: [],
-          };
-        });
-      });
-
-    },
-    // 关联表变化回调
-    async ralationTableChange(row) {
-      this.tableFieldList = this.tableFieldList.filter((item) => {
-        return !row.relationFieldList.some((val) => {
-          return val.id == item.id;
-        });
-      });
-      row.relationFieldName = "";
-      row.relationType = "";
-      row.disableRelaFieldName = false;
-      row.disableRelaType = false;
-      row.relationFieldList = [];
-      if (!row.relationTable) {
-        return;
-      }
-      // 获取关联表的字段
-      let data = {
-        databaseName: this.databaseName,
-        databaseType: this.databaseType,
-        tableName: row.relationTable,
-      };
-      let res = await getListName(data);
-      // 关联字段下拉列表数据
-      row.relaFieldNameList = res.map((item) => {
-        return {
-          fieldName: item.fieldName,
-          fieldDescription: item.fieldDescription,
-        };
-      });
-      let relationTableList = row.relationTableList.filter(
-        (item) => row.relationTable != item.tableName
-      );
-      row.relationFieldList = row.relaFieldNameList.map((item, index) => {
-        return {
-          id: row.relationTable + "_" + item.fieldName,
-          fieldName: item.fieldName,
-          fieldDescription: item.fieldDescription,
-          relationTable: "",
-          relationFieldName: "",
-          relaFieldNameList: [],
-          disableRelaFieldName: false,
-          relationType: "",
-          relationShowField: [],
-          relationShowFiledList: [],
-          disableRelaType: false,
-          isShow: true,
-          isSearch: false,
-          isExport: true,
-          relationTableList,
-          tableName: row.relationTable,
-          relationFieldList: [],
-          isChildren: true,
-        };
-      });
-      row.disableRelaFieldName = true;
-    },
-    // 关联类型变化回调
-    relationTypeChangeHandler(row) {
-      let tempRelationFieldList = row.relationFieldList.filter((item) => {
-        return !this.tableFieldList.find((val) => val.id === item.id);
-      });
-      this.tableFieldList = [...this.tableFieldList, ...tempRelationFieldList];
-    },
-    // 关联字段回调
-    relationFieldChange(row) {
-      if (!row.relationFieldName) {
-        row.relationType = "";
-        row.disableRelaType = false;
-        row.relaFieldNameList = [];
-        return;
-      }
-      row.disableRelaType = true;
-    },
-    // 递归获取列表信息
-    getCol(
-      tableFieldList,
-      columns,
-      searchFieldList = [],
-      tableExportField = {}
-    ) {
-      if (!tableFieldList.length) return;
-      for (let i = 0; i < tableFieldList.length; i++) {
-        let temp = tableFieldList[i];
-        let tempFieldName = "",
-          exportFieldName = "";
-        if (temp.isChildren) {
-          tempFieldName = temp.tableName + "_" + temp.fieldName;
-          exportFieldName = temp.tableName + "@" + temp.fieldName;
-        } else {
-          tempFieldName = temp.fieldName;
-          exportFieldName = temp.fieldName;
-        }
-        if (temp.isShow) {
-          let tempObj = {};
-          tempObj[tempFieldName] = temp.fieldDescription;
-          columns.push(tempObj);
-        }
-        if (temp.isSearch) {
-          searchFieldList.push(temp.tableName + "." + temp.fieldName);
-        }
-
-        if (temp.isExport) {
-          tableExportField[exportFieldName] = temp.fieldDescription;
-        }
-      }
-    },
-     // 获取所有表格
-    async getAllTable() {
-      let data = {
-        databaseName: this.databaseName,
-        databaseType: this.databaseType,
-      };
-      let res = await getFormName(data);
-
-      const baseTable = await this.getDicts("base_table");
-
-      this.tableList = res.data.filter((item) => {
-        return !baseTable.data.some(
-          (value) =>
-            value.dictValue.toLowerCase() == item.tableName.toLowerCase()
-        );
-      });
-    },
-    // 确认添加一个表格
-    confirmAddHandler(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let columns = [],
-            searchFieldList = []
-            this.getCol(
-              this.tableFieldList,
-              columns,
-              searchFieldList,
-            );
-          // 判断是否有包含查询字段
-          if (!searchFieldList.length) {
-          this.$message.warning("请至少选择一个包含查询字段");
-          return false;
-          }
-          let echoData = {
-            tableName: this.tableItemForm.tableName,
-            tableFieldData: this.tableFieldList,
-            formData: this.groupForm,
-          }
-          // 判断修改还是新增
-          if(this.relateTitle){ 
-            console.log('新增');
-            let tableKey = uuidv4();
-            let sqlKey = uuidv4();
-            searchFieldList.forEach((item, index) => {
-              this.formdata.conditionDefaultValueMap[item] = this.conditionDefault[index]
-            })
-            this.relyFileds.tableFieldList = this.tableFieldList
-            this.relyFileds.tableName = this.tableItemForm.tableName
-            this.tableItemForm.rowId = Date.now();
-
-            this.tableDataList.push({
-              dtName: this.tableItemForm.title,
-              dtTableName: this.tableItemForm.tableName,
-              rowId: this.tableItemForm.rowId,
-              selectFields: this.tableItemForm.selectFields,
-              orderByColumn: this.tableItemForm.orderByColumn,
-              timeFormate: this.tableItemForm.timeFormate,
-
-              rowId: this.tableItemForm.rowId,
-              tId: this.tId,
-              tableKey: tableKey,
-              sortOrder: this.tableItemForm.isAsc,
-              sqlKey: sqlKey,
-              dtColumnName: columns, 
-              timeFormat: 'yyyy-MM-dd',
-              searchFieldList: searchFieldList, 
-              conditionDefaultValueMap: this.formdata.conditionDefaultValueMap,
-              tableSql: this.getSQLStr(), 
-              tableExportField: '',
-              echoData: JSON.stringify(echoData),
-            });
-
-            // 选择依赖字段
-            this.groupList.push({tableFieldList: this.tableFieldList, tableItemForm: this.tableItemForm, conditionDefaultValueMap: this.conditionDefaultValueMap})
-
-            if(this.groupTitle){
-              this.addDragData.push({
-              rowId: this.tableItemForm.rowId,
-              tId: this.tId,
-              dtName: this.tableItemForm.title,
-              tableKey: tableKey,
-              dtTableName: this.tableItemForm.tableName,
-              primaryKey: this.tableItemForm.selectFields,
-              orderByColumn: this.tableItemForm.orderByColumn,
-              sortOrder: this.tableItemForm.isAsc,
-              sqlKey: sqlKey,
-              dtColumnName: columns, 
-              timeFormat: 'yyyy-MM-dd',
-              searchFieldList: searchFieldList, 
-              conditionDefaultValueMap: this.formdata.conditionDefaultValueMap,
-              tableSql: this.getSQLStr(), 
-              tableExportField: '',
-              echoData: JSON.stringify(echoData),
-              })
-            }
-            
-          } else {
-            console.log(456);
-            let tableKey = uuidv4();
-            let sqlKey = uuidv4();
-
-              this.relyFileds.tableFieldList = this.tableFieldList
-
-              this.relyFileds.tableName = this.tableItemForm.tableName
-
-
-              console.log(this.conditionDefault);
-              searchFieldList.forEach((item, index) => {
-                // if(this.conditionDefault.length > 1){
-                  this.formdata.conditionDefaultValueMap[item] = this.conditionDefault[index]
-                // }else{
-                //   this.formdata.conditionDefaultValueMap = this.conditionDefault
-                // }
-              })
-
-             console.log(this.tableItemForm);
-              this.tableDataList.forEach((item, index) => {
-                if(item.tId == this.tableItemForm.tId) {
-                  this.tableDataList[index] = {
-                    tId: this.tableItemForm.tId,
-                    dtName: this.tableItemForm.title,
-                    tableKey: tableKey,
-                    dtTableName: this.tableItemForm.tableName,
-                    primaryKey: this.tableItemForm.selectFields,
-                    orderByColumn: this.tableItemForm.orderByColumn,
-                    sortOrder: this.tableItemForm.isAsc,
-                    sqlKey: sqlKey,
-                    dtColumnName: columns, 
-                    timeFormat: 'yyyy-MM-dd',
-                    searchFieldList: searchFieldList, 
-                    conditionDefaultValueMap: this.formdata?.conditionDefaultValueMap,
-                    tableSql: this.getSQLStr(), 
-                    tableExportField: '',
-                    echoData: JSON.stringify(echoData),
-                  }
-                }
-              })
-
-              console.log('11',this.tableDataList);
-              this.$set(this.tableDataList)
-              console.log('11',this.addDragData);
-          }
-          this.isShowForm = false
-          this.tableItemForm = {}
-          this.tableFieldList = []
-          this.relyFiledsList = []
-          this.conditionDefault = []
-          this.conditionDefaultValueMap= ''
-          this.formdata.conditionDefaultValueMap = {}
-        } else {
-          this.$message.error("请完善表单信息");
-          return false;
-        }
-      });
-    },
-    // 修改一个表格数据
-    relateOne(row){
-      console.log(row);
-      if(row.tableKey){
-        this.menuId = row.menuId
-        
-        
-        for (const key in row.conditionDefaultValueMap) {  
-          // this.conditionDefaultValueMap = row.conditionDefaultValueMap[key]
-          console.log(key);
-        this.conditionDefaultValueMap = row.conditionDefaultValueMap[key]
-        
-        this.conditionDefault.push(row.conditionDefaultValueMap[key])
-      }
-        console.log(this.conditionDefaultValueMap);
-        // this.initTableData(row.tId);
-        let echoData = JSON.parse(row.echoData)
-
-        this.tableDataList.forEach((item, index) => {
-          if(item.tableKey == row.tableKey){
-            if(index == 0){
-
-              this.relyFileds.tableFieldList = ''
-            }else{
-
-              let beforeEcho = JSON.parse(this.tableDataList[index-1].echoData)
-              
-              this.relyFileds.tableFieldList = beforeEcho.tableFieldData
-
-            }
-          }
-        } )
-        this.tableFieldList = echoData.tableFieldData;
-        // this.tableItemForm = row
-        this.tableItemForm.tId = row.tId
-        this.tableItemForm.rowId = row.tableKey,
-        this.tableItemForm.isAsc = false,
-        this.tableItemForm.orderByColumn = "",
-        this.tableItemForm.title = row.dtName
-        this.tableItemForm.tableName = row.dtTableName
-        this.tableItemForm.selectFields = row.primaryKey
-        this.tableItemForm.timeFormate = row.timeFormat
-
-      }else{
-        this.tableItemForm.rowId = row.rowId,
-        this.tableItemForm.title = row.dtName
-        this.tableItemForm.selectFields = row.selectFields
-        this.tableItemForm.tableName = row.dtTableName
-        this.tableItemForm.orderByColumn = row.orderByColumn
-        this.tableItemForm.timeFormate = row.timeFormat
-      
-        this.getList()
-        this.groupList.forEach(item => {
-          if(item.tableItemForm.rowId == row.rowId){
-            item.tableFieldList = this.tableFieldList
-          }
-        })
-      }
-
-      this.getAllTable()
-      // console.log('修改', this.groupList);
-      // 展示字段的回显
-      this.relateTitle = false
-      this.isShowForm = true;
-    },
-    // 删除表格组
-    DeleteTableGroup(row){
-      const fIds = row.id || this.ids;
-      const menus = row.menuId || this.menuIds
-      this.$modal
-        .confirm('是否确认删除动态单编号为"' + fIds + '"的数据项？删除后表格中所有的数据都将删除！')
-        .then(function () {
-          return delGroup(fIds);
-        })
-        .then(async () => {
-          let res = await delMenu(menus);
-
-          this.getTableList();
-          this.reloadRouter();
-          this.$modal.msgSuccess("删除成功");
-
-        })
-        .catch(() => {});
-    },
-    // 取消新增
-    cancelAddHandler(){
-      this.isShowForm = false;
-      this.tableItemForm = {}
-      this.tableFieldList = []
-    },
-    // 关联类型变化回调
-    relationTypeChangeHandler(row) {
-      let tempRelationFieldList = row.relationFieldList.filter((item) => {
-        return !this.tableFieldList.find((val) => val.id === item.id);
-      });
-      this.tableFieldList = [...this.tableFieldList, ...tempRelationFieldList];
-    },
-    // 更新路由
-    reloadRouter() {
-      this.$store.dispatch("GenerateRoutes").then((accessRoutes) => {
-        this.$router.addRoutes(accessRoutes); // 动态添加可访问路由表
-      });
-    },
-    // 获取目标menu
-    getTargetMenu(menus) {
-      for (let i = 0; i < menus.length; i++) {
-        if (menus[i].menuId == this.groupForm.routePath) {
-          return menus[i];
-        } else if (menus.children?.length) {
-          return this.getTargetMenu(menus.children);
-        }
-      }
-      return false;
-    },
-    // 获取父级menuId
-    getParentMenuId(menuId, menus) {
-      let res;
-      for (let i = 0; i < menus.length; i++) {
-        let item = menus[i];
-        if (item.menuId == menuId) {
-          res = item.parentId;
-          break;
-        } else if (item.children?.length) {
-          if (
-            this.getParentMenuId(
-              menuId,
-              JSON.parse(JSON.stringify(item.children))
-            )
-          ) {
-            res = this.getParentMenuId(
-              menuId,
-              JSON.parse(JSON.stringify(item.children))
-            );
-          }
-        }
-      }
-      return res;
-    },
-    // 修改表格回显数据
-    async initTableData(tId) {
-      let res = await getTableInfo(tId);
-      console.log('回显数据', res);
-      if (res.code == 200) {
-        if (!this.formData.routePath) {
-          this.$message.warning("该表格菜单路由已经删除,请重新配置");
-        }
-        // this.formData.routePath
-        this.editData = res.data;
-        let val = await getParticMenu(res.data.tableKey);
-        if (val.code == 200) {
-          this.menuId = val.data.menuId;
-        }
-      } else {
-        this.$message.error("数据回显失败");
-      }
-    },
-    // 新增动态表格组
-    addTableGroup(formName){
-      this.$refs[formName].validate(async (valid) => {
-          if (valid) { 
-            // console.log('groupList', this.groupList);
-            if(this.addDragData.length < 2) return this.$message.error("请包含多个表格");
-            if(this.groupTitle){
-              let groupKeyObj = {
-              groupKey: uuidv4(),
-              };
-              let payLoad = {
-                component: "relateTable/relateTableEdit",
-                icon: "",
-                isCache: "0",
-                isFrame: "1",
-                menuName: this.groupForm.groupName,
-                menuType: "C",
-                orderNum: this.menuOrderNum,
-                parentId: this.groupForm.routePath,
-                path: groupKeyObj.groupKey,
-                query: JSON.stringify(groupKeyObj),
-                status: "0",
-                visible: "0",
-                tenantId: this.tenantId,
-              };
-              let result;
-              result = await addMenu(payLoad);
-
-              if(result.code == 200){
-                this.reloadRouter();
-                let data = {
-                  groupKey: groupKeyObj.groupKey,
-                  groupName: '',
-                  groupDescription: '',
-                  groupTableInfo: [],
-                  dragTables:[]
-                }
-                this.addDragData.forEach((item, index) => {
-                item.menuId = result.data;
-                // item.sqlKey = tableKeyObj.tableKey
-                let echo = JSON.parse(item.echoData)
-                echo.formData = this.groupForm
-                item.echoData = JSON.stringify(echo)
-                data.groupTableInfo.push({
-                  tableKey: item.tableKey,
-                  sort: index,
-                  tablename: item.dtTableName,
-                  menuId: result.data
-                  })
-                })
-                data.groupName = this.groupForm.groupName
-                data.groupDescription = this.groupForm.groupDescription
-                data.groupTableInfo = JSON.stringify(data.groupTableInfo)
-                data.dragTables = this.addDragData
-
-                // 添加表格组
-                let res = await addGroup(data)
-
-                if(res.code == 200){
-                  this.$message.success("创建成功");
-
-                  this.isShowTable = false
-                  this.groupForm = {}
-                } else {
-                  this.$message.success("创建失败");
-                  }
-                }
-            }else{
-            
-              let groupKeyObj = {
-                groupKey: uuidv4(),
-              };
-              let data = {
-                groupKey: groupKeyObj.groupKey,
-                groupName: '',
-                groupDescription: '',
-                groupTableInfo: [],
-                dragTables:[],
-                id: this.groupId
-              }
-              this.addDragData.forEach((item, index) => {
-                // item.sqlKey = tableKeyObj.tableKey
-                let echo = JSON.parse(item.echoData)
-                echo.formData = this.groupForm
-                item.echoData = JSON.stringify(echo)
-                data.groupTableInfo.push({
-                  tableKey: item.tableKey,
-                  sort: index,
-                  tablename: item.dtTableName,
-                  })
-              })
-                data.groupName = this.groupForm.groupName
-                data.groupDescription = this.groupForm.groupDescription
-                data.groupTableInfo = JSON.stringify(data.groupTableInfo)
-                data.dragTables = this.addDragData
-              let res = await updataGroup(data)
-              console.log(res)
-
-              if(res.code == 200){
-                let payLoad = {
-                  menuId: this.menuId,
-                  menuName: this.groupForm.groupName,
-                  parentId: this.groupForm.routePath,
-                  component: "tablelist/commonTable/listInfo",
-                  icon: "",
-                  isCache: "0",
-                  isFrame: "1",
-                  menuType: "C",
-                  orderNum: this.menuOrderNum,
-                  status: "0",
-                  visible: "0",
-                  tenantId: this.tenantId,
-              };
-                console.log(payLoad);
-                let result = await updateMenu(payLoad);
-                console.log('确认修改', result);
-              }          
-            }
-
-            this.isShowTable = false
-            this.addDragData = []
-            this.groupForm = []
-            this.tableDataList = []
-            this.getTableList()
-          } else {
-            this.$message.error("请完善表单信息");
-            return false;
-          }
-      });
-    },
-    /** 新增按钮操作 */
-    async handleAdd() {
-      // dialog弹窗
-      this.isShowTable = true
-
-      // dialog标题
-      this.groupTitle = true
-
-      // 新增关联表格
-      this.isShowForm = true
-      this.relateTitle = true
-      this.tableItemForm = {}
-      this.groupForm = {}
-      this.tableDataList = []
-      this.tableFieldList = []
-      this.relyOption = ''
-      this.conditionDefaultValueMap = ''
-    },
-    // 取消
-    cancelGroup(){
-      this.groupTitle = true
-      this.isShowTable = false
-    },
-    // 获取路由表单数据
-    async getMenuList() {
-      let res = await getMenuList();
-      this.menus = this.handleTree(res.data, "menuId");
-    },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.menuId,
-        label: node.menuName,
-        children: node.children,
-      };
-    },
-    // 修改动态表格组回显
-    UpdateTableGroup(row){
-      console.log(row);
-      // let id = JSON.parse(row.id)
-      getTable({ id: row.id }).then(res => {
-        this.groupId = res.data.id
-        // 关联表格
-        this.groupTableInfo = JSON.parse(res.data.groupTableInfo)
-        this.menuId = res.data.dragTables[0].menuId
-
-        this.groupForm = res.data
-        this.addDragData = res.data.dragTables
-        // 菜单路由回显
-        this.tableDataList = this.groupForm.dragTables
-        this.groupForm.routePath = this.getParentMenuId(
-          res.data.dragTables[0].menuId,
-          this.menus,
-          {}
-        )
-
-        if (!this.groupForm.routePath) {
-          this.$message.warning("该表格菜单路由已经删除,请重新配置");
-        }
-      })
-
-      this.groupTitle = false
-      this.isShowTable = true 
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        tId: null,
-        dtName: null,
-        dtNickname: null,
-        tableKey: null,
-        sqlKey: null,
-        dtTableName: null,
-        dtNotes: null,
-        dtColumnName: null,
-        timeFormat: null,
-        spare: null,
-        spare1: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        isSelection: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.getTableList();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.Keys = selection.map((item) => item.sqlKey);
-      this.menuIds = selection.map((item) => item.menuId);
-      this.selection = selection;
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    
-    /** 修改按钮操作 */
-    async handleUpdate(row) {
-      // 兼容勾选单个的修改
-      let tId = row?.tId || this.ids[0];
-      // this.$router.push({
-      //   path: "/system/fromModel/index/tableMange",
-      //   query: {
-      //     tId: tId,
-      //   },
-      // });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.tId != null) {
-            updateTable(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTable(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      console.log(row);
-      this.tableDataList.forEach((item, index) => {
-        if(row.tableKey == item.tableKey) {
-          this.tableDataList.splice(index, 1);
-        }
-      })
-      console.log(this.tableDataList)
-    },
-    // 更新路由
-    reloadRouter() {
-      this.$store.dispatch("GenerateRoutes").then((accessRoutes) => {
-        this.$router.addRoutes(accessRoutes); // 动态添加可访问路由表
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        process.env.VUE_APP_BASE_API3 + "system/table/export",
-        {
-          ...this.queryParams,
-        },
-        `table_${new Date().getTime()}.xlsx`
-      );
-    },
-    // 新增一个联动表格
-    addOneTable() {
-      this.relateTitle = true
-      if(this.relateTitle){
-        this.tableItemForm = {}
-        this.tableFieldList = []
-      }
-      if(!this.groupTitle){
-        // console.log('修改新增');
-        console.log(this.tableDataList[this.tableDataList.length-1].dtTableName)
-       
-        this.relyFileds.tableName = this.tableDataList[this.tableDataList.length-1].dtTableName
-        let echoData = JSON.parse(this.tableDataList[this.tableDataList.length-1].echoData)
-
-        this.relyFileds.tableFieldList = echoData.tableFieldData
-      }
-      this.getAllTable()
-      // 注意校验最后一条数据是否合法
-      this.isShowForm = true;
-    },
-
-    // 重置表单
-    // tableItemFormReset() {
-    //   Object.assign(this.tableItemForm, {
-    //     title: "",
-    //     tableId: "",
-    //     tableName: "",
-    //     showFields: [],
-    //     theRelateField: "",
-    //     executeOptions: [],
-    //   });
-    // },
-    // handlePreview() {
-    //   this.$router.push({
-    //     path: "/system/fromModel/index/relateTableEdit",
-    //   });
-    // },
-  },
-};
-</script>
-<style scoped lang="scss">
-::v-deep .el-dialog:not(.is-fullscreen){
-  width: 900px !important;
-}
-.isSearch {
-  ::v-deep .el-dialog:not(.is-fullscreen){
-  width: 320px !important;
-  }
-  ::v-deep .el-input--medium .el-input__inner{
-    margin-bottom: 10px !important;
-  }
-}
-.tablefiled{
-  ::v-deep .el-input--medium .el-input__inner{
-    width: 70px !important;
-  }
-}
-::v-deep .el-input--medium .el-input__inner{
-  width: 230px !important;
-}
-::v-deep .btn{
-  text-align: right !important;
-}
-.ipt {
-  height: 36px;
-  line-height: 36px;
-  font-size: 14px;
-  width: 100%;
-  outline: none;
-  text-align: center;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  color: #606266;
-  display: inline-block;
-  border-radius: 4px;
-}
-.isNullDesc {
-  border-color: #ff4949 !important;
-}
-
-.ipt:focus {
-  border-color: #1890ff;
-}
-::v-deep .vue-treeselect--has-value .vue-treeselect__input {
-  vertical-align: middle !important;
-}
-.formWrap {
-  display: flex;
-  justify-content: center;
-}
-
-::v-deep .el-table{
-  margin-top: 10px;
-}
-.nameipt{
-  display: inline;
-  margin-left: 10px;
-  ::v-deep .el-input--medium .el-input__inner{
-  width: 30%;
-  }
-  ::v-deep .el-input--medium{
-  display: inline;
-  }
-}
-.desc{
-  margin-left: 10px;
-}
-::v-deep .vue-treeselect--has-value .vue-treeselect__input {
-  vertical-align: middle !important;
-
-}
-.treeselect{
-   .vue-treeselect{
-    width: 230px !important;
-  }
-}
-</style>
-
-<style lang="scss">
- 
-.vue-treeselect{
-  z-index: 9999 !important;
-}
-</style>

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

@@ -10,7 +10,6 @@
     >
       <el-form-item label="表格组名" prop="dtName">
         <el-input
-          @input="change1($evevt)"
           v-model="queryParams.dtName"
           placeholder="请输入表格组名"
           clearable
@@ -145,11 +144,11 @@
         <el-form :model="groupForm" :rules="grouprules" ref="groupForm" label-width="100px" class="demo-ruleForm">
           <el-form-item label="表格组名" prop="groupName">
             <el-input v-model="groupForm.groupName" placeholder="请输入表格组名"
-            @input="change1($evevt)"></el-input>
+            ></el-input>
           </el-form-item>
           <el-form-item label="表格描述" prop="groupDescription">
             <el-input v-model="groupForm.groupDescription" placeholder="请输入表格描述"
-            @input="change1($evevt)"></el-input>
+            ></el-input>
           </el-form-item>
           <el-form-item label="菜单路由" prop="routePath">
           <div class="treeselect">
@@ -238,10 +237,10 @@
         >
           <el-form-item label="表格标题:" prop="title">
             <el-input
-            @input="change1($evevt)"
               v-model="tableItemForm.title"
               style="max-width: 221px"
               @change="iptChange()"
+              @input="iptChange()"
             ></el-input>
           </el-form-item>
           <el-form-item label="表格名称:" prop="tableName">
@@ -249,6 +248,7 @@
               v-model="tableItemForm.tableName"
               @change="getList()"
               placeholder="请选择表格名称"
+              @input="iptChange()"
             >
               <el-option
               v-for="item in tableList"
@@ -267,6 +267,7 @@
             <el-select
               v-model="tableItemForm.selectFields"
               placeholder="请选择表格主键"
+              @input="iptChange()"
             >
             <el-option
               v-for="item in tableFieldList"
@@ -285,6 +286,7 @@
             <el-select
               v-model="tableItemForm.timeFormate"
               placeholder="请选择时间格式"
+              @input="iptChange()"
             >
               <el-option
                 v-for="val in dict.type.sys_time_format"
@@ -298,6 +300,7 @@
             <el-select
               v-model="tableItemForm.orderByColumn"
               placeholder="请选择排序依赖"
+              @input="iptChange()"
             >
               <el-option
                 v-for="val in orderByFieldList"
@@ -515,11 +518,11 @@ export default {
       groupList:[],
       menus: [], //路由列表数据
       // 添加关联表格校验规则
-      // tableItemRules:{
-      //   title:[{ required: true, message: '请输入表格标题', trigger: 'blur' }],
-      //   tableName:[{ required: true, message: '请选择表格名称', trigger: 'change' }],
-      //   selectFields: [{ required: true, message: '请选择关联字段', trigger: 'change' }],
-      // },
+      tableItemRules:{
+        // title:[{ required: true, message: '请输入表格标题', trigger: 'blur' }],
+        // tableName:[{ required: true, message: '请选择表格名称', trigger: 'change' }],
+        // selectFields: [{ required: true, message: '请选择关联字段', trigger: 'change' }],
+      },
       groupForm: {
         groupName: '',
         groupDescription:'',
@@ -577,6 +580,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        groupType: 0,
         pageNum: 1,
         pageSize: 10,
         dtName: null,
@@ -627,7 +631,10 @@ export default {
       // 修改表格时的menuId
       menuId: "",
       // 修改是表格的id
-      groupId:''
+      groupId:'',
+      serachIndex: '',
+      //修改数据回显
+      echogroup:{},
     };
   },
   async created() {
@@ -667,7 +674,7 @@ export default {
             };
           });
       } else {
-        this.relationTableList = [];
+        this.relaiptChangetableItemRulestionTableList = [];
       }
     },
     'groupForm.routePath'(nval, oval) {
@@ -697,6 +704,7 @@ export default {
     },
     // 是否包含查询switch
     isSearchChange(status, row,index){
+      this.serachIndex = index
       this.isSearchIndex = row.tableName + '.' + row.fieldName
       if(!status){
         delete this.conditionDefault[this.isSearchIndex]
@@ -709,7 +717,7 @@ export default {
       this.relyOption = null
       this.conditionDefaultValueMap = ''
       this.isSearchDialog = false
-      this.tableFieldList[this.isSearchIndex].isSearch = false
+      this.tableFieldList[this.serachIndex].isSearch = false
     },
     isSearchBtn(){
       if(this.relyOption == 0){
@@ -981,13 +989,13 @@ export default {
           this.$message.warning("请至少选择一个包含查询字段");
           return false;
           }
-          let echoData = {
-            tableName: this.tableItemForm.tableName,
-            tableFieldData: this.tableFieldList,
-          }
+          let echoData = {}
           // 判断修改还是新增
           if(this.relateTitle){ 
-  
+            echoData = {
+            tableName: this.tableItemForm.tableName,
+            tableFieldData: this.tableFieldList,
+           }
             let tableKey = uuidv4();
             let sqlKey = uuidv4();
 
@@ -1003,7 +1011,7 @@ export default {
               selectFields: this.tableItemForm.selectFields,
               orderByColumn: this.tableItemForm.orderByColumn,
               timeFormate: this.tableItemForm.timeFormate,
-
+              primaryKey: this.tableItemForm.selectFields,
               rowId: this.tableItemForm.rowId,
               tId: this.tId,
               tableKey: tableKey,
@@ -1043,29 +1051,27 @@ export default {
             }
             
           } else {
-            let tableKey = uuidv4();
-            let sqlKey = uuidv4();
-            console.log(this.conditionDefault);
-
-            console.log(searchFieldList);
+            echoData = {
+              tableName: this.tableItemForm.tableName,
+              tableFieldData: this.tableFieldList,
+            }
+            // console.log('123456', echoData);
             this.tableDataList.forEach((item, index) => {
               if(item.tId == this.tableItemForm.tId){
-                // 判断依赖字段是否为一个
                 item.conditionDefaultValueMap = this.conditionDefault
-               
                 item.echoData = JSON.stringify(echoData),
                 item.sortOrder = this.tableItemForm.isAsc
                 item.orderByColumn = this.tableItemForm.orderByColumn
                 item.primaryKey = this.tableItemForm.selectFields
                 item.dtTableName = this.tableItemForm.tableName
                 item.dtName = this.tableItemForm.title
-                item.dtColumnName = columns
+                item.dtColumnName = JSON.stringify(columns)
                 item.searchFieldList = searchFieldList 
               }
             })
           }
-          console.log(this.tableDataList)
           this.isShowForm = false
+          echoData = {}
           this.tableItemForm = {}
           this.tableFieldList = []
           this.relyFiledsList = []
@@ -1080,7 +1086,6 @@ export default {
     },
     // 修改一个表格数据
     relateOne(row){
-      console.log(row);
       if(row.tableKey){
         this.menuId = row.menuId
         this.conditionDefault = row.conditionDefaultValueMap
@@ -1102,7 +1107,7 @@ export default {
         this.tableItemForm.tId = row.tId
         this.tableItemForm.rowId = row.tableKey,
         this.tableItemForm.isAsc = false,
-        this.tableItemForm.orderByColumn = "",
+        this.tableItemForm.orderByColumn = row.orderByColumn,
         this.tableItemForm.title = row.dtName
         this.tableItemForm.tableName = row.dtTableName
         this.tableItemForm.selectFields = row.primaryKey
@@ -1272,7 +1277,7 @@ export default {
                 // item.sqlKey = tableKeyObj.tableKey
                 let echo = JSON.parse(item.echoData)
                 echo.formData = this.groupForm
-                item.echoData = JSON.stringify(echo)
+                // item.echoData = JSON.stringify(echo)
                 data.groupTableInfo.push({
                   tableKey: item.tableKey,
                   sort: index,
@@ -1297,15 +1302,11 @@ export default {
                   this.$message.success("创建失败");
                   this.isShowTable = false
                   this.groupForm = {}
-                  }
                 }
+              }
             }else{
-            
-              let groupKeyObj = {
-                groupKey: uuidv4(),
-              };
               let data = {
-                groupKey: groupKeyObj.groupKey,
+                groupKey: this.echogroup.groupKey,
                 groupName: '',
                 groupDescription: '',
                 groupTableInfo: [],
@@ -1315,13 +1316,14 @@ export default {
               this.addDragData.forEach((item, index) => {
                 // item.sqlKey = tableKeyObj.tableKey
                 let echo = JSON.parse(item.echoData)
-                echo.formData = this.groupForm
+                // echo.formData = this.groupForm
+                // console.log(echo);
                 item.echoData = JSON.stringify(echo)
                 data.groupTableInfo.push({
                   tableKey: item.tableKey,
                   sort: index,
                   tablename: item.dtTableName,
-                  })
+                })
               })
                 data.groupName = this.groupForm.groupName
                 data.groupDescription = this.groupForm.groupDescription
@@ -1329,14 +1331,13 @@ export default {
                 data.dragTables = this.addDragData
                 console.log(data);
               let res = await updataGroup(data)
-              console.log(res)
 
               if(res.code == 200){
                 let payLoad = {
                   menuId: this.menuId,
                   menuName: this.groupForm.groupName,
                   parentId: this.groupForm.routePath,
-                  component: "tablelist/commonTable/listInfo",
+                  component: "relateTable/relateTableEdit",
                   icon: "",
                   isCache: "0",
                   isFrame: "1",
@@ -1346,17 +1347,28 @@ export default {
                   visible: "0",
                   tenantId: this.tenantId,
               };
-                console.log(payLoad);
                 let result = await updateMenu(payLoad);
-                console.log('确认修改', result);
-              }          
+
+                if(result.code == 200){
+                  this.$message.success("修改成功");
+
+                  this.isShowTable = false
+                  this.groupForm = {}
+                } else {
+                  this.$message.success("修改失败");
+                  this.isShowTable = false
+                  this.groupForm = {}
+                }
+
+              } 
             }
             this.isShowTable = false
             this.addDragData = []
-            this.groupForm = []
+            this.groupForm = {}
             this.tableDataList = []
             this.reloadRouter();
             this.getTableList()
+
           } else {
             this.$message.error("请完善表单信息");
             return false;
@@ -1397,17 +1409,22 @@ export default {
       };
     },
     // 修改动态表格组回显
-    UpdateTableGroup(row){
-      getRouters().then(res => {})
-      console.log(row);
+    async UpdateTableGroup(row){
+      await this.getMenuList();
       // let id = JSON.parse(row.id)
       getTable({ id: row.id }).then(res => {
+        this.echogroup = res.data
         this.groupId = res.data.id
         // 关联表格
         this.groupTableInfo = JSON.parse(res.data.groupTableInfo)
         this.menuId = res.data.dragTables[0].menuId
-
+        
         this.groupForm = res.data
+        res.data.dragTables.forEach(item => {
+          if(item.orderByColumn.includes('.')){
+            item.orderByColumn = item.orderByColumn.split('.')[1]
+          }
+        })
         this.addDragData = res.data.dragTables
         // 菜单路由回显
         this.tableDataList = this.groupForm.dragTables

ruoyi-ui/src/views/relateTable/relateTableEdit.vue

@@ -160,17 +160,17 @@ export default {
       this.tableLists = JSON.parse(res.msg)
     },
     updateDataList(row,index) {
-      // console.log(row, index);
       // let tableKey = this.tableLists[index+1].tableKey
       let beforeChild = this.$refs['childComponent'+index][0]
       index++
+      console.log(beforeChild);
       const chlid = this.$refs['childComponent'+index][0]
       // console.log(chlid);
       if(!chlid) return
-      let contion = beforeChild.condition
+      // let contion = beforeChild.condition
       // let tableList = beforeChild.tableList[0]
       // console.log(contion,tableList);
-      chlid.getDataHandler(contion,row)
+      chlid.getDataHandler(beforeChild.contion,row)
     },
   },
 };

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

@@ -778,7 +778,7 @@ export default {
     submitForm() {
       this.$refs["btnGroupFormRef"].validate(async (valid) => {
         if (valid) {
-          let validateRes = myValidate(this.btnGroupFormData);
+          let validateRes = this.myValidate(this.btnGroupFormData);
           if (!validateRes.flag) {
             this.$message.error(validateRes.msg);
             return;

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

@@ -362,27 +362,7 @@
               <!-- <el-table-column prop="type" label="类型" width="50"> -->
               <el-table-column prop="statisticType" label="统计类型" width="50">
               </el-table-column>
-              <el-table-column prop="statuscode" label="状态码" width="70">
-              </el-table-column>
-              <!-- <el-table-column prop="title" label="标题" width="83"> -->
-              <!-- <el-table-column
-                prop="statuscode"
-                label="状态码"
-                width="70">
-              </el-table-column> -->
-              <el-table-column
-                prop="statisticDescription"
-                label="统计描述"
-                width="150"
-              >
-              </el-table-column>
-              <!-- <el-table-column prop="description" label="描述" width="150"> -->
-              <el-table-column
-                prop="statisticObject"
-                label="统计对象"
-                width="150"
-              >
-              </el-table-column>
+             
               <el-table-column
                 label="操作"
                 align="center"
@@ -668,13 +648,6 @@
             <!-- <el-option label="状态" value="status"></el-option> -->
           </el-select>
         </el-form-item>
-
-        <el-form-item label="统计描述" prop="statisticDescription">
-          <el-input v-model="dataCountFormData.statisticDescription"></el-input>
-        </el-form-item>
-        <el-form-item label="统计对象" prop="statisticObject">
-          <el-input v-model="dataCountFormData.statisticObject"></el-input>
-        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeAddDialog">取 消</el-button>
@@ -1590,7 +1563,6 @@ export default {
             let tableKeyObj = {
               tableKey: this.uuid,
             };
-            // console.log(this.formData)
             let payLoad = {
               component: "tablelist/commonTable/listInfo",
               icon: "",
@@ -1662,6 +1634,7 @@ export default {
               });
               this.searchFieldList = searchFieldList;
             });
+            
             let res;
             let res1;
             if (this.tId) {
@@ -1675,7 +1648,7 @@ export default {
               this.dragTableStatisticList.forEach((item) => {
                 item.tableKey = this.editData.tableKey;
               });
-              console.log(res);
+              // console.log(res);
               res1 = await updateStatistic({
                 tableKey: this.editData.tableKey,
                 dragTableStatisticList: this.dragTableStatisticList,

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -255,6 +255,27 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 绑定按钮dialog -->
+    <el-dialog
+      title="提示"
+      :visible.sync="btnDialogVisible"
+      :before-close="handleClose">
+      <DialogTemplate 
+       ref="dialogRef"
+        :groupKey="groupKey"
+        :rowobj="rowobj" 
+        :subCount="subCount"
+        :tableCount="tableCount"
+        :subTableName="subTableName"
+        @addList="addListHandler"
+        >
+      </DialogTemplate>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="btnDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="btnComfirm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -276,12 +297,17 @@ import { camelCase } from "@/utils";
 import { inputDisableComplete } from "@/utils/other";
 import Menu from "./BtnMenu.vue";
 import { checkRole } from "@/utils/permission";
+import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
 
 export default {
   name: "listInfo",
-  components: { Queryfrom, Menu },
+  components: { Queryfrom, Menu, DialogTemplate },
   data() {
     return {
+      // 绑定按钮dialog
+      btnDialogVisible: false,
+      // 绑定修改dialog
+      groupKey: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -370,6 +396,14 @@ export default {
       dynamicData: {},
       // 当前点击按钮的数据
       currentBtnData: {},
+      // 修改选中行
+      rowobj:{},
+      // 该行的统计信息
+      subCount:[],
+      tableCount:[],
+      // 弹窗新增数据
+      addLists:[],
+      subTableName: '',
     };
   },
 
@@ -601,10 +635,38 @@ export default {
       }
       return strs[0];
     },
-
+    // 绑定dialog对话框关闭
+    handleClose(){
+      this.btnDialogVisible = false
+    },
+    getLastUppercaseWord(text) {
+      const pattern = /\b[A-Z][a-z]*\b/g;
+      const matches = [...text.matchAll(pattern)];
+      if (matches.length > 0) {
+        const lastMatch = matches[matches.length - 1][0];
+        return lastMatch;
+      } else {
+        return null;
+      }
+    },
     /** 修改按钮操作 */
     async handleUpdate(row, btnData) {
-      console.log(this.currentBtnData);
+      // console.log(this.currentBtnData);
+      
+      let nameTable = this.templateInfo.template.dtTableName
+      // console.log(nameTable);
+      // console.log('row', row);
+      this.rowobj = {}
+      let obj = {}
+      for(let key in row) {
+
+        let modifiedTable = key.replace(/[A-Z]/g, (match) => `_${match}`).toLowerCase(); 
+
+        this.rowobj[modifiedTable] = row[key];
+
+        let str = modifiedTable.substring(nameTable.length+1)
+        obj[str] = row[key];
+      }
 
       // 新的修改请求
       try {
@@ -624,14 +686,66 @@ export default {
         payLoad.conditionMap[this.templateInfo.template?.primaryKey] =
           row[primary];
         let res = await btnCommonApi(payLoad);
-        if (!res.data || !res.data.template.dfVueTemplate) {
+        this.subTableName = res.data.result.dragTables[1].dtTableName
+        // 判断是否绑定dialog弹窗
+        if (this.currentBtnData.btnTableFormGroupKey == '') {
           this.$message.error("当前表格未绑定表单!");
           return;
-        }
-        res.data.template.dfFormSql &&
+
+          res.data.template.dfFormSql &&
           (this.dynamicData = JSON.parse(res.data.template.dfFormSql));
-        this.addRealFieldName(res.data.result.resultMap);
-        let resultMap = res.data.result.resultMap;
+           this.addRealFieldName(res.data.result.resultMap);
+          let resultMap = res.data.result.resultMap;
+
+          Object.assign(this.defaultValue, resultMap);
+          this.jsonData = JSON.parse(res.data.template.dfVueTemplate);
+          this.open = true;
+          this.title = "修改信息";
+          this.form.password = this.initPassword;
+          this.$nextTick(() => {
+            this.$refs.addFromRef.setData(res.data.result.resultMap);
+          });
+        }else{
+          this.btnDialogVisible = true
+          this.groupKey = this.currentBtnData.btnTableFormGroupKey
+          this.$nextTick(()=>{
+            let refChild = this.$refs.dialogRef
+
+            // console.log(this.$refs.dialogRef);
+            refChild.getLists(this.groupKey)
+          })
+
+          let tablesubKey = res.data.result.dragTables[1].tableKey
+     
+          // 查询统计信息
+          getStatisticList({
+            queryMap: {
+              tableKey: tablesubKey,
+            },
+          }).then((res) => {
+            // console.log('统计', res);
+            this.subCount = res.data
+          });
+
+          let prmKey = this.templateInfo.template.primaryKey
+          let pkey = prmKey.replace(/_([a-z])/g, (match, p1) => p1.toUpperCase());
+
+          let data = {
+            queryMap:{
+              tableKey:res.data.result.dragTables[2].tableKey,
+            }
+          }
+
+          let key = '#{' + this.templateInfo.template.dtTableName + '.' + this.templateInfo.template.primaryKey
+
+          data.queryMap[key] = "'" + obj[this.templateInfo.template.primaryKey] + "'";
+
+          getStatisticList(data).then((res) => {
+            // console.log('统计', res);
+            this.tableCount = res.data
+          });
+        }
+       
         // let fieldList = Object.keys(resultMap);
         // let tableName = this.longestCommonSubstring(fieldList);
         // fieldList.forEach((field) => {
@@ -639,15 +753,7 @@ export default {
         //   realField = realField[0].toLocaleLowerCase() + realField.substring(1);
         //   resultMap[realField] = resultMap[field];
         // });
-        console.log(resultMap);
-        Object.assign(this.defaultValue, resultMap);
-        this.jsonData = JSON.parse(res.data.template.dfVueTemplate);
-        this.open = true;
-        this.title = "修改信息";
-        this.form.password = this.initPassword;
-        this.$nextTick(() => {
-          this.$refs.addFromRef.setData(res.data.result.resultMap);
-        });
+   
       } catch (error) {
         this.$message.error("网络异常,请稍后再试");
         console.log(error);
@@ -828,6 +934,28 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
+    // 弹窗新增的数
+    addListHandler(val){
+      this.addLists.push(...val)
+      console.log(this.addLists);
+    },
+    // 绑定弹窗Dialog确定按钮
+    btnComfirm(){
+      // let data = {
+      //   addListMap:[],
+      //   basicMap:{
+      //     btnType: 10,
+      //     tableName: this.subTableName,
+      //     visible: true,
+      //   },
+      //   commMap: {},
+      //   conditionMap: {},
+      // }
+      // // data.addListMap =
+      // btnCommonApi(data).then(res => {
+      //   console.log('弹窗确定', res);
+      // })
+    },
     //提交编辑结果按钮回调
     editConfirmHandler() {
       this.$refs.addFromRef
@@ -1082,4 +1210,8 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+  ::v-deep .el-dialog:not(.is-fullscreen){
+    min-width: 610px !important;
+  }
+</style>

ruoyi-ui/src/views/tablelist/components/cardCountPanel.vue

@@ -23,6 +23,8 @@
       </el-card>
     </div>
   </div>
+
+  
 </template>
 
 <script>