@tongfun/tf-widget 0.1.140 → 0.1.141

package/lib/tf-widget.common.js

@@ -18,8 +18,8 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 32 modules
-var tf_ag_grid_table = __webpack_require__(8157);
+// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 36 modules
+var tf_ag_grid_table = __webpack_require__(7819);
 // EXTERNAL MODULE: ./package/tf-table/index.js + 12 modules
 var tf_table = __webpack_require__(8409);
 // EXTERNAL MODULE: ./package/tf-splitter/index.js + 6 modules
@@ -135359,7 +135359,7 @@ function removeMultiDragElements() {
 
 /***/ }),
 
-/***/ 8157:
+/***/ 7819:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -135369,8 +135369,8 @@ __webpack_require__.d(__webpack_exports__, {
   "Z": function() { return /* binding */ tf_ag_grid_table; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/index.vue?vue&type=template&id=59eeec56&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOut),expression:"handleClickOut"}],staticClass:"tf-common-table-container"},[_c('ag-grid-vue',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],ref:_vm.tableRef,staticClass:"ag-theme-alpine",staticStyle:{"width":"100%","height":"100%"},attrs:{"row-selection":"multiple","row-height":_vm.rowHeight,"header-height":_vm.headerHeight,"suppress-row-transform":"true","enable-browser-tooltips":"true","suppress-property-names-check":"","suppress-column-move-animation":"true","animate-rows":"true","row-multi-select-with-click":_vm.rowMultiSelectWithClick,"default-col-def":_vm.defaultColDef,"row-data":_vm.filteredData,"column-defs":_vm.columns,"context":_vm.context,"row-drag-managed":_vm.rowDragManaged,"row-drag-entire-row":_vm.rowDragEntireRow,"row-drag-multi-row":_vm.rowDragMultiRow,"overlay-no-rows-template":_vm.overlayNoRowsTemplate,"enable-cell-text-selection":_vm.enableCellTextSelection},on:{"grid-ready":_vm.onGridReady,"column-resized":_vm.columnResized,"column-moved":_vm.columnMoved,"cell-clicked":_vm.cellClick,"row-selected":_vm.currentChange,"cell-double-clicked":_vm.cellDBLClick,"selection-changed":_vm.selectionChange,"rowDragEnd":_vm.rowDragEnd}}),_c('TfPreviewPictures',{ref:"TfPreviewPictures"})],1)}
+;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/index.vue?vue&type=template&id=0e674479&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOut),expression:"handleClickOut"}],staticClass:"tf-common-table-container"},[_c('ag-grid-vue',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],ref:_vm.tableRef,staticClass:"ag-theme-alpine",staticStyle:{"width":"100%","height":"100%"},attrs:{"row-selection":"multiple","row-height":_vm.rowHeight,"header-height":_vm.headerHeight,"suppress-row-transform":"true","enable-browser-tooltips":"enableBrowserTooltips","suppress-property-names-check":"","suppress-column-move-animation":"true","animate-rows":"true","row-multi-select-with-click":_vm.rowMultiSelectWithClick,"default-col-def":_vm.defaultColDef,"row-data":_vm.filteredData,"column-defs":_vm.columns,"context":_vm.context,"row-drag-managed":_vm.rowDragManaged,"row-drag-entire-row":_vm.rowDragEntireRow,"row-drag-multi-row":_vm.rowDragMultiRow,"overlay-no-rows-template":_vm.overlayNoRowsTemplate,"enable-cell-text-selection":_vm.enableCellTextSelection,"tooltip-show-delay":_vm.tooltipShowDelay,"tooltip-hide-delay":_vm.tooltipHideDelay},on:{"grid-ready":_vm.onGridReady,"column-resized":_vm.columnResized,"column-moved":_vm.columnMoved,"cell-clicked":_vm.cellClick,"row-selected":_vm.currentChange,"cell-double-clicked":_vm.cellDBLClick,"selection-changed":_vm.selectionChange,"rowDragEnd":_vm.rowDragEnd}}),_c('TfPreviewPictures',{ref:"TfPreviewPictures"})],1)}
 var staticRenderFns = []
 
 
@@ -135911,6 +135911,97 @@ var tf_sort_option_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var tf_sort_option = (tf_sort_option_component.exports);
+;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/components/tf-plan-cell-render/index.vue?vue&type=template&id=bb21b084&
+var tf_plan_cell_rendervue_type_template_id_bb21b084_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('TfInput',{attrs:{"not-form":"","type":_vm.inputType,"disabled":_vm.disabled,"options":_vm.sortModeList},on:{"change":_vm.handleChange},model:{value:(_vm.value),callback:function ($$v) {_vm.value=$$v},expression:"value"}})],1)}
+var tf_plan_cell_rendervue_type_template_id_bb21b084_staticRenderFns = []
+
+
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/components/tf-plan-cell-render/index.vue?vue&type=script&lang=js&
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+/* harmony default export */ var tf_plan_cell_rendervue_type_script_lang_js_ = ({
+  name: 'TfCellRender',
+  components: {
+    TfInput: tf_input/* default */.Z
+  },
+
+  data() {
+    return {
+      value: '',
+      inputType: 'input',
+      changeType: '',
+      sortModeList: [{
+        id: 'ASC',
+        name: 'ASC'
+      }, {
+        id: 'DESC',
+        name: 'DESC'
+      }],
+      disabled: false
+    };
+  },
+
+  /** params:当前操作单元格对象 */
+  beforeMount() {
+    this.setInitialState(this.params);
+  },
+
+  methods: {
+    setInitialState(params) {
+      this.value = params.value;
+
+      if (params.inputType) {
+        this.inputType = params.inputType;
+      } // 表格设置的特殊逻辑
+
+
+      if (params.column.colId === 'isFreeze' && params.data.isChild) {
+        this.disabled = true;
+      }
+    },
+
+    handleChange(value) {
+      this.params.context.componentParent.handleChangeValue({
+        value: value,
+        params: this.params
+      });
+    }
+
+  }
+});
+;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/components/tf-plan-cell-render/index.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_tf_plan_cell_rendervue_type_script_lang_js_ = (tf_plan_cell_rendervue_type_script_lang_js_); 
+;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/components/tf-plan-cell-render/index.vue
+
+
+
+
+
+/* normalize component */
+;
+var tf_plan_cell_render_component = (0,componentNormalizer/* default */.Z)(
+  components_tf_plan_cell_rendervue_type_script_lang_js_,
+  tf_plan_cell_rendervue_type_template_id_bb21b084_render,
+  tf_plan_cell_rendervue_type_template_id_bb21b084_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var tf_plan_cell_render = (tf_plan_cell_render_component.exports);
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/components/tf-preview-pictures/index.vue?vue&type=template&id=8e090d24&scoped=true&
 var tf_preview_picturesvue_type_template_id_8e090d24_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dialog',{attrs:{"title":"","visible":_vm.dialogVisible,"width":"30.7vw"},on:{"update:visible":function($event){_vm.dialogVisible=$event}}},[_c('div',{staticClass:"content"},[_c('el-image',{staticStyle:{"width":"100%","height":"100%"},attrs:{"src":_vm.annexFile[_vm.currentIndex - 1],"fit":'contain'}})],1),_c('span',{staticClass:"dialog-footer",attrs:{"slot":"footer"},slot:"footer"},[_c('div',{staticClass:"bottom-menu"},[_c('i',{staticClass:"el-icon-caret-left",on:{"click":_vm.reduce}}),_c('span',[_vm._v(_vm._s(_vm.currentIndex)+" /"+_vm._s(_vm.annexFile.length)+" ")]),_c('i',{staticClass:"el-icon-caret-right",on:{"click":_vm.add}})])])])}
 var tf_preview_picturesvue_type_template_id_8e090d24_scoped_true_staticRenderFns = []
@@ -136041,6 +136132,9 @@ var utils = __webpack_require__(2325);
 //
 //
 //
+//
+//
+
 
 
 
@@ -136059,6 +136153,7 @@ var utils = __webpack_require__(2325);
     TfCellRender: tf_cell_render,
     TfSortOption: tf_sort_option,
     TfCellButton: tf_cell_button,
+    TfPlanCellRender: tf_plan_cell_render,
     TfPreviewPictures: tf_preview_pictures
   },
 
@@ -136118,6 +136213,18 @@ var utils = __webpack_require__(2325);
     enableCellTextSelection: {
       type: Boolean,
       default: true
+    },
+    enableBrowserTooltips: {
+      type: Boolean,
+      default: false
+    },
+    tooltipShowDelay: {
+      type: Number,
+      default: 100
+    },
+    tooltipHideDelay: {
+      type: Number,
+      default: 2000
     }
   },
 
@@ -136423,10 +136530,10 @@ var utils = __webpack_require__(2325);
 });
 ;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var tf_ag_grid_table_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/index.vue?vue&type=style&index=0&id=59eeec56&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-ag-grid-table/src/index.vue?vue&type=style&index=0&id=0e674479&prod&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue?vue&type=style&index=0&id=59eeec56&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue?vue&type=style&index=0&id=0e674479&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue
 
@@ -136443,7 +136550,7 @@ var src_component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "59eeec56",
+  "0e674479",
   null
   
 )
@@ -139261,8 +139368,8 @@ var staticRenderFns = []
 
 // EXTERNAL MODULE: ./package/tf-table/index.js + 12 modules
 var tf_table = __webpack_require__(8409);
-// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 32 modules
-var tf_ag_grid_table = __webpack_require__(8157);
+// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 36 modules
+var tf_ag_grid_table = __webpack_require__(7819);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-tab-table/src/index.vue?vue&type=script&lang=js&
 //
 //
@@ -139711,8 +139818,8 @@ var component = (0,componentNormalizer/* default */.Z)(
 /* harmony default export */ var tf_filter = (component.exports);
 // EXTERNAL MODULE: ./src/utils/index.js
 var utils = __webpack_require__(2325);
-// EXTERNAL MODULE: ./src/directives/index.js + 28 modules
-var directives = __webpack_require__(8388);
+// EXTERNAL MODULE: ./src/directives/index.js + 27 modules
+var directives = __webpack_require__(2637);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/index.vue?vue&type=script&lang=js&
 //
 //
@@ -140462,7 +140569,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 8388:
+/***/ 2637:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -140703,73 +140810,42 @@ async function initColumnDrag(el, binding, vNode) {
       oldIndex
     }) => {
       const {
-        fullColumn,
-        tableColumn
-      } = tableInstance.getTableColumn(); // 转换真实索引
-
-      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
-      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
+        collectColumn
+      } = tableInstance.getTableColumn();
 
-      if (newColumnIndex === oldColumnIndex) {
+      if (newIndex === oldIndex) {
         return;
       } // 移动到目标列
 
 
-      const currRow = fullColumn.splice(oldColumnIndex, 1)[0];
-      fullColumn.splice(newColumnIndex, 0, currRow);
-      tableInstance.loadColumn(fullColumn);
-      columnChange(el, binding, vNode, oldColumnIndex, newColumnIndex);
+      const currRow = collectColumn.splice(oldIndex, 1)[0];
+      collectColumn.splice(newIndex, 0, currRow);
+      tableInstance.loadColumn(collectColumn); // 配置更新
+
+      columnChange(el, binding, vNode);
     }
   }); // 列拖拽监听事件
 
-  const columnChange = (el, binding, vNode, oldColumnIndex, newColumnIndex) => {
-    // 判断表格有无checkbox和序号列
-    let total = 0;
+  const columnChange = (el, binding, vNode) => {
+    let num = 1;
     const tableInstance = vNode.componentInstance;
     const {
       fullColumn
     } = tableInstance.getTableColumn();
 
-    if (fullColumn.find(d => d.type === 'checkbox')) {
-      total++;
-    }
-
-    if (fullColumn.find(d => d.type === 'index')) {
-      total++;
-    }
-
-    const oldIndex = oldColumnIndex - total;
-    const newIndex = newColumnIndex - total; // 向左移
-
-    if (oldIndex > newIndex) {
-      for (let i = newIndex; i < oldIndex; i++) {
-        el.umyTableSetting.tableConfigList[i].fieldIndex++;
-      }
-
-      el.umyTableSetting.tableConfigList[oldIndex].fieldIndex -= oldIndex - newIndex;
-    } else {
-      // 向右移
-      for (let i = newIndex; i > oldIndex; i--) {
-        el.umyTableSetting.tableConfigList[i].fieldIndex--;
-      }
-
-      el.umyTableSetting.tableConfigList[oldIndex].fieldIndex += newIndex - oldIndex;
-    }
+    const generateFiledIndex = columns => {
+      columns.forEach(item => {
+        const findIndex = el.umyTableSetting.tableConfigList.findIndex(d => d.field === item.property);
+        findIndex !== -1 && (el.umyTableSetting.tableConfigList[findIndex].fieldIndex = num++);
+        item.children && generateFiledIndex(item.children);
+      });
+    };
 
+    generateFiledIndex(fullColumn);
     el.umyTableSetting.tableConfigList.sort((a, b) => a.fieldIndex - b.fieldIndex);
+    el.tfSettingInstance?.forceInit(el.umyTableSetting.tableConfigList);
   };
 }
-;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/validate.js
-/** 验证表格是否为多表头 */
-function valiteMutiple(el, binding, vNode) {
-  const tableInstance = vNode.componentInstance;
-  const {
-    collectColumn,
-    fullColumn
-  } = tableInstance.getTableColumn();
-  el.isMutiple = collectColumn.length !== fullColumn.length;
-  return collectColumn.length !== fullColumn.length;
-}
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(3797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
@@ -141018,20 +141094,20 @@ var component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var column_header = (component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/index.vue?vue&type=template&id=73868636&scoped=true&
-var tf_settingvue_type_template_id_73868636_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dialog',{staticClass:"tf-setting-dialog",attrs:{"visible":_vm.dialogVisible,"append-to-body":"","before-close":_vm.close,"close-on-click-modal":false,"close-on-press-escape":false},on:{"update:visible":function($event){_vm.dialogVisible=$event}}},[_c('div',{staticClass:"setting-container"},[_c('el-tabs',{model:{value:(_vm.activeTab),callback:function ($$v) {_vm.activeTab=$$v},expression:"activeTab"}},[_c('el-tab-pane',{attrs:{"label":"表头设置","name":"form"}},[_c('TfSettingForm',{ref:"formSetting",attrs:{"config-list":_vm.configList},on:{"close":_vm.close,"save":_vm.saveFormSetting}})],1)],1)],1)])}
-var tf_settingvue_type_template_id_73868636_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/index.vue?vue&type=template&id=89b35bfc&scoped=true&
+var tf_settingvue_type_template_id_89b35bfc_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dialog',{staticClass:"tf-setting-dialog",attrs:{"title":"列配置（多级表头不允许冻结）","visible":_vm.dialogVisible,"append-to-body":"","before-close":_vm.close,"close-on-click-modal":false,"close-on-press-escape":false},on:{"update:visible":function($event){_vm.dialogVisible=$event}}},[_c('div',{staticClass:"setting-container"},[_c('el-tabs',{model:{value:(_vm.activeTab),callback:function ($$v) {_vm.activeTab=$$v},expression:"activeTab"}},[_c('el-tab-pane',{attrs:{"label":"表头设置","name":"form"}},[_c('TfSettingForm',{ref:"formSetting",attrs:{"config-list":_vm.configList},on:{"close":_vm.close,"save":_vm.saveFormSetting}})],1)],1)],1)])}
+var tf_settingvue_type_template_id_89b35bfc_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=template&id=6c1fc346&scoped=true&
-var tf_setting_formvue_type_template_id_6c1fc346_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-setting-form-content"},[_c('div',{staticClass:"tf-header-group"},[_c('div',{staticClass:"tf-search-text"},[_c('el-input',{attrs:{"placeholder":"搜索字段名称","clearable":""},on:{"input":_vm.handleSearchField},model:{value:(_vm.searchContent),callback:function ($$v) {_vm.searchContent=$$v},expression:"searchContent"}},[_c('i',{staticClass:"el-input__icon el-icon-search",attrs:{"slot":"prefix"},slot:"prefix"})])],1),_c('TfButtonGroup',[_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('showChange')}}},[_vm._v("显/隐切换")]),_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('freeze')}}},[_vm._v("冻结/固定")]),_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.saveLoading},on:{"click":function($event){return _vm.handlerButtons('save')}}},[_vm._v("保存")]),_c('el-button',{attrs:{"type":"danger","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('close')}}},[_vm._v("关闭")])],1)],1),_c('div',{staticClass:"tf-common-table"},[_c('TfAgGridTable',{ref:"settingTable",attrs:{"columns":_vm.mainColumns,"table-data":_vm.showTableData,"row-drag-managed":false,"row-drag-entire-row":false,"row-drag-multi-row":false,"enable-cell-text-selection":false},on:{"rowDragEnd":_vm.rowDragEnd,"handleChangeCellValue":_vm.handleChangeCellValue,"sortRow":_vm.sortRow,"selectChange":_vm.selectChange}})],1)])}
-var tf_setting_formvue_type_template_id_6c1fc346_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=template&id=18b2ec14&scoped=true&
+var tf_setting_formvue_type_template_id_18b2ec14_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-setting-form-content"},[_c('div',{staticClass:"tf-header-group"},[_c('div',{staticClass:"tf-search-text"},[_c('el-input',{attrs:{"placeholder":"搜索字段名称","clearable":""},on:{"input":_vm.handleSearchField},model:{value:(_vm.searchContent),callback:function ($$v) {_vm.searchContent=$$v},expression:"searchContent"}},[_c('i',{staticClass:"el-input__icon el-icon-search",attrs:{"slot":"prefix"},slot:"prefix"})])],1),_c('TfButtonGroup',[_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('showChange')}}},[_vm._v("显/隐切换")]),_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('freeze')}}},[_vm._v("冻结/固定")]),_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.saveLoading},on:{"click":function($event){return _vm.handlerButtons('save')}}},[_vm._v("保存")]),_c('el-button',{attrs:{"type":"danger","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('close')}}},[_vm._v("关闭")])],1)],1),_c('div',{staticClass:"tf-common-table"},[_c('TfAgGridTable',{ref:"settingTable",attrs:{"columns":_vm.mainColumns,"table-data":_vm.showTableData,"row-drag-managed":false,"row-drag-entire-row":false,"row-drag-multi-row":false,"enable-cell-text-selection":false},on:{"rowDragEnd":_vm.rowDragEnd,"handleChangeCellValue":_vm.handleChangeCellValue,"sortRow":_vm.sortRow,"selectChange":_vm.selectChange}})],1)])}
+var tf_setting_formvue_type_template_id_18b2ec14_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./package/tf-button-group/index.js + 6 modules
 var tf_button_group = __webpack_require__(3829);
-// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 32 modules
-var tf_ag_grid_table = __webpack_require__(8157);
+// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 36 modules
+var tf_ag_grid_table = __webpack_require__(7819);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=script&lang=js&
 //
 //
@@ -141102,20 +141178,15 @@ var tf_ag_grid_table = __webpack_require__(8157);
       }, {
         field: 'label',
         headerName: '字段',
+        tooltipField: 'label',
         suppressMovable: true,
+        cellClass: 'label-column',
         width: 150
-      }, // { field: 'isQuery',
-      //   headerName: '表头筛选',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'switch' },
-      //   width: 145
-      // },
-      {
+      }, {
         field: 'isShow',
         headerName: '显隐切换',
         suppressMovable: true,
-        cellRenderer: 'TfCellRender',
+        cellRenderer: 'TfPlanCellRender',
         cellRendererParams: {
           inputType: 'switch'
         },
@@ -141124,40 +141195,12 @@ var tf_ag_grid_table = __webpack_require__(8157);
         field: 'isFreeze',
         headerName: '冻结',
         suppressMovable: true,
-        cellRenderer: 'TfCellRender',
+        cellRenderer: 'TfPlanCellRender',
         cellRendererParams: {
           inputType: 'switch'
         },
         width: 145
-      } // { field: 'isSort',
-      //   headerName: '排序',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'switch' }, width: 145 }
-      // { field: 'isSum',
-      //   headerName: '合计',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'switch' }, width: 145 },
-      // { field: 'isFuzzy',
-      //   headerName: '模糊搜索',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'switch' }, width: 145 },
-      // { field: 'digit',
-      //   headerName: '保留位数',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'integer' },
-      //   width: 145
-      // }
-      // { field: 'sortMode',
-      //   headerName: '列排序',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'select' }, width: 145 },
-      // { field: 'option', headerName: '操作', suppressMovable: true, cellRenderer: 'TfSortOption', width: 145 }
-      ],
+      }],
       tableData: [],
       selectRows: [],
       originalTableData: [],
@@ -141315,6 +141358,11 @@ var tf_ag_grid_table = __webpack_require__(8157);
         case 'freeze':
           {
             this.selectRows.forEach(item => {
+              // 多表头下的列不允许固定列
+              if (item.isChild) {
+                return;
+              }
+
               const findIndex = this.tableData.findIndex(d => d.field === item.field);
               this.tableData[findIndex].isFreeze = !this.tableData[findIndex].isFreeze;
             });
@@ -141371,10 +141419,10 @@ var tf_ag_grid_table = __webpack_require__(8157);
 });
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_tf_setting_formvue_type_script_lang_js_ = (tf_setting_formvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=6c1fc346&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=18b2ec14&prod&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=6c1fc346&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=18b2ec14&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue
 
@@ -141387,11 +141435,11 @@ var tf_ag_grid_table = __webpack_require__(8157);
 
 var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
   components_tf_setting_formvue_type_script_lang_js_,
-  tf_setting_formvue_type_template_id_6c1fc346_scoped_true_render,
-  tf_setting_formvue_type_template_id_6c1fc346_scoped_true_staticRenderFns,
+  tf_setting_formvue_type_template_id_18b2ec14_scoped_true_render,
+  tf_setting_formvue_type_template_id_18b2ec14_scoped_true_staticRenderFns,
   false,
   null,
-  "6c1fc346",
+  "18b2ec14",
   null
   
 )
@@ -141417,6 +141465,7 @@ var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
 //
 //
 //
+//
 
 /* harmony default export */ var tf_settingvue_type_script_lang_js_ = ({
   name: 'TfSetting',
@@ -141474,10 +141523,10 @@ var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_tf_settingvue_type_script_lang_js_ = (tf_settingvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/index.vue?vue&type=style&index=0&id=73868636&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/index.vue?vue&type=style&index=0&id=89b35bfc&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/index.vue?vue&type=style&index=0&id=73868636&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/index.vue?vue&type=style&index=0&id=89b35bfc&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/index.vue
 
@@ -141490,11 +141539,11 @@ var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
 
 var tf_setting_component = (0,componentNormalizer/* default */.Z)(
   components_tf_settingvue_type_script_lang_js_,
-  tf_settingvue_type_template_id_73868636_scoped_true_render,
-  tf_settingvue_type_template_id_73868636_scoped_true_staticRenderFns,
+  tf_settingvue_type_template_id_89b35bfc_scoped_true_render,
+  tf_settingvue_type_template_id_89b35bfc_scoped_true_staticRenderFns,
   false,
   null,
-  "73868636",
+  "89b35bfc",
   null
   
 )
@@ -141506,7 +141555,6 @@ var tf_setting_component = (0,componentNormalizer/* default */.Z)(
 
 
 
-
 external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 /** 初始化表格配置信息 */
 
@@ -141540,9 +141588,11 @@ async function initTableConfigList(el, binding, vNode) {
   vm.$nextTick(() => {
     // 获取本地的列数据
     const {
+      collectColumn,
       fullColumn
     } = tableInstance.getTableColumn(); // 过滤掉title不存在和特殊列
 
+    const collectArr = collectColumn.map(item => item.property);
     const localColumn = fullColumn.filter(item => item.title && ['index', 'checkbox'].indexOf(item.type) === -1);
 
     const testField = (obj, field) => {
@@ -141550,11 +141600,14 @@ async function initTableConfigList(el, binding, vNode) {
     }; // Merge远程配置
 
 
-    el.umyTableSetting.tableConfigList = localColumn.map((item, index) => {
+    el.umyTableSetting.tableConfigList = localColumn.map(item => {
       const current = el.umyTableSetting.userConfigList.find(d => item.property && d.field === item.property) || {};
+      let parent = null;
+      item.parentId && (parent = collectColumn.find(column => column.id === item.parentId));
       return {
-        label: item.title,
         field: item.property,
+        label: parent ? `${parent.title}-${item.title}` : item.title,
+        isChild: collectArr.indexOf(item.property) === -1,
         isShow: testField(current, 'isShow') ? current.isShow : true,
         isFreeze: testField(current, 'isFreeze') ? current.isFreeze : false,
         fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : item.width ? (item.width + '').split('px')[0] : 150,
@@ -141634,6 +141687,7 @@ function updateColumn(el, binding, vNode, fullColumn) {
     }; // 对checkbox和index列的处理到此为止，直接return
 
     if (Object.keys(enums).indexOf(column.type) !== -1) {
+      fullColumn[index].resizable = false;
       return fullColumn[index].fieldIndex = enums[column.type];
     } // 存在配置
 
@@ -141679,21 +141733,21 @@ function updateColumn(el, binding, vNode, fullColumn) {
 /** 表格重载配置 */
 
 const reloadColumns = async (el, binding, vNode) => {
-  // 多表头暂时不使用此功能，无需reload
-  if (valiteMutiple(el, binding, vNode)) {
-    return;
-  }
-
+  const vm = vNode.context;
   const tableInstance = vNode.componentInstance;
   const {
     fullColumn
   } = tableInstance.getTableColumn();
-  const newColumns = updateColumn(el, binding, vNode, fullColumn);
-  tableInstance.reloadColumn(newColumns);
+  updateColumn(el, binding, vNode, fullColumn);
+  await vm.$nextTick();
+  const {
+    collectColumn
+  } = tableInstance.getTableColumn();
+  collectColumn.sort((a, b) => a.fieldIndex - b.fieldIndex);
+  tableInstance.reloadColumn(collectColumn);
 };
 ;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/watch.js
 
-
 /** 表格列宽变化事件 */
 
 function watch_watchTableHeaderNode(el, binding, vNode) {
@@ -141718,11 +141772,7 @@ function watchTableColumn(el, binding, vNode) {
   vm.$watch(() => {
     return tableInstance.getTableColumn().fullColumn;
   }, async (newVal, oldVal) => {
-    if (valiteMutiple(el, binding, vNode)) {
-      return;
-    } // 以下判断是为了适配动态列加载的表格
-
-
+    // 以下判断是为了适配动态列加载的表格
     if (!oldVal || !oldVal.length) {
       init = false;
     }
@@ -141772,9 +141822,8 @@ function watchTableColumn(el, binding, vNode) {
 
 const addSettingColumn = (el, binding, vNode) => {
   const tableInstance = vNode.componentInstance;
-  const columns = tableInstance.getTableColumn().fullColumn;
+  const columns = tableInstance.getTableColumn().collectColumn;
   const settingColumn = columns.find(d => d.type === 'index');
-  const settingColumnIndex = columns.findIndex(d => d.type === 'index');
   const mixinObj = {
     type: 'index',
     width: '40',
@@ -141785,11 +141834,24 @@ const addSettingColumn = (el, binding, vNode) => {
       header: () => [initSettingHeader(el, binding, vNode)]
     }
   };
-  settingColumn && columns.splice(settingColumnIndex, 1);
+  settingColumn && columns.splice(columns.findIndex(d => d.type === 'index'), 1);
   const newColumns = settingColumn ? [...columns, { ...settingColumn,
     ...mixinObj
   }] : [...columns, mixinObj];
-  newColumns.sort((a, b) => a.fieldIndex - b.fieldIndex);
+
+  const getFieldIndex = obj => {
+    let fieldIndex,
+        current = obj;
+
+    while (!fieldIndex && current) {
+      fieldIndex = current.fieldIndex;
+      current = obj.children ? obj.children[0] : null;
+    }
+
+    return fieldIndex;
+  };
+
+  newColumns.sort((a, b) => getFieldIndex(a) - getFieldIndex(b));
   tableInstance.loadColumn(newColumns);
 };
 /** 列排序方法 */
@@ -141839,7 +141901,7 @@ const initSettingHeader = (el, binding, vNode) => {
     }
   })]);
 };
-/** 调整头部筛选以及排序 */
+/** 头部筛选排序组件 */
 
 
 const initRenderHeader = (el, binding, vNode, column) => {
@@ -141901,10 +141963,9 @@ const umyTableSetting = {
   unbind(el, binding, vNode) {
     if (!binding.value) {
       return;
-    } // 多表头暂时不添加此功能，直接return
-
+    }
 
-    !el.isMutiple && saveSetting(el, binding, vNode);
+    saveSetting(el, binding, vNode);
     el.tfSettingInstance.$destroy();
   }
 
@@ -228667,8 +228728,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
 
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 28 modules
-var directives = __webpack_require__(8388);
+// EXTERNAL MODULE: ./src/directives/index.js + 27 modules
+var directives = __webpack_require__(2637);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-data-list/main.vue?vue&type=script&lang=js&
 //
 //
@@ -231152,8 +231213,8 @@ var tf_credential_recordvue_type_template_id_5026f523_scoped_true_staticRenderFn
 
 // EXTERNAL MODULE: ./package/tf-button-group/index.js + 6 modules
 var tf_button_group = __webpack_require__(3829);
-// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 32 modules
-var tf_ag_grid_table = __webpack_require__(8157);
+// EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 36 modules
+var tf_ag_grid_table = __webpack_require__(7819);
 // EXTERNAL MODULE: ./package/tf-pagination/index.js + 6 modules
 var tf_pagination = __webpack_require__(6364);
 // EXTERNAL MODULE: ./src/api/tf-table.js