@zscreate/form-component 1.1.689-AI.10 → 1.1.689-AI.11

package/dist/form-component.umd.js

@@ -67585,10 +67585,6 @@ let getFileExt = filename => {
     AutoScrollText: _AutoScrollText_vue__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A
   },
   inject: {
-    formContext: {
-      from: 'formContext',
-      default: null
-    },
     config: {
       form: 'config'
     },
@@ -67604,6 +67600,11 @@ let getFileExt = filename => {
       default: false // 默认值
     }
   },
+  provide() {
+    return {
+      useNewTableDictCache: this.widget.type === 'newTable'
+    };
+  },
   data() {
     return {
       isEdit: false,
@@ -67618,6 +67619,7 @@ let getFileExt = filename => {
     // 替换分页的三个点，保证在小米手机样式没问题
     this.$nextTick(() => {
       if (this.$isMobile) {
+        debugger;
         document.querySelector(".ant-pagination-item-ellipsis").innerText = "...";
         document.querySelector(".ant-pagination-item-ellipsis").style.fontSize = "20px";
       }
@@ -67640,13 +67642,8 @@ let getFileExt = filename => {
       this.tableIndex = this.index; // 不能删  eval 需要 this.tableIndex
       if (widget.options.defaultValue.includes('script:')) val = widget.options.defaultValue;
       if (val && String(val).startsWith('script:')) {
-        var _this$formContext;
         val = eval(val.replace('script:', ''));
-        const tableModel = this.source.model;
-        if ((_this$formContext = this.formContext) !== null && _this$formContext !== void 0 && _this$formContext.ensureTableModelsWritable) {
-          this.formContext.ensureTableModelsWritable(tableModel);
-        }
-        this.$set(this.models[tableModel][index], widget.model, val);
+        this.$set(this.models[this.source.model][index], widget.model, val);
         return val;
       }
       return val;
@@ -67699,14 +67696,14 @@ let getFileExt = filename => {
 /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_14__);
 /* 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__(70811);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(40000);
+/* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(92241);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(96463);
 /* 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__(30210);
+/* harmony import */ var _form_form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(5954);
 /* 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);
@@ -67718,7 +67715,7 @@ 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_newTableUtil__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(29195);
 /* harmony import */ var _form_form_util_dictDataCache__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(33883);
 
 
@@ -68186,6 +68183,226 @@ let getFileExt = filename => {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -68210,7 +68427,11 @@ 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 => (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(item))) || [];
+      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')) || [];
+    },
+    newTableWidgets() {
+      var _this$data2;
+      return ((_this$data2 = this.data) === null || _this$data2 === void 0 || (_this$data2 = _this$data2.list) === null || _this$data2 === void 0 ? void 0 : _this$data2.filter(item => item.type === 'newTable')) || [];
     },
     tableItem() {
       return _form_form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .A;
@@ -68292,8 +68513,7 @@ let getFileExt = filename => {
       rulesOver: false,
       userSignature: undefined,
       tableNum: 0,
-      timerObj: {},
-      virtualTableRefs: {}
+      timerObj: {}
       // formList: [],
       // allLoading: false,
       // allLoadingTips: '正在加载表单数据0%...',
@@ -68427,27 +68647,47 @@ 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;
-            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) {
+            if (this.tableData[tableWidget.model]) {
               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)) {
+                  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;
+                    if (value && String(value).startsWith('script:')) {
+                      value = eval(value.replace('script:', ''));
+                      this.$set(this.models[tableWidget.model][index], item.model, value);
+                    }
+                  });
+                }
               });
             }
           });
-          // 分页/轻量行：为全部行补算序号等 script 默认值
+          tableWidget.options.canView = !isAllHide;
+        });
+        console.log('tableWidgets', val);
+      },
+      deep: true,
+      immediate: true
+    },
+    newTableWidgets: {
+      handler() {
+        this.newTableWidgets.forEach(tableWidget => {
+          let isAllHide = true;
+          tableWidget.columns.forEach(item => {
+            if (item.options.canView) isAllHide = false;
+          });
           const modelRows = this.models[tableWidget.model];
-          if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(tableWidget) && Array.isArray(modelRows) && modelRows.length && tableWidget.options.supportPage) {
-            this.ensureTableModelsWritable(tableWidget.model);
-            this.models[tableWidget.model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .applyTableScriptDefaults */ .AJ)(tableWidget, modelRows);
+          if (Array.isArray(modelRows) && modelRows.length && tableWidget.options.supportPage) {
+            this.ensureNewTableModelsWritable(tableWidget.model);
+            this.models[tableWidget.model] = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .applyTableScriptDefaults */ .AJ)(tableWidget, modelRows);
           }
           tableWidget.options.canView = !isAllHide;
         });
-        console.log('tableWidgets', val);
       },
       deep: true,
       immediate: true
@@ -68505,45 +68745,6 @@ 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) {
@@ -68566,35 +68767,34 @@ let getFileExt = filename => {
     unFreezeModels(model) {
       this.models[model] = (0,lodash_es__WEBPACK_IMPORTED_MODULE_26__/* ["default"] */ .A)(this.models[model]);
     },
-    ensureTableModelsWritable(model) {
+    ensureNewTableModelsWritable(model) {
       if (Array.isArray(this.models[model]) && Object.isFrozen(this.models[model])) {
         this.unFreezeModels(model);
       }
     },
-    prepareTableModelsForSubmit() {
-      const tables = this.findTableComponent(this.widgetList).filter(table => {
+    prepareNewTableModelsForSubmit() {
+      const tables = this.findNewTableComponent(this.widgetList).filter(table => {
         var _table$options, _table$options2;
         return ((_table$options = table.options) === null || _table$options === void 0 ? void 0 : _table$options.canView) && !((_table$options2 = table.options) !== null && _table$options2 !== void 0 && _table$options2.disabled);
       });
       tables.forEach(table => {
         const model = table.model;
         if (!Array.isArray(this.models[model])) return;
-        this.ensureTableModelsWritable(model);
-        this.models[model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .finalizeTableModelRows */ .n_)(table, this.models[model]);
+        this.ensureNewTableModelsWritable(model);
+        this.models[model] = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .finalizeTableModelRows */ .n_)(table, this.models[model]);
       });
     },
-    syncTableScriptDefaults(tableWidget) {
+    syncNewTableScriptDefaults(tableWidget) {
       const model = tableWidget === null || tableWidget === void 0 ? void 0 : tableWidget.model;
       if (!model || !Array.isArray(this.models[model])) return;
-      this.ensureTableModelsWritable(model);
-      this.models[model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .applyTableScriptDefaults */ .AJ)(tableWidget, this.models[model]);
+      this.ensureNewTableModelsWritable(model);
+      this.models[model] = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .applyTableScriptDefaults */ .AJ)(tableWidget, this.models[model]);
     },
     currTablePageData(model) {
       var _this$tablePageInfo$m, _this$tablePageInfo$m2, _this$tablePageInfo$m3, _this$tablePageInfo$m4, _this$tablePageInfo$m5;
       return this.tableData[model].slice((((_this$tablePageInfo$m = this.tablePageInfo[model]) === null || _this$tablePageInfo$m === void 0 ? void 0 : _this$tablePageInfo$m.current) - 1) * ((_this$tablePageInfo$m2 = this.tablePageInfo[model]) === null || _this$tablePageInfo$m2 === void 0 ? void 0 : _this$tablePageInfo$m2.pageSize), (((_this$tablePageInfo$m3 = this.tablePageInfo[model]) === null || _this$tablePageInfo$m3 === void 0 ? void 0 : _this$tablePageInfo$m3.current) - 1) * ((_this$tablePageInfo$m4 = this.tablePageInfo[model]) === null || _this$tablePageInfo$m4 === void 0 ? void 0 : _this$tablePageInfo$m4.pageSize) + ((_this$tablePageInfo$m5 = this.tablePageInfo[model]) === null || _this$tablePageInfo$m5 === void 0 ? void 0 : _this$tablePageInfo$m5.pageSize));
     },
     async tablePageChange(widget, curr, pageSize) {
-      this.ensureTableModelsWritable(widget.model);
       this.formLoading = true;
       await this.$nextTick();
       if (this.tablePageInfo[widget.model].pageSize !== pageSize) curr = 1;
@@ -68607,6 +68807,21 @@ let getFileExt = filename => {
       }, 0);
       console.log(widget, curr, pageSize);
     },
+    async newTablePageChange(widget, curr, pageSize) {
+      this.ensureNewTableModelsWritable(widget.model);
+      this.formLoading = true;
+      this.tableLoading = true;
+      await this.$nextTick();
+      if (this.tablePageInfo[widget.model].pageSize !== pageSize) curr = 1;
+      this.tablePageInfo[widget.model].pageSize = pageSize;
+      await this.$nextTick();
+      this.tablePageInfo[widget.model].current = curr;
+      await this.$nextTick();
+      setTimeout(() => {
+        this.tableLoading = false;
+        this.formLoading = false;
+      }, 0);
+    },
     nextPage() {
       this.tableData.page++;
     },
@@ -68676,7 +68891,11 @@ let getFileExt = filename => {
           this.tablePageInfo[widget.model].current = 1;
           this.$set(this.tableData, widget.model, []);
           this.models[widget.model] = res.result || [];
-          this.tableInitByModel(widget.model);
+          if (widget.type === 'newTable') {
+            this.generateNewTableData(widget);
+          } else {
+            this.tableInitByModel(widget.model);
+          }
         } else {
           this.$message.error(res && res.message || '导入失败');
         }
@@ -68700,21 +68919,28 @@ let getFileExt = filename => {
     //添加子表单里面的row
     addToTableData(data, model, addModel = undefined, clickByUser = false) {
       const tableWidget = this.tableModel[model];
-      this.ensureTableModelsWritable(model);
-      const lightweight = tableWidget && tableWidget._lightweightRows;
+      if ((tableWidget === null || tableWidget === void 0 ? void 0 : tableWidget.type) === 'newTable') {
+        return this.addToNewTableData(data, model, addModel, clickByUser);
+      }
+      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]++;
       this.tableData[model] === undefined ? this.$set(this.tableData, model, []) : null;
       if (addModel) {
         let addModelObject = {};
-        data.columns.forEach(item => {
-          if (!lightweight) {
-            item.options.isCorrect = false;
-          }
+        dataTemp.columns.forEach(item => {
+          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])) {
@@ -68723,7 +68949,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 && !lightweight) {
+        if (this.isDesign) {
           if (!this.destoryTable) this.destoryTable = [];
           this.destoryTable.push(() => {
             for (const key in _cloneData) {
@@ -68734,29 +68960,63 @@ let getFileExt = filename => {
             }
           });
           this.$on('hook:destroyed', () => {
+            // addModelObject forin  _cloneData
             this.destoryTable.forEach(func => func());
           });
         }
+        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();
+      this.tableData[model].push(dataTemp);
+      this.publishCalc(model);
+    },
+    addToNewTableData(data, model, addModel = undefined, clickByUser = false) {
+      var _tableWidget$options;
+      const tableWidget = this.tableModel[model];
+      this.ensureNewTableModelsWritable(model);
+      const lightweight = tableWidget && tableWidget._lightweightRows;
+      this.tableData[model] === undefined ? this.$set(this.tableData, model, []) : null;
+      if (addModel) {
+        const addModelObject = {};
+        data.columns.forEach(item => {
+          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;
+        });
+        this.unFreezeModels(model);
+        if (!Array.isArray(this.models[model])) {
+          this.models[model] = [];
+        }
+        this.models[model].push(addModelObject);
+        this.syncNewTableScriptDefaults(tableWidget);
+        this.freezeModels(model);
       }
       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()}`);
+        dataTemp = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createLightweightTableRow */ .r)(model, this.tableData[model].length, `${Date.now()}_${Math.random()}`);
       } else {
         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._clone = true;
+        dataTemp.hashKey = `${Date.now()}${Math.ceil(Math.random() * 10000)}`;
         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);
+      if (tableWidget !== null && tableWidget !== void 0 && (_tableWidget$options = tableWidget.options) !== null && _tableWidget$options !== void 0 && _tableWidget$options.supportPage) {
+        this.$nextTick(() => {
+          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));
+        });
       }
       this.publishCalc(model);
     },
@@ -68777,7 +69037,7 @@ let getFileExt = filename => {
     },
     //删除子表单row
     handleDeleteRow(index, model) {
-      this.ensureTableModelsWritable(model);
+      var _this$tableModel$mode;
       // //更新tableData
       if (this.currTablePageData(model).length === 1) {
         this.tablePageInfo[model].current = this.tablePageInfo[model].current - 1;
@@ -68795,6 +69055,9 @@ let getFileExt = filename => {
         item.index = _index++;
       });
       this.tableIndex[model]--;
+      if (((_this$tableModel$mode = this.tableModel[model]) === null || _this$tableModel$mode === void 0 ? void 0 : _this$tableModel$mode.type) === 'newTable') {
+        this.syncNewTableScriptDefaults(this.tableModel[model]);
+      }
       this.publishCalc(model);
     },
     findTableComponent(list = []) {
@@ -68802,11 +69065,20 @@ let getFileExt = filename => {
         if (Array.isArray(curr)) {
           return all.concat(this.findTableComponent(curr));
         }
-        if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(curr)) return all.concat(curr);
+        if (curr.type === 'table') return all.concat(curr);
         return all;
       }, []);
     },
-    navigateToSubTableRow({
+    findNewTableComponent(list = []) {
+      return list.reduce((all, curr) => {
+        if (Array.isArray(curr)) {
+          return all.concat(this.findNewTableComponent(curr));
+        }
+        if (curr.type === 'newTable') return all.concat(curr);
+        return all;
+      }, []);
+    },
+    navigateToNewTableRow({
       tableModel,
       rowIndex
     }) {
@@ -68814,19 +69086,6 @@ let getFileExt = filename => {
       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]) {
@@ -68837,33 +69096,71 @@ let getFileExt = filename => {
       }
       // 判断是否为 纠错审核内进来的, 纠错审核不用校验表单
       if (this.isCorrectAudit()) {
-        this.prepareTableModelsForSubmit();
+        this.prepareNewTableModelsForSubmit();
         return Promise.resolve((0,lodash_es__WEBPACK_IMPORTED_MODULE_26__/* ["default"] */ .A)(this.models));
       }
-      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, {
+      const newTables = this.findNewTableComponent(this.widgetList).filter(table => table.options.canView && !table.options.disabled);
+      const newTableErrors = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .validateNewTableRows */ .yK)(newTables, this.models, {
         isCorrectAudit: this.m_isCorrectAudit()
       });
+
+      // 判断子表单内组件有没有必填的校验
+      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;
+          }
+        }
+      });
+      // 子表单有必填校验 判断有没有添加行， 没有添加行需要手动添加行， 让它触发校验
+      //新疆科技不需要该逻辑，去除
+      // 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) => {
         const runValidate = () => {
           this.$refs.Form.validate(valid => {
-            if (valid && !tableErrors.length) {
-              this.prepareTableModelsForSubmit();
+            debugger;
+            if (valid && !newTableErrors.length) {
+              this.prepareNewTableModelsForSubmit();
               resolve((0,lodash_es__WEBPACK_IMPORTED_MODULE_26__/* ["default"] */ .A)(this.models));
             } else {
-              var _tableErrors$;
+              var _newTableErrors$;
               console.log("error submit!!");
-              const message = ((_tableErrors$ = tableErrors[0]) === null || _tableErrors$ === void 0 ? void 0 : _tableErrors$.message) || "表单数据校验失败";
-              if (tableErrors.length && valid) {
+              const message = ((_newTableErrors$ = newTableErrors[0]) === null || _newTableErrors$ === void 0 ? void 0 : _newTableErrors$.message) || "表单数据校验失败";
+              if (newTableErrors.length && valid) {
                 this.$message.warning(message);
               }
               reject(new Error(message).message);
-              this.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);
             }
           });
         };
-        if (tableErrors.length) {
-          this.navigateToSubTableRow(tableErrors[0]);
+        if (newTableErrors.length) {
+          this.navigateToNewTableRow(newTableErrors[0]);
           this.$nextTick(runValidate);
         } else {
           this.$nextTick(runValidate);
@@ -68939,7 +69236,7 @@ let getFileExt = filename => {
     //   });
     // },
     generateTableData(gen) {
-      if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(gen)) {
+      if (gen.type === "table") {
         var tableModel = gen.model;
         if (this.tableData[tableModel] instanceof Array) {
           this.tableData[tableModel].length = 0;
@@ -68947,16 +69244,75 @@ let getFileExt = filename => {
         }
         this.tableModel[tableModel] = gen;
         this.tableModel[tableModel]["options"]["defaultValue"] = this.models[gen.model];
-        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();
-        }
+        this.tableInitByModel(tableModel);
+      } else if (gen.type === "newTable") {
+        this.generateNewTableData(gen);
+      }
+    },
+    generateNewTableData(gen) {
+      const tableModel = gen.model;
+      if (this.tableData[tableModel] instanceof Array) {
+        this.tableData[tableModel].length = 0;
+        this.tableIndex[tableModel] = 0;
       }
+      this.tableModel[tableModel] = gen;
+      this.tableModel[tableModel]["options"]["defaultValue"] = this.models[gen.model];
+      const initTable = () => this.newTableInitByModel(tableModel);
+      (0,_form_form_util_dictDataCache__WEBPACK_IMPORTED_MODULE_34__/* .prefetchTableDictData */ .sE)(gen.columns, this.applyId).finally(initTable);
     },
     timeout: _form_utils_util__WEBPACK_IMPORTED_MODULE_32__.timeout,
     tableInitByModel(model) {
+      if (this.models[model] && this.models[model] instanceof Array && this.models[model].length > 0) {
+        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;
+          if (this.isDesign) {
+            if (!this.destoryTable) this.destoryTable = [];
+            this.destoryTable.push(() => {
+              this.value[model] = Array(this.models[model].length).fill({});
+            });
+            this.$on('hook:beforeDestroy', () => {
+              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);
+            }
+          }
+          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);
+          setTimeout(() => {
+            this.publishCalc(model);
+          }, 10);
+        }, 0);
+      }
+    },
+    newTableInitByModel(model) {
       if (this.models[model] && this.models[model] instanceof Array && this.models[model].length > 0) {
         if (this.tableData[model] === undefined) {
           this.$set(this.tableData, model, []);
@@ -68968,7 +69324,7 @@ let getFileExt = filename => {
           this.tableLoading = 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);
+          const lightweight = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .shouldUseLightweightTableRows */ .K2)(rowCount);
           tableWidget._lightweightRows = lightweight;
           if (this.isDesign) {
             if (!this.destoryTable) this.destoryTable = [];
@@ -68980,7 +69336,7 @@ let getFileExt = filename => {
             });
           }
           if (lightweight) {
-            this.tableData[model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createLightweightTableRows */ .eo)(model, rowCount);
+            this.tableData[model] = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createLightweightTableRows */ .eo)(model, rowCount);
           } else {
             const dataTemp = JSON.parse(JSON.stringify(tableWidget));
             dataTemp._clone = true;
@@ -68988,21 +69344,18 @@ let getFileExt = filename => {
             this.tableData[model] = Array.from({
               length: rowCount
             }, (_, index) => {
-              const row = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createFullTableRow */ .yk)(dataTemp);
+              const row = (0,_form_form_util_newTableUtil__WEBPACK_IMPORTED_MODULE_33__/* .createFullTableRow */ .yk)(dataTemp);
               row.hashKey = `${model}_${index}_${seed}`;
               row.index = index;
               return row;
             });
           }
           this.freezeModels(model);
-          this.syncTableScriptDefaults(tableWidget);
+          this.syncNewTableScriptDefaults(tableWidget);
           this.tableLoading = false;
           if (this.tableNum > 0) this.tableNum--;
           if (this.tableNum === 0) this.formLoading = 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);
@@ -69034,10 +69387,10 @@ let getFileExt = filename => {
       return true;
     },
     async handleLinkAge() {
-      var _this$data2;
+      var _this$data3;
       // console.log(this.data.config.linkage_config)
       const that = this;
-      if (!((_this$data2 = this.data) !== null && _this$data2 !== void 0 && (_this$data2 = _this$data2.config) !== null && _this$data2 !== void 0 && _this$data2.linkage_config)) return;
+      if (!((_this$data3 = this.data) !== null && _this$data3 !== void 0 && (_this$data3 = _this$data3.config) !== null && _this$data3 !== void 0 && _this$data3.linkage_config)) return;
       if (this.formFunctions) return;
       this.formFunctions = {
         async call_func(list, models) {
@@ -69161,7 +69514,7 @@ let getFileExt = filename => {
       this.formFunctions._init = true;
       await this.$nextTick();
       this.$watch('models', async (newVal, oldVal) => {
-        var _diffModels, _this$data3, _this$data4;
+        var _diffModels, _this$data4, _this$data5;
         await this.timeout(0);
         let diffModels = (0,lodash_es__WEBPACK_IMPORTED_MODULE_30__/* ["default"] */ .A)(newVal, (result, value, key) => {
           if (this.formFunctions._init) {
@@ -69178,8 +69531,8 @@ let getFileExt = filename => {
         }
         // const differenceObj = difference(cloneDeep(newVal), cloneDeep(oldVal))
         console.log('diffModels', diffModels);
-        const widgetList = (0,_form_form_util__WEBPACK_IMPORTED_MODULE_24__/* .getRecursionWidget */ .p)((_this$data3 = this.data) === null || _this$data3 === void 0 ? void 0 : _this$data3.list);
-        (_this$data4 = this.data) === null || _this$data4 === void 0 || (_this$data4 = _this$data4.config) === null || _this$data4 === void 0 || (_this$data4 = _this$data4.linkage_config) === null || _this$data4 === void 0 || _this$data4.forEach(item => {
+        const widgetList = (0,_form_form_util__WEBPACK_IMPORTED_MODULE_24__/* .getRecursionWidget */ .p)((_this$data4 = this.data) === null || _this$data4 === void 0 ? void 0 : _this$data4.list);
+        (_this$data5 = this.data) === null || _this$data5 === void 0 || (_this$data5 = _this$data5.config) === null || _this$data5 === void 0 || (_this$data5 = _this$data5.linkage_config) === null || _this$data5 === void 0 || _this$data5.forEach(item => {
           let {
             toTypeSelect,
             toWidgetList,
@@ -69192,7 +69545,7 @@ let getFileExt = filename => {
           // 表单详情会导致可编辑
           if (['update', 'disabled'].includes(toTypeSelect) && ['detail', 'review'].includes(this.$route.query.type)) return;
           toWidgetList.forEach(async toWidgetModel => {
-            var _this$data5;
+            var _this$data6;
             const widget = widgetList.find(item => item.model === toWidgetModel);
             const changeModelList = list.some(item => diffModels.includes(item.model)) ? list : [];
             if (changeModelList.length === 0) return;
@@ -69245,7 +69598,7 @@ let getFileExt = filename => {
                 this.$set(widget.options, 'required', flag);
                 this.$set(widget, 'rules', rules[widget.model]);
                 !flag && this.$refs.Form.clearValidate(widget.model);
-                this.generateRules(widget, (_this$data5 = this.data) === null || _this$data5 === void 0 || (_this$data5 = _this$data5.list) === null || _this$data5 === void 0 ? void 0 : _this$data5.find(item => item.model === widget.parentModel));
+                this.generateRules(widget, (_this$data6 = this.data) === null || _this$data6 === void 0 || (_this$data6 = _this$data6.list) === null || _this$data6 === void 0 ? void 0 : _this$data6.find(item => item.model === widget.parentModel));
                 // widget.options.required = flag
                 break;
               case 'update':
@@ -69306,7 +69659,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"].includes(widget.type) || (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
+          if (["grid", "grid-lay-out", "all-lay-out", 'table', 'newTable'].includes(widget.type)) {
             this.syncLayoutSubscribe(widget);
           }
           // 此类组件 需要深度遍历columns.list
@@ -69327,10 +69680,7 @@ let getFileExt = filename => {
               this.models[widget.model] = ["imgupload", "deptSelector", "userSelector", "userSelectorByRole", "relateSub"].includes(widget.type) ? [] : "";
             }
             // 子表单
-            if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
-              if (Array.isArray(this.models[widget.model])) {
-                this.models[widget.model] = (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .normalizeTableModelRows */ .aW)(widget, this.models[widget.model]);
-              }
+            if (widget.type === "table" || widget.type === "newTable") {
               //生成tableModel
               this.generateTableData(widget);
               return false;
@@ -69376,13 +69726,7 @@ let getFileExt = filename => {
     },
     // 设置models值 通过defaultValue
     setModelsbyDefaultValue(widget) {
-      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);
-        this.models[widget.model] = value ? (0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .normalizeTableModelRows */ .aW)(widget, value) : [];
-        this.generateTableData(widget);
-        return true;
-      }
+      const defaultValue = !this.data.config.status || this.data.config.status == 'XZ' ? ['table', 'newTable'].includes(widget.type) && !widget.options.defaultValue ? [] : widget.options.defaultValue : widget.type === 'select' && !widget.options.defaultValue ? void 0 : '';
       switch (widget.type) {
         case "verify":
           this.models[widget.model] = widget.operationColumns;
@@ -69411,12 +69755,30 @@ let getFileExt = filename => {
           }
           this.models[widget.model] = selectDefaultValue;
           return true;
+        case "table":
+        case "newTable":
+          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 ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(widget)) {
+      if (widget.type === "table" || widget.type === "newTable") {
         var tableRlues = {};
         if (widget.columns.length > 0) {
           widget.columns.forEach(item => {
@@ -69426,15 +69788,13 @@ let getFileExt = filename => {
                   return {
                     ...i,
                     validator: (rule, val, callback) => {
-                      var _this$models$tableMod;
                       let index = rule.field.split('.')[1];
-                      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];
+                      let value = val ? val : this.models[item.tableKey][index][item.model];
                       // 子表单组件不可见的时候， 内部组件都不校验
                       if (!widget.options.canView) {
                         return callback();
                       }
-                      if (!item.options.canView || item.options.disabled && !this.m_isCorrectAudit() || !rule.required) {
+                      if (!item.options.canView || item.options.disabled && !this.m_isCorrectBt || !rule.required) {
                         return callback();
                       }
                       if (value === "" || value === undefined || value == null || Array.isArray(value) && !value.length) {
@@ -69579,7 +69939,7 @@ let getFileExt = filename => {
     dataListReset() {
       if (this.data.list.length > 0) {
         this.data.list.forEach(item => {
-          if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_33__/* .isTableWidget */ .X2)(item)) {
+          if (item.type === "table") {
             item.options.defaultValue = [];
           }
         });
@@ -70243,7 +70603,6 @@ 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);
 
 
 
@@ -70265,7 +70624,6 @@ const API = '/form/formdesiger/countLeaveDays';
 
 
 
-
 __webpack_require__.g.dictData = {};
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   inject: {
@@ -70402,7 +70760,7 @@ __webpack_require__.g.dictData = {};
   computed: {
     applyId() {
       var _this$formContext, _this$$route;
-      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);
+      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);
     },
     currUserInfo() {
       var _this$formContext2;
@@ -70570,7 +70928,7 @@ __webpack_require__.g.dictData = {};
               item.columns.forEach(columnsItem => {
                 func(res_list, columnsItem.list);
               });
-            } else if ((0,_form_form_util_tableUtil__WEBPACK_IMPORTED_MODULE_19__/* .isTableWidget */ .X2)(item)) {
+            } else if (["table", "newTable"].includes(item.type)) {
               // columns
               func(res_list, item.columns);
             } else {
@@ -70643,11 +71001,7 @@ __webpack_require__.g.dictData = {};
     //时间比较
     onDateChange(val) {
       if (this.tableKey) {
-        var _this$formContext3;
-        if ((_this$formContext3 = this.formContext) !== null && _this$formContext3 !== void 0 && _this$formContext3.ensureTableModelsWritable) {
-          this.formContext.ensureTableModelsWritable(this.tableKey);
-        }
-        this.$set(this.models[this.tableKey][this.tableIndex], this.widget.model, val);
+        this.models[this.tableKey][this.tableIndex][this.widget.model] = val;
       } else {
         this.models[this.widget.model] = val;
       }
@@ -71213,7 +71567,7 @@ module.exports = {
 
 /***/ },
 
-/***/ 40000
+/***/ 96463
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -72498,7 +72852,7 @@ if(templist.includes('匹配条件字段的值')){
   components: {
     JEllipsis: JEllipsis,
     codemirror: vue_codemirror.codemirror,
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 28807))
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 68456))
   },
   props: {
     datalist: {
@@ -74802,15 +75156,15 @@ 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=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:[
+;// ./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=662f8adf&scoped=true
+var componentvue_type_template_id_662f8adf_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_ef4ced6e_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_662f8adf_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.49.0@core-js/modules/es.array.unshift.js
@@ -74912,6 +75266,11 @@ 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],
+  inject: {
+    useNewTableDictCache: {
+      default: false
+    }
+  },
   data() {
     return {
       page: 0,
@@ -74930,6 +75289,12 @@ 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) {
@@ -75065,7 +75430,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;
-        (0,dictDataCache/* clearDictCache */.ue)();
+        __webpack_require__.g.dictData[wight.model] = null;
         let currDataModel = this.dataModel;
         if (typeof data == "object") {
           //用此判断 来确定是否由消息发布者手动触发来启动
@@ -75136,6 +75501,7 @@ 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
@@ -75157,6 +75523,7 @@ 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 {
@@ -75164,8 +75531,72 @@ if (!__webpack_require__.g.linkage_select) __webpack_require__.g.linkage_select
             text: item.label
           };
         });
-      } else if (!this.isGetOptionsByPulish) {
+      } else if (this.useNewTableDictCache) {
         this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
+      } 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
+                  };
+                });
+              }
+            });
+          }
+        }
       }
       __webpack_require__.g.dictData[this.widget.model] = this.dictOptions;
     },
@@ -75185,10 +75616,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=ef4ced6e&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=662f8adf&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./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?vue&type=style&index=0&id=662f8adf&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/Select/component.vue
 
@@ -75201,11 +75632,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_ef4ced6e_scoped_true_render,
-  componentvue_type_template_id_ef4ced6e_scoped_true_staticRenderFns,
+  componentvue_type_template_id_662f8adf_scoped_true_render,
+  componentvue_type_template_id_662f8adf_scoped_true_staticRenderFns,
   false,
   null,
-  "ef4ced6e",
+  "662f8adf",
   null
   
 )
@@ -76554,7 +76985,7 @@ var util = __webpack_require__(97031);
   },
   beforeCreate: function () {
     // 直接 components 申明layoutItem 会导致循环调用问题， 但是用 异步组件 () =>layoutItem.vue 会导致 副组件 $nextTick 无法获取dom 更新后回调
-    this.$options.components.layoutItem = (__webpack_require__(70811)["default"]);
+    this.$options.components.layoutItem = (__webpack_require__(92241)["default"]);
   },
   watch: {
     "widget": {
@@ -77551,7 +77982,7 @@ var componentvue_type_template_id_cab895c6_scoped_true_staticRenderFns = []
   },
   beforeCreate: function () {
     // 直接 components 申明layoutItem 会导致循环调用问题， 但是用 异步组件 () =>layoutItem.vue 会导致 副组件 $nextTick 无法获取dom 更新后回调
-    this.$options.components.layoutItem = (__webpack_require__(70811)["default"]);
+    this.$options.components.layoutItem = (__webpack_require__(92241)["default"]);
   },
   watch: {
     "widget": {
@@ -80019,8 +80450,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=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:({
+;// ./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=1719ff5b&scoped=true
+var componentvue_type_template_id_1719ff5b_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'
@@ -80029,12 +80460,13 @@ var componentvue_type_template_id_02f7d5e6_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_02f7d5e6_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_1719ff5b_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
 
 
+
 //
 //
 //
@@ -80110,6 +80542,11 @@ var componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns = []
 /* harmony default export */ const Radio_componentvue_type_script_lang_js = ({
   name: "radio",
   mixins: [widgetMixins/* default */.A],
+  inject: {
+    useNewTableDictCache: {
+      default: false
+    }
+  },
   data() {
     return {
       dataModel: "",
@@ -80139,22 +80576,80 @@ var componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns = []
       });
     },
     async initDictData() {
-      this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
+      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.useNewTableDictCache) {
+        this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
+      } 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
+                  };
+                });
+              }
+            });
+          }
+        }
+      }
       __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=02f7d5e6&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=1719ff5b&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=02f7d5e6&prod&lang=css
+;// ./src/form/modules/components/Radio/component.vue?vue&type=style&index=0&id=1719ff5b&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=02f7d5e6&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=1719ff5b&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./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?vue&type=style&index=1&id=1719ff5b&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/Radio/component.vue
 
@@ -80168,11 +80663,11 @@ var componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns = []
 
 var Radio_component_component = (0,componentNormalizer/* default */.A)(
   components_Radio_componentvue_type_script_lang_js,
-  componentvue_type_template_id_02f7d5e6_scoped_true_render,
-  componentvue_type_template_id_02f7d5e6_scoped_true_staticRenderFns,
+  componentvue_type_template_id_1719ff5b_scoped_true_render,
+  componentvue_type_template_id_1719ff5b_scoped_true_staticRenderFns,
   false,
   null,
-  "02f7d5e6",
+  "1719ff5b",
   null
   
 )
@@ -80737,8 +81232,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=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:({
+;// ./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=ff8aa88e
+var componentvue_type_template_id_ff8aa88e_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',
@@ -80747,7 +81242,7 @@ var componentvue_type_template_id_22c73925_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_22c73925_staticRenderFns = []
+var componentvue_type_template_id_ff8aa88e_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
@@ -80831,6 +81326,11 @@ var componentvue_type_template_id_22c73925_staticRenderFns = []
 /* harmony default export */ const Checkbox_componentvue_type_script_lang_js = ({
   name: "checkbox",
   mixins: [widgetMixins/* default */.A],
+  inject: {
+    useNewTableDictCache: {
+      default: false
+    }
+  },
   data() {
     return {
       dataModel: [],
@@ -80895,17 +81395,79 @@ var componentvue_type_template_id_22c73925_staticRenderFns = []
       }
     },
     async initDictData() {
-      this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
-      __webpack_require__.g.dictData[this.widget.model] = 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.useNewTableDictCache) {
+        this.dictOptions = await (0,dictDataCache/* fetchDictOptions */.$i)(this.widget.options, this.applyId);
+      } 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;
+        }
+      }
     }
   }
 });
 ;// ./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=22c73925&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=ff8aa88e&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=22c73925&prod&lang=css
+;// ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=ff8aa88e&prod&lang=css
 
 ;// ./src/form/modules/components/Checkbox/component.vue
 
@@ -80918,8 +81480,8 @@ var componentvue_type_template_id_22c73925_staticRenderFns = []
 
 var Checkbox_component_component = (0,componentNormalizer/* default */.A)(
   components_Checkbox_componentvue_type_script_lang_js,
-  componentvue_type_template_id_22c73925_render,
-  componentvue_type_template_id_22c73925_staticRenderFns,
+  componentvue_type_template_id_ff8aa88e_render,
+  componentvue_type_template_id_ff8aa88e_staticRenderFns,
   false,
   null,
   null,
@@ -82382,7 +82944,7 @@ var componentvue_type_template_id_50c00481_scoped_true_staticRenderFns = []
 
 
 const componentvue_type_script_lang_js_widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
-const layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 70811));
+const layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 92241));
 /* harmony default export */ const Grid_componentvue_type_script_lang_js = ({
   name: "widgetDesign",
   components: {
@@ -82784,7 +83346,7 @@ var componentvue_type_template_id_1106030a_scoped_true_staticRenderFns = []
 //
 //
 
-const componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 70811));
+const componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 92241));
 
 /* harmony default export */ const GridLayout_componentvue_type_script_lang_js = ({
   mixins: [widgetMixins/* default */.A],
@@ -83488,7 +84050,7 @@ var componentvue_type_template_id_23ce24a6_scoped_true_staticRenderFns = []
 //
 //
 
-const AllLayout_componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 70811));
+const AllLayout_componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 92241));
 //import GenerateIdeaSignItem from "./GenerateIdeaSignItem"; //idea-sign签名审核表单item
 
 /* harmony default export */ const AllLayout_componentvue_type_script_lang_js = ({
@@ -84300,7 +84862,7 @@ var es_symbol_description = __webpack_require__(81325);
 //
 
 
-const Verify_componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 70811));
+const Verify_componentvue_type_script_lang_js_layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 92241));
 
 
 
@@ -114728,21 +115290,19 @@ 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=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) {
+;// ./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) {
               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_627f4e94_scoped_true_staticRenderFns = []
+var conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns = []
 
 
-;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=627f4e94&scoped=true
+;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=057ba4e5&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
 
 
@@ -114907,7 +115467,6 @@ var tableUtil = __webpack_require__(5229);
 
 
 
-
 /* harmony default export */ const conferenceRoomModalvue_type_script_lang_js = ({
   name: "TaskScriptAddModal",
   inject: {
@@ -114983,7 +115542,7 @@ var tableUtil = __webpack_require__(5229);
       debugger;
       let arr = [];
       dataList.forEach(item => {
-        if ((0,tableUtil/* isTableWidget */.X2)(item) && item.columns && item.columns.length > 0) {
+        if (item.type === 'table' && 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 => {
@@ -115202,15 +115761,15 @@ var tableUtil = __webpack_require__(5229);
 });
 ;// ./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=627f4e94&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=057ba4e5&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=627f4e94&prod&lang=less&scoped=true
+;// ./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-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
+;// ./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
 // extracted by mini-css-extract-plugin
 
-;// ./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?vue&type=style&index=1&id=057ba4e5&prod&lang=css
 
 ;// ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue
 
@@ -115224,11 +115783,11 @@ var tableUtil = __webpack_require__(5229);
 
 var conferenceRoomModal_component = (0,componentNormalizer/* default */.A)(
   component_conferenceRoomModalvue_type_script_lang_js,
-  conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_render,
-  conferenceRoomModalvue_type_template_id_627f4e94_scoped_true_staticRenderFns,
+  conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_render,
+  conferenceRoomModalvue_type_template_id_057ba4e5_scoped_true_staticRenderFns,
   false,
   null,
-  "627f4e94",
+  "057ba4e5",
   null
   
 )
@@ -115308,9 +115867,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=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/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/component/selectAppModal.vue?vue&type=template&id=397a2098&scoped=true
@@ -115441,7 +116000,6 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
 //
 
 
-
 /* harmony default export */ const conferenceRoom_widgetSetupvue_type_script_lang_js = ({
   name: "widgetSetup",
   data() {
@@ -115478,7 +116036,7 @@ var component_selectAppModal_component = (0,componentNormalizer/* default */.A)(
         //时间
         this.dateDateList.push(item);
         this.dataColumnsList.push(item);
-      } else if ((0,tableUtil/* isTableWidget */.X2)(item) && item.columns && item.columns.length > 0) {
+      } else if (item.type === 'table' && 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);
@@ -115510,10 +116068,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=b87a9ec2&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=20ca2364&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./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?vue&type=style&index=0&id=20ca2364&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/conferenceRoom/widgetSetup.vue
 
@@ -115526,11 +116084,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_b87a9ec2_scoped_true_render,
-  widgetSetupvue_type_template_id_b87a9ec2_scoped_true_staticRenderFns,
+  widgetSetupvue_type_template_id_20ca2364_scoped_true_render,
+  widgetSetupvue_type_template_id_20ca2364_scoped_true_staticRenderFns,
   false,
   null,
-  "b87a9ec2",
+  "20ca2364",
   null
   
 )
@@ -118715,10 +119273,9 @@ const Bus = new (vue__WEBPACK_IMPORTED_MODULE_0___default())();
 "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 */   sE: () => (/* binding */ prefetchTableDictData)
 /* harmony export */ });
-/* unused harmony export getDictCacheKey */
+/* unused harmony exports getDictCacheKey, clearDictCache */
 /* 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);
@@ -118911,8 +119468,6 @@ function clearDictCache(cacheKey) {
 /* 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);
-
 
 
 
@@ -118958,7 +119513,7 @@ function getRecursionWidget(widgetList) {
             columnsItem.list.p_model = item.model;
             func(res_list, columnsItem.list);
           });
-        } else if ((0,_tableUtil__WEBPACK_IMPORTED_MODULE_3__/* .isTableWidget */ .X2)(item)) {
+        } else if (["table", "newTable"].includes(item.type)) {
           // columns
           item.columns.p_type = item.type;
           item.columns.p_model = item.model;
@@ -119071,25 +119626,20 @@ const getMathResult = (method, arr, sub) => {
 
 /***/ },
 
-/***/ 5229
+/***/ 29195
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   AJ: () => (/* binding */ applyTableScriptDefaults),
-/* 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 */   aW: () => (/* binding */ normalizeTableModelRows),
 /* harmony export */   eo: () => (/* binding */ createLightweightTableRows),
-/* harmony export */   gj: () => (/* binding */ validateSubTableRows),
 /* harmony export */   n_: () => (/* binding */ finalizeTableModelRows),
-/* harmony export */   qh: () => (/* binding */ getTableVirtualKeeps),
 /* harmony export */   r: () => (/* binding */ createLightweightTableRow),
+/* harmony export */   yK: () => (/* binding */ validateNewTableRows),
 /* harmony export */   yk: () => (/* binding */ createFullTableRow)
 /* harmony export */ });
-/* unused harmony exports TABLE_WIDGET_TYPES, isNewTableWidget, isLightweightTableRow, evalTableScriptValue */
+/* unused harmony exports LARGE_TABLE_ROW_THRESHOLD, isNewTableWidget, normalizeTableModelRows, evalTableScriptValue */
 /* 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);
@@ -119117,27 +119667,11 @@ const getMathResult = (method, arr, sub) => {
 
 
 
-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;
 }
@@ -119162,9 +119696,6 @@ function createFullTableRow(template) {
   row.rand_id = Math.random().toString();
   return row;
 }
-function isLightweightTableRow(row) {
-  return row && row._lightweight === true;
-}
 
 /** 补全子表单每行的列字段，避免分页/默认值场景下部分行缺 key */
 function normalizeTableModelRows(tableWidget, rows) {
@@ -119206,7 +119737,7 @@ function shouldApplyTableScriptValue(value, col) {
   return false;
 }
 
-/** 分页/轻量行场景下，为全部行补算 script 默认值（序号列等） */
+/** 分页场景下，为全部行补算 script 默认值（序号列等） */
 function applyTableScriptDefaults(tableWidget, rows) {
   var _tableWidget$columns2;
   if (!Array.isArray(rows) || !(tableWidget !== null && tableWidget !== void 0 && (_tableWidget$columns2 = tableWidget.columns) !== null && _tableWidget$columns2 !== void 0 && _tableWidget$columns2.length)) return rows || [];
@@ -119229,7 +119760,7 @@ function applyTableScriptDefaults(tableWidget, rows) {
   });
 }
 
-/** 补全并规范化子表单行数据（提交前调用） */
+/** 补全并规范化新子表单行数据（提交前调用） */
 function finalizeTableModelRows(tableWidget, rows) {
   return applyTableScriptDefaults(tableWidget, normalizeTableModelRows(tableWidget, rows));
 }
@@ -119237,8 +119768,8 @@ function isEmptyValue(value) {
   return value === '' || value === undefined || value === null || Array.isArray(value) && !value.length;
 }
 
-/** 不依赖 DOM，遍历子表单全部行做必填/最少选校验（分页、虚拟滚动下未挂载行也能拦截） */
-function validateSubTableRows(tables, models, {
+/** 不依赖 DOM，遍历新子表单全部行做必填/最少选校验（分页下未挂载行也能拦截） */
+function validateNewTableRows(tables, models, {
   isCorrectAudit = false
 } = {}) {
   const errors = [];
@@ -142062,7 +142593,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
-var components = __webpack_require__(40000);
+var components = __webpack_require__(96463);
 ;// ./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
 //
 //
@@ -143725,7 +144256,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 30210
+/***/ 5954
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -143735,7 +144266,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=f81354ea&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=02804c33&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 = []
 
@@ -143744,10 +144275,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=f81354ea&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=02804c33&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=f81354ea&prod&scoped=true&lang=less
+;// ./src/form/modules/common/tableItem.vue?vue&type=style&index=0&id=02804c33&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);
@@ -143766,7 +144297,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "f81354ea",
+  "02804c33",
   null
   
 )
@@ -144033,7 +144564,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 
 
 const widgetFormItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 48942));
-const layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 70811));
+const layoutItem = () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 92241));
 /* harmony default export */ const widgetDesignvue_type_script_lang_js = ({
   name: "widgetDesign",
   components: {
@@ -144293,7 +144824,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 28807
+/***/ 68456
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -144305,11 +144836,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=6ffd30c3&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')?[(
+;// ./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=795d9573&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.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:[_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:({
+                )?_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:({
                     width: widget.options.labelWidth + 'px',
                     borderColor: _vm.data.config.borderColor,
                     backgroundColor: _vm.data.config.bgc,
@@ -144321,7 +144852,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]))?[(_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 () {
+                          : '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 () {
                                     var args = [], len = arguments.length;
                                     while ( len-- ) args[ len ] = arguments[ len ];
 
@@ -144331,17 +144862,48 @@ 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()]:(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) {
+}},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) {
                       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()]:_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(),(
+                      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()]:_vm._e(),(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:({
+                    width: widget.options.labelWidth + 'px',
+                    borderColor: _vm.data.config.borderColor,
+                    backgroundColor: _vm.data.config.bgc,
+                    color: _vm.data.config.color,
+                  })},[_c('p',{staticStyle:{"position":"relative","margin-bottom":"0","padding-bottom":"0"}},[(widget.options.enableImport && !widget.options.disabled)?_c('span',[_c('a-upload',{staticStyle:{"float":"left","margin":"0 5px"},attrs:{"action":_vm.actionUrl + "?formId=" + (_vm.data.formId) + "&tableKey=" + (widget.model),"headers":_vm.headers,"showUploadList":false,"accept":".xls,.xlsx","beforeUpload":_vm.beforeUpload},on:{"change":function (params) { return _vm.handleChange(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(widget)}}},[_c('a-button',[_vm._v("下载模板")])],1)],1):_vm._e(),(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(widget)}}},[_c('a-icon',{attrs:{"type":"download"}}),_vm._v("导出")],1)],1):_vm._e(),_c('span',[_vm._v(_vm._s(widget.name))])])]):_c('div',{staticClass:"table-content",style:({
+                    background: _vm.data.config.bgc,
+                    color: _vm.data.config.color,
+                    borderColor: _vm.data.config.borderColor, })},[_c('span',{staticStyle:{"position":"relative","margin-bottom":"0","height":"40px","display":"block"},style:({})},[_c('span',{staticStyle:{"position":"absolute","display":"flex","height":"100%","align-items":"center"}},[(widget.options.enableImport && !widget.options.disabled)?_c('span',[_c('a-upload',{staticStyle:{"float":"left","margin":"0 5px"},attrs:{"action":_vm.actionUrl + "?formId=" + (_vm.data.formId) + "&tableKey=" + (widget.model),"headers":_vm.headers,"accept":".xls,.xlsx","showUploadList":false,"beforeUpload":_vm.beforeUpload},on:{"change":function (params) { return _vm.handleChange(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(widget)}}},[_c('a-button',[_vm._v("下载模板")])],1)],1):_vm._e(),(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(widget)}}},[_c('a-icon',{attrs:{"type":"download"}}),_vm._v("导出")],1)],1):_vm._e()]),_c('span',[_vm._v(_vm._s(widget.name))])])]),_c('div',{staticClass:"table-right"},[_c('div',{staticClass:"sub-table-col sub-table-col-no-border"},[_vm._l((_vm.tableWidgetColumns(widget)),function(children,index){return _c('span',{directives:[{name:"show",rawName:"v-show",value:(children.type !== 'hidden'),expression:"children.type !== 'hidden'"}],key:index,class:[
+                        _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,"applyId":_vm.applyId}})}),(_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 ];
+
+                                    return _vm.newTablePageChange.apply(void 0, [ widget ].concat( args ));
+},"showSizeChange":function () {
+                                    var args = [], len = arguments.length;
+                                    while ( len-- ) args[ len ] = arguments[ len ];
+
+                                    return _vm.newTablePageChange.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()]:_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,"applyId":_vm.applyId}})})]:_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":"数据加载中"}},[(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:{
+                    )?_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('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}})],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)}
@@ -144352,15 +144914,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=6ffd30c3&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=795d9573&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=6ffd30c3&prod&lang=less&scoped=true
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=795d9573&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=6ffd30c3&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=795d9573&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=6ffd30c3&prod&lang=css
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=795d9573&prod&lang=css
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(64008);
@@ -144380,7 +144942,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "6ffd30c3",
+  "795d9573",
   null
   
 )
@@ -144389,7 +144951,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 70811
+/***/ 92241
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -144401,7 +144963,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ layoutItem)
 });
 
-;// ./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/layoutItem.vue?vue&type=template&id=0e694577&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/layout/layoutItem.vue?vue&type=template&id=3d82d3aa&scoped=true
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"custom_form_item",class:{ 'ant-form-noBorder':  _vm.widget.options.noBorder},staticStyle:{"position":"relative"}},[_c('a-tooltip',{attrs:{"placement":"top","title":"纠错"}},[(_vm.widget.options.canCorrect && _vm.isCorrect)?_c('span',{staticClass:"correction",on:{"click":function($event){return _vm.handlecorrection(_vm.widget, _vm.$refs['component'])}}}):_vm._e()]),(!_vm.widget.options.isCorrected)?[(_vm.widget.type == 'input')?[_c('input-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"models":_vm.models,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'textarea')?[_c('textarea-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"models":_vm.models,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'number')?[_c('number-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'switch')?[_c('switch-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'slider')?[_c('slider-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'radio')?[_c('radio-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'checkbox')?[_c('checkbox-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'rate')?[_c('rate-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'hidden')?[_c('hidden-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"models":_vm.models,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'placeholder')?[_c('placeholder-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models}})]:(_vm.widget.type == 'superLink')?[_c('superLink-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'codeControl')?[_c('codeControl-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'select')?[_c('select-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models,"rules":_vm.rules,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"applyId":_vm.applyId},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'cascaderSelect')?[_c('cascader-select-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models,"rules":_vm.rules,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'cascader')?[_c('cascader-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models,"rules":_vm.rules,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'relateSub')?[_c('relate-sub-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'userSelector')?[_c('user-selector-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'userSelectorByRole')?[_c('user-selector-by-role-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'imgupload')?[_c('img-upload-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"hashKey":_vm.hashKey,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'fileupload')?[_c('file-upload-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'uploadModel')?[_c('upload-model-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'signature')?[_c('signature-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'idea-sign')?[_c('idea-sign-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'verify')?[_c('verify-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'deptSelector')?[_c('depart-selector-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'dataTable')?[_c('data-table-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'time')?[_c('time-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'signatureWrite')?[_c('signature-write-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'date')?[_c('date-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:_vm._e(),(_vm.widget.type == 'editorAirt')?[_c('editor-airt-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"models":_vm.models},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}})]:(_vm.widget.type == 'responsibility')?[_c('responsibility-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:_vm._e(),(_vm.widget.type == 'location')?[_c('location-component',{attrs:{"widget":_vm.widget,"rules":_vm.rules,"models":_vm.models,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:_vm._e(),_vm._l((_vm.HnKjTypes),function(hnkjType){return [(hnkjType === _vm.widget.type)?_c(hnkjType + 'Component',{ref:"component",refInFor:true,tag:"component",attrs:{"widget":_vm.widget,"verifyLogs":_vm.verifyLogs,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"rules":_vm.rules,"dataObj":_vm.dataObj,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"models":_vm.models},on:{"updateModels":_vm.updateModels},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}}):_vm._e()]})]:_vm._e(),(_vm.widget.options.isCorrected)?_c('a-popover',{attrs:{"overlayClassName":"myStyle"}},[_c('template',{slot:"content"},[_vm._v("原值是："+_vm._s(['', undefined, null].includes(_vm.widget.options.oldValue) ? '【空】' : _vm.widget.options.oldValue))]),_c('div',{staticClass:"correct-style",style:({
           background: _vm.widget.options.isCorrected ? 'rgba(255,204,204)' : null,
         })},[(_vm.widget.type === 'cascaderSelect')?[_c('cascader-select-component',{ref:"component",attrs:{"widget":_vm.widget,"verifyLogs":_vm.verifyLogs,"verifyNode":_vm.verifyNode,"suggest":_vm.suggest,"rules":_vm.rules,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"models":_vm.models},on:{"updateModels":_vm.updateModels},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}})]:_vm._e(),(_vm.widget.type == 'input')?[_c('input-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"showLabel":_vm.showLabel,"models":_vm.models,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'textarea')?[_c('textarea-component',{ref:"component",attrs:{"widget":_vm.widget,"rules":_vm.rules,"models":_vm.models,"showLabel":_vm.showLabel,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'number')?[_c('number-component',{ref:"component",attrs:{"widget":_vm.widget,"showLabel":_vm.showLabel,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'switch')?[_c('switch-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'slider')?[_c('slider-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'radio')?[_c('radio-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'checkbox')?[_c('checkbox-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'rate')?[_c('rate-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'hidden')?[_c('hidden-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'placeholder')?[_c('placeholder-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models}})]:(_vm.widget.type == 'superLink')?[_c('superLink-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'codeControl')?[_c('codeControl-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'select')?[_c('select-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models,"showLabel":_vm.showLabel,"rules":_vm.rules,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"applyId":_vm.applyId},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'cascader')?[_c('cascader-component',{ref:"component",attrs:{"widget":_vm.widget,"models":_vm.models,"rules":_vm.rules,"showLabel":_vm.showLabel,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'relateSub')?[_c('relate-sub-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'userSelector')?[_c('user-selector-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'userSelectorByRole')?[_c('user-selector-by-role-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'imgupload')?[_c('img-upload-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"hashKey":_vm.hashKey,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'fileupload')?[_c('file-upload-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'uploadModel')?[_c('upload-model-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'signature')?[_c('signature-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'idea-sign')?[_c('idea-sign-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'deptSelector')?[_c('depart-selector-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'time')?[_c('time-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'signatureWrite')?[_c('signature-write-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'responsibility')?[_c('responsibility-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"tableIndex":_vm.tableIndex,"showLabel":_vm.showLabel,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:(_vm.widget.type == 'date')?[_c('date-component',{ref:"component",attrs:{"widget":_vm.widget,"tableKey":_vm.tableKey,"showLabel":_vm.showLabel,"tableIndex":_vm.tableIndex,"rules":_vm.rules,"models":_vm.models},on:{"updateModels":_vm.updateModels}})]:_vm._e()],2)],2):_vm._e(),(_vm.widget.options.canCorrect && _vm.isCorrect)?_c('correction-modal',{ref:"CorrectionModal",on:{"submitCorrectObj":_vm.submitCorrectObj}}):_vm._e()],2)}
@@ -144462,7 +145024,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
-var components = __webpack_require__(40000);
+var components = __webpack_require__(96463);
 // 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);
@@ -145431,10 +145993,6 @@ var hnkj = __webpack_require__(52438);
     }
   },
   inject: {
-    formContext: {
-      from: 'formContext',
-      default: null
-    },
     isCorrect: {
       // 健名
       from: "isCorrect",
@@ -145582,34 +146140,24 @@ var hnkj = __webpack_require__(52438);
       }
     },
     tableInit(val) {
-      var _this$formContext, _this$formContext2;
-      const tableKey = this.tableKey;
-      const index = this.tableIndex;
-      const field = this.widget.model;
-      if ((_this$formContext = this.formContext) !== null && _this$formContext !== void 0 && _this$formContext.ensureTableModelsWritable) {
-        this.formContext.ensureTableModelsWritable(tableKey);
-      } else if ((_this$formContext2 = this.formContext) !== null && _this$formContext2 !== void 0 && _this$formContext2.unFreezeModels && Array.isArray(this.models[tableKey]) && Object.isFrozen(this.models[tableKey])) {
-        this.formContext.unFreezeModels(tableKey);
-      }
-      const rows = this.models[tableKey];
-      if (!rows) return;
-      if (typeof rows[index] !== 'object' || rows[index] === null) {
-        this.$set(rows, index, {});
-      }
-      this.$set(rows[index], field, val);
+      var cloneArr = this.models[this.tableKey];
+      if (!(typeof cloneArr[this.tableIndex] == "object")) {
+        cloneArr[this.tableIndex] = {};
+      }
+      cloneArr[this.tableIndex][this.widget.model] = val;
       this.$emit("update:models", {
         ...this.models,
-        [tableKey]: rows
+        [this.tableKey]: cloneArr
       });
     }
   }
 });
 ;// ./src/form/modules/layout/layoutItem.vue?vue&type=script&lang=js
  /* harmony default export */ const layout_layoutItemvue_type_script_lang_js = (layoutItemvue_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/layout/layoutItem.vue?vue&type=style&index=0&id=0e694577&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/layoutItem.vue?vue&type=style&index=0&id=3d82d3aa&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutItem.vue?vue&type=style&index=0&id=0e694577&prod&lang=less&scoped=true
+;// ./src/form/modules/layout/layoutItem.vue?vue&type=style&index=0&id=3d82d3aa&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/layout/layoutItem.vue
 
@@ -145626,7 +146174,7 @@ var layoutItem_component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "0e694577",
+  "3d82d3aa",
   null
   
 )
@@ -145670,7 +146218,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(5335);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1029 modules
-var components = __webpack_require__(40000);
+var components = __webpack_require__(96463);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(31227);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -163608,7 +164156,7 @@ function toString(value) {
 (module) {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.689-AI.10"}');
+module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.689-AI.11"}');
 
 /***/ }
 
@@ -177410,9 +177958,9 @@ 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__(28807);
+var layoutForPaper = __webpack_require__(68456);
 // EXTERNAL MODULE: ./src/form/modules/layout/layoutItem.vue + 10 modules
-var layoutItem = __webpack_require__(70811);
+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
 var Containervue_type_template_id_497bb086_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-layout',{staticClass:"fm2-container",class:{ 'gzt-hidden-key': _vm.hiddenSave }},[_c('a-layout',[_c('a-layout-sider',{staticClass:"left-sider",attrs:{"width":"260px"}},[_c('div',{staticClass:"left-actions"},[(!_vm.hiddenSave)?_c('span',{staticClass:"action-btn primary",on:{"click":_vm.handleSave}},[_vm._v("保存")]):_vm._e(),_c('span',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isView),expression:"!isView"}],staticClass:"action-btn primary",on:{"click":_vm.handlePreview}},[_vm._v("预览")]),_c('span',{directives:[{name:"show",rawName:"v-show",value:(_vm.isView),expression:"isView"}],staticClass:"action-btn primary",on:{"click":_vm.handleColse}},[_vm._v("关闭预览")]),_c('span',{staticClass:"action-btn primary",on:{"click":_vm.handleGenerateJson}},[_vm._v("查看JSON")]),_c('span',{directives:[{name:"show",rawName:"v-show",value:(_vm.isView),expression:"isView"}],staticClass:"action-btn primary",on:{"click":_vm.handleGetData}},[_vm._v("模拟提交")]),_c('span',{staticClass:"action-btn danger",on:{"click":_vm.handleClear}},[_vm._v("清空")])]),_c('widget-list'),(_vm.isView)?_c('div',{staticClass:"preview-options"},[_c('a-button',{class:{'btn-active': _vm.isPreviewDesktop },attrs:{"type":"link","icon":"desktop"},on:{"click":function($event){_vm.isPreviewDesktop = true}}},[_vm._v(" 桌面端 ")]),_c('a-divider',{attrs:{"type":"vertical"}}),_c('a-button',{class:{'btn-active': !_vm.isPreviewDesktop },attrs:{"type":"link","icon":"mobile"},on:{"click":function($event){_vm.isPreviewDesktop = false}}},[_vm._v(" 移动端 ")])],1):_vm._e()],1),_c('a-layout',[_c('a-layout-content',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isView),expression:"!isView"}],staticClass:"center-container g1-form_main2",attrs:{"direction":"vertical"}},[_c('div',{staticClass:"a-layout-main",class:{ 'widget-empty': _vm.widgetForm.list.length == 0 }},[_c('widget-form',{ref:"widgetForm",attrs:{"data":_vm.widgetForm,"selectedWidget":_vm.widgetFormSelect},on:{"widgetListChange":_vm.getWidgetFormList,"update:data":function($event){_vm.widgetForm=$event},"update:selectedWidget":function($event){_vm.widgetFormSelect=$event},"update:selected-widget":function($event){_vm.widgetFormSelect=$event}}})],1)]),_c('a-layout-sider',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isView),expression:"!isView"}],staticClass:"widget-config-container g1-panel1",attrs:{"width":"300px"}},[_c('a-layout-header',{staticStyle:{"background":"#fff"},attrs:{"height":"45px"}},[_c('div',{staticClass:"config-tab",class:{ active: _vm.configTab == 'widget' },on:{"click":function($event){return _vm.handleConfigSelect('widget')}}},[_vm._v(" 字段属性 ")]),_c('div',{staticClass:"config-tab",class:{ active: _vm.configTab == 'form' },on:{"click":function($event){return _vm.handleConfigSelect('form')}}},[_vm._v(" 表单属性 ")])]),_c('div',{staticClass:"config-content a-layout-main"},[(!_vm.refreshWidgetConfig)?_c('widget-config',{directives:[{name:"show",rawName:"v-show",value:(_vm.configTab == 'widget'),expression:"configTab == 'widget'"}],ref:"widgetconfig",attrs:{"selectedWidget":_vm.widgetFormSelect,"datalist":_vm.widgetForm.list}}):_vm._e(),_c('form-config',{directives:[{name:"show",rawName:"v-show",value:(_vm.configTab == 'form'),expression:"configTab == 'form'"}],attrs:{"formConfig":_vm.widgetForm.config,"hiddenSave":_vm.hiddenSave},on:{"update:formConfig":function($event){return _vm.$set(_vm.widgetForm, "config", $event)},"update:form-config":function($event){return _vm.$set(_vm.widgetForm, "config", $event)},"changeHeaderOrFooter":_vm.changeHeaderOrFooter}})],1)],1),(_vm.isView)?_c('a-layout-content',{staticClass:"center-container g1-form_main2",attrs:{"direction":"vertical"}},[_c('div',{staticClass:"a-layout-main",style:({ textAlign: (_vm.isView && !_vm.isPreviewDesktop) ? 'center' : 'left' })},[(!_vm.isPreviewDesktop)?_c('div',{staticClass:"phone-preview"},[_c('iframe',{ref:"previewIframe",staticClass:"previewIframe",staticStyle:{"width":"375px","margin":"0 auto","height":"620px","margin-top":"-20px"},attrs:{"id":"previewIframe","src":_vm.previewMobileUrl,"frameborder":"0"},on:{"load":_vm.previewMobileOnload}})]):_c('layout-for-paper',{ref:"layoutForPaper",attrs:{"insite":"true","isDesign":true,"data":_vm.previewWidgetForm,"value":_vm.widgetModels},on:{"on-change":_vm.handleDataChange}})],1)]):_vm._e()],1),_c('cus-dialog',{ref:"jsonPreview",staticStyle:{"text-align":"left"},attrs:{"title":"数据展示","visible":_vm.jsonVisible,"width":"800px","form":""},on:{"on-close":function($event){_vm.jsonVisible = false}}},[_c('codemirror',{staticClass:"code",attrs:{"value":_vm.jsonTemplate,"options":_vm.options}}),_c('template',{slot:"action"},[(_vm.canCopy)?_c('a-button',{staticClass:"json-btn",attrs:{"type":"primary","data-clipboard-text":_vm.jsonCopyValue}},[_vm._v("复制数据")]):_vm._e(),(!_vm.canCopy)?_c('a-button',{staticClass:"json-btn",on:{"click":function($event){_vm.jsonVisible = false}}},[_vm._v("关闭")]):_vm._e()],1)],2),_c('pageFooterAndHeader',{ref:"pageFooterAndHeader",on:{"changeContent":_vm.changeContent}})],1)],1)}
 var Containervue_type_template_id_497bb086_staticRenderFns = []
@@ -178880,7 +179428,7 @@ 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 + 1029 modules
-var components = __webpack_require__(40000);
+var components = __webpack_require__(96463);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 5 modules
 var widgetFormItem = __webpack_require__(48942);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules
@@ -179922,8 +180470,8 @@ var widgetConfigvue_type_template_id_6aa7533c_scoped_true_render = function () {
 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=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),(
+;// ./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),(
           _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 &&
@@ -179946,15 +180494,13 @@ var widgetPublicConfigvue_type_template_id_34cf2307_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_34cf2307_scoped_true_staticRenderFns = []
+var widgetPublicConfigvue_type_template_id_5f94fdfc_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
 
 
@@ -180350,7 +180896,6 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
 
 
 
-
 /* harmony default export */ const widgetPublicConfigvue_type_script_lang_js = ({
   name: "widgetPublicConfig",
   inject: {
@@ -180430,7 +180975,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
     //   return regularCheckDicts ? regularCheckDicts() : []
     // },
     hasAutoHeight() {
-      return ['select', 'radio', 'checkbox'].includes(this.widget.type) && !['table', 'newTable'].includes(this.widget.parentType);
+      return ['select', 'radio', 'checkbox'].includes(this.widget.type) && this.widget.parentType !== 'table';
     }
   },
   methods: {
@@ -180479,7 +181024,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
         if (['date', 'time'].includes(item.type)) {
           //时间
           this.dateDateList.push(item);
-        } else if (['table', 'newTable'].includes(item.type) && item.columns && item.columns.length > 0) {
+        } else if (item.type === 'table' && 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 => {
@@ -180513,7 +181058,7 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
             item.columns.forEach(columnsItem => {
               this.recursionSameType(columnsItem.list, type);
             });
-          } else if ((0,tableUtil/* isTableWidget */.X2)(item)) {
+          } else if (["table"].includes(item.type)) {
             // columns
             this.recursionSameType(item.columns, type);
           } else {
@@ -180683,10 +181228,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=34cf2307&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=5f94fdfc&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=34cf2307&prod&lang=less&scoped=true
+;// ./src/form/modules/widgetPublicConfig.vue?vue&type=style&index=0&id=5f94fdfc&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/widgetPublicConfig.vue
 
@@ -180699,11 +181244,11 @@ const fontNames = ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "
 
 var widgetPublicConfig_component = (0,componentNormalizer/* default */.A)(
   modules_widgetPublicConfigvue_type_script_lang_js,
-  widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_render,
-  widgetPublicConfigvue_type_template_id_34cf2307_scoped_true_staticRenderFns,
+  widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_render,
+  widgetPublicConfigvue_type_template_id_5f94fdfc_scoped_true_staticRenderFns,
   false,
   null,
-  "34cf2307",
+  "5f94fdfc",
   null
   
 )
@@ -183449,26 +183994,13 @@ class Virtual {
   // try goiong to render next range by a leading buffer according to current direction
   handleDataSourcesChange() {
     let start = this.range.start;
-    if (this.direction === DIRECTION_TYPE.FRONT) {
+    if (this.isFront()) {
       start = start - LEADING_BUFFER;
-    } else if (this.direction === DIRECTION_TYPE.BEHIND) {
+    } else if (this.isBehind()) {
       start = start + LEADING_BUFFER;
     }
     start = Math.max(start, 0);
-    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);
+    this.updateRange(this.range.start, this.getEndByStart(start));
   }
 
   // when slot size change, we also need force update
@@ -183478,24 +184010,11 @@ class Virtual {
 
   // calculating range on scroll
   handleScroll(offset) {
-    const prevOffset = this.offset;
-    if (offset < prevOffset || offset === 0) {
-      this.direction = DIRECTION_TYPE.FRONT;
-    } else if (offset > prevOffset) {
-      this.direction = DIRECTION_TYPE.BEHIND;
-    }
+    this.direction = offset < this.offset || offset === 0 ? DIRECTION_TYPE.FRONT : 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) {
@@ -183596,7 +184115,7 @@ class Virtual {
       // if range length is less than keeps, corrent it base on end
       start = end - keeps + 1;
     }
-    if (this.range.start !== start || this.range.end !== end) {
+    if (this.range.start !== start) {
       this.updateRange(start, end);
     }
   }
@@ -183832,7 +184351,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)
     }
   }
 };
@@ -183940,39 +184459,13 @@ const VirtualList = {
   props: VirtualProps,
   data() {
     return {
-      range: null,
-      scrollParentEl: null
+      range: null
     };
   },
   watch: {
-    'dataSources.length'(newLen, oldLen) {
+    'dataSources.length'() {
       this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources());
-      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();
-      }
+      this.virtual.handleDataSourcesChange();
     },
     keeps(newValue) {
       this.virtual.updateParam('keeps', newValue);
@@ -184002,12 +184495,14 @@ const VirtualList = {
     // set back offset when awake from keep-alive
     this.scrollToOffset(this.virtual.offset);
     if (this.pageMode) {
-      this.bindPageScroll();
+      document.addEventListener('scroll', this.onScroll, {
+        passive: false
+      });
     }
   },
   deactivated() {
     if (this.pageMode) {
-      this.unbindPageScroll();
+      document.removeEventListener('scroll', this.onScroll);
     }
   },
   mounted() {
@@ -184020,19 +184515,16 @@ const VirtualList = {
 
     // in page mode we bind scroll event to document
     if (this.pageMode) {
-      this.scrollParentEl = this.findScrollParent(this.$refs.root);
       this.updatePageModeFront();
-      this.$nextTick(() => {
-        this.refreshListScrollAnchor();
-        this.bindPageScroll();
-        this.syncScrollRange();
+      document.addEventListener('scroll', this.onScroll, {
+        passive: false
       });
     }
   },
   beforeDestroy() {
     this.virtual.destroy();
     if (this.pageMode) {
-      this.unbindPageScroll();
+      document.removeEventListener('scroll', this.onScroll);
     }
   },
   methods: {
@@ -184044,74 +184536,10 @@ 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 this.getPageModeOffset();
+        return document.documentElement[this.directionKey] || document.body[this.directionKey];
       } else {
         const {
           root
@@ -184123,9 +184551,6 @@ 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 {
@@ -184134,31 +184559,10 @@ 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 {
@@ -184167,31 +184571,11 @@ 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) {
-        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;
-        }
+        document.body[this.directionKey] = offset;
+        document.documentElement[this.directionKey] = offset;
       } else {
         const {
           root
@@ -184212,18 +184596,23 @@ const VirtualList = {
       }
     },
     // set current scroll position to bottom
-    scrollToBottom(retryCount = 0) {
+    scrollToBottom() {
       const {
         shepherd
       } = this.$refs;
-      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);
+      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);
+      }
     },
     // when using page mode we need update slot header size manually
     // taking root offset relative to the browser as slot header size
@@ -184231,50 +184620,14 @@ const VirtualList = {
       const {
         root
       } = this.$refs;
-      if (!root) return;
-      if (this.scrollParentEl) {
-        this.virtual.updateParam('slotHeaderSize', 0);
-        return;
+      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);
       }
-      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() {
@@ -184308,15 +184661,6 @@ 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) {
@@ -184333,22 +184677,13 @@ 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;
-      }
 
-      // 嵌套滚动容器内，列表总高度常小于视口，原守卫会阻止滚回前几行
-      const inNestedScrollParent = this.pageMode && this.scrollParentEl;
-      if (!inNestedScrollParent && scrollSize > 0 && offset + clientSize > scrollSize + 1) {
+      // iOS scroll-spring-back behavior will make direction mistake
+      if (offset < 0 || offset + clientSize > scrollSize + 1 || !scrollSize) {
         return;
       }
       this.virtual.handleScroll(offset);
@@ -192244,7 +192579,7 @@ var formula_edit_component = (0,componentNormalizer/* default */.A)(
     }
   },
   components: {
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 28807)),
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 68456)),
     FormulaEdit: formula_edit
   },
   data() {