@zscreate/form-component 1.1.689-AI.7 → 1.1.689-AI.9

package/dist/form-component.umd.js

@@ -67607,13 +67607,13 @@ let getFileExt = filename => {
     };
   },
   created() {
-    this.editArr.length = this.source.columns.length;
+    const columnCount = this.widget && this.widget.columns || this.source && this.source.columns || [];
+    this.editArr.length = columnCount.length;
   },
   mounted() {
     // 替换分页的三个点，保证在小米手机样式没问题
     this.$nextTick(() => {
       if (this.$isMobile) {
-        debugger;
         document.querySelector(".ant-pagination-item-ellipsis").innerText = "...";
         document.querySelector(".ant-pagination-item-ellipsis").style.fontSize = "20px";
       }
@@ -67691,13 +67691,13 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(29414);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(78393);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(92241);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(5882);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(40000);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(55469);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_19__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(9274);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_20__);
 /* harmony import */ var _form_components_MessageBox_confirmBox_vue__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(97381);
-/* harmony import */ var _form_form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(97128);
+/* harmony import */ var _form_form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(48555);
 /* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(5335);
 /* harmony import */ var _form_form_util__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(36113);
 /* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(50522);
@@ -67709,6 +67709,8 @@ let getFileExt = filename => {
 /* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(97015);
 /* harmony import */ var _form_api_api__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(68294);
 /* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(97031);
+/* harmony import */ var _form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(5229);
+/* harmony import */ var _form_form_util_dictDataCache__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(33883);
 
 
 
@@ -68145,6 +68147,38 @@ let getFileExt = filename => {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
 
 
 
@@ -68167,7 +68201,7 @@ let getFileExt = filename => {
   computed: {
     tableWidgets() {
       var _this$data;
-      return ((_this$data = this.data) === null || _this$data === void 0 || (_this$data = _this$data.list) === null || _this$data === void 0 ? void 0 : _this$data.filter(item => item.type === 'table')) || [];
+      return ((_this$data = this.data) === null || _this$data === void 0 || (_this$data = _this$data.list) === null || _this$data === void 0 ? void 0 : _this$data.filter(item => (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(item))) || [];
     },
     tableItem() {
       return _form_form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .A;
@@ -68249,7 +68283,8 @@ let getFileExt = filename => {
       rulesOver: false,
       userSignature: undefined,
       tableNum: 0,
-      timerObj: {}
+      timerObj: {},
+      virtualTableRefs: {}
       // formList: [],
       // allLoading: false,
       // allLoadingTips: '正在加载表单数据0%...',
@@ -68383,14 +68418,17 @@ let getFileExt = filename => {
         this.tableWidgets.forEach(tableWidget => {
           let isAllHide = true;
           tableWidget.columns.forEach((item, idx) => {
+            var _this$tableData$table;
             if (item.options.canView) isAllHide = false;
-            if (this.tableData[tableWidget.model]) {
+            const rowCount = ((_this$tableData$table = this.tableData[tableWidget.model]) === null || _this$tableData$table === void 0 ? void 0 : _this$tableData$table.length) || 0;
+            const skipRowSync = tableWidget._lightweightRows || rowCount > _form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .LARGE_TABLE_ROW_THRESHOLD */ .Oi;
+            if (this.tableData[tableWidget.model] && !skipRowSync) {
               this.tableData[tableWidget.model].forEach((row, rowIndex) => {
                 row.columns[idx].options.canView = item.options.canView;
                 row.columns[idx].options.disabled = item.options.disabled;
                 row.columns[idx].options.required = item.options.required;
                 // 解决存在分页情况导出序号空白;
-                if (tableWidget.supportPage && tableWidget.type == 'table' && Array.isArray(this.tableData[tableWidget.model]) && ['input', 'textarea'].includes(item.type)) {
+                if (tableWidget.supportPage && (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(tableWidget) && Array.isArray(this.tableData[tableWidget.model]) && ['input', 'textarea'].includes(item.type)) {
                   this.tableData[tableWidget.model].forEach((el, index) => {
                     let value = this.models[tableWidget.model][index][item.model];
                     if (item.options.defaultValue.includes('script:')) value = item.options.defaultValue;
@@ -68463,6 +68501,45 @@ let getFileExt = filename => {
     }
   },
   methods: {
+    isTableUseVirtualScroll: _form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableUseVirtualScroll */ .Ce,
+    isTablePaginationActive(widget) {
+      var _widget$options;
+      return !!((_widget$options = widget.options) !== null && _widget$options !== void 0 && _widget$options.supportPage);
+    },
+    scrollTableToLastPage(model) {
+      var _this$tableData$model;
+      const pageInfo = this.tablePageInfo[model];
+      if (!pageInfo) return;
+      const pageSize = pageInfo.pageSize || 10;
+      const total = ((_this$tableData$model = this.tableData[model]) === null || _this$tableData$model === void 0 ? void 0 : _this$tableData$model.length) || 0;
+      pageInfo.current = Math.max(1, Math.ceil(total / pageSize));
+    },
+    getTableVirtualKeeps: _form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .getTableVirtualKeeps */ .qh,
+    setVirtualTableRef(el, model) {
+      if (el) {
+        this.$set(this.virtualTableRefs, model, el);
+      } else if (this.virtualTableRefs[model]) {
+        this.$delete(this.virtualTableRefs, model);
+      }
+    },
+    scrollTableToNewRow(model) {
+      this.$nextTick(() => {
+        const vlist = this.virtualTableRefs[model];
+        if (vlist && typeof vlist.scrollToNewRow === 'function') {
+          vlist.scrollToNewRow();
+        }
+      });
+    },
+    syncVirtualTable(model) {
+      this.$nextTick(() => {
+        this.$nextTick(() => {
+          const vlist = this.virtualTableRefs[model];
+          if (vlist && typeof vlist.resetToHead === 'function') {
+            vlist.resetToHead();
+          }
+        });
+      });
+    },
     beforeUpload: function (file) {
       var fileType = file.type;
       if (fileType.indexOf("excel") < 0) {
@@ -68594,25 +68671,21 @@ let getFileExt = filename => {
     },
     //添加子表单里面的row
     addToTableData(data, model, addModel = undefined, clickByUser = false) {
-      let dataTemp = data;
-      // if (!data._clone) {
-      dataTemp = JSON.parse(JSON.stringify(data));
-      // }
-      // this.tableIndex[model] === undefined ? this.$set(this.tableIndex, model, 0) : null;
-      // dataTemp.index = this.tableIndex[model];
-      // this.tableIndex[model]++;
+      const tableWidget = this.tableModel[model];
+      const lightweight = tableWidget && tableWidget._lightweightRows;
       this.tableData[model] === undefined ? this.$set(this.tableData, model, []) : null;
       if (addModel) {
         let addModelObject = {};
-        dataTemp.columns.forEach(item => {
-          item.options.isCorrect = false;
+        data.columns.forEach(item => {
+          if (!lightweight) {
+            item.options.isCorrect = false;
+          }
           if (clickByUser) {
             item.tableColCanEdit = true;
           }
           let defaultValue = item.defaultValue ? item.defaultValue : item.options.defaultValue;
           if (item.type == "imgupload" && item.options.defaultFiles) defaultValue = item.options.defaultFiles;
           addModelObject[item.model] = defaultValue;
-          // if (addModelObject[item.model] === undefined) addModelObject[item.model] = ''
         });
         this.unFreezeModels(model);
         if (!Array.isArray(this.models[model])) {
@@ -68621,7 +68694,7 @@ let getFileExt = filename => {
         const _cloneData = (0,_util_util__WEBPACK_IMPORTED_MODULE_16__/* .cloneObj */ .lR)(addModelObject);
         this.models[model].push(addModelObject);
         this.freezeModels(model);
-        if (this.isDesign) {
+        if (this.isDesign && !lightweight) {
           if (!this.destoryTable) this.destoryTable = [];
           this.destoryTable.push(() => {
             for (const key in _cloneData) {
@@ -68632,18 +68705,30 @@ let getFileExt = filename => {
             }
           });
           this.$on('hook:destroyed', () => {
-            // addModelObject forin  _cloneData
             this.destoryTable.forEach(func => func());
           });
         }
-        dataTemp.options.isCorrect = false;
+      }
+      let dataTemp;
+      if (lightweight) {
+        dataTemp = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createLightweightTableRow */ .r)(model, this.tableData[model].length, `${Date.now()}_${Math.random()}`);
       } else {
-        dataTemp.options.isCorrect = true;
+        dataTemp = JSON.parse(JSON.stringify(data));
+        if (addModel) {
+          dataTemp.options.isCorrect = false;
+        } else {
+          dataTemp.options.isCorrect = true;
+        }
+        let random_number = Math.ceil(Math.random() * 10000) + '';
+        dataTemp.hashKey = new Date().getTime() + random_number;
+        dataTemp.rand_id = Math.random().toString();
       }
-      let random_number = Math.ceil(Math.random() * 10000) + '';
-      dataTemp.hashKey = new Date().getTime() + random_number;
-      dataTemp.rand_id = Math.random().toString();
       this.tableData[model].push(dataTemp);
+      if (tableWidget && this.isTablePaginationActive(tableWidget)) {
+        this.$nextTick(() => this.scrollTableToLastPage(model));
+      } else if (tableWidget && (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableUseVirtualScroll */ .Ce)(tableWidget)) {
+        this.scrollTableToNewRow(model);
+      }
       this.publishCalc(model);
     },
     publishCalc(model) {
@@ -68687,10 +68772,31 @@ let getFileExt = filename => {
         if (Array.isArray(curr)) {
           return all.concat(this.findTableComponent(curr));
         }
-        if (curr.type === 'table') return all.concat(curr);
+        if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(curr)) return all.concat(curr);
         return all;
       }, []);
     },
+    navigateToSubTableRow({
+      tableModel,
+      rowIndex
+    }) {
+      if (!this.tablePageInfo[tableModel]) return;
+      const pageSize = this.tablePageInfo[tableModel].pageSize || 10;
+      this.tablePageInfo[tableModel].current = Math.floor(rowIndex / pageSize) + 1;
+    },
+    scrollToFirstFormError() {
+      setTimeout(() => {
+        const explainDom = document.querySelector(".ant-form-explain");
+        if (explainDom) {
+          const y = explainDom.getBoundingClientRect().y - 100;
+          document.documentElement.scrollTop += y;
+          const scrollArea = document.querySelector(".scroll-area");
+          if (scrollArea) {
+            scrollArea.scrollTop += y;
+          }
+        }
+      }, 0);
+    },
     //校验表单 获取数据
     getFormData() {
       if (this.verifyNode && this.models[this.verifyNode]) {
@@ -68701,56 +68807,33 @@ let getFileExt = filename => {
       }
       // 判断是否为 纠错审核内进来的, 纠错审核不用校验表单
       if (this.isCorrectAudit()) return Promise.resolve(this.models);
-
-      // 判断子表单内组件有没有必填的校验
-      const tables = this.findTableComponent(this.widgetList).filter(table => {
-        if ([table.options.canView, !table.options.disabled].includes(false)) return;
-        const {
-          columns = []
-        } = table;
-        for (let i = 0; i < columns.length; i++) {
-          var _columns$i$options;
-          const {
-            rules = []
-          } = columns[i];
-          if (rules.some(rule => rule.required)) return true;
-          if ((_columns$i$options = columns[i].options) !== null && _columns$i$options !== void 0 && _columns$i$options.minValue) {
-            return true;
-          }
-        }
+      const subTables = this.findTableComponent(this.widgetList).filter(table => table.options.canView && !table.options.disabled);
+      const tableErrors = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .validateSubTableRows */ .gj)(subTables, this.models, {
+        isCorrectAudit: this.m_isCorrectAudit()
       });
-      // 子表单有必填校验 判断有没有添加行， 没有添加行需要手动添加行， 让它触发校验
-      //新疆科技不需要该逻辑，去除
-      // tables.forEach(table => {
-      //   const model = this.models[table.model]
-      //   if ( !model || ( Array.isArray(model) && model.length === 0 )) {
-      //     this.addToTableData(table, table.model, 'addModel', true)
-      //   }
-      // })
-      debugger;
       return new Promise((resolve, reject) => {
-        this.$nextTick(() => {
+        const runValidate = () => {
           this.$refs.Form.validate(valid => {
-            debugger;
-            if (valid) {
+            if (valid && !tableErrors.length) {
               resolve(this.models);
             } else {
+              var _tableErrors$;
               console.log("error submit!!");
-              reject(new Error("表单数据校验失败").message);
-              setTimeout(() => {
-                const explainDom = document.querySelector(".ant-form-explain");
-                if (explainDom) {
-                  const y = explainDom.getBoundingClientRect().y - 100;
-                  document.documentElement.scrollTop += y;
-                  const scrollArea = document.querySelector(".scroll-area");
-                  if (scrollArea) {
-                    scrollArea.scrollTop += y;
-                  }
-                }
-              }, 0);
+              const message = ((_tableErrors$ = tableErrors[0]) === null || _tableErrors$ === void 0 ? void 0 : _tableErrors$.message) || "表单数据校验失败";
+              if (tableErrors.length && valid) {
+                this.$message.warning(message);
+              }
+              reject(new Error(message).message);
+              this.scrollToFirstFormError();
             }
           });
-        });
+        };
+        if (tableErrors.length) {
+          this.navigateToSubTableRow(tableErrors[0]);
+          this.$nextTick(runValidate);
+        } else {
+          this.$nextTick(runValidate);
+        }
       });
     },
     //重置表单
@@ -68822,10 +68905,7 @@ let getFileExt = filename => {
     //   });
     // },
     generateTableData(gen) {
-      // console.log('JSON.models',JSON.stringify(this.models))
-      // this.tableData = {}
-      // this.tableIndex = {}
-      if (gen.type === "table") {
+      if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(gen)) {
         var tableModel = gen.model;
         if (this.tableData[tableModel] instanceof Array) {
           this.tableData[tableModel].length = 0;
@@ -68833,7 +68913,12 @@ let getFileExt = filename => {
         }
         this.tableModel[tableModel] = gen;
         this.tableModel[tableModel]["options"]["defaultValue"] = this.models[gen.model];
-        this.tableInitByModel(tableModel);
+        const initTable = () => this.tableInitByModel(tableModel);
+        if (gen.type === 'newTable') {
+          (0,_form_form_util_dictDataCache__WEBPACK_IMPORTED_MODULE_34__/* .prefetchTableDictData */ .sE)(gen.columns, this.applyId).finally(initTable);
+        } else {
+          initTable();
+        }
       }
     },
     timeout: _form_utils_util__WEBPACK_IMPORTED_MODULE_32__.timeout,
@@ -68842,14 +68927,15 @@ let getFileExt = filename => {
         if (this.tableData[model] === undefined) {
           this.$set(this.tableData, model, []);
         }
-        // console.log('--',this.tableModel[model], model)
         setTimeout(async () => {
           this.tableNum++;
           this.$emit("tableLoading", true);
           this.formLoading = true;
           this.tableLoading = true;
-          let dataTemp = JSON.parse(JSON.stringify(this.tableModel[model]));
-          dataTemp._clone = true;
+          const tableWidget = this.tableModel[model];
+          const rowCount = this.models[model].length;
+          const lightweight = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .shouldUseLightweightTableRows */ .K2)(rowCount);
+          tableWidget._lightweightRows = lightweight;
           if (this.isDesign) {
             if (!this.destoryTable) this.destoryTable = [];
             this.destoryTable.push(() => {
@@ -68859,29 +68945,29 @@ let getFileExt = filename => {
               this.destoryTable.forEach(func => func());
             });
           }
-          this.originIndex = 0;
-          for (let i = 0; i < this.models[model].length; i++) {
-            this.originIndex++;
-            if (i < this.tableModel[model].options.supportPage ? 5 : 20) {
-              await this.timeout(0);
-              // this.addToTableData(dataTemp, model);
-            }
+          if (lightweight) {
+            this.tableData[model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createLightweightTableRows */ .eo)(model, rowCount);
+          } else {
+            const dataTemp = JSON.parse(JSON.stringify(tableWidget));
+            dataTemp._clone = true;
+            const seed = Date.now();
+            this.tableData[model] = Array.from({
+              length: rowCount
+            }, (_, index) => {
+              const row = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createFullTableRow */ .yk)(dataTemp);
+              row.hashKey = `${model}_${index}_${seed}`;
+              row.index = index;
+              return row;
+            });
           }
           this.freezeModels(model);
-          let tableData = Array.from({
-            length: this.models[model].length
-          }, () => JSON.parse(JSON.stringify(dataTemp)));
-          tableData.forEach((el, index) => {
-            if (!el.hashKey) {
-              el.hashKey = new Date().getTime() + Math.ceil(Math.random() * 10000) + '' + index;
-            }
-          });
-          this.tableData[model] = tableData;
           this.tableLoading = false;
           if (this.tableNum > 0) this.tableNum--;
           if (this.tableNum === 0) this.formLoading = false;
-          console.log("tableLoading false");
           this.$emit("tableLoading", false);
+          if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableUseVirtualScroll */ .Ce)(tableWidget)) {
+            this.syncVirtualTable(model);
+          }
           setTimeout(() => {
             this.publishCalc(model);
           }, 10);
@@ -69185,7 +69271,7 @@ let getFileExt = filename => {
       this.handleLinkAge();
       if (Array.isArray(genList) && genList.length > 0) {
         genList.forEach((widget, index) => {
-          if (["grid", "grid-lay-out", "all-lay-out", 'table'].includes(widget.type)) {
+          if (["grid", "grid-lay-out", "all-lay-out"].includes(widget.type) || (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
             this.syncLayoutSubscribe(widget);
           }
           // 此类组件 需要深度遍历columns.list
@@ -69206,7 +69292,7 @@ let getFileExt = filename => {
               this.models[widget.model] = ["imgupload", "deptSelector", "userSelector", "userSelectorByRole", "relateSub"].includes(widget.type) ? [] : "";
             }
             // 子表单
-            if (widget.type === "table") {
+            if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
               //生成tableModel
               this.generateTableData(widget);
               return false;
@@ -69252,7 +69338,26 @@ let getFileExt = filename => {
     },
     // 设置models值 通过defaultValue
     setModelsbyDefaultValue(widget) {
-      const defaultValue = !this.data.config.status || this.data.config.status == 'XZ' ? widget.type === 'table' && !widget.options.defaultValue ? [] : widget.options.defaultValue : widget.type === 'select' && !widget.options.defaultValue ? void 0 : '';
+      const defaultValue = !this.data.config.status || this.data.config.status == 'XZ' ? (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget) && !widget.options.defaultValue ? [] : widget.options.defaultValue : widget.type === 'select' && !widget.options.defaultValue ? void 0 : '';
+      if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
+        const value = (0,_util_util__WEBPACK_IMPORTED_MODULE_16__/* .cloneObj */ .lR)(widget.options.defaultValue);
+        // 子表单默认值， 如果 缺少 内部子组件key， 会导致校验失败， 所以需要补全
+        const tableWidget = this.widgetList[0].find(item => item.model === widget.model);
+        const childKeys = tableWidget ? tableWidget.columns.map(item => item.model) : [];
+        if (Array.isArray(value)) {
+          value.forEach(val => {
+            const valKeys = Object.keys(val || {});
+            childKeys.forEach(key => {
+              if (!valKeys.includes(key)) {
+                val[key] = undefined;
+              }
+            });
+          });
+        }
+        this.models[widget.model] = value ? value : [];
+        this.generateTableData(widget);
+        return true;
+      }
       switch (widget.type) {
         case "verify":
           this.models[widget.model] = widget.operationColumns;
@@ -69281,29 +69386,12 @@ let getFileExt = filename => {
           }
           this.models[widget.model] = selectDefaultValue;
           return true;
-        case "table":
-          const value = (0,_util_util__WEBPACK_IMPORTED_MODULE_16__/* .cloneObj */ .lR)(widget.options.defaultValue);
-          // 子表单默认值， 如果 缺少 内部子组件key， 会导致校验失败， 所以需要补全
-          const childKeys = this.widgetList[0].find(item => item.model === widget.model).columns.map(item => item.model);
-          if (Array.isArray(value)) {
-            value.forEach(val => {
-              const valKeys = Object.keys(val || {});
-              childKeys.forEach(key => {
-                if (!valKeys.includes(key)) {
-                  val[key] = undefined;
-                }
-              });
-            });
-          }
-          this.models[widget.model] = value ? value : [];
-          this.generateTableData(widget);
-          return true;
         default:
           return false;
       }
     },
     generateRules(widget, parentWidget) {
-      if (widget.type === "table") {
+      if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
         var tableRlues = {};
         if (widget.columns.length > 0) {
           widget.columns.forEach(item => {
@@ -69313,13 +69401,15 @@ let getFileExt = filename => {
                   return {
                     ...i,
                     validator: (rule, val, callback) => {
+                      var _this$models$tableMod;
                       let index = rule.field.split('.')[1];
-                      let value = val ? val : this.models[item.tableKey][index][item.model];
+                      const tableModel = item.tableKey || item.parentModel || widget.model;
+                      let value = val !== undefined && val !== null ? val : (_this$models$tableMod = this.models[tableModel]) === null || _this$models$tableMod === void 0 || (_this$models$tableMod = _this$models$tableMod[index]) === null || _this$models$tableMod === void 0 ? void 0 : _this$models$tableMod[item.model];
                       // 子表单组件不可见的时候， 内部组件都不校验
                       if (!widget.options.canView) {
                         return callback();
                       }
-                      if (!item.options.canView || item.options.disabled && !this.m_isCorrectBt || !rule.required) {
+                      if (!item.options.canView || item.options.disabled && !this.m_isCorrectAudit() || !rule.required) {
                         return callback();
                       }
                       if (value === "" || value === undefined || value == null || Array.isArray(value) && !value.length) {
@@ -69464,7 +69554,7 @@ let getFileExt = filename => {
     dataListReset() {
       if (this.data.list.length > 0) {
         this.data.list.forEach(item => {
-          if (item.type === "table") {
+          if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(item)) {
             item.options.defaultValue = [];
           }
         });
@@ -70128,6 +70218,7 @@ const API = '/form/formdesiger/countLeaveDays';
 /* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(78014);
 /* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(38574);
 /* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(97031);
+/* harmony import */ var _form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(5229);
 
 
 
@@ -70149,6 +70240,7 @@ const API = '/form/formdesiger/countLeaveDays';
 
 
 
+
 __webpack_require__.g.dictData = {};
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   inject: {
@@ -70285,7 +70377,7 @@ __webpack_require__.g.dictData = {};
   computed: {
     applyId() {
       var _this$formContext, _this$$route;
-      return (this === null || this === void 0 || (_this$formContext = this.formContext) === null || _this$formContext === void 0 ? void 0 : _this$formContext.applyId) || ((_this$$route = this.$route) === null || _this$$route === void 0 || (_this$$route = _this$$route.query) === null || _this$$route === void 0 ? void 0 : _this$$route.applyId);
+      return this.$attrs.applyId || (this === null || this === void 0 || (_this$formContext = this.formContext) === null || _this$formContext === void 0 ? void 0 : _this$formContext.applyId) || ((_this$$route = this.$route) === null || _this$$route === void 0 || (_this$$route = _this$$route.query) === null || _this$$route === void 0 ? void 0 : _this$$route.applyId);
     },
     currUserInfo() {
       var _this$formContext2;
@@ -70453,7 +70545,7 @@ __webpack_require__.g.dictData = {};
               item.columns.forEach(columnsItem => {
                 func(res_list, columnsItem.list);
               });
-            } else if (["table"].includes(item.type)) {
+            } else if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_19__/* .isTableWidget */ .X2)(item)) {
               // columns
               func(res_list, item.columns);
             } else {
@@ -71092,7 +71184,7 @@ module.exports = {
 
 /***/ },
 
-/***/ 5882
+/***/ 40000
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -72377,7 +72469,7 @@ if(templist.includes('匹配条件字段的值')){
   components: {
     JEllipsis: JEllipsis,
     codemirror: vue_codemirror.codemirror,
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48498))
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 89715))
   },
   props: {
     datalist: {
@@ -74681,19 +74773,21 @@ var widgetDesign_component = (0,componentNormalizer/* default */.A)(
   widgetSetup: widgetSetup,
   widgetDesign: widgetDesign
 });
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=template&id=3e4df89e&scoped=true
-var componentvue_type_template_id_3e4df89e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item select_component",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px',background: _vm.widget.options.bgColor, '--dropdown_width': _vm.dropDownWidth })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=template&id=ef4ced6e&scoped=true
+var componentvue_type_template_id_ef4ced6e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item select_component",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px',background: _vm.widget.options.bgColor, '--dropdown_width': _vm.dropDownWidth })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
         _vm.config.align,
         _vm.config.validate === true && _vm.widget.options.required === true
           ? 'is_required'
           : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e(),_c('a-select',{attrs:{"dropdownStyle":{ zIndex: 3000,  maxWidth: _vm.dropDownMaxWidth, minWidth: _vm.dropDownMinWidth },"placeholder":_vm.widget.options.placeholder,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"value":_vm.select_value,"showSearch":"","optionFilterProp":"label","allowClear":"","getPopupContainer":function (triggerNode) {
           return triggerNode.parentNode || _vm.document.body;
         },"mode":_vm.widget.options.multiple ? 'multiple' : 'default',"showArrow":""},on:{"change":_vm.handleChange,"search":_vm.handleSearch,"blur":_vm.handleBlur,"popupScroll":function (e) { _vm.handleScroll(e) }}},[(_vm.thrList.length > 0)?_vm._l((_vm.thrList),function(item,idx){return _c('a-select-option',{key:idx,attrs:{"title":item.xm,"value":item.gh,"label":item.xm}},[_vm._v(" "+_vm._s(item.xm)+" ")])}):_vm._l((_vm.filterDictOptions),function(item,idx){return _c('a-select-option',{key:idx,attrs:{"title":item.text,"value":item.value,"label":item.text}},[_vm._v(" "+_vm._s(item.text)+" ")])})],2)],1)],1):_vm._e()}
-var componentvue_type_template_id_3e4df89e_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_ef4ced6e_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/es.array.unshift.js
 var es_array_unshift = __webpack_require__(13255);
+// EXTERNAL MODULE: ./src/form/util/dictDataCache.js
+var dictDataCache = __webpack_require__(33883);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(9274);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
@@ -74785,6 +74879,7 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpac
 
 
 
+
 if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select = {};
 /* harmony default export */ const Select_componentvue_type_script_lang_js = ({
   mixins: [widgetMixins/* default */.A],
@@ -74806,12 +74901,6 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
       thrList: []
     };
   },
-  props: {
-    applyId: {
-      type: String,
-      default: ""
-    }
-  },
   components: {},
   created() {
     if (localStorage.getItem('isZJGMFormDesign') && this.widget.model === 'thr' && window._CONFIG.isZJGMFormDesign) {
@@ -74947,7 +75036,7 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
       if (!wight || !wight.model) return false;
       const func = (msg, data) => {
         __webpack_require__.g.linkage_select[wight.model] = data;
-        __webpack_require__.g.dictData[wight.model] = null;
+        (0,dictDataCache/* clearDictCache */.ue)();
         let currDataModel = this.dataModel;
         if (typeof data == "object") {
           //用此判断 来确定是否由消息发布者手动触发来启动
@@ -75018,7 +75107,6 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
           this.models[this.widget.model] = e;
         }
       }
-      debugger;
       if (this.tableKey) {
         // this.models[this.tableKey][this.tableIndex][this.widget.model] = e
         // this.dataModel = e
@@ -75040,7 +75128,6 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
     },
     //获取数据
     async initDictData() {
-      // 代表自定义数据项
       if (this.widget.options.remoteNumber == '4') {
         this.dictOptions = this.widget.options.designDataList.map(item => {
           return {
@@ -75048,70 +75135,8 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
             text: item.label
           };
         });
-      } else {
-        const {
-          dictTable
-        } = this.widget.options;
-        if (this.widget.options.dictName) {
-          //根据字典Code, 初始化字典数组
-          await (0,manage/* getAction */.Th)(`/sys/dict/getDictItems/${this.widget.options.dictName}`).then(res => {
-            if (res.success && !this.isGetOptionsByPulish) {
-              this.dictOptions = res.result;
-            }
-          });
-        } else if (dictTable) {
-          let params = {
-            tableName: dictTable
-          };
-          if (!__webpack_require__.g['getDataCenterDict']) {
-            __webpack_require__.g['getDataCenterDict'] = {};
-          }
-          let func = () => (0,manage/* getAction */.Th)('/form/formdesiger/getDataCenterDict', params);
-          if (__webpack_require__.g['getDataCenterDict'][dictTable]) {
-            func = () => Promise.resolve(__webpack_require__.g['getDataCenterDict'][dictTable]);
-          }
-          await func().then(res => {
-            if (res.success && !this.isGetOptionsByPulish) {
-              __webpack_require__.g['getDataCenterDict'][dictTable] = res;
-              this.dictOptions = (res.result || []).map(item => {
-                return {
-                  value: item.dictValue,
-                  text: item.dictLabel
-                };
-              });
-            }
-          });
-        } else if (this.widget.options.dictUrl) {
-          if (this.widget.options.dictUrl.indexOf("?") != -1) {
-            let list = this.widget.options.dictUrl.split("?");
-            let url = list[0];
-            let params = this.getparams(list[1]);
-            await (0,manage/* getAction */.Th)(url, params).then(res => {
-              if (res.success && !this.isGetOptionsByPulish) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.dataKey,
-                    text: item.dataValue
-                  };
-                });
-              }
-            });
-          } else {
-            const params = this.applyId ? {
-              applyId: this.applyId
-            } : {};
-            await (0,manage/* getAction */.Th)(this.widget.options.dictUrl, params).then(res => {
-              if (res.success && !this.isGetOptionsByPulish) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.id,
-                    text: item.departName
-                  };
-                });
-              }
-            });
-          }
-        }
+      } else if (!this.isGetOptionsByPulish) {
+        this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
       }
       __webpack_require__.g.dictData[this.widget.model] = this.dictOptions;
     },
@@ -75131,10 +75156,10 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
 });
 ;// ./src/form/modules/components/Select/component.vue?vue&type=script&lang=js
  /* harmony default export */ const components_Select_componentvue_type_script_lang_js = (Select_componentvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=3e4df89e&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=ef4ced6e&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=3e4df89e&prod&lang=less&scoped=true
+;// ./src/form/modules/components/Select/component.vue?vue&type=style&index=0&id=ef4ced6e&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/Select/component.vue
 
@@ -75147,11 +75172,11 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
 
 var component_component = (0,componentNormalizer/* default */.A)(
   components_Select_componentvue_type_script_lang_js,
-  componentvue_type_template_id_3e4df89e_scoped_true_render,
-  componentvue_type_template_id_3e4df89e_scoped_true_staticRenderFns,
+  componentvue_type_template_id_ef4ced6e_scoped_true_render,
+  componentvue_type_template_id_ef4ced6e_scoped_true_staticRenderFns,
   false,
   null,
-  "3e4df89e",
+  "ef4ced6e",
   null
   
 )
@@ -76679,103 +76704,994 @@ var widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns = []
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetSetup.vue?vue&type=script&lang=js
 
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+
+
+
+/* harmony default export */ const Table_widgetSetupvue_type_script_lang_js = ({
+  name: "widgetSetup",
+  mixins: [widgetSetupMixins],
+  data() {
+    return {
+      rules: {},
+      defaultValue: "",
+      source: '4'
+    };
+  },
+  props: {
+    widget: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    }
+  },
+  components: {
+    datasetManagement: datasetManagement,
+    defaultValueWithSql: defaultValueWithSql
+  },
+  computed: {
+    isFormDesignSQL() {
+      return window._CONFIG.isFormDesignSQL;
+    },
+    isFormDesignSQLKey() {
+      return window._CONFIG.isFormDesignSQLKey;
+    }
+  },
+  created() {
+    console.log(this.widget);
+    this.defaultValue = typeof this.widget.options.defaultValue === "string" ? this.widget.options.defaultValue : "";
+    this.addIndexColumnChange(this.widget.options.enableIndex);
+  },
+  watch: {
+    "widget": {
+      handler(widget, oldWidget) {
+        // setTimeout(() => {
+        //
+        // }, 0)
+      },
+      deep: true
+    },
+    defaultValue(v) {
+      this.widget.options.defaultValue = v;
+    }
+  },
+  methods: {
+    handleChange(selectedItems) {
+      this.widget.options.computingMethod = selectedItems;
+    },
+    handleChangetwo(selectedItems) {
+      this.widget.options.computingSub = selectedItems;
+    },
+    handleOptionsRemove(index) {
+      this.widget.designList.splice(index, 1);
+    },
+    handleTableAddColumn() {
+      this.widget.designList.push({
+        x: 0,
+        y: 1,
+        w: 1,
+        h: 1,
+        i: new Date().getTime() + ""
+      });
+    },
+    addIndexColumnChange(e) {
+      __webpack_require__.g.addTableIndexColumn({
+        widget: this.widget,
+        targetValue: e
+      });
+    },
+    openDefaultValueWithSql() {
+      this.$refs.datasetManagement.init(this.widget.options, true);
+      this.widget.options.source = this.source;
+    },
+    setDateOk(val) {
+      this.widget.options.defaultValue = "defaultQuerySQL";
+      this.widget.options.defaultSQL = val;
+    },
+    openDefaultValueWithSqlKey() {
+      this.$refs.defaultValueWithSql.init(this.widget.options);
+    },
+    setDefalutValue(values) {
+      this.widget.options.defaultValue = 'defaultQuerySQL';
+      this.widget.options.defaultSQL = values;
+    }
+  }
+});
+;// ./src/form/modules/components/Table/widgetSetup.vue?vue&type=script&lang=js
+ /* harmony default export */ const components_Table_widgetSetupvue_type_script_lang_js = (Table_widgetSetupvue_type_script_lang_js); 
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetSetup.vue?vue&type=style&index=0&id=2b3989c5&prod&lang=less&scoped=true
+// extracted by mini-css-extract-plugin
+
+;// ./src/form/modules/components/Table/widgetSetup.vue?vue&type=style&index=0&id=2b3989c5&prod&lang=less&scoped=true
+
+;// ./src/form/modules/components/Table/widgetSetup.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var Table_widgetSetup_component = (0,componentNormalizer/* default */.A)(
+  components_Table_widgetSetupvue_type_script_lang_js,
+  widgetSetupvue_type_template_id_2b3989c5_scoped_true_render,
+  widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns,
+  false,
+  null,
+  "2b3989c5",
+  null
+  
+)
+
+/* harmony default export */ const Table_widgetSetup = (Table_widgetSetup_component.exports);
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=template&id=47af2467&scoped=true
+var widgetDesignvue_type_template_id_47af2467_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget && _vm.widget.key)?_c('div',{key:_vm.widget.key,staticClass:"widget-form-list widget-view widget-grid",class:{ active: _vm.selectWidget.key == _vm.widget.key },attrs:{"align":_vm.widget.options.align},on:{"click":function($event){return _vm.handleSelectWidget(_vm.index, _vm.listindex)}}},[_c('div',{staticClass:"table_label"},[_vm._v(_vm._s(_vm.widget.name))]),_c('div',{staticClass:"grid-background",style:({
+      top: '40px',
+      height: _vm.setHeight(_vm.widget.options.rowsNum, _vm.widget.options.rowsHeight),
+    }),attrs:{"type":"flex"}},_vm._l((_vm.transformArr(_vm.widget.options.rowsNum)),function(item,rowKey){return _c('div',{key:rowKey,staticClass:"rows"},_vm._l((_vm.transformArr(_vm.widget.options.columnsNum)),function(item,columnKey){return _c('div',{key:columnKey,staticClass:"columns",style:({
+          width: _vm.getColumnsWidth(_vm.widget.options.columnsNum),
+          height: _vm.widget.options.rowsHeight - 1 + 'px',
+        })})}),0)}),0),_c('div',{staticStyle:{"width":"100%"},style:({
+      height: _vm.setHeight(_vm.widget.options.rowsNum, _vm.widget.options.rowsHeight),
+    })},[_c('grid-layout',{attrs:{"layout":_vm.widget.designList,"col-num":Number(_vm.widget.options.columnsNum),"row-height":Number(_vm.widget.options.rowsHeight),"maxRows":Number(_vm.widget.options.rowsNum),"is-draggable":true,"is-resizable":true,"is-mirrored":false,"vertical-compact":true,"margin":[0, 0],"use-css-transforms":true},on:{"update:layout":function($event){return _vm.$set(_vm.widget, "designList", $event)}}},_vm._l((_vm.widget.designList),function(item,colIndex){return _c('grid-item',{key:item.i,attrs:{"x":item.x,"y":item.y,"w":item.w,"h":item.h,"i":item.i}},[(_vm.widget.columns)?_c('div',{staticClass:"grid-lay-out-wrap"},[_c('draggable',_vm._b({staticClass:"grid-lay-out-wrap",attrs:{"setData":function (){},"no-transition-on-drag":true},on:{"end":_vm.handleMoveEnd,"add":function($event){return _vm.handleWidgetColAdd($event, _vm.widget, colIndex)}},model:{value:(_vm.widget.columns),callback:function ($$v) {_vm.$set(_vm.widget, "columns", $$v)},expression:"widget.columns"}},'draggable',_vm.draggableOptions,false),[_c('widget-form-item',{ref:"WidgetFormItem",refInFor:true,attrs:{"widget":_vm.getTableColumn(_vm.widget.columns, colIndex),"widgetListCell":_vm.widget.columns,"select":_vm.selectWidget,"index":colIndex,"deleteColIndex":colIndex},on:{"update:select":function($event){_vm.selectWidget=$event}}})],1)],1):_vm._e()])}),1),(_vm.selectWidget.key == _vm.widget.key)?_c('div',{staticClass:"widget-view-action widget-col-action"},[_c('i',{staticClass:"iconfont icon-trash",on:{"click":function($event){$event.stopPropagation();return _vm.handleWidgetDelete(_vm.index, _vm.listindex)}}})]):_vm._e(),(_vm.selectWidget.key == _vm.widget.key)?_c('div',{staticClass:"widget-view-drag widget-col-drag"},[_c('i',{staticClass:"iconfont icon-drag drag-widget"})]):_vm._e(),_c('div',{staticClass:"widget-view-model"},[_c('span',[_vm._v(_vm._s(_vm.widget.model))])])],1)]):_vm._e()}
+var widgetDesignvue_type_template_id_47af2467_scoped_true_staticRenderFns = []
+
+
+// EXTERNAL MODULE: ./node_modules/_vuedraggable@2.24.3@vuedraggable/dist/vuedraggable.umd.js
+var vuedraggable_umd = __webpack_require__(59715);
+var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
+// EXTERNAL MODULE: ./src/form/modules/common/dragItem.vue + 5 modules
+var dragItem = __webpack_require__(83523);
+// EXTERNAL MODULE: ./node_modules/_vue-grid-layout@2.4.0@vue-grid-layout/dist/vue-grid-layout.common.js
+var vue_grid_layout_common = __webpack_require__(23774);
+var vue_grid_layout_common_default = /*#__PURE__*/__webpack_require__.n(vue_grid_layout_common);
+;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=script&lang=js
+
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+
+
+const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
+/* harmony default export */ const Table_widgetDesignvue_type_script_lang_js = ({
+  name: "widgetDesign",
+  props: {
+    config: {
+      type: Object,
+      default: function () {
+        return {
+          component: {}
+        };
+      }
+    },
+    value: {
+      type: String,
+      default: ""
+    },
+    widget: {
+      type: Object,
+      default: () => {
+        return null;
+      }
+    },
+    index: {
+      type: Number,
+      default: () => {
+        return null;
+      }
+    },
+    listindex: {
+      type: Number,
+      default: () => {
+        return null;
+      }
+    },
+    selectedWidget: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      draggableOptions: {
+        group: {
+          name: "widgetwrap"
+        },
+        ghostClass: "ghost",
+        animation: 200,
+        handle: ".drag-widget"
+      },
+      selectWidget: this.selectedWidget
+    };
+  },
+  components: {
+    Draggable: (vuedraggable_umd_default()),
+    dragItem: dragItem/* default */.A,
+    widgetFormItem,
+    GridLayout: (vue_grid_layout_common_default()).GridLayout,
+    GridItem: (vue_grid_layout_common_default()).GridItem
+  },
+  mounted() {
+    console.log("grid-lay-out---");
+    console.log(this.widget);
+  },
+  methods: {
+    /***
+     * @param { array } columns
+     * @param { number } colIndex
+     * @return { object } obj
+     */
+    getTableColumn(columns, colIndex) {
+      let obj = {};
+      if (Array.isArray(columns) && columns.length > 0) {
+        columns.forEach(item => {
+          if (item.designColIndex === colIndex) {
+            obj = item;
+          }
+        });
+      }
+      return obj;
+    },
+    /****设置grid-lay-out高度**/
+    setHeight(number, height) {
+      return number * height + "px";
+    },
+    /**string 转换为数组 **/
+    transformArr(number) {
+      return new Array(parseInt(number));
+    },
+    /****背景网格单元格的长度 */
+    getColumnsWidth(number) {
+      return 100 / number + "%";
+    },
+    handleMoveEnd(e, listindex) {},
+    handleChange(e) {
+      this.$emit("change", e);
+    },
+    handleSelectWidget(index, listindex) {
+      // this.$emit("handleSelectWidget", index, listindex);
+    },
+    handleWidgetColAdd($event, widget, colIndex) {
+      this.$emit("handleWidgetTableAdd", $event, widget, colIndex);
+    },
+    handleWidgetDelete(index, listindex) {
+      this.$emit("handlTableDelete", index, listindex);
+    }
+  },
+  watch: {
+    selectedWidget(val) {
+      this.selectWidget = val;
+    },
+    selectWidget(val) {
+      this.$emit("update:selectedWidget", val);
+    }
+  }
+});
+;// ./src/form/modules/components/Table/widgetDesign.vue?vue&type=script&lang=js
+ /* harmony default export */ const components_Table_widgetDesignvue_type_script_lang_js = (Table_widgetDesignvue_type_script_lang_js); 
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=style&index=0&id=47af2467&prod&lang=less&scoped=true
+// extracted by mini-css-extract-plugin
+
+;// ./src/form/modules/components/Table/widgetDesign.vue?vue&type=style&index=0&id=47af2467&prod&lang=less&scoped=true
+
+;// ./src/form/modules/components/Table/widgetDesign.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var Table_widgetDesign_component = (0,componentNormalizer/* default */.A)(
+  components_Table_widgetDesignvue_type_script_lang_js,
+  widgetDesignvue_type_template_id_47af2467_scoped_true_render,
+  widgetDesignvue_type_template_id_47af2467_scoped_true_staticRenderFns,
+  false,
+  null,
+  "47af2467",
+  null
+  
+)
+
+/* harmony default export */ const Table_widgetDesign = (Table_widgetDesign_component.exports);
+;// ./src/form/modules/components/Table/index.js
+
+
+
+/* harmony default export */ const Table = ({
+  component: Table_component,
+  widgetSetup: Table_widgetSetup,
+  widgetDesign: Table_widgetDesign
+});
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/component.vue?vue&type=template&id=cab895c6&scoped=true
+var componentvue_type_template_id_cab895c6_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"table-design"},[(_vm.widget.options.height == 0 && !_vm.widget.options.disabled)?_c('span',{staticClass:"last-one no-label-add-button",attrs:{"title":"添加行"}},[(!_vm.widget.options.hiddenOperateBtn)?_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.addToTableData(_vm.widget, _vm.widget.model, 'addModel')}}},[_vm._v("添加行")]):_vm._e()],1):_c('div',{staticClass:"table_label",style:({ borderColor: _vm.widget.options.height == 0 ? 'rgba(0,0,0,0)' : _vm.config.borderColor, height: _vm.widget.options.height + 'px' })},[_c('span',{staticStyle:{"position":"absolute","display":"flex","height":"100%","align-items":"center"}},[(_vm.widget.options.enableImport && !_vm.widget.options.disabled)?_c('span',[_c('a-upload',{staticStyle:{"margin":"0 5px"},attrs:{"action":_vm.actionUrl + "?formId=" + _vm.formId + "&tableKey=" + (_vm.widget.model),"headers":_vm.headers,"showUploadList":false},on:{"change":function (params) { _vm.handleChange(_vm.widget, params) }}},[_c('a-button',[_c('a-icon',{attrs:{"type":"upload"}}),_vm._v("上传")],1)],1),_c('confirm-box',{staticStyle:{"float":"left","margin":"0 5px"},attrs:{"content":"注意：使用Excel模板导入仅支持文本、日期、下拉等内容，无法支持复杂的组件以及数据校验等，请确认！"},on:{"confirm":function($event){return _vm.downloadTableTemplate(_vm.widget)}}},[_c('a-button',[_vm._v("下载模板")])],1)],1):_vm._e(),(_vm.widget.options.auditorExport&&!_vm.isDesign&&_vm.isApply!=true)?_c('span',{staticStyle:{"float":"left","margin":"0 5px"}},[_c('a-button',{on:{"click":function($event){return _vm.auditorDownLoad(_vm.widget)}}},[_c('a-icon',{attrs:{"type":"download"}}),_vm._v("导出")],1)],1):_vm._e()]),_vm._v(" "+_vm._s(_vm.widget.options.height != 0 ? _vm.widget.name : '')+" "),(!_vm.widget.options.disabled)?_c('span',{class:{ 'last-one': true, 'no-label-add-button': _vm.widget.options.height == 0 },attrs:{"title":"添加行"}},[(!_vm.widget.options.hiddenOperateBtn)?_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.addToTableData(_vm.widget, _vm.widget.model, 'addModel')}}},[_vm._v("添加行")]):_vm._e()],1):_vm._e()]),_vm._l((_vm.tableData[_vm.widget.model]),function(tableColums,columsIndex){return _c('div',{key:columsIndex,staticClass:"table-design-content"},[_c('div',{staticClass:"widget-grid-lay-out-wrapper",style:({
+        height: _vm.setHeight(
+          tableColums.options.rowsNum,
+          tableColums.options.rowsHeight
+        ),
+        display: 'grid',
+        gridTemplateColumns: _vm.setGridTemplateValue(
+          tableColums.options.columnsNum
+        ),
+        gridTemplateRows: _vm.setGridTemplateValue(
+          tableColums.options.rowsNum,
+          tableColums.options.rowsHeight
+        ),
+      })},_vm._l((tableColums.designList),function(col,colIndex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.getTableColumn(tableColums.columns, colIndex).options.canView),expression:"getTableColumn(tableColums.columns, colIndex).options.canView"}],key:colIndex,style:({
+          'grid-column': _vm.setItemPosition(col, 'column'),
+          'grid-row': _vm.setItemPosition(col),
+        })},[[_c('layoutItem',{key:colIndex,attrs:{"tableKey":tableColums.model,"tableIndex":columsIndex,"models":_vm.models,"rules":_vm.rules,"widget":_vm.getTableColumn(tableColums.columns, colIndex)},on:{"update:models":_vm.updateModels}})]],2)}),0),(!_vm.widget.options.disabled && !_vm.widget.options.hiddenOperateBtn)?_c('div',{staticClass:"table-design-delete"},[_c('span',{staticClass:"last-one del-button",attrs:{"title":"删除行"}},[_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.handleDeleteRow(columsIndex, _vm.widget.model)}}},[_vm._v("删除行")])],1)]):_vm._e()])})],2):_vm._e()}
+var componentvue_type_template_id_cab895c6_scoped_true_staticRenderFns = []
+
+
+;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/component.vue?vue&type=script&lang=js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+
+
+/* harmony default export */ const NewTable_componentvue_type_script_lang_js = ({
+  name: 'NewTableComponent',
+  props: {
+    rules: {
+      type: Object
+    },
+    widget: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    models: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    formId: {
+      type: String,
+      default: ''
+    },
+    tableData: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    applyId: {
+      type: String,
+      default: ""
+    },
+    isDesign: {
+      type: Boolean,
+      default: false
+    },
+    //发起申请阶段
+    isApply: {
+      type: Boolean,
+      default: false
+    }
+  },
+  inject: ['config'],
+  components: {
+    ConfirmBox: confirmBox/* default */.A
+  },
+  data() {
+    return {
+      imgUrl: window._CONFIG['imgUrl'],
+      actionUrl: (window._CONFIG['businessBaseUrl'] || window._CONFIG['domianURL']) + '/form/formdesiger/importTableExcel',
+      headers: {
+        'X-Access-Token': this.getToken()
+      },
+      customRowHeight: '',
+      allHeight: undefined
+    };
+  },
+  beforeCreate: function () {
+    // 直接 components 申明layoutItem 会导致循环调用问题， 但是用 异步组件 () =>layoutItem.vue 会导致 副组件 $nextTick 无法获取dom 更新后回调
+    this.$options.components.layoutItem = (__webpack_require__(92241)["default"]);
+  },
+  watch: {
+    "widget": {
+      handler(val) {
+        const itemCol = this.widget;
+        if (!itemCol || this.customRowHeight) return;
+
+        // 1. 计算最大行数（动态）
+        //  行数 = 找出所有元素中 最大的结束行号 + 1
+        const maxRow = Math.max(...itemCol.designList.map(item => item.y + item.h - 1)) + 1;
+
+        // 2. 找出需要隐藏的行（该行所有列都不可见）
+        const hiddenRows = new Set();
+        itemCol.columns.forEach(col => {
+          const y = itemCol.designList[col.designColIndex].y;
+          if (!col.options.canView) {
+            const allInvisible = itemCol.columns.filter(c => itemCol.designList[c.designColIndex].y === y).every(c => !c.options.canView);
+            if (allInvisible) hiddenRows.add(y);
+          }
+        });
+
+        // 3. 计算有效行高（跳过隐藏行）
+        const rowHeight = itemCol.options.rowsHeight;
+        const visibleRowHeights = [];
+        for (let row = 0; row < maxRow; row++) {
+          if (!hiddenRows.has(row)) {
+            visibleRowHeights.push(rowHeight);
+          }
+        }
+
+        // 4. 设置结果
+        this.customRowHeight = visibleRowHeights.map(h => `${h}px`).join(' ');
+        this.allHeight = visibleRowHeights.reduce((sum, h) => sum + h, 0);
+        console.log('可见行高度:', visibleRowHeights);
+        console.log('总高度:', this.allHeight);
+      },
+      deep: true,
+      immediate: true
+    },
+    'tableData': {
+      handler(val) {},
+      deep: true
+    }
+  },
+  computed: {
+    config() {
+      var _this$tableData;
+      return (_this$tableData = this.tableData) === null || _this$tableData === void 0 ? void 0 : _this$tableData[this.widget.model];
+    }
+  },
+  created() {
+    console.log(this, this.widget, '.......', this.tableData, (0,cloneDeep/* default */.A)(this.tableData[this.widget.model]));
+  },
+  methods: {
+    handleChange(widget, {
+      file
+    }) {
+      if (file.size > 100 * 1024 * 1024) {
+        this.$message.error("文件超出100M");
+        return false;
+      }
+      if (file.status == "done") {
+        const res = file.response;
+        if (res.success && res.result) {
+          const parent = this.$parent.$parent.$parent.$parent;
+          parent.tableIndex[widget.model] = 0;
+          parent.$set(parent.tableData, widget.model, undefined);
+          parent.models[widget.model] = res.result || [];
+          parent.tableInitByModel(widget.model);
+        } else {
+          this.$message.error(res && res.message || '导入失败');
+        }
+      }
+    },
+    updateModels(val) {
+      this.$emit('update:models', val);
+    },
+    setHeight(number, height) {
+      if (this.allHeight) return this.allHeight + 'px';
+      return number * height + 'px';
+    },
+    setGridTemplateValue(number, height) {
+      if (height) {
+        if (this.customRowHeight) return this.customRowHeight;
+        return 'repeat(' + parseInt(number) + ',' + height + 'px)';
+      } else {
+        return 'repeat(' + parseInt(number) + ',' + 100 / number + '%)';
+      }
+    },
+    setItemPosition(object, type) {
+      if (type) {
+        if (object && String(object.w) && String(object.x)) {
+          return object.x + 1 + ' / span ' + object.w;
+        }
+      } else {
+        if (object && String(object.h) && String(object.y)) {
+          return object.y + 1 + ' / span ' + object.h;
+        }
+      }
+    },
+    getTableColumn(columns, colIndex) {
+      let obj = {};
+      if (Array.isArray(columns) && columns.length > 0) {
+        columns.forEach(item => {
+          if (item.designColIndex === colIndex) {
+            obj = item;
+          }
+        });
+      }
+      return obj;
+    },
+    addToTableData(weight, model, addModel) {
+      // console.log(weight,model,addModel)
+      this.$emit('addToTableData', weight, model, addModel);
+    },
+    auditorDownLoad(widget) {
+      util.exportFile.call(this, `/form/dataQuery/exportSubTableData?applyId=${this.applyId}&subTableCode=${widget.model}`, `${widget.name}.xls`);
+    },
+    downloadTableTemplate(widget) {
+      if (widget.options.enableImportV2) {
+        return util.exportFile.call(this, `/form/formdesiger/downloadTableTemplate?formId=${this.formId}&tableCode=${widget.model}`, `${widget.name}导入模板.xls`);
+      }
+      const templatePath = widget.options.templatePath;
+      if (!templatePath) {
+        this.$message.error('暂无模板');
+        return;
+      }
+      window.open(this.imgUrl + templatePath);
+    },
+    handleDeleteRow(columsIndex, model) {
+      this.$emit('handleDeleteRow', columsIndex, model);
+    }
+  }
+});
+;// ./src/form/modules/components/NewTable/component.vue?vue&type=script&lang=js
+ /* harmony default export */ const components_NewTable_componentvue_type_script_lang_js = (NewTable_componentvue_type_script_lang_js); 
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/component.vue?vue&type=style&index=0&id=cab895c6&prod&lang=less&scoped=true
+// extracted by mini-css-extract-plugin
+
+;// ./src/form/modules/components/NewTable/component.vue?vue&type=style&index=0&id=cab895c6&prod&lang=less&scoped=true
+
+;// ./src/form/modules/components/NewTable/component.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var NewTable_component_component = (0,componentNormalizer/* default */.A)(
+  components_NewTable_componentvue_type_script_lang_js,
+  componentvue_type_template_id_cab895c6_scoped_true_render,
+  componentvue_type_template_id_cab895c6_scoped_true_staticRenderFns,
+  false,
+  null,
+  "cab895c6",
+  null
+  
+)
+
+/* harmony default export */ const NewTable_component = (NewTable_component_component.exports);
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetSetup.vue?vue&type=template&id=770bc912&scoped=true
+var widgetSetupvue_type_template_id_770bc912_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-alert',{staticStyle:{"margin-bottom":"12px"},attrs:{"type":"info","show-icon":"","message":"新子表单已优化字典类组件的数据加载：相同数据源仅请求一次。未开启分页时全部行直接渲染；开启「支持分页显示」后走分页模式。"}}),_c('a-form-model-item',{attrs:{"label":"默认值"}},[(_vm.isFormDesignSQL && !_vm.isFormDesignSQLKey)?_c('a-input',{attrs:{"type":"textarea"},model:{value:(_vm.defaultValue),callback:function ($$v) {_vm.defaultValue=$$v},expression:"defaultValue"}}):_vm._e()],1),(!_vm.isFormDesignSQL &&  !_vm.isFormDesignSQLKey)?_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.openDefaultValueWithSql}},[_vm._v("关联数据集")]):_vm._e(),(_vm.isFormDesignSQLKey)?_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.openDefaultValueWithSqlKey}},[_vm._v("配置详情")]):_vm._e(),_c('a-form-model-item',{attrs:{"label":"审核人可导出"}},[_c('a-switch',{model:{value:(_vm.widget.options.auditorExport),callback:function ($$v) {_vm.$set(_vm.widget.options, "auditorExport", $$v)},expression:"widget.options.auditorExport"}})],1),_c('a-form-model-item',{attrs:{"label":"是否序号列"}},[_c('a-switch',{on:{"change":_vm.addIndexColumnChange},model:{value:(_vm.widget.options.enableIndex),callback:function ($$v) {_vm.$set(_vm.widget.options, "enableIndex", $$v)},expression:"widget.options.enableIndex"}})],1),_c('a-form-model-item',{attrs:{"label":"序列号提示文字"}},[_c('a-input',{attrs:{"placeholder":"格式：index;提示文字 / 提示文字;index"},on:{"change":function($event){return _vm.addIndexColumnChange('edit')}},model:{value:(_vm.widget.options.indexColumnName),callback:function ($$v) {_vm.$set(_vm.widget.options, "indexColumnName", $$v)},expression:"widget.options.indexColumnName"}})],1),_c('a-form-model-item',{attrs:{"label":"支持分页显示"}},[_c('a-switch',{model:{value:(_vm.widget.options.supportPage),callback:function ($$v) {_vm.$set(_vm.widget.options, "supportPage", $$v)},expression:"widget.options.supportPage"}})],1),_c('a-form-model-item',{attrs:{"label":"支持导入"}},[_c('a-switch',{model:{value:(_vm.widget.options.enableImport),callback:function ($$v) {_vm.$set(_vm.widget.options, "enableImport", $$v)},expression:"widget.options.enableImport"}})],1),(_vm.widget.options.enableImport)?_c('a-form-model-item',{attrs:{"label":"使用新版下载模板接口"}},[_c('a-switch',{model:{value:(_vm.widget.options.enableImportV2),callback:function ($$v) {_vm.$set(_vm.widget.options, "enableImportV2", $$v)},expression:"widget.options.enableImportV2"}})],1):_vm._e(),_c('a-form-model-item',{attrs:{"label":"禁用双击编辑"}},[_c('a-switch',{model:{value:(_vm.widget.options.disbaledDoubleClickEdit),callback:function ($$v) {_vm.$set(_vm.widget.options, "disbaledDoubleClickEdit", $$v)},expression:"widget.options.disbaledDoubleClickEdit"}})],1),_c('a-form-model-item',{attrs:{"label":"隐藏操作按钮"}},[_c('a-switch',{model:{value:(_vm.widget.options.hiddenOperateBtn),callback:function ($$v) {_vm.$set(_vm.widget.options, "hiddenOperateBtn", $$v)},expression:"widget.options.hiddenOperateBtn"}})],1),_c('a-form-model-item',{attrs:{"label":"子表单内组件宽度"}},[_c('a-switch',{model:{value:(_vm.widget.options.customSubWidth),callback:function ($$v) {_vm.$set(_vm.widget.options, "customSubWidth", $$v)},expression:"widget.options.customSubWidth"}}),_c('div',{staticStyle:{"margin-left":"10px"}},[_vm._l((_vm.widget.columns),function(col){return (_vm.widget.options.customSubWidth)?[_c('div',[_c('div',[_c('span',[_vm._v(_vm._s(col.name))])]),_c('a-input-number',{staticStyle:{"width":"100%"},attrs:{"min":0,"max":1000,"placeholder":"宽度设置（px）, 不设置为自动分配"},model:{value:(col.subWidth),callback:function ($$v) {_vm.$set(col, "subWidth", $$v)},expression:"col.subWidth"}})],1)]:_vm._e()})],2)],1),_c('a-form-model-item',{ref:"title",attrs:{"label":"标题布局方式:","prop":"title"}},[_c('a-radio-group',{attrs:{"button-style":"solid"},model:{value:(_vm.widget.options.inline),callback:function ($$v) {_vm.$set(_vm.widget.options, "inline", $$v)},expression:"widget.options.inline"}},[_c('a-radio-button',{attrs:{"value":false}},[_vm._v(" 块级 ")]),_c('a-radio-button',{attrs:{"value":true}},[_vm._v(" 行内 ")])],1)],1),(_vm.widget.options && Object.keys(_vm.widget.options).indexOf('inline') >= 0 && _vm.widget.options.inline == false)?_c('a-form-model-item',{attrs:{"label":"子集布局方式："}},[_c('a-radio-group',{attrs:{"button-style":"solid"},model:{value:(_vm.widget.options.layoutModel),callback:function ($$v) {_vm.$set(_vm.widget.options, "layoutModel", $$v)},expression:"widget.options.layoutModel"}},[_c('a-radio-button',{attrs:{"value":"auto"}},[_vm._v("默认")]),_c('a-radio-button',{attrs:{"value":"design"}},[_vm._v("自定义 ")])],1)],1):_vm._e(),(_vm.widget.options.inline == false && _vm.widget.options.layoutModel == 'design')?[_c('a-form-model-item',{attrs:{"label":"基础网格列数："}},[_c('a-input-number',{attrs:{"step":2,"max":24,"min":0},model:{value:(_vm.widget.options.columnsNum),callback:function ($$v) {_vm.$set(_vm.widget.options, "columnsNum", $$v)},expression:"widget.options.columnsNum"}})],1),_c('a-form-model-item',{attrs:{"label":"基础网格行数"}},[_c('a-input-number',{attrs:{"step":1,"min":0},model:{value:(_vm.widget.options.rowsNum),callback:function ($$v) {_vm.$set(_vm.widget.options, "rowsNum", $$v)},expression:"widget.options.rowsNum"}})],1),_c('a-form-model-item',{attrs:{"label":"基础行高"}},[_c('a-input-number',{attrs:{"step":1,"min":20},model:{value:(_vm.widget.options.rowsHeight),callback:function ($$v) {_vm.$set(_vm.widget.options, "rowsHeight", $$v)},expression:"widget.options.rowsHeight"}})],1),_c('a-form-model-item',{attrs:{"label":"子集配置："}},[_c('ul',[_c('li',[_c('span',[_vm._v("横向起点")]),_vm._v("/ "),_c('span',[_vm._v("步长")]),_vm._v("/ "),_c('span',[_vm._v("纵向起点")]),_vm._v("/ "),_c('span',[_vm._v("步长")])]),_vm._l((_vm.widget.designList),function(item,index){return _c('li',{key:index},[_c('i',{staticClass:"drag-item",staticStyle:{"font-size":"16px","margin":"0 5px"}},[_c('i',{staticClass:"iconfont icon-icon_bars"})]),_c('a-input-number',{staticStyle:{"width":"47px"},attrs:{"placeholder":"横向起始位置","type":"number","min":0},model:{value:(item.x),callback:function ($$v) {_vm.$set(item, "x", _vm._n($$v))},expression:"item.x"}}),_c('a-input-number',{staticStyle:{"width":"47px","margin-right":"3px"},attrs:{"placeholder":"行步长","type":"number","min":0},model:{value:(item.w),callback:function ($$v) {_vm.$set(item, "w", _vm._n($$v))},expression:"item.w"}}),_c('a-input-number',{staticStyle:{"width":"47px","margin-right":"3px"},attrs:{"placeholder":"竖向起始位置","type":"number","min":0},model:{value:(item.y),callback:function ($$v) {_vm.$set(item, "y", _vm._n($$v))},expression:"item.y"}}),_c('a-input-number',{staticStyle:{"width":"47px","margin-right":"3px"},attrs:{"placeholder":"列步长","type":"number","min":0},model:{value:(item.h),callback:function ($$v) {_vm.$set(item, "h", _vm._n($$v))},expression:"item.h"}}),_c('a-button',{staticStyle:{"margin-left":"5px","border-radius":"50%"},attrs:{"circle":"","plain":"","type":"danger","size":"small","icon":"minus"},on:{"click":function($event){return _vm.handleOptionsRemove(index)}}})],1)})],2),_c('div',{staticStyle:{"margin-left":"22px"}},[_c('a-button',{attrs:{"type":"link"},on:{"click":_vm.handleTableAddColumn}},[_vm._v("添加列")])],1)])]:_vm._e()],2),_c('datasetManagement',{ref:"datasetManagement",on:{"setDateOk":_vm.setDateOk}}),_c('default-value-with-sql',{ref:"defaultValueWithSql",on:{"setDefalutOk":_vm.setDefalutValue}})],1)])])}
+var widgetSetupvue_type_template_id_770bc912_scoped_true_staticRenderFns = []
+
+
+;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetSetup.vue?vue&type=script&lang=js
+
 //
 //
 //
@@ -76888,9 +77804,8 @@ var widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns = []
 
 
 
-
-/* harmony default export */ const Table_widgetSetupvue_type_script_lang_js = ({
-  name: "widgetSetup",
+/* harmony default export */ const NewTable_widgetSetupvue_type_script_lang_js = ({
+  name: "newTableWidgetSetup",
   mixins: [widgetSetupMixins],
   data() {
     return {
@@ -76920,30 +77835,15 @@ var widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns = []
     }
   },
   created() {
-    console.log(this.widget);
     this.defaultValue = typeof this.widget.options.defaultValue === "string" ? this.widget.options.defaultValue : "";
     this.addIndexColumnChange(this.widget.options.enableIndex);
   },
   watch: {
-    "widget": {
-      handler(widget, oldWidget) {
-        // setTimeout(() => {
-        //
-        // }, 0)
-      },
-      deep: true
-    },
     defaultValue(v) {
       this.widget.options.defaultValue = v;
     }
   },
   methods: {
-    handleChange(selectedItems) {
-      this.widget.options.computingMethod = selectedItems;
-    },
-    handleChangetwo(selectedItems) {
-      this.widget.options.computingSub = selectedItems;
-    },
     handleOptionsRemove(index) {
       this.widget.designList.splice(index, 1);
     },
@@ -76979,14 +77879,14 @@ var widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns = []
     }
   }
 });
-;// ./src/form/modules/components/Table/widgetSetup.vue?vue&type=script&lang=js
- /* harmony default export */ const components_Table_widgetSetupvue_type_script_lang_js = (Table_widgetSetupvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetSetup.vue?vue&type=style&index=0&id=2b3989c5&prod&lang=less&scoped=true
+;// ./src/form/modules/components/NewTable/widgetSetup.vue?vue&type=script&lang=js
+ /* harmony default export */ const components_NewTable_widgetSetupvue_type_script_lang_js = (NewTable_widgetSetupvue_type_script_lang_js); 
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetSetup.vue?vue&type=style&index=0&id=770bc912&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Table/widgetSetup.vue?vue&type=style&index=0&id=2b3989c5&prod&lang=less&scoped=true
+;// ./src/form/modules/components/NewTable/widgetSetup.vue?vue&type=style&index=0&id=770bc912&prod&lang=less&scoped=true
 
-;// ./src/form/modules/components/Table/widgetSetup.vue
+;// ./src/form/modules/components/NewTable/widgetSetup.vue
 
 
 
@@ -76995,20 +77895,20 @@ var widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns = []
 
 /* normalize component */
 
-var Table_widgetSetup_component = (0,componentNormalizer/* default */.A)(
-  components_Table_widgetSetupvue_type_script_lang_js,
-  widgetSetupvue_type_template_id_2b3989c5_scoped_true_render,
-  widgetSetupvue_type_template_id_2b3989c5_scoped_true_staticRenderFns,
+var NewTable_widgetSetup_component = (0,componentNormalizer/* default */.A)(
+  components_NewTable_widgetSetupvue_type_script_lang_js,
+  widgetSetupvue_type_template_id_770bc912_scoped_true_render,
+  widgetSetupvue_type_template_id_770bc912_scoped_true_staticRenderFns,
   false,
   null,
-  "2b3989c5",
+  "770bc912",
   null
   
 )
 
-/* harmony default export */ const Table_widgetSetup = (Table_widgetSetup_component.exports);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=template&id=47af2467&scoped=true
-var widgetDesignvue_type_template_id_47af2467_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget && _vm.widget.key)?_c('div',{key:_vm.widget.key,staticClass:"widget-form-list widget-view widget-grid",class:{ active: _vm.selectWidget.key == _vm.widget.key },attrs:{"align":_vm.widget.options.align},on:{"click":function($event){return _vm.handleSelectWidget(_vm.index, _vm.listindex)}}},[_c('div',{staticClass:"table_label"},[_vm._v(_vm._s(_vm.widget.name))]),_c('div',{staticClass:"grid-background",style:({
+/* harmony default export */ const NewTable_widgetSetup = (NewTable_widgetSetup_component.exports);
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetDesign.vue?vue&type=template&id=416eb027&scoped=true
+var widgetDesignvue_type_template_id_416eb027_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget && _vm.widget.key)?_c('div',{key:_vm.widget.key,staticClass:"widget-form-list widget-view widget-grid",class:{ active: _vm.selectWidget.key == _vm.widget.key },attrs:{"align":_vm.widget.options.align},on:{"click":function($event){return _vm.handleSelectWidget(_vm.index, _vm.listindex)}}},[_c('div',{staticClass:"table_label"},[_vm._v(_vm._s(_vm.widget.name))]),_c('div',{staticClass:"grid-background",style:({
       top: '40px',
       height: _vm.setHeight(_vm.widget.options.rowsNum, _vm.widget.options.rowsHeight),
     }),attrs:{"type":"flex"}},_vm._l((_vm.transformArr(_vm.widget.options.rowsNum)),function(item,rowKey){return _c('div',{key:rowKey,staticClass:"rows"},_vm._l((_vm.transformArr(_vm.widget.options.columnsNum)),function(item,columnKey){return _c('div',{key:columnKey,staticClass:"columns",style:({
@@ -77017,18 +77917,10 @@ var widgetDesignvue_type_template_id_47af2467_scoped_true_render = function () {
         })})}),0)}),0),_c('div',{staticStyle:{"width":"100%"},style:({
       height: _vm.setHeight(_vm.widget.options.rowsNum, _vm.widget.options.rowsHeight),
     })},[_c('grid-layout',{attrs:{"layout":_vm.widget.designList,"col-num":Number(_vm.widget.options.columnsNum),"row-height":Number(_vm.widget.options.rowsHeight),"maxRows":Number(_vm.widget.options.rowsNum),"is-draggable":true,"is-resizable":true,"is-mirrored":false,"vertical-compact":true,"margin":[0, 0],"use-css-transforms":true},on:{"update:layout":function($event){return _vm.$set(_vm.widget, "designList", $event)}}},_vm._l((_vm.widget.designList),function(item,colIndex){return _c('grid-item',{key:item.i,attrs:{"x":item.x,"y":item.y,"w":item.w,"h":item.h,"i":item.i}},[(_vm.widget.columns)?_c('div',{staticClass:"grid-lay-out-wrap"},[_c('draggable',_vm._b({staticClass:"grid-lay-out-wrap",attrs:{"setData":function (){},"no-transition-on-drag":true},on:{"end":_vm.handleMoveEnd,"add":function($event){return _vm.handleWidgetColAdd($event, _vm.widget, colIndex)}},model:{value:(_vm.widget.columns),callback:function ($$v) {_vm.$set(_vm.widget, "columns", $$v)},expression:"widget.columns"}},'draggable',_vm.draggableOptions,false),[_c('widget-form-item',{ref:"WidgetFormItem",refInFor:true,attrs:{"widget":_vm.getTableColumn(_vm.widget.columns, colIndex),"widgetListCell":_vm.widget.columns,"select":_vm.selectWidget,"index":colIndex,"deleteColIndex":colIndex},on:{"update:select":function($event){_vm.selectWidget=$event}}})],1)],1):_vm._e()])}),1),(_vm.selectWidget.key == _vm.widget.key)?_c('div',{staticClass:"widget-view-action widget-col-action"},[_c('i',{staticClass:"iconfont icon-trash",on:{"click":function($event){$event.stopPropagation();return _vm.handleWidgetDelete(_vm.index, _vm.listindex)}}})]):_vm._e(),(_vm.selectWidget.key == _vm.widget.key)?_c('div',{staticClass:"widget-view-drag widget-col-drag"},[_c('i',{staticClass:"iconfont icon-drag drag-widget"})]):_vm._e(),_c('div',{staticClass:"widget-view-model"},[_c('span',[_vm._v(_vm._s(_vm.widget.model))])])],1)]):_vm._e()}
-var widgetDesignvue_type_template_id_47af2467_scoped_true_staticRenderFns = []
+var widgetDesignvue_type_template_id_416eb027_scoped_true_staticRenderFns = []
 
 
-// EXTERNAL MODULE: ./node_modules/_vuedraggable@2.24.3@vuedraggable/dist/vuedraggable.umd.js
-var vuedraggable_umd = __webpack_require__(59715);
-var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
-// EXTERNAL MODULE: ./src/form/modules/common/dragItem.vue + 5 modules
-var dragItem = __webpack_require__(83523);
-// EXTERNAL MODULE: ./node_modules/_vue-grid-layout@2.4.0@vue-grid-layout/dist/vue-grid-layout.common.js
-var vue_grid_layout_common = __webpack_require__(23774);
-var vue_grid_layout_common_default = /*#__PURE__*/__webpack_require__.n(vue_grid_layout_common);
-;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=script&lang=js
+;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetDesign.vue?vue&type=script&lang=js
 
 
 //
@@ -77144,9 +78036,9 @@ var vue_grid_layout_common_default = /*#__PURE__*/__webpack_require__.n(vue_grid
 
 
 
-const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
-/* harmony default export */ const Table_widgetDesignvue_type_script_lang_js = ({
-  name: "widgetDesign",
+const widgetDesignvue_type_script_lang_js_widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
+/* harmony default export */ const NewTable_widgetDesignvue_type_script_lang_js = ({
+  name: "newTableWidgetDesign",
   props: {
     config: {
       type: Object,
@@ -77201,7 +78093,7 @@ const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_requ
   components: {
     Draggable: (vuedraggable_umd_default()),
     dragItem: dragItem/* default */.A,
-    widgetFormItem,
+    widgetFormItem: widgetDesignvue_type_script_lang_js_widgetFormItem,
     GridLayout: (vue_grid_layout_common_default()).GridLayout,
     GridItem: (vue_grid_layout_common_default()).GridItem
   },
@@ -77261,14 +78153,14 @@ const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_requ
     }
   }
 });
-;// ./src/form/modules/components/Table/widgetDesign.vue?vue&type=script&lang=js
- /* harmony default export */ const components_Table_widgetDesignvue_type_script_lang_js = (Table_widgetDesignvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Table/widgetDesign.vue?vue&type=style&index=0&id=47af2467&prod&lang=less&scoped=true
+;// ./src/form/modules/components/NewTable/widgetDesign.vue?vue&type=script&lang=js
+ /* harmony default export */ const components_NewTable_widgetDesignvue_type_script_lang_js = (NewTable_widgetDesignvue_type_script_lang_js); 
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/NewTable/widgetDesign.vue?vue&type=style&index=0&id=416eb027&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Table/widgetDesign.vue?vue&type=style&index=0&id=47af2467&prod&lang=less&scoped=true
+;// ./src/form/modules/components/NewTable/widgetDesign.vue?vue&type=style&index=0&id=416eb027&prod&lang=less&scoped=true
 
-;// ./src/form/modules/components/Table/widgetDesign.vue
+;// ./src/form/modules/components/NewTable/widgetDesign.vue
 
 
 
@@ -77277,26 +78169,26 @@ const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_requ
 
 /* normalize component */
 
-var Table_widgetDesign_component = (0,componentNormalizer/* default */.A)(
-  components_Table_widgetDesignvue_type_script_lang_js,
-  widgetDesignvue_type_template_id_47af2467_scoped_true_render,
-  widgetDesignvue_type_template_id_47af2467_scoped_true_staticRenderFns,
+var NewTable_widgetDesign_component = (0,componentNormalizer/* default */.A)(
+  components_NewTable_widgetDesignvue_type_script_lang_js,
+  widgetDesignvue_type_template_id_416eb027_scoped_true_render,
+  widgetDesignvue_type_template_id_416eb027_scoped_true_staticRenderFns,
   false,
   null,
-  "47af2467",
+  "416eb027",
   null
   
 )
 
-/* harmony default export */ const Table_widgetDesign = (Table_widgetDesign_component.exports);
-;// ./src/form/modules/components/Table/index.js
+/* harmony default export */ const NewTable_widgetDesign = (NewTable_widgetDesign_component.exports);
+;// ./src/form/modules/components/NewTable/index.js
 
 
 
-/* harmony default export */ const Table = ({
-  component: Table_component,
-  widgetSetup: Table_widgetSetup,
-  widgetDesign: Table_widgetDesign
+/* harmony default export */ const NewTable = ({
+  component: NewTable_component,
+  widgetSetup: NewTable_widgetSetup,
+  widgetDesign: NewTable_widgetDesign
 });
 ;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Cascader/component.vue?vue&type=template&id=410db45c
 var componentvue_type_template_id_410db45c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
@@ -79098,8 +79990,8 @@ var Slider_widgetDesign_component = (0,componentNormalizer/* default */.A)(
   widgetSetup: Slider_widgetSetup,
   widgetDesign: Slider_widgetDesign
 });
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=template&id=1277221d&scoped=true
-var componentvue_type_template_id_1277221d_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-radio-group',{attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder},on:{"change":_vm.onChange},nativeOn:{"click":function($event){_vm.isClickByUser = true}},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-radio',{key:index,style:({
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=template&id=02f7d5e6&scoped=true
+var componentvue_type_template_id_02f7d5e6_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-radio-group',{attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder},on:{"change":_vm.onChange},nativeOn:{"click":function($event){_vm.isClickByUser = true}},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-radio',{key:index,style:({
             display: 'inline-block',
           }),attrs:{"value":item.value}},[_vm._v(" "+_vm._s(item.text)+" ")])}):_vm._e(),(_vm.widget.options.inline == false)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-radio',{key:index,style:({
             display: 'block'
@@ -79108,13 +80000,12 @@ var componentvue_type_template_id_1277221d_scoped_true_render = function () {var
         _vm.config.validate === true && _vm.widget.options.required === true
           ? 'is_required'
           : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e()],1)],1):_vm._e()}
-var componentvue_type_template_id_1277221d_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns = []
 
 
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=script&lang=js
 
 
-
 //
 //
 //
@@ -79186,6 +80077,7 @@ var componentvue_type_template_id_1277221d_scoped_true_staticRenderFns = []
 
 
 
+
 /* harmony default export */ const Radio_componentvue_type_script_lang_js = ({
   name: "radio",
   mixins: [widgetMixins/* default */.A],
@@ -79218,78 +80110,22 @@ var componentvue_type_template_id_1277221d_scoped_true_staticRenderFns = []
       });
     },
     async initDictData() {
-      this.dictOptions = [];
-      // 代表自定义数据项
-      if (this.widget.options.remoteNumber == '4') {
-        this.dictOptions = this.widget.options.designDataList.map(item => {
-          return {
-            value: item.value,
-            text: item.label
-          };
-        });
-      } else {
-        if (this.widget.options.dictName) {
-          await (0,manage/* getAction */.Th)(`/sys/dict/getDictItems/${this.widget.options.dictName}`).then(res => {
-            if (res.success) {
-              this.dictOptions = res.result;
-            }
-          });
-        } else if (this.widget.options.dictTable) {
-          let params = {
-            tableName: this.widget.options.dictTable
-          };
-          await (0,manage/* getAction */.Th)("form/formdesiger/getDataCenterDict", params).then(res => {
-            this.dictOptions = res.result.map(item => {
-              return {
-                value: item.dictValue,
-                text: item.dictLabel
-              };
-            });
-          });
-        } else if (this.widget.options.dictUrl) {
-          if (this.widget.options.dictUrl.indexOf("?") != -1) {
-            let list = this.widget.options.dictUrl.split("?");
-            let url = list[0];
-            let params = this.getparams(list[1]);
-            await (0,manage/* getAction */.Th)(url, params).then(res => {
-              if (res.success) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.dataKey,
-                    text: item.dataValue
-                  };
-                });
-              }
-            });
-          } else {
-            await (0,manage/* getAction */.Th)(this.widget.options.dictUrl).then(res => {
-              if (res.success) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.dataKey,
-                    text: item.dataValue
-                  };
-                });
-              }
-            });
-          }
-        }
-      }
+      this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
       __webpack_require__.g.dictData[this.widget.model] = this.dictOptions;
     }
   }
 });
 ;// ./src/form/modules/components/Radio/component.vue?vue&type=script&lang=js
  /* harmony default export */ const components_Radio_componentvue_type_script_lang_js = (Radio_componentvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=1277221d&prod&lang=css
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=02f7d5e6&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=1277221d&prod&lang=css
+;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=02f7d5e6&prod&lang=css
 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=style&index=1&id=1277221d&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Radio/component.vue?vue&type=style&index=1&id=02f7d5e6&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=1&id=1277221d&prod&lang=less&scoped=true
+;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=1&id=02f7d5e6&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/Radio/component.vue
 
@@ -79303,11 +80139,11 @@ var componentvue_type_template_id_1277221d_scoped_true_staticRenderFns = []
 
 var Radio_component_component = (0,componentNormalizer/* default */.A)(
   components_Radio_componentvue_type_script_lang_js,
-  componentvue_type_template_id_1277221d_scoped_true_render,
-  componentvue_type_template_id_1277221d_scoped_true_staticRenderFns,
+  componentvue_type_template_id_02f7d5e6_scoped_true_render,
+  componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns,
   false,
   null,
-  "1277221d",
+  "02f7d5e6",
   null
   
 )
@@ -79872,8 +80708,8 @@ var Radio_widgetDesign_component = (0,componentNormalizer/* default */.A)(
   widgetSetup: Radio_widgetSetup,
   widgetDesign: Radio_widgetDesign
 });
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=template&id=652c6ca2
-var componentvue_type_template_id_652c6ca2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-checkbox-group',{staticStyle:{"width":"100%"},attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder,"value":_vm.dataModel},on:{"change":_vm.onChange},nativeOn:{"click":function($event){return _vm.handleClick.apply(null, arguments)}}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,class:{inlineCheckbox:_vm.checkboxDesign_CZXY},style:({
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=template&id=22c73925
+var componentvue_type_template_id_22c73925_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.autoHeight ? 'auto' : _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-checkbox-group',{staticStyle:{"width":"100%"},attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder,"value":_vm.dataModel},on:{"change":_vm.onChange},nativeOn:{"click":function($event){return _vm.handleClick.apply(null, arguments)}}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,class:{inlineCheckbox:_vm.checkboxDesign_CZXY},style:({
             display: 'inline-block',
           }),attrs:{"value":item.value}},[_vm._v(_vm._s(item.text))])}):_vm._e(),(_vm.widget.options.inline == false)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,style:({
             display: 'block',
@@ -79882,7 +80718,7 @@ var componentvue_type_template_id_652c6ca2_render = function () {var _vm=this;va
         _vm.config.validate === true && _vm.widget.options.required === true
           ? 'is_required'
           : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e()],1)],1):_vm._e()}
-var componentvue_type_template_id_652c6ca2_staticRenderFns = []
+var componentvue_type_template_id_22c73925_staticRenderFns = []
 
 
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=script&lang=js
@@ -79960,6 +80796,7 @@ var componentvue_type_template_id_652c6ca2_staticRenderFns = []
 
 
 
+
 // import { ajaxGetDictItems } from "@form/api/api";
 // import { getAction } from "@form/api/manage";
 /* harmony default export */ const Checkbox_componentvue_type_script_lang_js = ({
@@ -80029,77 +80866,17 @@ var componentvue_type_template_id_652c6ca2_staticRenderFns = []
       }
     },
     async initDictData() {
-      // 代表自定义数据项
-      if (this.widget.options.remoteNumber == '4') {
-        this.dictOptions = this.widget.options.designDataList.map(item => {
-          return {
-            value: item.value,
-            text: item.label
-          };
-        });
-      } else {
-        if (this.widget.options.dictName) {
-          await (0,manage/* getAction */.Th)(`/sys/dict/getDictItems/${this.widget.options.dictName}`).then(res => {
-            if (res.success) {
-              this.dictOptions = res.result;
-            }
-          });
-        } else if (this.widget.options.dictTable) {
-          let params = {
-            tableName: this.widget.options.dictTable
-          };
-          await (0,manage/* getAction */.Th)("/form/formdesiger/getDataCenterDict", params).then(res => {
-            console.log(res);
-            this.dictOptions = res.result.map(item => {
-              return {
-                value: item.dictValue,
-                text: item.dictLabel
-              };
-            });
-            console.log(this.dictOptions);
-          });
-        } else if (this.widget.options.dictUrl) {
-          if (this.widget.options.dictUrl.indexOf("?") != -1) {
-            let list = this.widget.options.dictUrl.split("?");
-            let url = list[0];
-            let params = this.getparams(list[1]);
-            console.log(url, "1111", params);
-            await (0,manage/* getAction */.Th)(url, params).then(res => {
-              console.log(res);
-              if (res.success) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.dataKey,
-                    text: item.dataValue
-                  };
-                });
-              }
-            });
-          } else {
-            (0,manage/* getAction */.Th)(this.widget.options.dictUrl).then(res => {
-              console.log(res);
-              if (res.success) {
-                this.dictOptions = res.result.map(item => {
-                  return {
-                    value: item.dataKey,
-                    text: item.dataValue
-                  };
-                });
-              }
-            });
-          }
-          __webpack_require__.g.dictData[this.widget.model] = this.dictOptions;
-        }
-      }
+      this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
+      __webpack_require__.g.dictData[this.widget.model] = this.dictOptions;
     }
   }
 });
 ;// ./src/form/modules/components/Checkbox/component.vue?vue&type=script&lang=js
  /* harmony default export */ const components_Checkbox_componentvue_type_script_lang_js = (Checkbox_componentvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=652c6ca2&prod&lang=css
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=22c73925&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=652c6ca2&prod&lang=css
+;// ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=22c73925&prod&lang=css
 
 ;// ./src/form/modules/components/Checkbox/component.vue
 
@@ -80112,8 +80889,8 @@ var componentvue_type_template_id_652c6ca2_staticRenderFns = []
 
 var Checkbox_component_component = (0,componentNormalizer/* default */.A)(
   components_Checkbox_componentvue_type_script_lang_js,
-  componentvue_type_template_id_652c6ca2_render,
-  componentvue_type_template_id_652c6ca2_staticRenderFns,
+  componentvue_type_template_id_22c73925_render,
+  componentvue_type_template_id_22c73925_staticRenderFns,
   false,
   null,
   null,
@@ -82473,7 +83250,7 @@ var widgetDesignvue_type_template_id_1f623548_scoped_true_staticRenderFns = []
 
 
 
-const widgetDesignvue_type_script_lang_js_widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
+const GridLayout_widgetDesignvue_type_script_lang_js_widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
 /* harmony default export */ const GridLayout_widgetDesignvue_type_script_lang_js = ({
   name: "widgetDesign",
   props: {
@@ -82530,7 +83307,7 @@ const widgetDesignvue_type_script_lang_js_widgetFormItem = () => Promise.resolve
   components: {
     Draggable: (vuedraggable_umd_default()),
     dragItem: dragItem/* default */.A,
-    widgetFormItem: widgetDesignvue_type_script_lang_js_widgetFormItem,
+    widgetFormItem: GridLayout_widgetDesignvue_type_script_lang_js_widgetFormItem,
     GridLayout: (vue_grid_layout_common_default()).GridLayout,
     GridItem: (vue_grid_layout_common_default()).GridItem
   },
@@ -113922,19 +114699,21 @@ var componentvue_type_template_id_3afb410c_scoped_true_render = function () {var
 var componentvue_type_template_id_3afb410c_scoped_true_staticRenderFns = []
 
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=057ba4e5&scoped=true
-var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":_vm.title,"width":"100%","height":"100%","wrapClassName":"full-modal","visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"cancelText":"关闭","destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"conference-room-content"},[_c('div',{staticClass:"conference-room-content-hard"},[_c('div',{staticClass:"left"},[_c('div',{staticClass:"left-date-type"},[_c('a-radio-group',{attrs:{"button-style":"solid","disabled":_vm.loading},on:{"change":_vm.changeDateType},model:{value:(_vm.dataObj.dateType),callback:function ($$v) {_vm.$set(_vm.dataObj, "dateType", $$v)},expression:"dataObj.dateType"}},[_c('a-radio-button',{attrs:{"value":0}},[_vm._v(" 日 ")]),_c('a-radio-button',{attrs:{"value":1}},[_vm._v(" 周 ")]),_c('a-radio-button',{attrs:{"value":2}},[_vm._v(" 月 ")])],1)],1),_c('div',{staticClass:"left-date-content"},[_c('a-icon',{attrs:{"type":"left"},on:{"click":function($event){return _vm.changeDate(false)}}}),(_vm.dataObj.dateType === 0)?_c('a-date-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"136px"},attrs:{"allowClear":false,"format":"YYYY年MM月DD日","suffixIcon":false,"getCalendarContainer":function (triggerNode) {
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=627f4e94&scoped=true
+var conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":_vm.title,"width":"100%","height":"100%","wrapClassName":"full-modal","visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"cancelText":"关闭","destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"conference-room-content"},[_c('div',{staticClass:"conference-room-content-hard"},[_c('div',{staticClass:"left"},[_c('div',{staticClass:"left-date-type"},[_c('a-radio-group',{attrs:{"button-style":"solid","disabled":_vm.loading},on:{"change":_vm.changeDateType},model:{value:(_vm.dataObj.dateType),callback:function ($$v) {_vm.$set(_vm.dataObj, "dateType", $$v)},expression:"dataObj.dateType"}},[_c('a-radio-button',{attrs:{"value":0}},[_vm._v(" 日 ")]),_c('a-radio-button',{attrs:{"value":1}},[_vm._v(" 周 ")]),_c('a-radio-button',{attrs:{"value":2}},[_vm._v(" 月 ")])],1)],1),_c('div',{staticClass:"left-date-content"},[_c('a-icon',{attrs:{"type":"left"},on:{"click":function($event){return _vm.changeDate(false)}}}),(_vm.dataObj.dateType === 0)?_c('a-date-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"136px"},attrs:{"allowClear":false,"format":"YYYY年MM月DD日","suffixIcon":false,"getCalendarContainer":function (triggerNode) {
               return triggerNode.parentNode || _vm.document.body;
             }},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):(_vm.dataObj.dateType === 1)?_c('a-week-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"103px"},attrs:{"allowClear":false,"placeholder":"Select week","format":"YYYY年wo","getCalendarContainer":function (triggerNode) {
               return triggerNode.parentNode || _vm.document.body;
             }},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):_c('a-month-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"103px"},attrs:{"allowClear":false,"placeholder":"Select month","format":"YYYY年MM月","getCalendarContainer":function (triggerNode) {
               return triggerNode.parentNode || _vm.document.body;
             }},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}),_c('a-icon',{attrs:{"type":"right"},on:{"click":function($event){return _vm.changeDate(true)}}})],1),_c('div',{staticClass:"left-date-button"},[_c('a-button',{attrs:{"disabled":_vm.loading},on:{"click":_vm.resetDate}},[_vm._v(_vm._s(_vm.dataObj.dateType === 0 ? '今天' : _vm.dataObj.dateType === 1 ? '本周' : '本月'))]),_c('a-icon',{staticStyle:{"margin-left":"20px","color":"#999","font-size":"20px"},attrs:{"type":"redo"},on:{"click":function($event){return _vm.debounceGetDataListFunction()}}})],1)]),_c('div',{staticClass:"right"},[_c('div',{staticClass:"right-content"},[_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-0"}),_c('div',{staticClass:"text"},[_vm._v("占用")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-1"}),_c('div',{staticClass:"text"},[_vm._v("待审批")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-2"}),_c('div',{staticClass:"text"},[_vm._v("冲突")])])])])]),_c('div',{staticClass:"conference-room-body"},[_c('a-spin',{staticStyle:{"width":"100%"},attrs:{"spinning":_vm.loading}},[_c('table',{staticClass:"table",attrs:{"cellspacing":"0","cellpadding":"0","border":"0"}},[_c('thead',[_c('tr',[_c('th',{attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"16px"}},[_c('img',{staticStyle:{"width":"20px","margin-right":"5px"},attrs:{"src":__webpack_require__(44193),"alt":""}}),_c('div',[_vm._v(_vm._s(_vm.title))])])]),_c('th',{attrs:{"colspan":(_vm.dateTime.length * (_vm.dataObj.dateType === 0 ? 2 : 1)) || 1}},[(_vm.dataObj.dateShow)?_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"14px"}},[_c('div',[_vm._v(_vm._s(_vm.moment(_vm.dataObj.dateShow).format(_vm.dataObj.dateType === 0 ? 'MM月DD日' : _vm.dataObj.dateType === 1 ? 'YYYY年wo' : 'YYYY年MM月')))]),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("（"+_vm._s(_vm.moment(_vm.dataObj.dateShow).format('dddd'))+"）")]):_vm._e(),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("单位：时")]):_vm._e(),(_vm.dataObj.dateType === 2)?_c('div',[_vm._v("（"+_vm._s(_vm.moment(_vm.dataObj.dateShow).daysInMonth())+"天）")]):_vm._e()]):_vm._e()])])]),_c('tbody',[_c('tr',[_c('td',{staticStyle:{"background-color":"#fff","padding":"0"},attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"space-between"}},[_c('a-input',{staticClass:"input-no-border",attrs:{"placeholder":"请输入会议室"},model:{value:(_vm.searchKey),callback:function ($$v) {_vm.searchKey=(typeof $$v === 'string'? $$v.trim(): $$v)},expression:"searchKey"}}),_c('div',{staticStyle:{"display":"flex","align-items":"center","justify-content":"center"}},[_c('div',{staticStyle:{"width":"30px","text-align":"center"}},[_c('img',{staticStyle:{"width":"20px","cursor":"pointer"},attrs:{"src":__webpack_require__(85081),"alt":""},on:{"click":_vm.search}})])])],1)]),_vm._l((_vm.dateTime),function(i){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],attrs:{"colspan":_vm.dataObj.dateType === 0 ? 2 : 1}},[_vm._v(_vm._s(i)+" ")])}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2),_vm._l((_vm.dataList),function(item,index){return _c('tr',[_c('td',{attrs:{"colspan":"1"}},[_c('div',{staticClass:"ellipsis",attrs:{"title":item.hysName}},[_vm._v(" "+_vm._s(item.hysName)+" ")])]),_vm._l((_vm.getdateTime(item.dateTime)),function(el){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],class:'td-bg-' + el.status,staticStyle:{"padding":"0"},attrs:{"colspan":"1"}},[(el.dataList.length)?_c('a-tooltip',{attrs:{"placement":"bottom","overlayClassName":"tooltip-data"}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"max-height":"460px","overflow-y":"auto"}},_vm._l((el.dataList),function(info){return _c('div',{staticClass:"tooltip-data-body"},[_c('div',{staticClass:"tooltip-data-body-item"},_vm._l((_vm.dataObj.dataColumns),function(j){return _c('div',{attrs:{"title":j.name + ':' + info[j.model]}},[_vm._v(" "+_vm._s(j.name)+":"+_vm._s(info[j.model])+" ")])}),0)])}),0)]),_c('div',{staticStyle:{"width":"100%","height":"32px","line-height":"32px"}},[_vm._v(_vm._s(el.dataList.length > 1 ? el.dataList.length : '  '))])],2):_c('div',{staticStyle:{"width":"100%","height":"32px","line-height":"32px"}},[_vm._v("  ")])],1)}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2)})],2)])])],1),_c('div',{staticClass:"conference-room-table"},[_c('a-table',{attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"size":"small","rowKey":"id","loading":_vm.tableLoading},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"ableCancel",fn:function(text,record){return (text == '1')?_c('a',{attrs:{"href":"javascript:;"},on:{"click":function($event){return _vm.closeRomm(record.id)}}},[_vm._v("取消")]):_vm._e()}}],null,true)})],1)])])}
-var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns = []
+var conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_staticRenderFns = []
 
 
-;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=057ba4e5&scoped=true
+;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=627f4e94&scoped=true
 
+// EXTERNAL MODULE: ./src/form/util/tableUtil.js
+var tableUtil = __webpack_require__(5229);
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=script&lang=js
 
 
@@ -114099,6 +114878,7 @@ var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns
 
 
 
+
 /* harmony default export */ const conferenceRoomModalvue_type_script_lang_js = ({
   name: "TaskScriptAddModal",
   inject: {
@@ -114174,7 +114954,7 @@ var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns
       debugger;
       let arr = [];
       dataList.forEach(item => {
-        if (item.type === 'table' && item.columns && item.columns.length > 0) {
+        if ((0,tableUtil/* isTableWidget */.X2)(item) && item.columns && item.columns.length > 0) {
           arr.push(...item.columns);
         } else if (['all-lay-out', 'grid', 'grid-lay-out'].includes(item.type) && item.columns && item.columns.length > 0) {
           item.columns.forEach(i => {
@@ -114393,15 +115173,15 @@ var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns
 });
 ;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=script&lang=js
  /* harmony default export */ const component_conferenceRoomModalvue_type_script_lang_js = (conferenceRoomModalvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=057ba4e5&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=627f4e94&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=057ba4e5&prod&lang=less&scoped=true
+;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=627f4e94&prod&lang=less&scoped=true
 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=1&id=057ba4e5&prod&lang=css
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=1&id=627f4e94&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=1&id=057ba4e5&prod&lang=css
+;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=1&id=627f4e94&prod&lang=css
 
 ;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue
 
@@ -114415,11 +115195,11 @@ var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns
 
 var conferenceRoomModal_component = (0,componentNormalizer/* default */.A)(
   component_conferenceRoomModalvue_type_script_lang_js,
-  conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_render,
-  conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns,
+  conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_render,
+  conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_staticRenderFns,
   false,
   null,
-  "057ba4e5",
+  "627f4e94",
   null
   
 )
@@ -114499,9 +115279,9 @@ var conferenceRoom_component_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const conferenceRoom_component = (conferenceRoom_component_component.exports);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=template&id=20ca2364&scoped=true
-var widgetSetupvue_type_template_id_20ca2364_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"title",attrs:{"label":"授权人","prop":"title"}},[_c('select-app-modal',{attrs:{"widget":_vm.widget}})],1),_c('a-form-model-item',{attrs:{"label":"数据源"}},[_c('a-select',{attrs:{"allowClear":"","placeholder":"请选择数据源"},model:{value:(_vm.widget.dataKey),callback:function ($$v) {_vm.$set(_vm.widget, "dataKey", $$v)},expression:"widget.dataKey"}},_vm._l((_vm.dataKeyList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"数据项"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择数据项","mode":"multiple"},model:{value:(_vm.widget.dataColumns),callback:function ($$v) {_vm.$set(_vm.widget, "dataColumns", $$v)},expression:"widget.dataColumns"}},_vm._l((_vm.dataColumnsList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"开始时间"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择时间","mode":"multiple"},model:{value:(_vm.widget.dateStartList),callback:function ($$v) {_vm.$set(_vm.widget, "dateStartList", $$v)},expression:"widget.dateStartList"}},_vm._l((_vm.dateDateList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"结束时间"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择时间","mode":"multiple"},model:{value:(_vm.widget.dateEndList),callback:function ($$v) {_vm.$set(_vm.widget, "dateEndList", $$v)},expression:"widget.dateEndList"}},_vm._l((_vm.dateDateList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1)],1)],1)])])}
-var widgetSetupvue_type_template_id_20ca2364_scoped_true_staticRenderFns = []
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=template&id=b87a9ec2&scoped=true
+var widgetSetupvue_type_template_id_b87a9ec2_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"title",attrs:{"label":"授权人","prop":"title"}},[_c('select-app-modal',{attrs:{"widget":_vm.widget}})],1),_c('a-form-model-item',{attrs:{"label":"数据源"}},[_c('a-select',{attrs:{"allowClear":"","placeholder":"请选择数据源"},model:{value:(_vm.widget.dataKey),callback:function ($$v) {_vm.$set(_vm.widget, "dataKey", $$v)},expression:"widget.dataKey"}},_vm._l((_vm.dataKeyList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"数据项"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择数据项","mode":"multiple"},model:{value:(_vm.widget.dataColumns),callback:function ($$v) {_vm.$set(_vm.widget, "dataColumns", $$v)},expression:"widget.dataColumns"}},_vm._l((_vm.dataColumnsList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"开始时间"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择时间","mode":"multiple"},model:{value:(_vm.widget.dateStartList),callback:function ($$v) {_vm.$set(_vm.widget, "dateStartList", $$v)},expression:"widget.dateStartList"}},_vm._l((_vm.dateDateList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1),_c('a-form-model-item',{attrs:{"label":"结束时间"}},[_c('a-select',{attrs:{"allowClear":"","show-search":"","option-filter-prop":"children","filter-option":_vm.filterOption,"placeholder":"请选择时间","mode":"multiple"},model:{value:(_vm.widget.dateEndList),callback:function ($$v) {_vm.$set(_vm.widget, "dateEndList", $$v)},expression:"widget.dateEndList"}},_vm._l((_vm.dateDateList),function(info){return _c('a-select-option',{key:info.model,attrs:{"title":info.name,"value":info.model}},[_vm._v(" "+_vm._s(info.name)+" ")])}),1)],1)],1)],1)])])}
+var widgetSetupvue_type_template_id_b87a9ec2_scoped_true_staticRenderFns = []
 
 
 ;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/selectAppModal.vue?vue&type=template&id=397a2098&scoped=true
@@ -114632,6 +115412,7 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
 //
 
 
+
 /* harmony default export */ const conferenceRoom_widgetSetupvue_type_script_lang_js = ({
   name: "widgetSetup",
   data() {
@@ -114668,7 +115449,7 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
         //时间
         this.dateDateList.push(item);
         this.dataColumnsList.push(item);
-      } else if (item.type === 'table' && item.columns && item.columns.length > 0) {
+      } else if ((0,tableUtil/* isTableWidget */.X2)(item) && item.columns && item.columns.length > 0) {
         if (item.columns.some(i => i.type === 'select')) arr.push(...item.columns.filter(i => i.type === 'select'));
         if (item.columns.some(i => ['date', 'time'].includes(i.type))) this.dateDateList.push(...item.columns.filter(i => ['date', 'time'].includes(i.type)));
         this.dataColumnsList.push(...item.columns);
@@ -114700,10 +115481,10 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
 });
 ;// ./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=script&lang=js
  /* harmony default export */ const components_conferenceRoom_widgetSetupvue_type_script_lang_js = (conferenceRoom_widgetSetupvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=style&index=0&id=20ca2364&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=style&index=0&id=b87a9ec2&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=style&index=0&id=20ca2364&prod&lang=less&scoped=true
+;// ./src/form/modules/components/conferenceRoom/widgetSetup.vue?vue&type=style&index=0&id=b87a9ec2&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/conferenceRoom/widgetSetup.vue
 
@@ -114716,11 +115497,11 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
 
 var conferenceRoom_widgetSetup_component = (0,componentNormalizer/* default */.A)(
   components_conferenceRoom_widgetSetupvue_type_script_lang_js,
-  widgetSetupvue_type_template_id_20ca2364_scoped_true_render,
-  widgetSetupvue_type_template_id_20ca2364_scoped_true_staticRenderFns,
+  widgetSetupvue_type_template_id_b87a9ec2_scoped_true_render,
+  widgetSetupvue_type_template_id_b87a9ec2_scoped_true_staticRenderFns,
   false,
   null,
-  "20ca2364",
+  "b87a9ec2",
   null
   
 )
@@ -117503,6 +118284,7 @@ let widgetSetupList = {
  //单行文本
  //下拉选择
  //子表单
+ //新子表单
  //地区选择
  //多行文本
  //计数器
@@ -117542,6 +118324,7 @@ let components_componentList = {
   inputComponent: Input.component,
   selectComponent: Select.component,
   tableComponent: Table.component,
+  newTableComponent: NewTable.component,
   textareaComponent: Textarea.component,
   numberComponent: components_Number.component,
   switchComponent: Switch.component,
@@ -117584,6 +118367,7 @@ let components_widgetDesignList = {
   inputWidgetDesign: Input.widgetDesign,
   selectWidgetDesign: Select.widgetDesign,
   tableWidgetDesign: Table.widgetDesign,
+  newTableWidgetDesign: NewTable.widgetDesign,
   textareaWidgetDesign: Textarea.widgetDesign,
   numberWidgetDesign: components_Number.widgetDesign,
   switchWidgetDesign: Switch.widgetDesign,
@@ -117622,6 +118406,7 @@ let components_widgetSetupList = {
   inputWidgetSetup: Input.widgetSetup,
   selectWidgetSetup: Select.widgetSetup,
   tableWidgetSetup: Table.widgetSetup,
+  newTableWidgetSetup: NewTable.widgetSetup,
   textareaWidgetSetup: Textarea.widgetSetup,
   numberWidgetSetup: components_Number.widgetSetup,
   switchWidgetSetup: Switch.widgetSetup,
@@ -117895,6 +118680,193 @@ const Bus = new (vue__WEBPACK_IMPORTED_MODULE_0___default())();
 
 /***/ },
 
+/***/ 33883
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   $i: () => (/* binding */ fetchDictOptions),
+/* harmony export */   sE: () => (/* binding */ prefetchTableDictData),
+/* harmony export */   ue: () => (/* binding */ clearDictCache)
+/* harmony export */ });
+/* unused harmony export getDictCacheKey */
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7068);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48753);
+/* harmony import */ var core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(65546);
+/* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33975);
+/* harmony import */ var core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53304);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_set_difference_v2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(92088);
+/* harmony import */ var core_js_modules_es_set_difference_v2_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_difference_v2_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_set_intersection_v2_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(27302);
+/* harmony import */ var core_js_modules_es_set_intersection_v2_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_intersection_v2_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_set_is_disjoint_from_v2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(90575);
+/* harmony import */ var core_js_modules_es_set_is_disjoint_from_v2_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_is_disjoint_from_v2_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_set_is_subset_of_v2_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(12742);
+/* harmony import */ var core_js_modules_es_set_is_subset_of_v2_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_is_subset_of_v2_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_set_is_superset_of_v2_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(99149);
+/* harmony import */ var core_js_modules_es_set_is_superset_of_v2_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_is_superset_of_v2_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_set_symmetric_difference_v2_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(81938);
+/* harmony import */ var core_js_modules_es_set_symmetric_difference_v2_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_symmetric_difference_v2_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_set_union_v2_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(42588);
+/* harmony import */ var core_js_modules_es_set_union_v2_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_union_v2_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(5335);
+
+
+
+
+
+
+
+
+
+
+
+
+
+const cache = Object.create(null);
+const pending = Object.create(null);
+function parseUrlParams(url) {
+  const obj = {};
+  const strs = url.split('&');
+  for (let i = 0; i < strs.length; i++) {
+    const pair = strs[i].split('=');
+    if (pair[0]) obj[pair[0]] = pair[1];
+  }
+  return obj;
+}
+
+/** 根据字典配置生成唯一缓存键（同行子表单多行共用同一数据源） */
+function getDictCacheKey(options = {}, applyId) {
+  if (options.remoteNumber === '4') {
+    return `custom:${JSON.stringify(options.designDataList || [])}`;
+  }
+  if (options.dictName) {
+    return `dict:${options.dictName}`;
+  }
+  if (options.dictTable) {
+    return `table:${options.dictTable}`;
+  }
+  if (options.dictUrl) {
+    const base = options.dictUrl.split('?')[0];
+    const query = options.dictUrl.indexOf('?') !== -1 ? options.dictUrl.split('?')[1] : '';
+    const applyPart = applyId ? `&applyId=${applyId}` : '';
+    return `url:${base}?${query}${applyPart}`;
+  }
+  if (Array.isArray(options.options) && options.options.length) {
+    return `static:${JSON.stringify(options.options)}`;
+  }
+  return null;
+}
+function mapDictTableResult(result) {
+  return (result || []).map(item => ({
+    value: item.dictValue,
+    text: item.dictLabel
+  }));
+}
+function mapDictUrlResult(result, useDepart) {
+  return (result || []).map(item => ({
+    value: useDepart ? item.id || item.dataKey : item.dataKey,
+    text: useDepart ? item.departName || item.dataValue : item.dataValue
+  }));
+}
+async function loadDictOptions(options = {}, applyId) {
+  if (options.remoteNumber === '4') {
+    return (options.designDataList || []).map(item => ({
+      value: item.value,
+      text: item.label
+    }));
+  }
+  if (options.dictName) {
+    const res = await (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .getAction */ .Th)(`/sys/dict/getDictItems/${options.dictName}`);
+    if (res.success) return res.result || [];
+    return [];
+  }
+  if (options.dictTable) {
+    const res = await (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .getAction */ .Th)('/form/formdesiger/getDataCenterDict', {
+      tableName: options.dictTable
+    });
+    if (res.success) return mapDictTableResult(res.result);
+    return [];
+  }
+  if (options.dictUrl) {
+    if (options.dictUrl.indexOf('?') !== -1) {
+      const list = options.dictUrl.split('?');
+      const url = list[0];
+      const params = parseUrlParams(list[1]);
+      const res = await (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .getAction */ .Th)(url, params);
+      if (res.success) return mapDictUrlResult(res.result, false);
+      return [];
+    }
+    const params = applyId ? {
+      applyId
+    } : {};
+    const res = await (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .getAction */ .Th)(options.dictUrl, params);
+    if (res.success) return mapDictUrlResult(res.result, true);
+    return [];
+  }
+  if (Array.isArray(options.options)) {
+    return options.options;
+  }
+  return [];
+}
+
+/**
+ * 获取字典选项（带内存缓存与并发去重）
+ * @returns {Promise<Array<{value, text}>>}
+ */
+function fetchDictOptions(options = {}, applyId) {
+  const cacheKey = getDictCacheKey(options, applyId);
+  if (!cacheKey) {
+    return Promise.resolve(Array.isArray(options.options) ? options.options : []);
+  }
+  if (cache[cacheKey]) {
+    return Promise.resolve(cache[cacheKey]);
+  }
+  if (pending[cacheKey]) {
+    return pending[cacheKey];
+  }
+  pending[cacheKey] = loadDictOptions(options, applyId).then(data => {
+    cache[cacheKey] = data;
+    delete pending[cacheKey];
+    return data;
+  }).catch(err => {
+    delete pending[cacheKey];
+    throw err;
+  });
+  return pending[cacheKey];
+}
+
+/** 子表单列字典预加载：每类数据源只请求一次 */
+function prefetchTableDictData(columns = [], applyId) {
+  const dictTypes = ['select', 'radio', 'checkbox'];
+  const seen = new Set();
+  const tasks = [];
+  columns.forEach(col => {
+    if (!dictTypes.includes(col.type)) return;
+    const key = getDictCacheKey(col.options, applyId);
+    if (!key || seen.has(key)) return;
+    seen.add(key);
+    tasks.push(fetchDictOptions(col.options, applyId));
+  });
+  return Promise.all(tasks);
+}
+function clearDictCache(cacheKey) {
+  if (cacheKey) {
+    delete cache[cacheKey];
+    delete pending[cacheKey];
+  } else {
+    Object.keys(cache).forEach(k => delete cache[k]);
+    Object.keys(pending).forEach(k => delete pending[k]);
+  }
+}
+
+/***/ },
+
 /***/ 36113
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -117910,6 +118882,8 @@ const Bus = new (vue__WEBPACK_IMPORTED_MODULE_0___default())();
 /* harmony import */ var core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(65546);
 /* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _tableUtil__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5229);
+
 
 
 
@@ -117955,7 +118929,7 @@ function getRecursionWidget(widgetList) {
             columnsItem.list.p_model = item.model;
             func(res_list, columnsItem.list);
           });
-        } else if (["table"].includes(item.type)) {
+        } else if ((0,_tableUtil__WEBPACK_IMPORTED_MODULE_3__/* .isTableWidget */ .X2)(item)) {
           // columns
           item.columns.p_type = item.type;
           item.columns.p_model = item.model;
@@ -118068,6 +119042,166 @@ const getMathResult = (method, arr, sub) => {
 
 /***/ },
 
+/***/ 5229
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Ce: () => (/* binding */ isTableUseVirtualScroll),
+/* harmony export */   K2: () => (/* binding */ shouldUseLightweightTableRows),
+/* harmony export */   Oi: () => (/* binding */ LARGE_TABLE_ROW_THRESHOLD),
+/* harmony export */   X2: () => (/* binding */ isTableWidget),
+/* harmony export */   eo: () => (/* binding */ createLightweightTableRows),
+/* harmony export */   gj: () => (/* binding */ validateSubTableRows),
+/* harmony export */   qh: () => (/* binding */ getTableVirtualKeeps),
+/* harmony export */   r: () => (/* binding */ createLightweightTableRow),
+/* harmony export */   yk: () => (/* binding */ createFullTableRow)
+/* harmony export */ });
+/* unused harmony exports TABLE_WIDGET_TYPES, isNewTableWidget, isLightweightTableRow */
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7068);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48753);
+/* harmony import */ var core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_iterator_find_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20362);
+/* harmony import */ var core_js_modules_es_iterator_find_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_find_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(65546);
+/* harmony import */ var core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(12822);
+/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53304);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(35064);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_6__);
+
+
+
+
+
+
+
+const TABLE_WIDGET_TYPES = ['table', 'newTable'];
+
+/** 超过此行数时使用轻量行结构，避免深拷贝导致内存崩溃 */
+const LARGE_TABLE_ROW_THRESHOLD = 100;
+function isTableWidget(widget) {
+  return widget && TABLE_WIDGET_TYPES.includes(widget.type);
+}
+function isNewTableWidget(widget) {
+  return widget && widget.type === 'newTable';
+}
+
+/** 仅原子表单在未开分页时使用虚拟滚动 */
+function isTableUseVirtualScroll(widget) {
+  var _widget$options;
+  return widget && widget.type === 'table' && !((_widget$options = widget.options) !== null && _widget$options !== void 0 && _widget$options.supportPage);
+}
+function getTableVirtualKeeps(widget) {
+  if (!widget || !widget.options) return 50;
+  if (widget.options.virtualKeeps) return widget.options.virtualKeeps;
+  return 50;
+}
+function shouldUseLightweightTableRows(rowCount) {
+  return rowCount > LARGE_TABLE_ROW_THRESHOLD;
+}
+function createLightweightTableRow(model, index, seed = Date.now()) {
+  return {
+    model,
+    _lightweight: true,
+    hashKey: `${model}_${index}_${seed}`,
+    rand_id: `${index}_${seed}`,
+    index
+  };
+}
+function createLightweightTableRows(model, rowCount, seed = Date.now()) {
+  return Array.from({
+    length: rowCount
+  }, (_, index) => createLightweightTableRow(model, index, seed));
+}
+function createFullTableRow(template) {
+  const row = JSON.parse(JSON.stringify(template));
+  row._clone = true;
+  row.hashKey = `${Date.now()}${Math.ceil(Math.random() * 10000)}`;
+  row.rand_id = Math.random().toString();
+  return row;
+}
+function isLightweightTableRow(row) {
+  return row && row._lightweight === true;
+}
+function isEmptyValue(value) {
+  return value === '' || value === undefined || value === null || Array.isArray(value) && !value.length;
+}
+
+/** 不依赖 DOM，遍历子表单全部行做必填/最少选校验（分页、虚拟滚动下未挂载行也能拦截） */
+function validateSubTableRows(tables, models, {
+  isCorrectAudit = false
+} = {}) {
+  const errors = [];
+  for (const table of tables) {
+    var _table$options, _table$options2;
+    if (!((_table$options = table.options) !== null && _table$options !== void 0 && _table$options.canView) || (_table$options2 = table.options) !== null && _table$options2 !== void 0 && _table$options2.disabled) continue;
+    const tableModel = table.model;
+    const rows = models[tableModel];
+    const columns = table.columns || [];
+    for (const col of columns) {
+      var _col$options, _col$options2;
+      if (!((_col$options = col.options) !== null && _col$options !== void 0 && _col$options.canView)) continue;
+      if ((_col$options2 = col.options) !== null && _col$options2 !== void 0 && _col$options2.disabled && !isCorrectAudit) continue;
+      const rules = col.rules || [];
+      const requiredRule = rules.find(r => r.required);
+      const {
+        minValue,
+        maxValue
+      } = col.options || {};
+      if (!requiredRule && !minValue) continue;
+      if (!Array.isArray(rows) || rows.length === 0) {
+        if (requiredRule) {
+          errors.push({
+            tableModel,
+            rowIndex: 0,
+            columnModel: col.model,
+            message: requiredRule.message || `${(col.name || '').replaceAll(' ', '')}必须填写`
+          });
+        }
+        continue;
+      }
+      rows.forEach((row, rowIndex) => {
+        const value = row[col.model];
+        if (requiredRule && isEmptyValue(value)) {
+          errors.push({
+            tableModel,
+            rowIndex,
+            columnModel: col.model,
+            message: requiredRule.message || `${(col.name || '').replaceAll(' ', '')}必须填写`
+          });
+          return;
+        }
+        if (minValue) {
+          if (maxValue && minValue === maxValue) {
+            if (!value || Array.isArray(value) && value.length !== maxValue) {
+              errors.push({
+                tableModel,
+                rowIndex,
+                columnModel: col.model,
+                message: `${col.name}必须选择${maxValue}项`
+              });
+            }
+          } else if (!value || Array.isArray(value) && value.length < minValue) {
+            errors.push({
+              tableModel,
+              rowIndex,
+              columnModel: col.model,
+              message: `${col.name}最少选择${minValue}项`
+            });
+          }
+        }
+      });
+    }
+  }
+  return errors;
+}
+
+/***/ },
+
 /***/ 78393
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -140821,8 +141955,8 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(5882);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
+var components = __webpack_require__(40000);
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -142485,7 +143619,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 97128
+/***/ 48555
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -142495,7 +143629,7 @@ __webpack_require__.d(__webpack_exports__, {
   A: () => (/* binding */ tableItem)
 });
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/tableItem.vue?vue&type=template&id=9b717926&scoped=true
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/tableItem.vue?vue&type=template&id=0536d5fe&scoped=true
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sub-table-col sub-table-col-no-border"},[_vm._l((_vm.widget.columns),function(tableItem,col_index){return _c('span',{directives:[{name:"show",rawName:"v-show",value:(tableItem.type !== 'hidden' && tableItem.options.canView),expression:"tableItem.type !== 'hidden' && tableItem.options.canView"}],key:_vm.index + '_' + col_index,staticClass:"sub-table-item",style:(Object.assign({}, _vm.handleSubTableStyle(_vm.widget, tableItem)))},[(['input', 'textarea'].includes(tableItem.type) && !_vm.editArr[col_index] && !tableItem.tableColCanEdit && (!_vm.widget.options.disbaledDoubleClickEdit))?_c('div',{style:(("color: #000; border-right: 1px solid " + (_vm.config.borderColor) + "; border-bottom: 1px solid " + (_vm.config.borderColor) + ";  line-height: normal; padding: 0 15px; line-break: anywhere; overflow: hidden; display: flex;  align-items: center; height: " + (tableItem.options.height ? tableItem.options.height+'px':'initial'))),attrs:{"title":_vm.showValue(_vm.models[_vm.source.model][_vm.index][tableItem.model], tableItem, _vm.index)},on:{"dblclick":function($event){return _vm.tableColumnsDBClick(col_index, tableItem, _vm.source.model + '_' + _vm.index + '_' + tableItem.model)}}},[(!_vm.$isMobile)?_c('span',[_vm._v(_vm._s(_vm.showValue(_vm.models[_vm.source.model][_vm.index][tableItem.model], tableItem, _vm.index)))]):_c('AutoScrollText',{attrs:{"text":_vm.showValue(_vm.models[_vm.source.model][_vm.index][tableItem.model], tableItem, _vm.index)  || '',"maxWidth":280 / _vm.widget.columns.length,"duration":18 / _vm.widget.columns.length,"delay":1.5,"pauseOnHover":true}})],1):_c('layout-item',{directives:[{name:"show",rawName:"v-show",value:(tableItem.options.canView),expression:"tableItem.options.canView"}],key:_vm.source.hashKey,attrs:{"tableKey":_vm.source.model,"rules":_vm.rules,"tableIndex":_vm.index,"hashKey":_vm.source.hashKey,"widget":tableItem,"models":_vm.models,"showLabel":false,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event}}})],1)}),(!_vm.widget.options.disabled && !_vm.widget.options.hiddenOperateBtn)?_c('span',{staticClass:"last-one",style:({ borderColor: _vm.data.config.borderColor })},[_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.handleDeleteRow(_vm.index, _vm.widget.model, _vm.source.hashKey)}}},[_vm._v("删除行")])],1):_vm._e()],2)}
 var staticRenderFns = []
 
@@ -142504,10 +143638,10 @@ var staticRenderFns = []
 var tableItemvue_type_script_lang_js = __webpack_require__(19361);
 ;// ./src/form/modules/common/tableItem.vue?vue&type=script&lang=js
  /* harmony default export */ const common_tableItemvue_type_script_lang_js = (tableItemvue_type_script_lang_js/* default */.A); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=9b717926&prod&scoped=true&lang=less
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=0536d5fe&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=9b717926&prod&scoped=true&lang=less
+;// ./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=0536d5fe&prod&scoped=true&lang=less
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(64008);
@@ -142526,7 +143660,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "9b717926",
+  "0536d5fe",
   null
   
 )
@@ -143053,7 +144187,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 48498
+/***/ 89715
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -143065,11 +144199,11 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ layoutForPaper)
 });
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=73194dd8&scoped=true
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-spin',{staticClass:"layout layout-input-all-setting",class:{ 'no-border': !_vm.data.config.border, 'save-pdf': _vm.showLine, 'ant-form-noBorder': _vm.data.config.componentsNoBorder },style:({ 'overflow-x': _vm.data.config.layout === 'horizontal' ? 'auto' : 'initial' }),attrs:{"spinning":_vm.formLoading,"tip":_vm.formLoadingTip}},[(_vm.pageLoading && _vm.showLayoutLoading)?_c('div',{class:{ form_skeleton: _vm.pageLoading }},[(_vm.pageLoading)?_c('a-skeleton',{attrs:{"active":"","loading":_vm.pageLoading,"paragraph":{ rows: 12 }}}):_vm._e()],1):_vm._e(),_c('a-form-model',{ref:"Form",attrs:{"hideRequiredMark":true,"model":_vm.models,"rules":_vm.rules,"wrapper-col":{}},on:{"update:rules":function($event){_vm.rules=$event},"validate":_vm.validate}},_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_vm._t("default"):_vm._e(),(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.value && _vm.value.formIndex)?_c('div',{staticStyle:{"text-align":"right","font-weight":"bold"}},[_vm._v(_vm._s(_vm.value.formIndex))]):_vm._e(),(_vm.data.config.pageHeader && listindex === 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('div',{staticClass:"page-border",style:({ borderColor: _vm.data.config.borderColor })},[_vm._l((list),function(widget,index){return [(widget.type == 'table')?[(
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=7dc51789&scoped=true
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-spin',{staticClass:"layout layout-input-all-setting",class:{ 'no-border': !_vm.data.config.border, 'save-pdf': _vm.showLine, 'ant-form-noBorder': _vm.data.config.componentsNoBorder },style:({ 'overflow-x': _vm.data.config.layout === 'horizontal' ? 'auto' : 'initial' }),attrs:{"spinning":_vm.formLoading,"tip":_vm.formLoadingTip}},[(_vm.pageLoading && _vm.showLayoutLoading)?_c('div',{class:{ form_skeleton: _vm.pageLoading }},[(_vm.pageLoading)?_c('a-skeleton',{attrs:{"active":"","loading":_vm.pageLoading,"paragraph":{ rows: 12 }}}):_vm._e()],1):_vm._e(),_c('a-form-model',{ref:"Form",attrs:{"hideRequiredMark":true,"model":_vm.models,"rules":_vm.rules,"wrapper-col":{}},on:{"update:rules":function($event){_vm.rules=$event},"validate":_vm.validate}},_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_vm._t("default"):_vm._e(),(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.value && _vm.value.formIndex)?_c('div',{staticStyle:{"text-align":"right","font-weight":"bold"}},[_vm._v(_vm._s(_vm.value.formIndex))]):_vm._e(),(_vm.data.config.pageHeader && listindex === 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('div',{staticClass:"page-border",style:({ borderColor: _vm.data.config.borderColor })},[_vm._l((list),function(widget,index){return [(widget.type == 'table' || widget.type == 'newTable')?[(
                   widget.options.layoutModel === 'auto' ||
                   widget.options.layoutModel === undefined
-                )?_c('a-spin',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",class:[widget.options.supportPage?'pagiAfter':'',widget.options.inline == true ? 'row-table' : ''],style:({ borderColor: _vm.data.config.borderColor, marginBottom: (widget.options.supportPage &&  _vm.tablePageInfo[widget.model] && _vm.tablePageInfo[widget.model].total > 10) ? '50px' : '' }),attrs:{"spinning":_vm.tableLoading && !_vm.formLoading,"tip":"数据加载中"}},[(widget.options.inline)?_c('div',{staticClass:"table-left",style:({
+                )?_c('a-spin',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",class:[_vm.isTablePaginationActive(widget)?'pagiAfter':'',widget.options.inline == true ? 'row-table' : ''],style:({ borderColor: _vm.data.config.borderColor, marginBottom: (_vm.isTablePaginationActive(widget) &&  _vm.tablePageInfo[widget.model] && _vm.tablePageInfo[widget.model].total > 10) ? '50px' : '' }),attrs:{"spinning":_vm.tableLoading && !_vm.formLoading,"tip":"数据加载中"}},[(widget.options.inline)?_c('div',{staticClass:"table-left",style:({
                     width: widget.options.labelWidth + 'px',
                     borderColor: _vm.data.config.borderColor,
                     backgroundColor: _vm.data.config.bgc,
@@ -143081,7 +144215,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
                         _vm.data.config.align,
                         _vm.data.config.validate === true && children.options.required === true
                           ? 'is_required'
-                          : 'no_required' ],staticStyle:{"border-right":"1px solid #333","border-bottom":"1px solid #333"},style:(Object.assign({}, {borderColor: _vm.data.config.borderColor, background:  _vm.data.config.bgc}, _vm.handleSubTableStyle(widget, children)))},[_vm._v(_vm._s(children.name))])}),(!widget.options.hiddenOperateBtn && _vm.tableWidgetColumns(widget).length > 0 && !widget.options.disabled)?_c('span',{staticClass:"last-one",style:({ borderColor: _vm.data.config.borderColor, background:  _vm.data.config.bgc, color: _vm.data.config.color })},[_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.addToTableData(widget, widget.model, 'addModel', true)}}},[_vm._v("添加行")])],1):_vm._e()],2),(Array.isArray(_vm.tableData[widget.model]))?[(widget.options.supportPage)?[_vm._l((_vm.currTablePageData(widget.model)),function(source,idx){return _c('table-item',{key:(_vm.tablePageInfo[widget.model].current - 1) * _vm.tablePageInfo[widget.model].pageSize + idx,attrs:{"widget":widget,"index":(_vm.tablePageInfo[widget.model].current - 1) * _vm.tablePageInfo[widget.model].pageSize  + idx,"data":_vm.data,"rules":_vm.rules,"models":_vm.models,"handleDeleteRow":_vm.handleDeleteRow,"source":source}})}),(_vm.tablePageInfo[widget.model] && _vm.tablePageInfo[widget.model].total > 10)?_c('div',{staticClass:"hasWidgetAfter",staticStyle:{"padding":"10px","position":"absolute","top":"100%"},style:({borderColor:_vm.data.config.borderColor})},[_c('a-pagination',{attrs:{"show-quick-jumper":"","show-size-changer":"","total":_vm.tablePageInfo[widget.model].total},on:{"change":function () {
+                          : 'no_required' ],staticStyle:{"border-right":"1px solid #333","border-bottom":"1px solid #333"},style:(Object.assign({}, {borderColor: _vm.data.config.borderColor, background:  _vm.data.config.bgc}, _vm.handleSubTableStyle(widget, children)))},[_vm._v(_vm._s(children.name))])}),(!widget.options.hiddenOperateBtn && _vm.tableWidgetColumns(widget).length > 0 && !widget.options.disabled)?_c('span',{staticClass:"last-one",style:({ borderColor: _vm.data.config.borderColor, background:  _vm.data.config.bgc, color: _vm.data.config.color })},[_c('a-button',{attrs:{"size":"small","type":"primary"},on:{"click":function($event){return _vm.addToTableData(widget, widget.model, 'addModel', true)}}},[_vm._v("添加行")])],1):_vm._e()],2),(Array.isArray(_vm.tableData[widget.model]))?[(_vm.isTablePaginationActive(widget))?[_vm._l((_vm.currTablePageData(widget.model)),function(source,idx){return _c('table-item',{key:(_vm.tablePageInfo[widget.model].current - 1) * _vm.tablePageInfo[widget.model].pageSize + idx,attrs:{"widget":widget,"index":(_vm.tablePageInfo[widget.model].current - 1) * _vm.tablePageInfo[widget.model].pageSize  + idx,"data":_vm.data,"rules":_vm.rules,"models":_vm.models,"handleDeleteRow":_vm.handleDeleteRow,"source":source}})}),(_vm.tablePageInfo[widget.model] && _vm.tablePageInfo[widget.model].total > 10)?_c('div',{staticClass:"hasWidgetAfter",staticStyle:{"padding":"10px","position":"absolute","top":"100%"},style:({borderColor:_vm.data.config.borderColor})},[_c('a-pagination',{attrs:{"show-quick-jumper":"","show-size-changer":"","total":_vm.tablePageInfo[widget.model].total},on:{"change":function () {
                                     var args = [], len = arguments.length;
                                     while ( len-- ) args[ len ] = arguments[ len ];
 
@@ -143091,17 +144225,17 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
                                     while ( len-- ) args[ len ] = arguments[ len ];
 
                                     return _vm.tablePageChange.apply(void 0, [ widget ].concat( args ));
-}},model:{value:(_vm.tablePageInfo[widget.model].current),callback:function ($$v) {_vm.$set(_vm.tablePageInfo[widget.model], "current", $$v)},expression:"tablePageInfo[widget.model].current"}})],1):_vm._e()]:_c('virtual-list',{staticClass:"virtual-list",attrs:{"keeps":50,"page-mode":"","data-key":function (ref) {
+}},model:{value:(_vm.tablePageInfo[widget.model].current),callback:function ($$v) {_vm.$set(_vm.tablePageInfo[widget.model], "current", $$v)},expression:"tablePageInfo[widget.model].current"}})],1):_vm._e()]:(widget.type === 'newTable')?_vm._l((_vm.tableData[widget.model]),function(source,idx){return _c('table-item',{key:source.rand_id || source.hashKey || idx,attrs:{"widget":widget,"index":idx,"data":_vm.data,"rules":_vm.rules,"models":_vm.models,"handleDeleteRow":_vm.handleDeleteRow,"source":source}})}):(_vm.isTableUseVirtualScroll(widget) && _vm.tableData[widget.model].length)?_c('virtual-list',{ref:function (el) { return _vm.setVirtualTableRef(el, widget.model); },refInFor:true,staticClass:"virtual-list",attrs:{"keeps":_vm.getTableVirtualKeeps(widget),"estimate-size":45,"page-mode":"","data-key":function (ref) {
                       var model = ref.model;
                       var idx = ref.index;
                       var rand_id = ref.rand_id;
-  return rand_id || (model + idx) },"data-sources":_vm.tableData[widget.model],"data-component":_vm.tableItem,"extra-props":{ widget: widget, models: _vm.models, data: _vm.data, rules: _vm.rules, handleDeleteRow: _vm.handleDeleteRow}}})]:_vm._e(),(
+  return rand_id || (model + idx) },"data-sources":_vm.tableData[widget.model],"data-component":_vm.tableItem,"extra-props":{ widget: widget, models: _vm.models, data: _vm.data, rules: _vm.rules, handleDeleteRow: _vm.handleDeleteRow}}}):_vm._e()]:_vm._e(),(
                       widget.options.computingSub.length > 0 &&
                       widget.options.computingMethod.length > 0 &&
                       _vm.tableData &&
                       _vm.tableData[widget.model] &&
                       _vm.tableData[widget.model].length > 0
-                    )?_c('div',{staticClass:"computed-wrap"},[_c('div',{staticClass:"item"},[_c('div',[_vm._v("需统计字段")]),_vm._l((widget.options.computingSub),function(_item,key){return _c('div',{key:key},[_vm._v(" "+_vm._s(_vm.getSubName(_item, _vm.tableWidgetColumns(widget)))+" ")])})],2),_vm._l((widget.options.computingMethod),function(_methodItem,key){return _c('div',{key:key,staticClass:"item"},[_c('div',[_vm._v(_vm._s(_vm.getMethodName(_methodItem)))]),_vm._l((widget.options.computingSub),function(_subItem,it_key){return _c('div',{key:it_key},[_vm._v(" "+_vm._s(_vm.getMathResult(_methodItem, _vm.models[widget.model], _subItem))+" ")])})],2)})],2):_vm._e()],2)]):(widget.options.layoutModel === 'design')?_c('a-spin',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"table_border row-item",style:({ borderColor: _vm.data.config.borderColor }),attrs:{"spinning":_vm.tableLoading && !_vm.formLoading,"tip":"数据加载中"}},[_c('tableComponent',{attrs:{"isApply":_vm.isApply,"isDesign":_vm.isDesign,"widget":widget,"tableData":_vm.tableData,"rules":_vm.rules,"models":_vm.models,"formId":_vm.data.formId,"index":index,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event},"addToTableData":_vm.addToTableData,"handleDeleteRow":_vm.handleDeleteRow}})],1):_vm._e()]:(widget.type === 'grid')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('grid-component',{attrs:{"rules":_vm.rules,"models":_vm.models,"widget":widget,"index":index,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"verifyLogs":_vm.verifyLogs,"config":_vm.data.config,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'grid-lay-out')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",class:widget.type == 'grid-lay-out' ? ' no-row-item ' : '',style:({ borderColor: _vm.data.config.borderColor })},[_c('grid-layout-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"index":index,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"verifyLogs":_vm.verifyLogs,"listindex":listindex,"config":_vm.data.config,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'verify')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('verify-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"verifyNode":_vm.verifyNode,"verifyLogs":_vm.verifyLogs,"suggest":_vm.suggest,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'all-lay-out')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('all-layout-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"index":index,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'placeholder')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,class:{
+                    )?_c('div',{staticClass:"computed-wrap"},[_c('div',{staticClass:"item"},[_c('div',[_vm._v("需统计字段")]),_vm._l((widget.options.computingSub),function(_item,key){return _c('div',{key:key},[_vm._v(" "+_vm._s(_vm.getSubName(_item, _vm.tableWidgetColumns(widget)))+" ")])})],2),_vm._l((widget.options.computingMethod),function(_methodItem,key){return _c('div',{key:key,staticClass:"item"},[_c('div',[_vm._v(_vm._s(_vm.getMethodName(_methodItem)))]),_vm._l((widget.options.computingSub),function(_subItem,it_key){return _c('div',{key:it_key},[_vm._v(" "+_vm._s(_vm.getMathResult(_methodItem, _vm.models[widget.model], _subItem))+" ")])})],2)})],2):_vm._e()],2)]):(widget.options.layoutModel === 'design')?_c('a-spin',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"table_border row-item",style:({ borderColor: _vm.data.config.borderColor }),attrs:{"spinning":_vm.tableLoading && !_vm.formLoading,"tip":"数据加载中"}},[(widget.type === 'newTable')?_c('newTableComponent',{attrs:{"isApply":_vm.isApply,"isDesign":_vm.isDesign,"widget":widget,"tableData":_vm.tableData,"rules":_vm.rules,"models":_vm.models,"formId":_vm.data.formId,"index":index,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event},"addToTableData":_vm.addToTableData,"handleDeleteRow":_vm.handleDeleteRow}}):_c('tableComponent',{attrs:{"isApply":_vm.isApply,"isDesign":_vm.isDesign,"widget":widget,"tableData":_vm.tableData,"rules":_vm.rules,"models":_vm.models,"formId":_vm.data.formId,"index":index,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event},"addToTableData":_vm.addToTableData,"handleDeleteRow":_vm.handleDeleteRow}})],1):_vm._e()]:(widget.type === 'grid')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('grid-component',{attrs:{"rules":_vm.rules,"models":_vm.models,"widget":widget,"index":index,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"verifyLogs":_vm.verifyLogs,"config":_vm.data.config,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'grid-lay-out')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",class:widget.type == 'grid-lay-out' ? ' no-row-item ' : '',style:({ borderColor: _vm.data.config.borderColor })},[_c('grid-layout-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"index":index,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"verifyLogs":_vm.verifyLogs,"listindex":listindex,"config":_vm.data.config,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'verify')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('verify-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"verifyNode":_vm.verifyNode,"verifyLogs":_vm.verifyLogs,"suggest":_vm.suggest,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'all-lay-out')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",style:({ borderColor: _vm.data.config.borderColor })},[_c('all-layout-component',{attrs:{"widget":widget,"rules":_vm.rules,"models":_vm.models,"index":index,"listindex":listindex,"applyId":_vm.applyId},on:{"update:rules":function($event){_vm.rules=$event},"update:models":function($event){_vm.models=$event}}})],1):(widget.type == 'placeholder')?_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,class:{
                 'item-bottom': !widget.options.border,
                 'row-item': widget.options.border,
               },style:({ borderColor: _vm.data.config.borderColor })},[_c('layout-item',{attrs:{"widget":widget,"models":_vm.models,"rules":_vm.rules,"verifyNode":_vm.verifyNode,"verifyLogs":_vm.verifyLogs,"applyId":_vm.applyId},on:{"update:models":function($event){_vm.models=$event},"update:rules":function($event){_vm.rules=$event}}})],1):_c('div',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView && widget.type != 'hidden'),expression:"widget.options.canView && widget.type != 'hidden'"}],key:index,staticClass:"row-item",class:{hiddenWidget:widget.type == 'hidden'},style:({ borderColor: _vm.data.config.borderColor })},[_c('layout-item',{attrs:{"widget":widget,"models":_vm.models,"verifyNode":_vm.verifyNode,"verifyLogs":_vm.verifyLogs,"suggest":_vm.suggest,"dataObj":_vm.data,"rules":_vm.rules,"applyId":_vm.applyId},on:{"update:models":function($event){_vm.models=$event},"update:rules":function($event){_vm.rules=$event}}})],1)]})],2),(_vm.data.config.pageFooter && listindex === _vm.widgetList.length - 1)?_c('div',{style:(_vm.data.config.footerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageFooter)}}):_vm._e()],2)}),0)],1)}
@@ -143112,15 +144246,15 @@ var staticRenderFns = []
 var layoutForPapervue_type_script_lang_js = __webpack_require__(49218);
 ;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=script&lang=js
  /* harmony default export */ const layout_layoutForPapervue_type_script_lang_js = (layoutForPapervue_type_script_lang_js/* default */.A); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=73194dd8&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=7dc51789&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=73194dd8&prod&lang=less&scoped=true
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=7dc51789&prod&lang=less&scoped=true
 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=73194dd8&prod&lang=css
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=7dc51789&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=73194dd8&prod&lang=css
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=7dc51789&prod&lang=css
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(64008);
@@ -143140,7 +144274,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "73194dd8",
+  "7dc51789",
   null
   
 )
@@ -143221,8 +144355,8 @@ var component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const CorrectionModal = (component.exports);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(5882);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
+var components = __webpack_require__(40000);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.5@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(55469);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -144415,8 +145549,8 @@ var vuedraggable_umd = __webpack_require__(59715);
 var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(5335);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(5882);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
+var components = __webpack_require__(40000);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(31227);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -162354,7 +163488,7 @@ function toString(value) {
 (module) {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.689-AI.7"}');
+module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.689-AI.9"}');
 
 /***/ }
 
@@ -176156,7 +177290,7 @@ var SvgIcon_component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const SvgIcon = (SvgIcon_component.exports);
 // EXTERNAL MODULE: ./src/form/modules/layout/layoutForPaper.vue + 6 modules
-var layoutForPaper = __webpack_require__(48498);
+var layoutForPaper = __webpack_require__(89715);
 // EXTERNAL MODULE: ./src/form/modules/layout/layoutItem.vue + 10 modules
 var layoutItem = __webpack_require__(92241);
 ;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/Container.vue?vue&type=template&id=497bb086
@@ -176170,9 +177304,9 @@ var es_array_reduce = __webpack_require__(69686);
 var es_iterator_reduce = __webpack_require__(38331);
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/web.dom-exception.stack.js
 var web_dom_exception_stack = __webpack_require__(17305);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetList.vue?vue&type=template&id=7f5cfb32&scoped=true
-var widgetListvue_type_template_id_7f5cfb32_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"components-list"},[_c('div',{staticClass:"tabs"},[_c('span',{class:{ activeTab: _vm.activeTab == 0 },on:{"click":function($event){return _vm.triggertab(0)}}},[_vm._v("基础控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 1 },on:{"click":function($event){return _vm.triggertab(1)}}},[_vm._v("高级控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 2 },on:{"click":function($event){return _vm.triggertab(2)}}},[_vm._v("布局控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 3 },on:{"click":function($event){return _vm.triggertab(3)}}},[_vm._v("公文相关")]),_c('span',{class:{ activeTab: _vm.activeTab == 4 },on:{"click":function($event){return _vm.triggertab(4)}}},[_vm._v("个性化")])]),(_vm.basicFields.length && _vm.activeTab == 0)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.basicComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.basicComponents),function(item,index){return [_c('li',{key:index,staticClass:"widget-control",class:{ 'no-put': item.type == 'divider' }},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])])]})],2)]:_vm._e(),(_vm.advanceFields.length && _vm.activeTab == 1)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.advanceComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.advanceComponents),function(item,index){return [(_vm.advanceFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control",class:{ 'no-put': item.type == 'table' }},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.layoutFields.length && _vm.activeTab == 2)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.layoutComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.layoutComponents),function(item,index){return [(_vm.layoutFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.specFields.length && _vm.activeTab == 3)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.specComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.specComponents),function(item,index){return [(_vm.specFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.hnkjComponentsConfig.length && _vm.activeTab == 4)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.hnkjComponentsConfig,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.hnkjComponentsConfig),function(item,index){return [_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])])]})],2)]:_vm._e()],2)}
-var widgetListvue_type_template_id_7f5cfb32_scoped_true_staticRenderFns = []
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetList.vue?vue&type=template&id=27422f7c&scoped=true
+var widgetListvue_type_template_id_27422f7c_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"components-list"},[_c('div',{staticClass:"tabs"},[_c('span',{class:{ activeTab: _vm.activeTab == 0 },on:{"click":function($event){return _vm.triggertab(0)}}},[_vm._v("基础控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 1 },on:{"click":function($event){return _vm.triggertab(1)}}},[_vm._v("高级控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 2 },on:{"click":function($event){return _vm.triggertab(2)}}},[_vm._v("布局控件")]),_c('span',{class:{ activeTab: _vm.activeTab == 3 },on:{"click":function($event){return _vm.triggertab(3)}}},[_vm._v("公文相关")]),_c('span',{class:{ activeTab: _vm.activeTab == 4 },on:{"click":function($event){return _vm.triggertab(4)}}},[_vm._v("个性化")])]),(_vm.basicFields.length && _vm.activeTab == 0)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.basicComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.basicComponents),function(item,index){return [_c('li',{key:index,staticClass:"widget-control",class:{ 'no-put': item.type == 'divider' }},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])])]})],2)]:_vm._e(),(_vm.advanceFields.length && _vm.activeTab == 1)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.advanceComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.advanceComponents),function(item,index){return [(_vm.advanceFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control",class:{ 'no-put': item.type == 'table' || item.type == 'newTable' }},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.layoutFields.length && _vm.activeTab == 2)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.layoutComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.layoutComponents),function(item,index){return [(_vm.layoutFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.specFields.length && _vm.activeTab == 3)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.specComponents,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.specComponents),function(item,index){return [(_vm.specFields.indexOf(item.type) >= 0)?_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])]):_vm._e()]})],2)]:_vm._e(),(_vm.hnkjComponentsConfig.length && _vm.activeTab == 4)?[_c('draggable',_vm._b({attrs:{"setData":function () {},"tag":"ul","list":_vm.hnkjComponentsConfig,"move":_vm.handleMove},on:{"end":_vm.handleMoveEnd,"start":_vm.handleMoveStart}},'draggable',_vm.draggableOptions,false),[_vm._l((_vm.hnkjComponentsConfig),function(item,index){return [_c('li',{key:index,staticClass:"widget-control no-put"},[_c('a',[_c('i',{staticClass:"icon iconfont",class:item.icon}),_c('span',[_vm._v(_vm._s(item.name))])])])]})],2)]:_vm._e()],2)}
+var widgetListvue_type_template_id_27422f7c_scoped_true_staticRenderFns = []
 
 
 ;// ./src/form/modules/config/defaultConfig.js
@@ -176659,6 +177793,43 @@ const advanceComponents = [{
   key: '',
   model: '',
   rules: []
+}, {
+  type: 'newTable',
+  name: '新子表单',
+  icon: 'icon-input',
+  options: {
+    layoutModel: 'auto',
+    defaultValue: [],
+    columnsNum: 4,
+    rowsNum: 2,
+    rowsHeight: 50,
+    inline: false,
+    inlineWidth: 200,
+    customClass: '',
+    remoteFunc: '',
+    remoteOptions: [],
+    canEdit: true,
+    height: 70,
+    canView: true,
+    enableIndex: true,
+    hiddenOperateBtn: false,
+    defaulcanView: true,
+    computingMethod: [],
+    computingSub: [],
+    auditorExport: false,
+    supportPage: false
+  },
+  columns: [],
+  designList: [{
+    x: 0,
+    y: 0,
+    w: 1,
+    h: 1,
+    i: '1'
+  }],
+  key: '',
+  model: '',
+  rules: []
 },
 // {
 //     type: 'blank',
@@ -177430,7 +178601,7 @@ const specComponents = [{
     },
     advanceFields: {
       type: Array,
-      default: () => ["table", "blank", "imgupload", "fileupload", "uploadModel", "editor", "cascader", "deptSelector", "userSelector", "userSelectorByRole", "idea-sign", "relateSub", "signatureWrite", "location", "imgCode", "publicSign", "responsibility", "dataTable"]
+      default: () => ["table", "newTable", "blank", "imgupload", "fileupload", "uploadModel", "editor", "cascader", "deptSelector", "userSelector", "userSelectorByRole", "idea-sign", "relateSub", "signatureWrite", "location", "imgCode", "publicSign", "responsibility", "dataTable"]
     },
     layoutFields: {
       type: Array,
@@ -177493,10 +178664,10 @@ const specComponents = [{
 });
 ;// ./src/form/modules/widgetList.vue?vue&type=script&lang=js
  /* harmony default export */ const modules_widgetListvue_type_script_lang_js = (widgetListvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetList.vue?vue&type=style&index=0&id=7f5cfb32&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetList.vue?vue&type=style&index=0&id=27422f7c&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/widgetList.vue?vue&type=style&index=0&id=7f5cfb32&prod&lang=less&scoped=true
+;// ./src/form/modules/widgetList.vue?vue&type=style&index=0&id=27422f7c&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/widgetList.vue
 
@@ -177509,22 +178680,22 @@ const specComponents = [{
 
 var widgetList_component = (0,componentNormalizer/* default */.A)(
   modules_widgetListvue_type_script_lang_js,
-  widgetListvue_type_template_id_7f5cfb32_scoped_true_render,
-  widgetListvue_type_template_id_7f5cfb32_scoped_true_staticRenderFns,
+  widgetListvue_type_template_id_27422f7c_scoped_true_render,
+  widgetListvue_type_template_id_27422f7c_scoped_true_staticRenderFns,
   false,
   null,
-  "7f5cfb32",
+  "27422f7c",
   null
   
 )
 
 /* harmony default export */ const widgetList = (widgetList_component.exports);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetForm.vue?vue&type=template&id=ca6b73ae&scoped=true
-var widgetFormvue_type_template_id_ca6b73ae_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"widget-form",class:{ 'no-border': !_vm.data.config.border },style:(_vm.widgetFormStyle)},[(_vm.widgetList[0].length == 0)?_c('div',{staticClass:"form-empty"},[_c('a-icon',{attrs:{"type":"inbox"}}),_c('p',[_vm._v("从左侧拖拽控件到此区域")])],1):_vm._e(),_c('a-form-model',{attrs:{"model":_vm.form,"label-col":{ style: 'width:200px' },"wrapper-col":{}}},[_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, {height: _vm.formNameHeight}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.data.config.pageHeader && listindex == 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('draggable',_vm._b({attrs:{"setData":function () {}},on:{"end":function (e) {
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetForm.vue?vue&type=template&id=aa7a7266&scoped=true
+var widgetFormvue_type_template_id_aa7a7266_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"widget-form",class:{ 'no-border': !_vm.data.config.border },style:(_vm.widgetFormStyle)},[(_vm.widgetList[0].length == 0)?_c('div',{staticClass:"form-empty"},[_c('a-icon',{attrs:{"type":"inbox"}}),_c('p',[_vm._v("从左侧拖拽控件到此区域")])],1):_vm._e(),_c('a-form-model',{attrs:{"model":_vm.form,"label-col":{ style: 'width:200px' },"wrapper-col":{}}},[_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, {height: _vm.formNameHeight}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.data.config.pageHeader && listindex == 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('draggable',_vm._b({attrs:{"setData":function () {}},on:{"end":function (e) {
             _vm.handleMoveEnd(e, listindex);
           },"add":function (e) {
             _vm.handleWidgetAdd(e, listindex);
-          }},model:{value:(_vm.widgetList[listindex]),callback:function ($$v) {_vm.$set(_vm.widgetList, listindex, $$v)},expression:"widgetList[listindex]"}},'draggable',_vm.draggableOptions,false),[_c('transition-group',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[listindex].length > 0),expression:"widgetList[listindex].length > 0"}],staticClass:"widget-form-list",attrs:{"name":"fade","tag":"div"}},[_vm._l((list),function(widget,index){return [(widget.type == 'table')?[(widget && widget.key)?_c('div',{key:widget.key,staticClass:"row-item"},[(
+          }},model:{value:(_vm.widgetList[listindex]),callback:function ($$v) {_vm.$set(_vm.widgetList, listindex, $$v)},expression:"widgetList[listindex]"}},'draggable',_vm.draggableOptions,false),[_c('transition-group',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[listindex].length > 0),expression:"widgetList[listindex].length > 0"}],staticClass:"widget-form-list",attrs:{"name":"fade","tag":"div"}},[_vm._l((list),function(widget,index){return [(widget.type == 'table' || widget.type == 'newTable')?[(widget && widget.key)?_c('div',{key:widget.key,staticClass:"row-item"},[(
                     widget.options.layoutModel === 'auto' ||
                     widget.options.layoutModel === undefined
                   )?_c('div',{key:index,staticClass:"row_table",class:{
@@ -177535,7 +178706,15 @@ var widgetFormvue_type_template_id_ca6b73ae_scoped_true_render = function () {va
                             index,
                             listindex,
                             'auto'
-                          )}},model:{value:(widget.columns),callback:function ($$v) {_vm.$set(widget, "columns", $$v)},expression:"widget.columns"}},'draggable',_vm.draggableOptions,false),_vm._l((widget.columns),function(item,idx){return _c('div',{key:idx},[_c('widget-form-item',{staticStyle:{"max-width":"200px","min-width":"200px","border":"1px dashed rgba(170, 170, 170, 0.7)","margin":"8px"},attrs:{"showLabel":false,"index":idx,"widget":item,"widgetListCell":widget.columns,"widgetList":_vm.widgetList,"select":_vm.selectWidget,"tableKey":widget.model},on:{"update:select":function($event){_vm.selectWidget=$event}}})],1)}),0),(_vm.selectWidget.key == widget.key)?_c('div',{staticClass:"widget-view-action"},[_c('i',{staticClass:"iconfont icon-trash",on:{"click":function($event){$event.stopPropagation();return _vm.handleWidgetDelete(index, listindex)}}})]):_vm._e(),(_vm.selectWidget.key == widget.key)?_c('div',{staticClass:"widget-view-drag"},[_c('i',{staticClass:"iconfont icon-drag drag-widget"})]):_vm._e(),_c('div',{staticClass:"widget-view-model"},[_c('span',[_vm._v(_vm._s(widget.model))])])],1)])]):(widget.options.layoutModel === 'design')?_c('div',{staticClass:"table-design"},[(widget && widget.key)?_c('div',{key:widget.key,attrs:{"title":widget.key},on:{"click":function($event){$event.stopPropagation();return _vm.handleSelectWidget(index, listindex)}}},[_c('table-widget-design',{attrs:{"index":index,"listindex":listindex,"widget":widget,"selectedWidget":_vm.selectWidget},on:{"update:selectedWidget":function($event){_vm.selectWidget=$event},"update:selected-widget":function($event){_vm.selectWidget=$event},"handleWidgetTableAdd":function ($event, widget, colIndex) {
+                          )}},model:{value:(widget.columns),callback:function ($$v) {_vm.$set(widget, "columns", $$v)},expression:"widget.columns"}},'draggable',_vm.draggableOptions,false),_vm._l((widget.columns),function(item,idx){return _c('div',{key:idx},[_c('widget-form-item',{staticStyle:{"max-width":"200px","min-width":"200px","border":"1px dashed rgba(170, 170, 170, 0.7)","margin":"8px"},attrs:{"showLabel":false,"index":idx,"widget":item,"widgetListCell":widget.columns,"widgetList":_vm.widgetList,"select":_vm.selectWidget,"tableKey":widget.model},on:{"update:select":function($event){_vm.selectWidget=$event}}})],1)}),0),(_vm.selectWidget.key == widget.key)?_c('div',{staticClass:"widget-view-action"},[_c('i',{staticClass:"iconfont icon-trash",on:{"click":function($event){$event.stopPropagation();return _vm.handleWidgetDelete(index, listindex)}}})]):_vm._e(),(_vm.selectWidget.key == widget.key)?_c('div',{staticClass:"widget-view-drag"},[_c('i',{staticClass:"iconfont icon-drag drag-widget"})]):_vm._e(),_c('div',{staticClass:"widget-view-model"},[_c('span',[_vm._v(_vm._s(widget.model))])])],1)])]):(widget.options.layoutModel === 'design')?_c('div',{staticClass:"table-design"},[(widget && widget.key)?_c('div',{key:widget.key,attrs:{"title":widget.key},on:{"click":function($event){$event.stopPropagation();return _vm.handleSelectWidget(index, listindex)}}},[(widget.type === 'newTable')?_c('new-table-widget-design',{attrs:{"index":index,"listindex":listindex,"widget":widget,"selectedWidget":_vm.selectWidget},on:{"update:selectedWidget":function($event){_vm.selectWidget=$event},"update:selected-widget":function($event){_vm.selectWidget=$event},"handleWidgetTableAdd":function ($event, widget, colIndex) {
+                          _vm.handleWidgetTableAdd(
+                            $event,
+                            widget,
+                            colIndex,
+                            listindex,
+                            'design'
+                          );
+                        },"handlTableDelete":_vm.handleWidgetDelete}}):_c('table-widget-design',{attrs:{"index":index,"listindex":listindex,"widget":widget,"selectedWidget":_vm.selectWidget},on:{"update:selectedWidget":function($event){_vm.selectWidget=$event},"update:selected-widget":function($event){_vm.selectWidget=$event},"handleWidgetTableAdd":function ($event, widget, colIndex) {
                           _vm.handleWidgetTableAdd(
                             $event,
                             widget,
@@ -177571,7 +178750,7 @@ var widgetFormvue_type_template_id_ca6b73ae_scoped_true_render = function () {va
                   'item-bottom': !widget.options.border,
                   'row-item': widget.options.border,
                 },style:({ borderColor: _vm.data.config.borderColor })},[_c('widget-form-item',{key:widget.key,attrs:{"index":index,"widget":widget,"widgetListCell":_vm.widgetList[listindex],"widgetList":_vm.widgetList,"select":_vm.selectWidget},on:{"updatePaperLayout":_vm.updatePaperLayout,"update:select":function($event){_vm.selectWidget=$event}}})],1)]:[(widget && widget.key)?_c('div',{key:widget.key,staticClass:"row-item"},[_c('widget-form-item',{key:widget.key,attrs:{"index":index,"widget":widget,"widgetListCell":_vm.widgetList[listindex],"widgetList":_vm.widgetList,"select":_vm.selectWidget},on:{"updatePaperLayout":_vm.updatePaperLayout,"update:select":function($event){_vm.selectWidget=$event}}})],1):_vm._e()]]})],2)],1),(_vm.data.config.pageFooter && listindex === _vm.widgetList.length - 1)?_c('div',{staticClass:"form-page-footer",style:(_vm.data.config.footerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageFooter)}}):_vm._e()],1)}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length == 0),expression:"widgetList[0].length == 0"}],staticClass:"paper",style:(_vm.contentStyle)},[_c('div',{staticClass:"form-title"},[_vm._v(_vm._s(_vm.data.config.formName))]),(_vm.data.config.pageHeader)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('draggable',_vm._b({attrs:{"setData":function () {}},on:{"end":_vm.handleMoveEnd,"add":_vm.handleWidgetAdd},model:{value:(_vm.widgetList[0]),callback:function ($$v) {_vm.$set(_vm.widgetList, 0, $$v)},expression:"widgetList[0]"}},'draggable',_vm.draggableOptions,false),[_c('transition-group',{staticClass:"widget-form-list widget-form-ocuupied",attrs:{"name":"fade","tag":"div"}})],1),(_vm.data.config.pageFooter)?_c('div',{style:(_vm.data.config.footerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageFooter)}}):_vm._e()],1)],2)],1)}
-var widgetFormvue_type_template_id_ca6b73ae_scoped_true_staticRenderFns = []
+var widgetFormvue_type_template_id_aa7a7266_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/es.array.sort.js
@@ -177580,8 +178759,8 @@ var es_array_sort = __webpack_require__(15360);
 var es_array_unshift = __webpack_require__(13255);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(78393);
-// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(5882);
+// EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
+var components = __webpack_require__(40000);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 5 modules
 var widgetFormItem = __webpack_require__(48942);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules
@@ -178011,6 +179190,26 @@ var form_util = __webpack_require__(36113);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -178029,7 +179228,7 @@ var form_util = __webpack_require__(36113);
   name: "widgetForm",
   data() {
     return {
-      fiBlist: ["verify", "grid", "table", "grid-lay-out", "all-lay-out", "idea-sign", "editorAirt", "dataTable", "hnkj-confirm"],
+      fiBlist: ["verify", "grid", "table", "newTable", "all-lay-out", "idea-sign", "editorAirt", "dataTable", "hnkj-confirm"],
       form: this.$form.createForm(this),
       widgetList: [[]],
       selectWidget: this.selectedWidget,
@@ -178355,11 +179554,11 @@ var form_util = __webpack_require__(36113);
         key,
         model: (this.widgetList[listindex][newIndex]["model"] ? this.widgetList[listindex][newIndex]["model"] : this.widgetList[listindex][newIndex].type) + "_" + key,
         rules: [],
-        columns: this.widgetList[listindex][newIndex].type === 'table' ? [] : this.widgetList[listindex][newIndex].columns
+        columns: ['table', 'newTable'].includes(this.widgetList[listindex][newIndex].type) ? [] : this.widgetList[listindex][newIndex].columns
       });
 
       /****table 避免共享designList***/
-      if (this.widgetList[listindex][newIndex].type === "table") {
+      if (['table', 'newTable'].includes(this.widgetList[listindex][newIndex].type)) {
         const newWidget = (0,cloneDeep/* default */.A)(this.widgetList[listindex][newIndex]);
         if (newWidget.options.enableIndex) {
           newWidget.columns.unshift(this.generateTableIndexConf(newWidget));
@@ -178528,7 +179727,7 @@ var form_util = __webpack_require__(36113);
       this.$set(row.columns, newIndex, {
         ...row.columns[newIndex],
         designColIndex: colIndex,
-        parentType: 'table',
+        parentType: row.type || 'table',
         options: {
           ...row.columns[newIndex].options,
           remoteFunc: "func_" + key
@@ -178572,10 +179771,10 @@ var form_util = __webpack_require__(36113);
 });
 ;// ./src/form/modules/widgetForm.vue?vue&type=script&lang=js
  /* harmony default export */ const modules_widgetFormvue_type_script_lang_js = (widgetFormvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetForm.vue?vue&type=style&index=0&id=ca6b73ae&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetForm.vue?vue&type=style&index=0&id=aa7a7266&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/widgetForm.vue?vue&type=style&index=0&id=ca6b73ae&prod&lang=less&scoped=true
+;// ./src/form/modules/widgetForm.vue?vue&type=style&index=0&id=aa7a7266&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/widgetForm.vue
 
@@ -178588,23 +179787,23 @@ var form_util = __webpack_require__(36113);
 
 var widgetForm_component = (0,componentNormalizer/* default */.A)(
   modules_widgetFormvue_type_script_lang_js,
-  widgetFormvue_type_template_id_ca6b73ae_scoped_true_render,
-  widgetFormvue_type_template_id_ca6b73ae_scoped_true_staticRenderFns,
+  widgetFormvue_type_template_id_aa7a7266_scoped_true_render,
+  widgetFormvue_type_template_id_aa7a7266_scoped_true_staticRenderFns,
   false,
   null,
-  "ca6b73ae",
+  "aa7a7266",
   null
   
 )
 
 /* harmony default export */ const widgetForm = (widgetForm_component.exports);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetConfig.vue?vue&type=template&id=45ff2fe2&scoped=true
-var widgetConfigvue_type_template_id_45ff2fe2_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.selectedWidget && _vm.selectedWidget.key)?_c('div',[(_vm.selectedWidget.type)?_c('widget-public-config',{attrs:{"widget":_vm.selectedWidget,"datalist":_vm.datalist}},[(_vm.selectedWidget.type == 'input')?[_c('inputWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'textarea')?[_c('textareaWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'number')?[_c('numberWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'switch')?[_c('switchWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'radio')?[_c('radioWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'checkbox')?[_c('checkboxWidgetSetup',{attrs:{"widget":_vm.selectedWidget,"datalist":_vm.datalist}})]:(_vm.selectedWidget.type == 'rate')?[_c('rateWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'slider')?[_c('sliderWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'hidden')?[_c('hiddenWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'superLink')?[_c('superLinkWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'codeControl')?[_c('codeControlWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'placeholder')?[_c('placeholderWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'select')?[_c('selectWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'cascaderSelect')?[_c('cascader-select-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'table')?[_c('tableWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'signature')?[_c('signatureWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'grid')?[_c('gridWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'grid-lay-out')?[_c('gridLayoutWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'all-lay-out')?[_c('allLayoutWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'verify')?[_c('verifyWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'idea-sign')?[_c('ideaSignWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'uploadModel')?[_c('uploadModelWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'relateSub')?[_c('relateSubWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'userSelector')?[_c('userSelectorWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'userSelectorByRole')?[_c('userSelectorByRoleWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'imgupload')?[_c('imgUploadWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'deptSelector')?[_c('departSelectorWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'dataTable')?[_c('dataTableWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'fileupload')?[_c('fileUploadWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'time')?[_c('timeWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'date')?[_c('dateWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'editorAirt')?[_c('editorAirtWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'responsibility')?[_c('responsibility-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'location')?[_c('location-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:_vm._e(),_vm._l((_vm.HnKjTypes),function(hnkjType){return [(hnkjType === _vm.selectedWidget.type)?_c(hnkjType + 'Setup',{tag:"component",attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}}):_vm._e()]})],2):_vm._e(),_c('editorDefalutModal',{ref:"editorDefalutModal",on:{"ok":_vm.editorDefalutModalOk}})],1):_c('div',{staticClass:"config-empty"},[_c('a-icon',{attrs:{"type":"select"}}),_c('p',[_vm._v("请选择一个控件以配置属性")])],1)}
-var widgetConfigvue_type_template_id_45ff2fe2_scoped_true_staticRenderFns = []
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetConfig.vue?vue&type=template&id=6aa7533c&scoped=true
+var widgetConfigvue_type_template_id_6aa7533c_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.selectedWidget && _vm.selectedWidget.key)?_c('div',[(_vm.selectedWidget.type)?_c('widget-public-config',{attrs:{"widget":_vm.selectedWidget,"datalist":_vm.datalist}},[(_vm.selectedWidget.type == 'input')?[_c('inputWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'textarea')?[_c('textareaWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'number')?[_c('numberWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'switch')?[_c('switchWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'radio')?[_c('radioWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'checkbox')?[_c('checkboxWidgetSetup',{attrs:{"widget":_vm.selectedWidget,"datalist":_vm.datalist}})]:(_vm.selectedWidget.type == 'rate')?[_c('rateWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'slider')?[_c('sliderWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'hidden')?[_c('hiddenWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'superLink')?[_c('superLinkWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'codeControl')?[_c('codeControlWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'placeholder')?[_c('placeholderWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'select')?[_c('selectWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'cascaderSelect')?[_c('cascader-select-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'table' || _vm.selectedWidget.type == 'newTable')?[(_vm.selectedWidget.type == 'table')?_c('tableWidgetSetup',{attrs:{"widget":_vm.selectedWidget}}):_c('newTableWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'signature')?[_c('signatureWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'grid')?[_c('gridWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'grid-lay-out')?[_c('gridLayoutWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'all-lay-out')?[_c('allLayoutWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'verify')?[_c('verifyWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'idea-sign')?[_c('ideaSignWidgetSetup',{attrs:{"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'uploadModel')?[_c('uploadModelWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'relateSub')?[_c('relateSubWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'userSelector')?[_c('userSelectorWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'userSelectorByRole')?[_c('userSelectorByRoleWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'imgupload')?[_c('imgUploadWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'deptSelector')?[_c('departSelectorWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'dataTable')?[_c('dataTableWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'fileupload')?[_c('fileUploadWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'time')?[_c('timeWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'date')?[_c('dateWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'editorAirt')?[_c('editorAirtWidgetSetup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'responsibility')?[_c('responsibility-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:(_vm.selectedWidget.type == 'location')?[_c('location-setup',{attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}})]:_vm._e(),_vm._l((_vm.HnKjTypes),function(hnkjType){return [(hnkjType === _vm.selectedWidget.type)?_c(hnkjType + 'Setup',{tag:"component",attrs:{"datalist":_vm.datalist,"widget":_vm.selectedWidget}}):_vm._e()]})],2):_vm._e(),_c('editorDefalutModal',{ref:"editorDefalutModal",on:{"ok":_vm.editorDefalutModalOk}})],1):_c('div',{staticClass:"config-empty"},[_c('a-icon',{attrs:{"type":"select"}}),_c('p',[_vm._v("请选择一个控件以配置属性")])],1)}
+var widgetConfigvue_type_template_id_6aa7533c_scoped_true_staticRenderFns = []
 
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetPublicConfig.vue?vue&type=template&id=5f94fdfc&scoped=true
-var widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"title",attrs:{"label":"标题"}},[_c('a-input',{model:{value:(_vm.widget.name),callback:function ($$v) {_vm.$set(_vm.widget, "name", $$v)},expression:"widget.name"}})],1),_c('a-form-model-item',{attrs:{"label":"标签宽度","prop":"title"}},[_c('a-input-number',{attrs:{"placeholder":"auto"},model:{value:(_vm.widget.options.labelWidth),callback:function ($$v) {_vm.$set(_vm.widget.options, "labelWidth", $$v)},expression:"widget.options.labelWidth"}})],1),(_vm.hasAutoHeight)?_c('a-form-model-item',{attrs:{"label":"自适应高度："}},[_c('a-switch',{model:{value:(_vm.widget.options.autoHeight),callback:function ($$v) {_vm.$set(_vm.widget.options, "autoHeight", $$v)},expression:"widget.options.autoHeight"}})],1):_vm._e(),(!_vm.widget.options.autoHeight)?_c('a-form-model-item',{attrs:{"label":"高度","prop":"title"}},[_c('a-input-number',{attrs:{"placeholder":"auto"},model:{value:(_vm.widget.options.height),callback:function ($$v) {_vm.$set(_vm.widget.options, "height", $$v)},expression:"widget.options.height"}})],1):_vm._e(),(_vm.widget.type === 'select')?_c('a-form-model-item',{ref:"bg_bgc",attrs:{"label":"背景颜色","prop":"bgcolor"}},[_c('colorPicker',{attrs:{"defaultColor":"#FFFFFF"},model:{value:(_vm.widget.options.bgColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "bgColor", $$v)},expression:"widget.options.bgColor"}})],1):_vm._e(),(!['placeholder', 'responsibility', 'fileupload', 'number', 'radio', 'checkbox', 'rate', 'switch', 'slider', 'superLink', 'codeControl', 'imgupload', 'fileupload', 'uploadModel', 'signatureWrite', 'location', 'imgCode', 'publicSign', 'responsibility', 'grid', 'editorAirt', 'hnkj-richEditor', 'hnkj-nameSignature', 'hnkj-sealSignature', 'conferenceRoom', 'all-lay-out', 'grid-lay-out', 'table' ].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"组件无边框","prop":"title"}},[_c('a-switch',{model:{value:(_vm.widget.options.noBorder),callback:function ($$v) {_vm.$set(_vm.widget.options, "noBorder", $$v)},expression:"widget.options.noBorder"}})],1):_vm._e(),(['input','textarea','placeholder'].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"下划线"}},[_c('a-switch',{model:{value:(_vm.widget.options.underline),callback:function ($$v) {_vm.$set(_vm.widget.options, "underline", $$v)},expression:"widget.options.underline"}})],1):_vm._e(),(['input','textarea','placeholder'].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"倾斜"}},[_c('a-switch',{model:{value:(_vm.widget.options.fontItalic),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontItalic", $$v)},expression:"widget.options.fontItalic"}})],1):_vm._e(),(['input', 'textarea'].includes(_vm.widget.type))?_c('div',[_c('a-form-model-item',{ref:"bgc",attrs:{"label":"字体颜色","prop":"labelwordcolor"}},[_c('colorPicker',{staticStyle:{"z-index":"3"},attrs:{"defaultColor":"#000000"},model:{value:(_vm.widget.options.fontColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontColor", $$v)},expression:"widget.options.fontColor"}})],1),_c('a-form-model-item',{ref:"bg_bgc",attrs:{"label":"背景颜色","prop":"bgcolor"}},[_c('colorPicker',{attrs:{"defaultColor":"#FFFFFF"},model:{value:(_vm.widget.options.bgColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "bgColor", $$v)},expression:"widget.options.bgColor"}})],1),_c('a-form-model-item',{attrs:{"label":"字体类型","prop":"title"}},[_c('a-select',{attrs:{"placeholder":"请选择字体"},model:{value:(_vm.widget.options.fontFamily),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontFamily", $$v)},expression:"widget.options.fontFamily"}},_vm._l((_vm.fontNames),function(item,idx){return _c('a-select-option',{key:idx,attrs:{"value":item}},[_vm._v(" "+_vm._s(item)+" ")])}),1)],1)],1):_vm._e(),(_vm.widget.type == 'codeControl')?_c('a-form-model-item',{attrs:{"label":"默认值"}},[_c('a-input',{attrs:{"disabled":""},model:{value:(_vm.widget.key),callback:function ($$v) {_vm.$set(_vm.widget, "key", $$v)},expression:"widget.key"}})],1):_vm._e(),(['imgupload', 'fileupload'].includes(_vm.widget.type) && _vm.widget.options.placeholder_1 !== undefined)?[(!_vm.seatList.includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"PC占位内容"}},[_c('a-input',{model:{value:(_vm.widget.options.placeholder_1),callback:function ($$v) {_vm.$set(_vm.widget.options, "placeholder_1", $$v)},expression:"widget.options.placeholder_1"}})],1):_vm._e()]:(!_vm.seatList.includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"占位内容"}},[_c('a-input',{model:{value:(_vm.widget.options.placeholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "placeholder", $$v)},expression:"widget.options.placeholder"}})],1):_vm._e(),(_vm.widget.type == 'superLink')?_c('a-form-model-item',{attrs:{"label":"超链接名称"}},[_c('a-input',{model:{value:(_vm.widget.options.title),callback:function ($$v) {_vm.$set(_vm.widget.options, "title", $$v)},expression:"widget.options.title"}})],1):_vm._e(),_vm._t("default"),(['input', 'textarea', 'number', 'date'].includes(_vm.widget.type) &&  !_vm.widget.form_table_index )?[_c('a-form-model-item',{attrs:{"label":"公式联动"}},[_c('warp-formula-edit',{attrs:{"datalist":_vm.datalist,"widget":_vm.widget}})],1)]:_vm._e(),(!['dataTable', 'workflowApp', 'cascaderSelect', 'hnkj-confirm', 'conferenceRoom'].includes(_vm.widget.type) && !_vm.widget.options.accurate)?_c('a-form-model-item',{attrs:{"label":"数据操作类型"}},[_c('a-select',{attrs:{"placeholder":"默认覆盖"},model:{value:(_vm.widget.options.zhuijiaType),callback:function ($$v) {_vm.$set(_vm.widget.options, "zhuijiaType", $$v)},expression:"widget.options.zhuijiaType"}},[_c('a-select-option',{attrs:{"value":"1"}},[_vm._v("覆盖")]),_c('a-select-option',{attrs:{"value":"2"}},[_vm._v("追加")])],1)],1):_vm._e(),(_vm.$route.query.jghsj === '1')?_c('a-form-model-item',{attrs:{"label":"选择入库唯一key"}},[_c('a-switch',{model:{value:(_vm.widget.isJghsjKey),callback:function ($$v) {_vm.$set(_vm.widget, "isJghsjKey", $$v)},expression:"widget.isJghsjKey"}})],1):_vm._e(),(_vm.$route.query.jghsj === '1' && _vm.widget.isJghsjKey)?_c('a-form-model-item',{attrs:{"label":"唯一key"}},[_c('a-select',{model:{value:(_vm.widget.model),callback:function ($$v) {_vm.$set(_vm.widget, "model", $$v)},expression:"widget.model"}},_vm._l((_vm.filedNameList),function(item){return _c('a-select-option',{key:item.field_name,attrs:{"value":item.field_name,"title":item.field_name_value}},[_vm._v(" "+_vm._s(item.field_name_value)+" ")])}),1)],1):_c('a-form-model-item',{attrs:{"label":"唯一key"}},[_c('a-input',{model:{value:(_vm.widget.model),callback:function ($$v) {_vm.$set(_vm.widget, "model", $$v)},expression:"widget.model"}})],1),(
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetPublicConfig.vue?vue&type=template&id=34cf2307&scoped=true
+var widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"title",attrs:{"label":"标题"}},[_c('a-input',{model:{value:(_vm.widget.name),callback:function ($$v) {_vm.$set(_vm.widget, "name", $$v)},expression:"widget.name"}})],1),_c('a-form-model-item',{attrs:{"label":"标签宽度","prop":"title"}},[_c('a-input-number',{attrs:{"placeholder":"auto"},model:{value:(_vm.widget.options.labelWidth),callback:function ($$v) {_vm.$set(_vm.widget.options, "labelWidth", $$v)},expression:"widget.options.labelWidth"}})],1),(_vm.hasAutoHeight)?_c('a-form-model-item',{attrs:{"label":"自适应高度："}},[_c('a-switch',{model:{value:(_vm.widget.options.autoHeight),callback:function ($$v) {_vm.$set(_vm.widget.options, "autoHeight", $$v)},expression:"widget.options.autoHeight"}})],1):_vm._e(),(!_vm.widget.options.autoHeight)?_c('a-form-model-item',{attrs:{"label":"高度","prop":"title"}},[_c('a-input-number',{attrs:{"placeholder":"auto"},model:{value:(_vm.widget.options.height),callback:function ($$v) {_vm.$set(_vm.widget.options, "height", $$v)},expression:"widget.options.height"}})],1):_vm._e(),(_vm.widget.type === 'select')?_c('a-form-model-item',{ref:"bg_bgc",attrs:{"label":"背景颜色","prop":"bgcolor"}},[_c('colorPicker',{attrs:{"defaultColor":"#FFFFFF"},model:{value:(_vm.widget.options.bgColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "bgColor", $$v)},expression:"widget.options.bgColor"}})],1):_vm._e(),(!['placeholder', 'responsibility', 'fileupload', 'number', 'radio', 'checkbox', 'rate', 'switch', 'slider', 'superLink', 'codeControl', 'imgupload', 'fileupload', 'uploadModel', 'signatureWrite', 'location', 'imgCode', 'publicSign', 'responsibility', 'grid', 'editorAirt', 'hnkj-richEditor', 'hnkj-nameSignature', 'hnkj-sealSignature', 'conferenceRoom', 'all-lay-out', 'grid-lay-out', 'table' ].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"组件无边框","prop":"title"}},[_c('a-switch',{model:{value:(_vm.widget.options.noBorder),callback:function ($$v) {_vm.$set(_vm.widget.options, "noBorder", $$v)},expression:"widget.options.noBorder"}})],1):_vm._e(),(['input','textarea','placeholder'].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"下划线"}},[_c('a-switch',{model:{value:(_vm.widget.options.underline),callback:function ($$v) {_vm.$set(_vm.widget.options, "underline", $$v)},expression:"widget.options.underline"}})],1):_vm._e(),(['input','textarea','placeholder'].includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"倾斜"}},[_c('a-switch',{model:{value:(_vm.widget.options.fontItalic),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontItalic", $$v)},expression:"widget.options.fontItalic"}})],1):_vm._e(),(['input', 'textarea'].includes(_vm.widget.type))?_c('div',[_c('a-form-model-item',{ref:"bgc",attrs:{"label":"字体颜色","prop":"labelwordcolor"}},[_c('colorPicker',{staticStyle:{"z-index":"3"},attrs:{"defaultColor":"#000000"},model:{value:(_vm.widget.options.fontColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontColor", $$v)},expression:"widget.options.fontColor"}})],1),_c('a-form-model-item',{ref:"bg_bgc",attrs:{"label":"背景颜色","prop":"bgcolor"}},[_c('colorPicker',{attrs:{"defaultColor":"#FFFFFF"},model:{value:(_vm.widget.options.bgColor),callback:function ($$v) {_vm.$set(_vm.widget.options, "bgColor", $$v)},expression:"widget.options.bgColor"}})],1),_c('a-form-model-item',{attrs:{"label":"字体类型","prop":"title"}},[_c('a-select',{attrs:{"placeholder":"请选择字体"},model:{value:(_vm.widget.options.fontFamily),callback:function ($$v) {_vm.$set(_vm.widget.options, "fontFamily", $$v)},expression:"widget.options.fontFamily"}},_vm._l((_vm.fontNames),function(item,idx){return _c('a-select-option',{key:idx,attrs:{"value":item}},[_vm._v(" "+_vm._s(item)+" ")])}),1)],1)],1):_vm._e(),(_vm.widget.type == 'codeControl')?_c('a-form-model-item',{attrs:{"label":"默认值"}},[_c('a-input',{attrs:{"disabled":""},model:{value:(_vm.widget.key),callback:function ($$v) {_vm.$set(_vm.widget, "key", $$v)},expression:"widget.key"}})],1):_vm._e(),(['imgupload', 'fileupload'].includes(_vm.widget.type) && _vm.widget.options.placeholder_1 !== undefined)?[(!_vm.seatList.includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"PC占位内容"}},[_c('a-input',{model:{value:(_vm.widget.options.placeholder_1),callback:function ($$v) {_vm.$set(_vm.widget.options, "placeholder_1", $$v)},expression:"widget.options.placeholder_1"}})],1):_vm._e()]:(!_vm.seatList.includes(_vm.widget.type))?_c('a-form-model-item',{attrs:{"label":"占位内容"}},[_c('a-input',{model:{value:(_vm.widget.options.placeholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "placeholder", $$v)},expression:"widget.options.placeholder"}})],1):_vm._e(),(_vm.widget.type == 'superLink')?_c('a-form-model-item',{attrs:{"label":"超链接名称"}},[_c('a-input',{model:{value:(_vm.widget.options.title),callback:function ($$v) {_vm.$set(_vm.widget.options, "title", $$v)},expression:"widget.options.title"}})],1):_vm._e(),_vm._t("default"),(['input', 'textarea', 'number', 'date'].includes(_vm.widget.type) &&  !_vm.widget.form_table_index )?[_c('a-form-model-item',{attrs:{"label":"公式联动"}},[_c('warp-formula-edit',{attrs:{"datalist":_vm.datalist,"widget":_vm.widget}})],1)]:_vm._e(),(!['dataTable', 'workflowApp', 'cascaderSelect', 'hnkj-confirm', 'conferenceRoom'].includes(_vm.widget.type) && !_vm.widget.options.accurate)?_c('a-form-model-item',{attrs:{"label":"数据操作类型"}},[_c('a-select',{attrs:{"placeholder":"默认覆盖"},model:{value:(_vm.widget.options.zhuijiaType),callback:function ($$v) {_vm.$set(_vm.widget.options, "zhuijiaType", $$v)},expression:"widget.options.zhuijiaType"}},[_c('a-select-option',{attrs:{"value":"1"}},[_vm._v("覆盖")]),_c('a-select-option',{attrs:{"value":"2"}},[_vm._v("追加")])],1)],1):_vm._e(),(_vm.$route.query.jghsj === '1')?_c('a-form-model-item',{attrs:{"label":"选择入库唯一key"}},[_c('a-switch',{model:{value:(_vm.widget.isJghsjKey),callback:function ($$v) {_vm.$set(_vm.widget, "isJghsjKey", $$v)},expression:"widget.isJghsjKey"}})],1):_vm._e(),(_vm.$route.query.jghsj === '1' && _vm.widget.isJghsjKey)?_c('a-form-model-item',{attrs:{"label":"唯一key"}},[_c('a-select',{model:{value:(_vm.widget.model),callback:function ($$v) {_vm.$set(_vm.widget, "model", $$v)},expression:"widget.model"}},_vm._l((_vm.filedNameList),function(item){return _c('a-select-option',{key:item.field_name,attrs:{"value":item.field_name,"title":item.field_name_value}},[_vm._v(" "+_vm._s(item.field_name_value)+" ")])}),1)],1):_c('a-form-model-item',{attrs:{"label":"唯一key"}},[_c('a-input',{model:{value:(_vm.widget.model),callback:function ($$v) {_vm.$set(_vm.widget, "model", $$v)},expression:"widget.model"}})],1),(
           _vm.widget.options && Object.keys(_vm.widget.options).indexOf('multiple') >= 0 && !_vm.excludeMultipleList.includes(_vm.widget.type) && !_vm.widget.options.accurate
         )?_c('a-form-model-item',{attrs:{"label":"是否多选"}},[_c('a-switch',{on:{"change":_vm.changeMutiple},model:{value:(_vm.widget.options.multiple),callback:function ($$v) {_vm.$set(_vm.widget.options, "multiple", $$v)},expression:"widget.options.multiple"}})],1):_vm._e(),(_vm.widget.options && (['checkbox'].includes(_vm.widget.type) || (['select'].includes(_vm.widget.type) && _vm.widget.options.multiple) ))?_c('a-form-model-item',{attrs:{"label":"选择区间限制"}},[_c('a-input-number',{attrs:{"id":"minValue","precision":0,"min":1,"placeholder":"最少选"},model:{value:(_vm.widget.options.minValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "minValue", $$v)},expression:"widget.options.minValue"}}),_vm._v(" - "),_c('a-input-number',{attrs:{"id":"maxValue","precision":0,"min":Number(_vm.widget.options.minValue),"placeholder":"最多选"},model:{value:(_vm.widget.options.maxValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "maxValue", $$v)},expression:"widget.options.maxValue"}})],1):_vm._e(),(
           !_vm.widget.form_table_index &&
@@ -178627,13 +179826,15 @@ var widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_render = functio
             )?_c('a-select',{staticStyle:{"width":"100%"},attrs:{"show-search":"","filter-option":_vm.searchDataType,"placeholder":"请选择数据类型"},model:{value:(_vm.widget.options.dataType),callback:function ($$v) {_vm.$set(_vm.widget.options, "dataType", $$v)},expression:"widget.options.dataType"}},[_c('a-select-option',{attrs:{"name":"字符串","value":"string"}},[_vm._v("字符串")]),_c('a-select-option',{attrs:{"name":"URL地址","value":"url"}},[_vm._v("URL地址")]),_c('a-select-option',{attrs:{"name":"邮箱地址","value":"email"}},[_vm._v("邮箱地址")]),(_vm.regularCheckDicts.length > 0)?_vm._l((_vm.regularCheckDicts),function(regular,idx){return _c('a-select-option',{key:idx,attrs:{"name":regular.title,"value":'regular__' + regular.value}},[_vm._v(_vm._s(regular.title))])}):_vm._e()],2):_vm._e(),(
               ['input', 'textarea'].includes(_vm.widget.type)
             )?_c('div',[(_vm.widget.type !== 'dataTable' && _vm.widget.type != 'hnkj-verify')?_c('a-input',{staticStyle:{"width":"100%"},attrs:{"disabled":String(_vm.widget.options.dataType).startsWith('regular__'),"placeholder":"填写正则表达式"},model:{value:(_vm.widget.options.pattern),callback:function ($$v) {_vm.$set(_vm.widget.options, "pattern", $$v)},expression:"widget.options.pattern"}}):_vm._e(),_c('a-input',{directives:[{name:"show",rawName:"v-show",value:(_vm.widget.options.pattern),expression:"widget.options.pattern"}],staticStyle:{"width":"100%"},attrs:{"placeholder":"请填写错误提示"},on:{"blur":_vm.valideError},model:{value:(_vm.widget.options.patternError),callback:function ($$v) {_vm.$set(_vm.widget.options, "patternError", $$v)},expression:"widget.options.patternError"}})],1):_vm._e()]:_vm._e()],2):_vm._e()],2)],1)}
-var widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_staticRenderFns = []
+var widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/es.symbol.description.js
 var es_symbol_description = __webpack_require__(81325);
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/es.string.replace-all.js
 var es_string_replace_all = __webpack_require__(35064);
+// EXTERNAL MODULE: ./src/form/util/tableUtil.js
+var tableUtil = __webpack_require__(5229);
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetPublicConfig.vue?vue&type=script&lang=js
 
 
@@ -179029,6 +180230,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
 
 
 
+
 /* harmony default export */ const widgetPublicConfigvue_type_script_lang_js = ({
   name: "widgetPublicConfig",
   inject: {
@@ -179108,7 +180310,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
     //   return regularCheckDicts ? regularCheckDicts() : []
     // },
     hasAutoHeight() {
-      return ['select', 'radio', 'checkbox'].includes(this.widget.type) && this.widget.parentType !== 'table';
+      return ['select', 'radio', 'checkbox'].includes(this.widget.type) && !['table', 'newTable'].includes(this.widget.parentType);
     }
   },
   methods: {
@@ -179157,7 +180359,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
         if (['date', 'time'].includes(item.type)) {
           //时间
           this.dateDateList.push(item);
-        } else if (item.type === 'table' && item.columns && item.columns.length > 0) {
+        } else if (['table', 'newTable'].includes(item.type) && item.columns && item.columns.length > 0) {
           if (item.columns.some(i => ['date', 'time'].includes(i.type))) this.dateDateList.push(...item.columns.filter(i => ['date', 'time'].includes(i.type)));
         } else if (['all-lay-out', 'grid', 'grid-lay-out'].includes(item.type) && item.columns && item.columns.length > 0) {
           item.columns.forEach(i => {
@@ -179191,7 +180393,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
             item.columns.forEach(columnsItem => {
               this.recursionSameType(columnsItem.list, type);
             });
-          } else if (["table"].includes(item.type)) {
+          } else if ((0,tableUtil/* isTableWidget */.X2)(item)) {
             // columns
             this.recursionSameType(item.columns, type);
           } else {
@@ -179361,10 +180563,10 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
 });
 ;// ./src/form/modules/widgetPublicConfig.vue?vue&type=script&lang=js
  /* harmony default export */ const modules_widgetPublicConfigvue_type_script_lang_js = (widgetPublicConfigvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=5f94fdfc&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=34cf2307&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=5f94fdfc&prod&lang=less&scoped=true
+;// ./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=34cf2307&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/widgetPublicConfig.vue
 
@@ -179377,11 +180579,11 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
 
 var widgetPublicConfig_component = (0,componentNormalizer/* default */.A)(
   modules_widgetPublicConfigvue_type_script_lang_js,
-  widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_render,
-  widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_staticRenderFns,
+  widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_render,
+  widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_staticRenderFns,
   false,
   null,
-  "5f94fdfc",
+  "34cf2307",
   null
   
 )
@@ -179671,6 +180873,7 @@ var WangEditor_component = (0,componentNormalizer/* default */.A)(
 //
 //
 //
+//
 
 
 
@@ -179722,10 +180925,10 @@ var WangEditor_component = (0,componentNormalizer/* default */.A)(
 });
 ;// ./src/form/modules/widgetConfig.vue?vue&type=script&lang=js
  /* harmony default export */ const modules_widgetConfigvue_type_script_lang_js = (widgetConfigvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetConfig.vue?vue&type=style&index=0&id=45ff2fe2&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/widgetConfig.vue?vue&type=style&index=0&id=6aa7533c&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/widgetConfig.vue?vue&type=style&index=0&id=45ff2fe2&prod&lang=less&scoped=true
+;// ./src/form/modules/widgetConfig.vue?vue&type=style&index=0&id=6aa7533c&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/widgetConfig.vue
 
@@ -179738,11 +180941,11 @@ var WangEditor_component = (0,componentNormalizer/* default */.A)(
 
 var widgetConfig_component = (0,componentNormalizer/* default */.A)(
   modules_widgetConfigvue_type_script_lang_js,
-  widgetConfigvue_type_template_id_45ff2fe2_scoped_true_render,
-  widgetConfigvue_type_template_id_45ff2fe2_scoped_true_staticRenderFns,
+  widgetConfigvue_type_template_id_6aa7533c_scoped_true_render,
+  widgetConfigvue_type_template_id_6aa7533c_scoped_true_staticRenderFns,
   false,
   null,
-  "45ff2fe2",
+  "6aa7533c",
   null
   
 )
@@ -182126,13 +183329,26 @@ class Virtual {
   // try goiong to render next range by a leading buffer according to current direction
   handleDataSourcesChange() {
     let start = this.range.start;
-    if (this.isFront()) {
+    if (this.direction === DIRECTION_TYPE.FRONT) {
       start = start - LEADING_BUFFER;
-    } else if (this.isBehind()) {
+    } else if (this.direction === DIRECTION_TYPE.BEHIND) {
       start = start + LEADING_BUFFER;
     }
     start = Math.max(start, 0);
-    this.updateRange(this.range.start, this.getEndByStart(start));
+    this.checkRange(start, this.getEndByStart(start));
+  }
+
+  // 数据增长时（如添加行）将渲染窗口移到末尾，确保新增行进入 DOM
+  showTailRange() {
+    const total = this.param.uniqueIds.length;
+    const keeps = this.param.keeps;
+    if (total <= keeps) {
+      this.checkRange(0, this.getLastIndex());
+      return;
+    }
+    const lastIndex = this.getLastIndex();
+    const start = Math.max(0, lastIndex - keeps + 1);
+    this.checkRange(start, lastIndex);
   }
 
   // when slot size change, we also need force update
@@ -182142,11 +183358,24 @@ class Virtual {
 
   // calculating range on scroll
   handleScroll(offset) {
-    this.direction = offset < this.offset || offset === 0 ? DIRECTION_TYPE.FRONT : DIRECTION_TYPE.BEHIND;
+    const prevOffset = this.offset;
+    if (offset < prevOffset || offset === 0) {
+      this.direction = DIRECTION_TYPE.FRONT;
+    } else if (offset > prevOffset) {
+      this.direction = DIRECTION_TYPE.BEHIND;
+    }
     this.offset = offset;
     if (!this.param) {
       return;
     }
+    const overs = this.getScrollOvers();
+    const buffer = this.param.buffer;
+    // 滚动位置已超出当前渲染窗口时强制同步（避免卡在 keeps 边界）
+    if (overs < this.range.start || overs > this.range.end - buffer) {
+      const start = Math.max(overs - buffer, 0);
+      this.checkRange(start, this.getEndByStart(start));
+      return;
+    }
     if (this.direction === DIRECTION_TYPE.FRONT) {
       this.handleFront();
     } else if (this.direction === DIRECTION_TYPE.BEHIND) {
@@ -182247,7 +183476,7 @@ class Virtual {
       // if range length is less than keeps, corrent it base on end
       start = end - keeps + 1;
     }
-    if (this.range.start !== start) {
+    if (this.range.start !== start || this.range.end !== end) {
       this.updateRange(start, end);
     }
   }
@@ -182483,7 +183712,7 @@ const Wrapper = {
     },
     // tell parent current size identify by unqiue key
     dispatchSizeChange() {
-      // this.$parent.$emit(this.event, this.uniqueKey, this.getCurrentSize(), this.hasInitial)
+      this.$parent.$emit(this.event, this.uniqueKey, this.getCurrentSize(), this.hasInitial);
     }
   }
 };
@@ -182591,13 +183820,39 @@ const VirtualList = {
   props: VirtualProps,
   data() {
     return {
-      range: null
+      range: null,
+      scrollParentEl: null
     };
   },
   watch: {
-    'dataSources.length'() {
+    'dataSources.length'(newLen, oldLen) {
       this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources());
-      this.virtual.handleDataSourcesChange();
+      const prevLen = oldLen || 0;
+      // 异步灌入数据（如子表单 tableInit）必须从第 0 行开始渲染，不能误跳到底部
+      if (!prevLen && newLen > 0) {
+        this.resetToHead();
+        return;
+      }
+      if (newLen > prevLen) {
+        const offset = this.getOffset();
+        const clientSize = this.getClientSize();
+        const scrollSize = this.getScrollSize();
+        const atBottom = scrollSize > clientSize && offset + clientSize >= scrollSize - 50;
+        if (atBottom) {
+          this.virtual.showTailRange();
+        } else {
+          this.virtual.handleDataSourcesChange();
+        }
+        this.scheduleScrollSync();
+      } else if (newLen < prevLen) {
+        const lastIndex = Math.max(0, newLen - 1);
+        const start = Math.min(this.virtual.range.start, lastIndex);
+        this.virtual.checkRange(start, Math.min(this.virtual.getEndByStart(start), lastIndex));
+        this.scheduleScrollSync();
+      } else {
+        this.virtual.handleDataSourcesChange();
+        this.scheduleScrollSync();
+      }
     },
     keeps(newValue) {
       this.virtual.updateParam('keeps', newValue);
@@ -182627,14 +183882,12 @@ const VirtualList = {
     // set back offset when awake from keep-alive
     this.scrollToOffset(this.virtual.offset);
     if (this.pageMode) {
-      document.addEventListener('scroll', this.onScroll, {
-        passive: false
-      });
+      this.bindPageScroll();
     }
   },
   deactivated() {
     if (this.pageMode) {
-      document.removeEventListener('scroll', this.onScroll);
+      this.unbindPageScroll();
     }
   },
   mounted() {
@@ -182647,16 +183900,19 @@ const VirtualList = {
 
     // in page mode we bind scroll event to document
     if (this.pageMode) {
+      this.scrollParentEl = this.findScrollParent(this.$refs.root);
       this.updatePageModeFront();
-      document.addEventListener('scroll', this.onScroll, {
-        passive: false
+      this.$nextTick(() => {
+        this.refreshListScrollAnchor();
+        this.bindPageScroll();
+        this.syncScrollRange();
       });
     }
   },
   beforeDestroy() {
     this.virtual.destroy();
     if (this.pageMode) {
-      document.removeEventListener('scroll', this.onScroll);
+      this.unbindPageScroll();
     }
   },
   methods: {
@@ -182668,10 +183924,74 @@ const VirtualList = {
     getSizes() {
       return this.virtual.sizes.size;
     },
+    findScrollParent(el) {
+      if (!el) return null;
+      let node = el.parentElement;
+      while (node && node !== document.body && node !== document.documentElement) {
+        if (node.classList && node.classList.contains('scroll-area')) {
+          return node;
+        }
+        const style = window.getComputedStyle(node);
+        const overflowY = style.overflowY;
+        const overflow = style.overflow;
+        if (/(auto|scroll|overlay)/.test(overflowY) || /(auto|scroll|overlay)/.test(overflow)) {
+          return node;
+        }
+        node = node.parentElement;
+      }
+      const scrollArea = document.querySelector('.scroll-area');
+      if (scrollArea && scrollArea.contains(el)) {
+        return scrollArea;
+      }
+      return null;
+    },
+    getListTopInScrollContent() {
+      const {
+        root
+      } = this.$refs;
+      const parent = this.scrollParentEl;
+      if (!root || !parent) return 0;
+      return parent.scrollTop + (root.getBoundingClientRect().top - parent.getBoundingClientRect().top);
+    },
+    refreshListScrollAnchor() {
+      this._listTopInContent = this.getListTopInScrollContent();
+    },
+    bindPageScroll() {
+      window.addEventListener('scroll', this.onScroll, {
+        passive: false
+      });
+      if (this.scrollParentEl) {
+        this.scrollParentEl.addEventListener('scroll', this.onScroll, {
+          passive: false
+        });
+      }
+    },
+    unbindPageScroll() {
+      window.removeEventListener('scroll', this.onScroll);
+      if (this.scrollParentEl) {
+        this.scrollParentEl.removeEventListener('scroll', this.onScroll);
+      }
+    },
+    getPageModeOffset() {
+      const {
+        root
+      } = this.$refs;
+      if (!root) return 0;
+      if (this.scrollParentEl) {
+        // 必须用 scrollTop 计算：rect 差值在容器内滚动时不变，会导致超过 keeps 后窗口不更新
+        if (this._listTopInContent == null) {
+          this.refreshListScrollAnchor();
+        }
+        const listTop = this._listTopInContent || 0;
+        const scrollTop = this.scrollParentEl[this.directionKey] || 0;
+        return Math.max(0, Math.ceil(scrollTop - listTop));
+      }
+      return document.documentElement[this.directionKey] || document.body[this.directionKey];
+    },
     // return current scroll offset
     getOffset() {
       if (this.pageMode) {
-        return document.documentElement[this.directionKey] || document.body[this.directionKey];
+        return this.getPageModeOffset();
       } else {
         const {
           root
@@ -182683,6 +184003,9 @@ const VirtualList = {
     getClientSize() {
       const key = this.isHorizontal ? 'clientWidth' : 'clientHeight';
       if (this.pageMode) {
+        if (this.scrollParentEl) {
+          return Math.ceil(this.scrollParentEl[key]);
+        }
         return document.documentElement[key] || document.body[key];
       } else {
         const {
@@ -182691,10 +184014,31 @@ const VirtualList = {
         return root ? Math.ceil(root[key]) : 0;
       }
     },
+    getListScrollSize() {
+      const {
+        root,
+        shepherd
+      } = this.$refs;
+      if (!root || !shepherd) return 0;
+      const offsetKey = this.isHorizontal ? 'offsetLeft' : 'offsetTop';
+      const sizeKey = this.isHorizontal ? 'offsetWidth' : 'offsetHeight';
+      return shepherd[offsetKey] + (shepherd[sizeKey] || 0);
+    },
+    getEstimatedScrollSize() {
+      const itemSize = this.virtual ? this.virtual.getEstimateSize() : this.estimateSize;
+      return Math.ceil(this.dataSources.length * itemSize);
+    },
     // return all scroll size
     getScrollSize() {
       const key = this.isHorizontal ? 'scrollWidth' : 'scrollHeight';
       if (this.pageMode) {
+        const listSize = this.getListScrollSize();
+        const estimatedSize = this.getEstimatedScrollSize();
+        const virtualSize = Math.max(listSize, estimatedSize);
+        if (virtualSize) return virtualSize;
+        if (this.scrollParentEl) {
+          return Math.ceil(this.scrollParentEl[key]);
+        }
         return document.documentElement[key] || document.body[key];
       } else {
         const {
@@ -182703,11 +184047,31 @@ const VirtualList = {
         return root ? Math.ceil(root[key]) : 0;
       }
     },
+    scrollLastItemIntoView() {
+      const {
+        root
+      } = this.$refs;
+      if (!root) return;
+      const lastItem = root.querySelector('[role="listitem"]:last-of-type');
+      if (lastItem) {
+        lastItem.scrollIntoView({
+          block: 'nearest',
+          behavior: 'auto'
+        });
+      }
+    },
     // set current scroll position to a expectant offset
     scrollToOffset(offset) {
       if (this.pageMode) {
-        document.body[this.directionKey] = offset;
-        document.documentElement[this.directionKey] = offset;
+        if (this.scrollParentEl) {
+          if (this._listTopInContent == null) {
+            this.refreshListScrollAnchor();
+          }
+          this.scrollParentEl[this.directionKey] = (this._listTopInContent || 0) + offset;
+        } else {
+          document.body[this.directionKey] = offset;
+          document.documentElement[this.directionKey] = offset;
+        }
       } else {
         const {
           root
@@ -182728,23 +184092,18 @@ const VirtualList = {
       }
     },
     // set current scroll position to bottom
-    scrollToBottom() {
+    scrollToBottom(retryCount = 0) {
       const {
         shepherd
       } = this.$refs;
-      if (shepherd) {
-        const offset = shepherd[this.isHorizontal ? 'offsetLeft' : 'offsetTop'];
-        this.scrollToOffset(offset);
-
-        // check if it's really scrolled to the bottom
-        // maybe list doesn't render and calculate to last range
-        // so we need retry in next event loop until it really at bottom
-        setTimeout(() => {
-          if (this.getOffset() + this.getClientSize() + 1 < this.getScrollSize()) {
-            this.scrollToBottom();
-          }
-        }, 3);
-      }
+      if (!shepherd || retryCount > 15) return;
+      const offset = shepherd[this.isHorizontal ? 'offsetLeft' : 'offsetTop'];
+      this.scrollToOffset(offset);
+      setTimeout(() => {
+        if (this.getOffset() + this.getClientSize() + 1 < this.getScrollSize()) {
+          this.scrollToBottom(retryCount + 1);
+        }
+      }, 3);
     },
     // when using page mode we need update slot header size manually
     // taking root offset relative to the browser as slot header size
@@ -182752,14 +184111,50 @@ const VirtualList = {
       const {
         root
       } = this.$refs;
-      if (root) {
-        const rect = root.getBoundingClientRect();
-        const {
-          defaultView
-        } = root.ownerDocument;
-        const offsetFront = this.isHorizontal ? rect.left + defaultView.pageXOffset : rect.top + defaultView.pageYOffset;
-        this.virtual.updateParam('slotHeaderSize', offsetFront);
+      if (!root) return;
+      if (this.scrollParentEl) {
+        this.virtual.updateParam('slotHeaderSize', 0);
+        return;
       }
+      const rect = root.getBoundingClientRect();
+      const {
+        defaultView
+      } = root.ownerDocument;
+      const offsetFront = this.isHorizontal ? rect.left + defaultView.pageXOffset : rect.top + defaultView.pageYOffset;
+      this.virtual.updateParam('slotHeaderSize', offsetFront);
+    },
+    refreshScrollParent() {
+      const {
+        root
+      } = this.$refs;
+      if (!root) return;
+      this.scrollParentEl = this.findScrollParent(root);
+      this._listTopInContent = null;
+    },
+    scheduleScrollSync() {
+      this.$nextTick(() => {
+        this.syncScrollRange();
+        requestAnimationFrame(() => {
+          this.syncScrollRange();
+        });
+      });
+    },
+    resetToHead() {
+      this.refreshScrollParent();
+      this.updatePageModeFront();
+      this.refreshListScrollAnchor();
+      this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources());
+      const lastIndex = Math.max(0, this.dataSources.length - 1);
+      this.virtual.checkRange(0, Math.min(this.keeps - 1, lastIndex));
+      this.scheduleScrollSync();
+    },
+    scrollToNewRow() {
+      this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources());
+      this.virtual.showTailRange();
+      this.$nextTick(() => {
+        this.scrollLastItemIntoView();
+        this.scheduleScrollSync();
+      });
     },
     // reset all state back to initial
     reset() {
@@ -182793,6 +184188,15 @@ const VirtualList = {
     onItemResized(id, size) {
       this.virtual.saveSize(id, size);
       this.$emit('resized', id, size);
+      if (!this._scrollSyncFrame) {
+        this._scrollSyncFrame = requestAnimationFrame(() => {
+          this._scrollSyncFrame = null;
+          if (this.pageMode && this.scrollParentEl) {
+            this.refreshListScrollAnchor();
+          }
+          this.syncScrollRange();
+        });
+      }
     },
     // event called when slot mounted or size changed
     onSlotResized(type, size, hasInit) {
@@ -182809,13 +184213,22 @@ const VirtualList = {
     onRangeChanged(range) {
       this.range = range;
     },
+    syncScrollRange() {
+      this.$nextTick(() => {
+        this.onScroll();
+      });
+    },
     onScroll(evt) {
       const offset = this.getOffset();
       const clientSize = this.getClientSize();
       const scrollSize = this.getScrollSize();
+      if (offset < 0) {
+        return;
+      }
 
-      // iOS scroll-spring-back behavior will make direction mistake
-      if (offset < 0 || offset + clientSize > scrollSize + 1 || !scrollSize) {
+      // 嵌套滚动容器内，列表总高度常小于视口，原守卫会阻止滚回前几行
+      const inNestedScrollParent = this.pageMode && this.scrollParentEl;
+      if (!inNestedScrollParent && scrollSize > 0 && offset + clientSize > scrollSize + 1) {
         return;
       }
       this.virtual.handleScroll(offset);
@@ -190711,7 +192124,7 @@ var formula_edit_component = (0,componentNormalizer/* default */.A)(
     }
   },
   components: {
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48498)),
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 89715)),
     FormulaEdit: formula_edit
   },
   data() {