@tongfun/tf-widget 0.1.133 → 0.1.135

package/lib/tf-widget.umd.js

@@ -11,7 +11,7 @@
 return /******/ (function() { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 5559:
+/***/ 9175:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23,15 +23,15 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ tf_table_main; }
 });
 
-;// 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-list/src/components/tf-table-main/index.vue?vue&type=template&id=14e47e5e&scoped=true&
+;// 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-list/src/components/tf-table-main/index.vue?vue&type=template&id=1055dbf6&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-table-main-container"},[(_vm.diyFilters.length)?_c('div',{staticClass:"container-top-input"},[_c('TfConditionInput',{attrs:{"form-data":_vm.diyFormData,"is-filter":true},on:{"handleChange":_vm.handleChange,"submitConditionChange":function($event){return _vm.$emit('conditionChange')},"reset":_vm.handelReset,"handlerAutoFilter":_vm.createAutoFilterScheme,"command":_vm.command}})],1):_vm._e(),_c('div',{staticClass:"tf-table-main-container-body"},[_c('TfGroup',{attrs:{"columns":_vm.mainColumns},on:{"groupChange":_vm.handleGroupChange}}),_c('div',{staticClass:"container-body-right"},[_c('TfSplitter',{attrs:{"first-hidden-bottom":"","before-use":_vm.beforeUseSplitter},scopedSlots:_vm._u([{key:"splitterTop",fn:function(){return [_c('div',{staticClass:"splitter-top-container"},[_c('div',{staticClass:"container-top-table"},[_c('TfAgGridTable',{ref:"mainTable",attrs:{"columns":_vm.mainColumns,"field-value-set":_vm.fieldValueSet,"table-data":_vm.mainTableData,"loading":_vm.mainTableLoading,"total-data":_vm.mainTotalData,"personal-font-color":_vm.personalFontColor},on:{"columnResized":function($event){return _vm.$emit('columnResized',$event)},"columnMoved":function($event){return _vm.$emit('columnMoved', $event)},"cellDBLClick":_vm.cellDBLClick,"selectChange":function($event){return _vm.$emit('selectChange',$event)},"currentChange":function($event){return _vm.$emit('currentChange',$event)}}})],1),_c('div',{staticClass:"container-top-pagination"},[_c('TfPagination',{ref:"mainTablePagination",attrs:{"total":_vm.mainTotal,"select-row-num":_vm.selectedRows.length},on:{"pageChange":function($event){return _vm.$emit('pageChange')}}})],1)])]},proxy:true},{key:"splitterBottom",fn:function(){return [_c('div',{staticClass:"splitter-bottom-container"},[_c('TfTabTable',{ref:"TfTabTable",attrs:{"tab-info":_vm.tabInfo,"is-ag-grid-table":""},on:{"tabClick":function($event){return _vm.$emit('tabClick')},"columnResized":function($event){return _vm.$emit('columnResized',$event)},"columnMoved":function($event){return _vm.$emit('columnMoved', $event)}}})],1)]},proxy:true}])})],1)],1),_c('tf-add-scheme',{ref:"tfAddScheme",attrs:{"loading":_vm.loadingScheme},on:{"saveAutoScheme":_vm.saveAutoScheme}})],1)}
 var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 22 modules
-var tf_ag_grid_table = __webpack_require__(9280);
+var tf_ag_grid_table = __webpack_require__(7389);
 // EXTERNAL MODULE: ./package/tf-table/index.js + 12 modules
-var tf_table = __webpack_require__(7802);
+var tf_table = __webpack_require__(3183);
 // EXTERNAL MODULE: ./package/tf-splitter/index.js + 6 modules
 var tf_splitter = __webpack_require__(3741);
 // EXTERNAL MODULE: ./package/tf-tab-table/index.js + 6 modules
@@ -1031,6 +1031,7 @@ var tf_add_scheme_component = (0,componentNormalizer/* default */.Z)(
 
       this.firstHiddenBottom = !this.firstHiddenBottom;
       done();
+      this.$emit('currentChange');
     },
 
     cellDBLClick(row) {
@@ -1093,10 +1094,10 @@ var tf_add_scheme_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-table-main/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_tf_table_mainvue_type_script_lang_js_ = (tf_table_mainvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table-list/src/components/tf-table-main/index.vue?vue&type=style&index=0&id=14e47e5e&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table-list/src/components/tf-table-main/index.vue?vue&type=style&index=0&id=1055dbf6&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-table-main/index.vue?vue&type=style&index=0&id=14e47e5e&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-table-main/index.vue?vue&type=style&index=0&id=1055dbf6&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-table-main/index.vue
 
@@ -1113,7 +1114,7 @@ var tf_table_main_component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "14e47e5e",
+  "1055dbf6",
   null
   
 )
@@ -135368,7 +135369,7 @@ function removeMultiDragElements() {
 
 /***/ }),
 
-/***/ 9280:
+/***/ 7389:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -135378,8 +135379,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=3c93dc46&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,"headerHeight":_vm.headerHeight,"suppressRowTransform":"true","enableBrowserTooltips":"true","suppressPropertyNamesCheck":"","suppressColumnMoveAnimation":"true","animateRows":"true","rowMultiSelectWithClick":_vm.rowMultiSelectWithClick,"default-col-def":_vm.defaultColDef,"row-data":_vm.filteredData,"columnDefs":_vm.columns,"context":_vm.context,"rowDragManaged":_vm.rowDragManaged,"rowDragEntireRow":_vm.rowDragEntireRow,"rowDragMultiRow":_vm.rowDragMultiRow,"overlayNoRowsTemplate":_vm.overlayNoRowsTemplate,"enableCellTextSelection":_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}})],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=23a1ff56&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}})],1)}
 var staticRenderFns = []
 
 
@@ -135908,12 +135909,16 @@ var utils = __webpack_require__(8023);
 
 /* harmony default export */ var srcvue_type_script_lang_js_ = ({
   name: 'TfAgGridTable',
+
+  /* eslint-disable */
   components: {
     AgGridVue: main.AgGridVue,
     TfFilter: tf_filter,
     TfCellRender: tf_cell_render,
     TfSortOption: tf_sort_option
   },
+
+  /* eslint-enable */
   directives: {
     Clickoutside: clickoutside/* default */.Z
   },
@@ -136247,18 +136252,24 @@ var utils = __webpack_require__(8023);
       this.gridApi.forEachNodeAfterFilter(node => {
         if (ids.indexOf(node.data.id) !== -1) {
           node.setSelected(true);
+          this.gridApi.ensureIndexVisible(node.rowIndex, 'middle');
         }
       });
+    },
+
+    /** 滚动到选中的第一行 */
+    scrollToSelect() {
+      this.gridApi.ensureIndexVisible(this.gridApi.getSelectedNodes()[0].rowIndex, 'middle');
     }
 
   }
 });
 ;// 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-63.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-63.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-63.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-63.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=3c93dc46&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-63.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-63.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-63.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-63.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=23a1ff56&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=3c93dc46&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue?vue&type=style&index=0&id=23a1ff56&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-ag-grid-table/src/index.vue
 
@@ -136275,7 +136286,7 @@ var src_component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "3c93dc46",
+  "23a1ff56",
   null
   
 )
@@ -136439,7 +136450,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   name: 'TfBasicTableList',
   components: {
     TfHeaderButton: tf_basic_header_button,
-    TfTableMain: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 5559))
+    TfTableMain: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 9175))
   },
   mixins: [init_table/* default */.Z],
 
@@ -139058,9 +139069,9 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./package/tf-table/index.js + 12 modules
-var tf_table = __webpack_require__(7802);
+var tf_table = __webpack_require__(3183);
 // EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 22 modules
-var tf_ag_grid_table = __webpack_require__(9280);
+var tf_ag_grid_table = __webpack_require__(7389);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //
@@ -139182,7 +139193,7 @@ src.install = function (Vue) {
 
 /***/ }),
 
-/***/ 7802:
+/***/ 3183:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -139192,8 +139203,8 @@ __webpack_require__.d(__webpack_exports__, {
   "Z": function() { return /* binding */ tf_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-table/src/index.vue?vue&type=template&id=687ba962&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-content"},[_c('div',{staticClass:"tf-common-table-container"},[_c('ux-grid',_vm._b({directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"},{name:"tableAutoHeight",rawName:"v-tableAutoHeight"},{name:"umyTableSetting",rawName:"v-umyTableSetting",value:(_vm.entityTableName),expression:"entityTableName"}],ref:_vm.tableRef,staticClass:"tf-common-table",attrs:{"border":"","column-key":"","width-resize":"","beautify-table":"","highlight-current-row":"","show-header-overflow":"","show-overflow":"tooltip","show-summary":"","summary-method":_vm.getSummaries,"valid-config":{ autoPos: true },"checkbox-config":{ highlight: true, trigger: 'row' },"edit-config":{ trigger: 'click', mode: 'cell', autoClear: false, showIcon: false },"sort-config":{trigger: 'cell', orders: ['asc', 'desc', 'null'], showIcon: false},"merge-cells":_vm.mergeCells,"cell-style":_vm.changeCellStyle},on:{"header-dragend":_vm.headerDragend,"cell-click":_vm.cellClick,"cell-dblclick":_vm.cellDBLClick,"current-change":_vm.currentChange,"selection-change":_vm.selectionChange}},'ux-grid',_vm.$attrs,false),[(_vm.columns.length || _vm.customColumns)?_c('ux-table-column',{attrs:{"fixed":_vm.fixed,"type":"checkbox","align":"center","width":"60"}}):_vm._e(),(_vm.showColumns)?_vm._l((_vm.columns),function(item){return _c('ux-table-column',_vm._b({key:item.field,attrs:{"min-width":item.fieldWidth ? item.fieldWidth : 150,"fixed":item.isLockSeat && _vm.fixed ? 'left' : '',"align":"center","resizable":"","sortable":""},scopedSlots:_vm._u([{key:"header",fn:function(ref){
+;// 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/index.vue?vue&type=template&id=6f4f4655&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-content"},[_c('div',{staticClass:"tf-common-table-container"},[_c('ux-grid',_vm._b({directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"},{name:"tableAutoHeight",rawName:"v-tableAutoHeight"}],ref:_vm.tableRef,staticClass:"tf-common-table",attrs:{"border":"","column-key":"","width-resize":"","beautify-table":"","highlight-current-row":"","show-header-overflow":"","show-overflow":"tooltip","show-summary":"","summary-method":_vm.getSummaries,"valid-config":{ autoPos: true },"checkbox-config":{ highlight: true, trigger: 'row' },"edit-config":{ trigger: 'click', mode: 'cell', autoClear: false, showIcon: false },"sort-config":{trigger: 'cell', orders: ['asc', 'desc', 'null'], showIcon: false},"merge-cells":_vm.mergeCells,"cell-style":_vm.changeCellStyle},on:{"header-dragend":_vm.headerDragend,"cell-click":_vm.cellClick,"cell-dblclick":_vm.cellDBLClick,"current-change":_vm.currentChange,"selection-change":_vm.selectionChange}},'ux-grid',_vm.$attrs,false),[(_vm.columns.length || _vm.customColumns)?_c('ux-table-column',{attrs:{"fixed":_vm.fixed,"type":"checkbox","align":"center","width":"60"}}):_vm._e(),(_vm.showColumns)?_vm._l((_vm.columns),function(item){return _c('ux-table-column',_vm._b({key:item.field,attrs:{"min-width":item.fieldWidth ? item.fieldWidth : 150,"fixed":item.isLockSeat && _vm.fixed ? 'left' : '',"align":"center","resizable":"","sortable":""},scopedSlots:_vm._u([{key:"header",fn:function(ref){
 var column = ref.column;
 return [_vm._v(" "+_vm._s(column.title)+" "),_c('tf-filter',{staticClass:"column-header",attrs:{"config-data":item,"field-value-set":_vm.fieldValueSet},on:{"update-filter":_vm.handleUpdateFilter}}),(column.order && column.order !== 'null')?_c('span',[_c('i',{class:[column.order === 'asc' ? 'el-icon-top' : 'el-icon-bottom']})]):_vm._e()]}}],null,true)},'ux-table-column',item,false))}):_vm._e(),(_vm.customColumns)?_vm._t("default"):_vm._e(),_c('template',{slot:"empty"},[_c('SvgIcon',{staticStyle:{"width":"6vw","height":"6vh"},attrs:{"icon-class":"table-empty"}}),_c('div',{staticStyle:{"font-size":"1.4vh"}},[_vm._v("暂无数据")])],1)],2)],1)])}
 var staticRenderFns = []
@@ -139509,8 +139520,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__(8023);
-// EXTERNAL MODULE: ./src/directives/index.js + 22 modules
-var directives = __webpack_require__(8047);
+// EXTERNAL MODULE: ./src/directives/index.js + 28 modules
+var directives = __webpack_require__(4251);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //
@@ -139578,7 +139589,6 @@ var directives = __webpack_require__(8047);
 //
 //
 //
-//
 
 
 
@@ -139825,10 +139835,10 @@ var directives = __webpack_require__(8047);
 });
 ;// CONCATENATED MODULE: ./package/tf-table/src/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var tf_table_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./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=style&index=0&id=687ba962&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./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=style&index=0&id=6f4f4655&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table/src/index.vue?vue&type=style&index=0&id=687ba962&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-table/src/index.vue?vue&type=style&index=0&id=6f4f4655&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table/src/index.vue
 
@@ -139845,7 +139855,7 @@ var src_component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "687ba962",
+  "6f4f4655",
   null
   
 )
@@ -140249,7 +140259,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 8047:
+/***/ 4251:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -140471,16 +140481,106 @@ const umyColumnWidth = {
   }
 
 };
+// EXTERNAL MODULE: ./node_modules/sortablejs/modular/sortable.core.esm.js
+var sortable_core_esm = __webpack_require__(2418);
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/drag.js
+
+/** 初始化列拖拽 */
+
+async function initColumnDrag(el, binding, vNode) {
+  const vm = vNode.context;
+  await vm.$nextTick();
+  const tableInstance = vNode.componentInstance;
+  el.sortable = sortable_core_esm/* default.create */.ZP.create(tableInstance.$el.querySelector('.body--wrapper .elx-table--header .elx-header--row'), {
+    handle: '.elx-header--column:not(.col--fixed)',
+    ghostClass: 'dragColbg',
+    chosenClass: 'dragColbg',
+    onEnd: ({
+      newIndex,
+      oldIndex
+    }) => {
+      const {
+        fullColumn,
+        tableColumn
+      } = tableInstance.getTableColumn(); // 转换真实索引
+
+      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
+      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
+
+      if (newColumnIndex === oldColumnIndex) {
+        return;
+      } // 移动到目标列
+
+
+      const currRow = fullColumn.splice(oldColumnIndex, 1)[0];
+      fullColumn.splice(newColumnIndex, 0, currRow);
+      tableInstance.loadColumn(fullColumn);
+      columnChange(el, binding, vNode, oldColumnIndex, newColumnIndex);
+    }
+  }); // 列拖拽监听事件
+
+  const columnChange = (el, binding, vNode, oldColumnIndex, newColumnIndex) => {
+    // 判断表格有无checkbox和序号列
+    let total = 0;
+    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;
+    }
+
+    el.umyTableSetting.tableConfigList.sort((a, b) => a.fieldIndex - b.fieldIndex);
+  };
+}
+;// 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__(7203);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/element-ui.common.js
 var element_ui_common = __webpack_require__(4720);
-;// 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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=template&id=2c5df124&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"column-header-directive",on:{"click":_vm.sortColumn}},[_c('span',[_vm._v(_vm._s(_vm.column.title))])])}
+;// 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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=template&id=20e724d0&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"column-header-directive",on:{"click":_vm.sortColumn}},[_c('span',[_vm._v(_vm._s(_vm.column.title))]),(_vm.column.orderBy)?_c('span',[_c('i',{class:[_vm.column.orderBy === 'asc' ? 'el-icon-top' : 'el-icon-bottom']})]):_vm._e(),_c('div',{class:{ 'filter-main': _vm.isClick || _vm.isFilter }},[_c('el-popover',{attrs:{"width":"200","trigger":"manual","placement":"bottom"},model:{value:(_vm.isClick),callback:function ($$v) {_vm.isClick=$$v},expression:"isClick"}},[_c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOut),expression:"handleClickOut"}],staticClass:"filter-main-context"},[_c('TfInput',{attrs:{"not-form":"","full-border":"","placeholder":"输入需要过滤的值"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleSubmit.apply(null, arguments)}},model:{value:(_vm.column.filterValue),callback:function ($$v) {_vm.$set(_vm.column, "filterValue", $$v)},expression:"column.filterValue"}}),_c('div',{staticClass:"option-buttons"},[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleCancel}},[_vm._v("重置")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleSubmit}},[_vm._v("确定")])],1)],1),_c('SvgIcon',{staticClass:"filter-icon",attrs:{"slot":"reference","icon-class":"filter"},on:{"click":function($event){$event.stopPropagation();return _vm.handleFilterClick.apply(null, arguments)}},slot:"reference"})],1)],1)])}
 var staticRenderFns = []
 
 
+// EXTERNAL MODULE: ./package/tf-input/index.js + 92 modules
+var tf_input = __webpack_require__(3604);
+// EXTERNAL MODULE: ./node_modules/element-ui/src/utils/clickoutside.js + 1 modules
+var clickoutside = __webpack_require__(6410);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=script&lang=js&
 //
 //
@@ -140497,58 +140597,199 @@ var staticRenderFns = []
 //
 //
 //
-// import TfFilter from '../tf-filter'
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
 /* harmony default export */ var column_headervue_type_script_lang_js_ = ({
-  components: {// TfFilter
+  components: {
+    TfInput: tf_input/* default */.Z
+  },
+  directives: {
+    Clickoutside: clickoutside/* default */.Z
   },
   props: {
+    // 当前列
     column: {
       type: Object,
       default: () => {}
+    },
+    // 表格实例
+    tableInstance: {
+      type: Object,
+      default: () => null
     }
   },
 
   data() {
     return {
-      fieldValueSet: {}
+      textBak: '',
+      isClick: false
     };
   },
 
+  computed: {
+    isFilter() {
+      return this.column.filterValue !== null && this.column.filterValue !== undefined && this.column.filterValue !== '';
+    }
+
+  },
+  watch: {
+    'tableInstance.data.length': {
+      handler(newVal, oldVal) {
+        if (!newVal) {
+          return;
+        } // this.tableInstance.isFilter 为true时表示表格已经触发过滤方法，无需重复触发
+        // 当过滤方法执行完毕后，会有定时器将此标志位置为false
+
+
+        if (newVal !== oldVal && !this.tableInstance.isFilter) {
+          this.tableInstance.isFilter = true;
+          this.handleSubmit();
+        }
+      },
+
+      immediate: true
+    }
+  },
   methods: {
     /** 排序 */
     sortColumn() {
-      if (!this.column.order) {
-        this.column.order = 'asc';
-      } else if (this.column.order === 'asc') {
-        this.column.order = 'desc';
-      } else if (this.column.order === 'desc') {
-        this.column.order = null;
-      } // TODO: 数据排序
+      const field = this.column.property;
 
+      switch (this.column.orderBy) {
+        case 'asc':
+          this.column.orderBy = 'desc';
+          this.tableInstance.sort(field, 'desc');
+          break;
+
+        case 'desc':
+          this.column.orderBy = null;
+          this.tableInstance.clearSort();
+          break;
+
+        default:
+          this.column.orderBy = 'asc';
+          this.tableInstance.sort(field, 'asc');
+          break;
+      }
+
+      this.$emit('handleSort', this.column.property);
     },
 
-    /**
-     * @param{
-     *  value: "输入的值"，
-     *  configData："在哪一列"
-     * }
-     */
-    handleUpdateFilter({
-      value,
-      params
-    }) {
-      console.log(value, params); // this.filterOption[params.column.colId] = { ...params, value } // field：
-      // this.filterMethod()
+    /** 图标点击事件 */
+    handleFilterClick() {
+      this.isClick = !this.isClick;
+      this.textBak = this.column.filterValue;
+    },
+
+    /** 单击外侧事件 */
+    handleClickOut(e) {
+      if (!this.isClick) {
+        return;
+      }
+
+      this.isClick = false;
+      this.column.filterValue = this.textBak;
+    },
+
+    /** 重置 */
+    handleCancel() {
+      this.textBak = '';
+      this.column.filterValue = '';
+      this.handleSubmit();
+    },
+
+    /** 确认 */
+    handleSubmit() {
+      this.isClick = false;
+      this.textBak = this.column.filterValue; // filterColumns 意为需要过滤的列
+
+      const filterColumns = this.tableInstance.getTableColumn().fullColumn.filter(item => {
+        return ['index', 'checkbox'].indexOf(item.type) === -1 && item.filterValue;
+      });
+
+      if (filterColumns.length) {
+        const filterMap = new Map();
+        filterColumns.forEach(item => {
+          filterMap.set(item.property, item.filterValue);
+        }); // this.tableInstance.data 意为表格的原始数据
+
+        const showTableData = this.tableInstance.data.filter(current => {
+          let isFilter = true;
+          const keyArr = Object.keys(current);
+          keyArr.some(key => {
+            const keyword = filterMap.get(key);
+
+            if (keyword !== null && keyword !== undefined) {
+              // 基础资料和枚举要特殊处理
+              const currentName = this.isBasicData(current[key]) ? current[key].name : current[key];
+
+              if (currentName === null || currentName === undefined || !`${currentName}`.includes(`${filterMap.get(key)}`)) {
+                isFilter = false;
+                return true;
+              }
+            }
+          });
+          return isFilter;
+        });
+        this.tableInstance.reloadData(showTableData);
+      } else {
+        // 加载所有数据
+        this.tableInstance.reloadData(this.tableInstance.data);
+      } // 过滤后根据当前列的排序方式进行排序
+
+
+      this.afterFilter(); // 这里防止重复计算
+
+      setTimeout(() => {
+        this.tableInstance.isFilter = false;
+      }, 100);
+    },
+
+    /** 筛选后，根据当前表格已有的列的状态进行排序 */
+    afterFilter() {
+      const columns = this.tableInstance.getTableColumn().fullColumn;
+      const hasOrderColumn = columns.find(d => d.orderBy);
+      hasOrderColumn && this.tableInstance.sort(hasOrderColumn.property, hasOrderColumn.orderBy);
+    },
+
+    isBasicData(data) {
+      return typeof data === 'object' && data !== null && data !== undefined;
     }
 
   }
 });
 ;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_column_headervue_type_script_lang_js_ = (column_headervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=2c5df124&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=20e724d0&prod&lang=less&scoped=true&
+// extracted by mini-css-extract-plugin
+
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=20e724d0&prod&lang=less&scoped=true&
+
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=20e724d0&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=2c5df124&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=20e724d0&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(3736);
@@ -140559,6 +140800,7 @@ var componentNormalizer = __webpack_require__(3736);
 ;
 
 
+
 /* normalize component */
 
 var component = (0,componentNormalizer/* default */.Z)(
@@ -140567,28 +140809,26 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "2c5df124",
+  "20e724d0",
   null
   
 )
 
 /* harmony default export */ var column_header = (component.exports);
-// EXTERNAL MODULE: ./node_modules/sortablejs/modular/sortable.core.esm.js
-var sortable_core_esm = __webpack_require__(2418);
-;// 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=0734c7ee&scoped=true&
-var tf_settingvue_type_template_id_0734c7ee_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,"width":"65%","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_0734c7ee_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=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/components/tf-setting-form/index.vue?vue&type=template&id=4365e85c&scoped=true&
-var tf_setting_formvue_type_template_id_4365e85c_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"},on:{"click":function($event){return _vm.handlerButtons('recover')}}},[_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":true,"row-drag-entire-row":true,"row-drag-multi-row":true,"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_4365e85c_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 = []
 
 
 // EXTERNAL MODULE: ./package/tf-button-group/index.js + 6 modules
 var tf_button_group = __webpack_require__(4380);
 // EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 22 modules
-var tf_ag_grid_table = __webpack_require__(9280);
+var tf_ag_grid_table = __webpack_require__(7389);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //
@@ -140701,11 +140941,6 @@ var tf_ag_grid_table = __webpack_require__(9280);
       //   suppressMovable: true,
       //   cellRenderer: 'TfCellRender',
       //   cellRendererParams: { inputType: 'switch' }, width: 145 },
-      // { field: 'fieldWidth',
-      //   headerName: '列宽',
-      //   suppressMovable: true,
-      //   cellRenderer: 'TfCellRender',
-      //   cellRendererParams: { inputType: 'integer' }, width: 145 }
       // { field: 'digit',
       //   headerName: '保留位数',
       //   suppressMovable: true,
@@ -140754,13 +140989,33 @@ var tf_ag_grid_table = __webpack_require__(9280);
         this.initFlag = true;
         this.tableData = JSON.parse(JSON.stringify(this.configList));
         this.originalTableData = JSON.parse(JSON.stringify(this.tableData));
-      } // // 更新序号
+      } // 更新序号
 
 
-      const newData = this.tableData.map((item, index) => ({ ...item,
-        fieldIndex: index + 1
-      }));
+      const newData = this.tableData.map(item => {
+        const current = this.configList.find(d => d.field === item.field);
+        return { ...item,
+          fieldIndex: current.fieldIndex
+        };
+      });
+      this.tableData = newData;
+      this.tableData.sort((a, b) => a.fieldIndex - b.fieldIndex);
+    },
+
+    forceInit(configList) {
+      this.configList.splice(0, this.configList.length, ...configList); // 初始化原始数据
+
+      this.tableData = JSON.parse(JSON.stringify(this.configList));
+      this.originalTableData = JSON.parse(JSON.stringify(this.tableData)); // 更新序号
+
+      const newData = this.tableData.map(item => {
+        const current = this.configList.find(d => d.field === item.field);
+        return { ...item,
+          fieldIndex: current.fieldIndex
+        };
+      });
       this.tableData = newData;
+      this.tableData.sort((a, b) => a.fieldIndex - b.fieldIndex);
     },
 
     /** 行拖拽排序, 支持同时选中多行拖拽 */
@@ -140867,8 +141122,8 @@ var tf_ag_grid_table = __webpack_require__(9280);
 
         case 'recover':
           {
-            this.selectRows = [];
-            this.tableData = JSON.parse(JSON.stringify(this.originalTableData));
+            // this.selectRows = []
+            // this.tableData = JSON.parse(JSON.stringify(this.originalTableData))
             break;
           }
         // 保存
@@ -140902,8 +141157,7 @@ var tf_ag_grid_table = __webpack_require__(9280);
         field: item.field,
         isShow: item.isShow,
         fieldIndex: index + 1,
-        isFreeze: item.isFreeze,
-        fieldWidth: item.fieldWidth // isSort: item.isSort,
+        isFreeze: item.isFreeze // isSort: item.isSort,
         // digit: item.digit,
         // isSum: item.isSum,
 
@@ -140914,10 +141168,10 @@ var tf_ag_grid_table = __webpack_require__(9280);
 });
 ;// 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-63.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-63.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-63.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-63.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=4365e85c&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-63.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-63.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-63.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-63.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&
 // 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=4365e85c&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=6c1fc346&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue
 
@@ -140930,11 +141184,11 @@ var tf_ag_grid_table = __webpack_require__(9280);
 
 var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
   components_tf_setting_formvue_type_script_lang_js_,
-  tf_setting_formvue_type_template_id_4365e85c_scoped_true_render,
-  tf_setting_formvue_type_template_id_4365e85c_scoped_true_staticRenderFns,
+  tf_setting_formvue_type_template_id_6c1fc346_scoped_true_render,
+  tf_setting_formvue_type_template_id_6c1fc346_scoped_true_staticRenderFns,
   false,
   null,
-  "4365e85c",
+  "6c1fc346",
   null
   
 )
@@ -140960,7 +141214,6 @@ var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
 //
 //
 //
-//
 
 /* harmony default export */ var tf_settingvue_type_script_lang_js_ = ({
   name: 'TfSetting',
@@ -140991,6 +141244,11 @@ var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
       });
     },
 
+    /** 初始化 */
+    forceInit(configList) {
+      this.$refs.formSetting && this.$refs.formSetting.forceInit(configList);
+    },
+
     /** 关闭弹框前 */
     close() {
       this.dialogVisible = false;
@@ -141013,10 +141271,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-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.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=0734c7ee&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.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&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/index.vue?vue&type=style&index=0&id=0734c7ee&prod&lang=less&scoped=true&
+;// 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
 
@@ -141029,30 +141287,27 @@ 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_0734c7ee_scoped_true_render,
-  tf_settingvue_type_template_id_0734c7ee_scoped_true_staticRenderFns,
+  tf_settingvue_type_template_id_73868636_scoped_true_render,
+  tf_settingvue_type_template_id_73868636_scoped_true_staticRenderFns,
   false,
   null,
-  "0734c7ee",
+  "73868636",
   null
   
 )
 
 /* harmony default export */ var tf_setting = (tf_setting_component.exports);
-;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/index.js
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/init.js
 
 
 
 
 
 
+external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 /** 初始化表格配置信息 */
 
-const initTableConfig = (el, binding, vNode) => {
-  if (!binding.value) {
-    return;
-  }
-
+function initTableConfig(el, binding, vNode) {
   const vm = vNode.context;
   const tableInstance = vNode.componentInstance;
   const module = vm.$router.options.base.substring(1); // 数据存储
@@ -141067,112 +141322,178 @@ const initTableConfig = (el, binding, vNode) => {
     tableName: el.umyTableSetting.configTableName
   }).then(async res => {
     el.umyTableSetting.userConfigList = res.data || [];
-    await initTableConfigList();
+    await initTableConfigList(el, binding, vNode);
     reloadColumns(el, binding, vNode);
-  });
+  }); // 动态添加class名，用于隐藏自带排序图标等
 
-  const initTableConfigList = async () => {
-    /**
-     * 先获取本地的列数据
-     * 再将远程的配置merge进来
-     * （防止出现本地新增的列在配置中不存在引发的问题）
-     */
-    vm.$nextTick(() => {
-      // 获取本地的列数据
-      const {
-        fullColumn
-      } = tableInstance.getTableColumn(); // 过滤掉title不存在和特殊列
+  tableInstance.$el.className += ' no-show-sort-icon-directive ';
+}
+/** 设置TableConfigList */
 
-      const localColumn = fullColumn.filter(item => item.title && ['index', 'checkbox'].indexOf(item.type) === -1);
+async function initTableConfigList(el, binding, vNode) {
+  const vm = vNode.context;
+  const tableInstance = vNode.componentInstance; // 先获取本地的列数据, 再将远程的配置merge进来（防止出现本地新增的列在配置中不存在引发的问题）
 
-      const testField = (obj, field) => {
-        return obj && obj[field] !== undefined && obj[field] !== null;
-      }; // Merge远程配置
+  vm.$nextTick(() => {
+    // 获取本地的列数据
+    const {
+      fullColumn
+    } = tableInstance.getTableColumn(); // 过滤掉title不存在和特殊列
 
+    const localColumn = fullColumn.filter(item => item.title && ['index', 'checkbox'].indexOf(item.type) === -1);
 
-      el.umyTableSetting.tableConfigList = localColumn.map(item => {
-        const current = el.umyTableSetting.userConfigList.find(d => d.field === item.property) || {};
-        return {
-          label: item.title,
-          field: item.property,
-          isShow: testField(current, 'isShow') ? current.isShow : true,
-          // isSort: testField(current, 'isSort') ? current.isSort : true,
-          isFreeze: testField(current, 'isFreeze') ? current.isFreeze : false,
-          fieldWidth: testField(current, 'fieldWidth') ? current.fieldWidth : 150,
-          fieldIndex: current.fieldIndex
-        };
-      });
-      el.umyTableSetting.tableConfigList.sort((a, b) => a.fieldIndex - b.fieldIndex);
+    const testField = (obj, field) => {
+      return obj && obj[field] !== undefined && obj[field] !== null;
+    }; // Merge远程配置
+
+
+    el.umyTableSetting.tableConfigList = localColumn.map((item, index) => {
+      const current = el.umyTableSetting.userConfigList.find(d => item.property && d.field === item.property) || {};
+      return {
+        label: item.title,
+        field: item.property,
+        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,
+        fieldIndex: current.fieldIndex
+      };
     });
-  }; // 监听表格列变化
+    el.umyTableSetting.tableConfigList.sort((a, b) => a.fieldIndex - b.fieldIndex);
+    el.tfSettingInstance?.forceInit(el.umyTableSetting.tableConfigList);
+  });
+}
+/** 配置弹框组件生成以及挂载 */
 
+function initTfSetting(el, binding, vNode) {
+  const vm = vNode.context;
+  el.tfSettingInstance = new (external_commonjs_vue_commonjs2_vue_root_Vue_default().extend(tf_setting))();
+  el.tfSettingInstance.$on('save', data => {
+    saveSetting(el, binding, vNode, true);
+  });
+  vm.$el.appendChild(el.tfSettingInstance.$mount().$el);
+}
+/** 保存设置 */
 
-  vm.$watch(() => {
-    return tableInstance.getTableColumn().fullColumn.length;
-  }, async () => {
-    await initTableConfigList();
-    reloadColumns(el, binding, vNode);
-  }, {
-    immediate: true
+function saveSetting(el, binding, vNode, closeLoading = false) {
+  const configs = getSaveData(el, binding, vNode);
+  const data = {
+    configs,
+    tableName: el.umyTableSetting.configTableName
+  };
+  (0,tf_table/* saveUserEntityConfigs */.Xx)(data).then(res => {
+    if (res.code === 0) {
+      if (closeLoading) {
+        reloadColumns(el, binding, vNode);
+        el.tfSettingInstance.close();
+      }
+    } else {
+      element_ui_common.Message.error(res.errorMsg || res.msg || '保存列配置失败，请稍后重试！');
+    }
+  }).catch(() => {
+    element_ui_common.Message.error('保存列配置失败，请稍后重试！');
+  }).finally(() => {
+    closeLoading && el.tfSettingInstance.closeLoading();
   });
-};
-/** 表格重载配置 */
+}
+/** 获取保存时的数据 */
 
+function getSaveData(el, binding, vNode) {
+  let configData;
 
-const reloadColumns = (el, binding, vNode) => {
-  const vm = vNode.context;
-  const tableInstance = vNode.componentInstance;
-  const {
-    fullColumn
-  } = tableInstance.getTableColumn();
-  const configData = el.tfSettingInstance.$refs.formSetting ? el.tfSettingInstance.$refs.formSetting.getSaveData() : el.umyTableSetting.tableConfigList;
-  fullColumn.map(column => {
+  if (!el.tfSettingInstance.$refs.formSetting) {
+    configData = el.umyTableSetting.tableConfigList;
+  } else {
+    const tableData = el.tfSettingInstance.$refs.formSetting.getSaveData();
+    configData = tableData.map(item => {
+      const current = el.umyTableSetting.tableConfigList.find(d => d.field === item.field);
+      const currentWidth = typeof current.fieldWidth === 'string' ? +current.fieldWidth.split('px')[0] : current.fieldWidth;
+      return { ...item,
+        fieldWidth: currentWidth
+      };
+    });
+  }
+
+  return configData;
+}
+function updateColumn(el, binding, vNode, fullColumn) {
+  let total = 1;
+  let total2 = 0;
+  const configData = getSaveData(el, binding, vNode);
+
+  const columnHasConfig = property => {
+    return el.umyTableSetting.userConfigList.find(d => property && d.field === property);
+  };
+
+  fullColumn.forEach((column, index) => {
     const enums = {
       'checkbox': -2,
       'index': -1
-    };
+    }; // 对checkbox和index列的处理到此为止，直接return
 
     if (Object.keys(enums).indexOf(column.type) !== -1) {
-      column.fieldIndex = enums[column.type];
-    }
+      return fullColumn[index].fieldIndex = enums[column.type];
+    } // 存在配置
+
 
-    const current = configData.find(d => d.field === column.property);
+    const current = configData.find(d => column.property && d.field === column.property);
 
     if (current) {
-      column.width = current.fieldWidth + 'px';
-      column.fixed = current.isFreeze ? 'left' : undefined;
-      column.visible = current.isShow;
-      column.fieldIndex = current.fieldIndex; // column.isSort = current.isSort
+      fullColumn[index].width = current.fieldWidth + 'px';
+      fullColumn[index].fixed = current.isFreeze ? 'left' : undefined;
+      fullColumn[index].visible = current.isShow;
+      fullColumn[index].fieldIndex = current.fieldIndex;
+    } // 记录没有配置的列总共有多少
+
+
+    const current2 = columnHasConfig(column.property);
+
+    if (!current2) {
+      total2++;
     }
   });
-  fullColumn.sort((a, b) => a.fieldIndex - b.fieldIndex);
-  tableInstance.loadColumn(fullColumn);
-};
-/** 保存设置 */
+  fullColumn.sort((a, b) => a.fieldIndex - b.fieldIndex); // 首次排序后，再对fieldIndex进行处理
 
+  fullColumn.forEach((column, index) => {
+    if (['checkbox', 'index'].indexOf(column.type) !== -1) {
+      return;
+    }
 
-const saveSetting = (el, binding, vNode, configData) => {
-  const data = {
-    configs: configData,
-    tableName: el.umyTableSetting.configTableName
-  };
-  (0,tf_table/* saveUserEntityConfigs */.Xx)(data).then(res => {
-    if (res.code === 0) {
-      reloadColumns(el, binding, vNode);
-      el.tfSettingInstance.close();
+    if (!columnHasConfig(column.property)) {
+      fullColumn[index].fieldIndex = total++;
     } else {
-      element_ui_common.Message.error(res.errorMsg || res.msg || '保存列配置失败，请稍后重试！');
+      fullColumn[index].fieldIndex = ++total2;
+    }
+
+    const findIndex = el.umyTableSetting.tableConfigList.findIndex(d => column.property && d.field === column.property);
+
+    if (findIndex !== -1) {
+      // 更新配置数据
+      el.umyTableSetting.tableConfigList[findIndex].fieldIndex = fullColumn[index].fieldIndex;
     }
-  }).catch(() => {
-    element_ui_common.Message.error('保存列配置失败，请稍后重试！');
-  }).finally(() => {
-    el.tfSettingInstance.closeLoading();
   });
+  return fullColumn;
+}
+/** 表格重载配置 */
+
+const reloadColumns = async (el, binding, vNode) => {
+  // 多表头暂时不使用此功能，无需reload
+  if (valiteMutiple(el, binding, vNode)) {
+    return;
+  }
+
+  const tableInstance = vNode.componentInstance;
+  const {
+    fullColumn
+  } = tableInstance.getTableColumn();
+  const newColumns = updateColumn(el, binding, vNode, fullColumn);
+  tableInstance.reloadColumn(newColumns);
 };
-/** 表格列宽变化事件 */
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/watch.js
+
 
+/** 表格列宽变化事件 */
 
-const umy_table_setting_watchTableHeaderNode = (el, binding, vNode) => {
+function watch_watchTableHeaderNode(el, binding, vNode) {
   const tableInstance = vNode.componentInstance; // 观察目标节点表头列宽的变化
 
   tableInstance.headerDragend = () => {
@@ -141184,163 +141505,198 @@ const umy_table_setting_watchTableHeaderNode = (el, binding, vNode) => {
       el.umyTableSetting.tableConfigList[index].fieldWidth = current.renderWidth || 150;
     });
   };
-};
-/** 初始化列拖拽 */
-
+}
+/** 监听表格列，动态添加配置列 */
 
-const initColumnDrag = async (el, binding, vNode) => {
+function watchTableColumn(el, binding, vNode) {
+  let init = false;
   const vm = vNode.context;
-  await vm.$nextTick();
   const tableInstance = vNode.componentInstance;
-  el.sortable = Sortable.create(tableInstance.$el.querySelector('.body--wrapper .elx-table--header .elx-header--row'), {
-    handle: '.elx-header--column:not(.col--fixed)',
-    ghostClass: 'dragColbg',
-    chosenClass: 'dragColbg',
-    onEnd: ({
-      newIndex,
-      oldIndex
-    }) => {
-      const {
-        fullColumn,
-        tableColumn
-      } = tableInstance.getTableColumn(); // 转换真实索引
+  vm.$watch(() => {
+    return tableInstance.getTableColumn().fullColumn;
+  }, async (newVal, oldVal) => {
+    if (valiteMutiple(el, binding, vNode)) {
+      return;
+    } // 以下判断是为了适配动态列加载的表格
 
-      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
-      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
-      console.log(oldIndex, newIndex);
-      console.log(oldColumnIndex, newColumnIndex); // 移动到目标列
 
-      const currRow = fullColumn.splice(oldColumnIndex, 1)[0];
-      fullColumn.splice(newColumnIndex, 0, currRow);
-      tableInstance.loadColumn(fullColumn);
-      columnChange(el, binding, vNode);
+    if (!oldVal || !oldVal.length) {
+      init = false;
     }
-  });
-};
-/** 列拖拽监听事件 */
-
 
-const columnChange = (el, binding, vNode) => {
-  const tableInstance = vNode.componentInstance; // TODO
-};
+    const oldColumns = (oldVal || []).filter(item => ['index', 'checkbox'].indexOf(item.type) === -1);
+    const newColumns = (newVal || []).filter(item => ['index', 'checkbox'].indexOf(item.type) === -1);
 
-const umyTableSetting = {
-  /** 插入父节点时调用 */
-  inserted(el, binding, vNode) {
-    if (!binding.value) {
-      return;
+    if (oldColumns.length !== newColumns.length) {
+      init = false;
     }
 
-    let init = false;
-    const vm = vNode.context;
-    const tableInstance = vNode.componentInstance; // 表格设置组件生成
+    if (newVal.length !== 0 && !init) {
+      init = true;
+      await initTableConfigList(el, binding, vNode); // 这里将表格的横向虚拟滚动列数调整到100（表示100列以内不需要横向虚拟滚动）这里关闭是为了保证头部渲染不卡顿
 
-    const settingHeader = vm.$createElement('i', {
-      class: 'el-icon-setting',
-      style: {
-        'display': 'flex',
-        'cursor': 'pointer',
-        'align-items': 'center',
-        'justify-content': 'center'
-      },
-      on: {
-        click() {
-          el.tfSettingInstance.show();
-          el.tfSettingInstance.configList = el.umyTableSetting.tableConfigList;
-        }
+      tableInstance.scrollX.gt = 100; // 更改当前默认表头，添加排序过滤功能
 
-      }
-    }); // 配置弹框组件生成以及挂载
+      const columns = tableInstance.getTableColumn().fullColumn;
+      columns.forEach((item, index) => {
+        vm.$set(columns[index], 'filterValue', null);
+        vm.$set(columns[index], 'orderBy', undefined);
+        vm.$set(columns[index], 'sortable', true);
+        vm.$set(columns[index], 'sortMethod', customSort(item.property));
 
-    el.tfSettingInstance = new (external_commonjs_vue_commonjs2_vue_root_Vue_default().extend(tf_setting))();
-    el.tfSettingInstance.$on('save', data => {
-      saveSetting(el, binding, vNode, data);
-    });
-    vm.$el.appendChild(el.tfSettingInstance.$mount().$el); // TODO：这里的组件注册有没有更好的方法
+        columns[index].slots.header = ({
+          column
+        }) => {
+          return [initRenderHeader(el, binding, vNode, column)];
+        };
+      }); // 更新列的配置
 
-    external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
+      updateColumn(el, binding, vNode, columns); // 表格设置组件挂载
 
-    const renderHeader = column => vm.$createElement('DirectiveColumnHeader', {
-      props: {
-        column: column
-      }
-    }); // 初始化列拖拽
-    // initColumnDrag(el, binding, vNode)
-    // 监听表头宽度拖拽
+      await vm.$nextTick();
+      addSettingColumn(el, binding, vNode);
+    }
+  }, {
+    immediate: true
+  });
+}
+/** 表格设置组件挂载 */
 
+const addSettingColumn = (el, binding, vNode) => {
+  const tableInstance = vNode.componentInstance;
+  const columns = tableInstance.getTableColumn().fullColumn;
+  const settingColumn = columns.find(d => d.type === 'index');
+  const settingColumnIndex = columns.findIndex(d => d.type === 'index');
+  const mixinObj = {
+    type: 'index',
+    width: '40',
+    fixed: 'left',
+    align: 'center',
+    fieldIndex: -1,
+    slots: {
+      header: () => [initSettingHeader(el, binding, vNode)]
+    }
+  };
+  settingColumn && columns.splice(settingColumnIndex, 1);
+  const newColumns = settingColumn ? [...columns, { ...settingColumn,
+    ...mixinObj
+  }] : [...columns, mixinObj];
+  newColumns.sort((a, b) => a.fieldIndex - b.fieldIndex);
+  tableInstance.loadColumn(newColumns);
+};
+/** 列排序方法 */
+
+
+const customSort = field => {
+  return (prevRow, nextRow) => {
+    // 数字排序
+    if (!isNaN(+prevRow[field]) && !isNaN(+nextRow[field])) {
+      const prev = !isNaN(+prevRow[field]) ? +prevRow[field] : 0;
+      const next = !isNaN(+nextRow[field]) ? +nextRow[field] : 0;
+      return Number(prev - next).toFixed(2);
+    } else {
+      // 非数字排序
+      return (prevRow[field] || '').localeCompare(nextRow[field] || '');
+    }
+  };
+};
+/** 头部设置组件 */
 
-    umy_table_setting_watchTableHeaderNode(el, binding, vNode); // 监听表格列，动态添加配置列
 
-    vm.$watch(() => {
-      return tableInstance.getTableColumn().fullColumn.length;
-    }, (newVal, oldVal) => {
-      if (!oldVal) {
-        init = false;
+const initSettingHeader = (el, binding, vNode) => {
+  const vm = vNode.context;
+  return vm.$createElement('el-tooltip', {
+    class: 'umy-table-setting-tooltip',
+    props: {
+      effect: 'dark',
+      content: '表格设置',
+      placement: 'top'
+    }
+  }, [vm.$createElement('i', {
+    // 样式在css中
+    class: 'el-icon-setting',
+    style: {
+      'display': 'flex',
+      'cursor': 'pointer',
+      'align-items': 'center',
+      'justify-content': 'center',
+      'font-size': '0.8291vw'
+    },
+    on: {
+      click() {
+        el.tfSettingInstance.show();
+        el.tfSettingInstance.configList = el.umyTableSetting.tableConfigList;
       }
 
-      if (newVal !== 0 && !init) {
-        init = true;
-        const columns = tableInstance.getTableColumn().fullColumn; // 更改当前默认表头，添加排序过滤功能
+    }
+  })]);
+};
+/** 调整头部筛选以及排序 */
 
+
+const initRenderHeader = (el, binding, vNode, column) => {
+  const vm = vNode.context;
+  const tableInstance = vNode.componentInstance;
+  return tableInstance.$createElement('DirectiveColumnHeader', {
+    props: {
+      column: column,
+      tableInstance: tableInstance
+    },
+    on: {
+      handleSort(property) {
+        // 修改当前列的排序时，将其他列的排序初始化
+        const columns = tableInstance.getTableColumn().fullColumn;
         columns.forEach((item, index) => {
           if (['index', 'checkbox'].indexOf(item.type) !== -1) {
             return;
           }
 
-          columns[index].slots.header = ({
-            column
-          }) => {
-            return [renderHeader(column)];
-          };
-        });
-        const settingColumn = columns.find(d => d.type === 'index');
-        const settingColumnIndex = columns.findIndex(d => d.type === 'index'); // 表格设置组件挂载
+          if (item.property === property) {
+            return;
+          }
 
-        if (settingColumn) {
-          columns.splice(settingColumnIndex, 1);
-          tableInstance.loadColumn([...columns, { ...settingColumn,
-            width: '40',
-            slots: {
-              header: () => [settingHeader]
-            }
-          }]);
-        } else {
-          tableInstance.loadColumn([...columns, {
-            fixed: 'left',
-            align: 'center',
-            type: 'index',
-            width: '40',
-            slots: {
-              header: () => [settingHeader]
-            }
-          }]);
-        }
+          vm.$set(columns[index], 'orderBy', undefined);
+        });
       }
-    }, {
-      immediate: true
-    }); // 初次加载配置
 
-    initTableConfig(el, binding, vNode);
+    }
+  });
+};
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/index.js
+/**
+ * umy-table-setting
+ * 自动设置序号列设置
+ */
+
+
+
+const umyTableSetting = {
+  /** 插入父节点调用 */
+  inserted(el, binding, vNode) {
+    if (!binding.value) {
+      return;
+    } // 初次加载配置
+
+
+    initTableConfig(el, binding, vNode); // 配置弹框组件生成以及挂载
+
+    initTfSetting(el, binding, vNode); // 初始化列拖拽
+
+    initColumnDrag(el, binding, vNode); // 监听表头宽度拖拽
+
+    watch_watchTableHeaderNode(el, binding, vNode); // 监听表格列，动态添加配置列
+
+    watchTableColumn(el, binding, vNode);
   },
 
-  /**  解绑 */
+  /** 解绑 */
   unbind(el, binding, vNode) {
     if (!binding.value) {
       return;
-    }
+    } // 多表头暂时不添加此功能，直接return
 
-    const configData = el.tfSettingInstance.$refs.formSetting ? el.tfSettingInstance.$refs.formSetting.getSaveData() : el.umyTableSetting.tableConfigList;
-    const data = {
-      configs: configData,
-      tableName: el.umyTableSetting.configTableName
-    };
-    (0,tf_table/* saveUserEntityConfigs */.Xx)(data).then(res => {
-      if (res.code !== 0) {
-        element_ui_common.Message.error(res.errorMsg || res.msg || '保存列配置失败，请稍后重试！');
-      }
-    }).catch(() => {
-      element_ui_common.Message.error('保存列配置失败，请稍后重试！');
-    });
+
+    !el.isMutiple && saveSetting(el, binding, vNode);
     el.tfSettingInstance.$destroy();
   }
 
@@ -141643,8 +141999,9 @@ const tableAutoHeight = {
 
   activated() {
     try {
-      document.querySelector('.ag-body-viewport').addEventListener('scroll', (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .debounceFun */ .u1)(this.scrollFn));
-      document.querySelector('.ag-body-viewport').scrollTop = this.scrollTop; // eslint-disable-next-line no-empty
+      document.querySelectorAll('.ag-body-viewport')[2].addEventListener('scroll', (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .debounceFun */ .u1)(this.scrollFn));
+      document.querySelectorAll('.ag-body-viewport')[2].scrollTop = this.scrollTop; // this.$refs.TfTableMain.$refs.mainTable.scrollToSelect()
+      // eslint-disable-next-line no-empty
     } catch (e) {}
   },
 
@@ -141655,7 +142012,7 @@ const tableAutoHeight = {
   methods: {
     /** 记录滑块移动的距离 */
     scrollFn() {
-      this.scrollTop = document.querySelector('.ag-body-viewport').scrollTop;
+      this.scrollTop = document.querySelectorAll('.ag-body-viewport')[2].scrollTop;
     },
 
     /** 表格初始化: 加载配置，获取表格数据 */
@@ -142189,7 +142546,24 @@ const tableAutoHeight = {
         params.showEntityCode = this.tableCode;
       }
 
-      const resp = await (0,_api_tf_table__WEBPACK_IMPORTED_MODULE_2__/* .getUserFontColorList */ .wk)(params);
+      const resp = await (0,_api_tf_table__WEBPACK_IMPORTED_MODULE_2__/* .getUserFontColorList */ .wk)(params); // 处理返回值
+
+      resp.data.personalFontColor.map(item => {
+        if (item.label) {
+          return item.value = {
+            id: item.value,
+            name: item.label
+          };
+        }
+      });
+      resp.data.sysFontColor.map(item => {
+        if (item.label) {
+          return item.value = {
+            id: item.value,
+            name: item.label
+          };
+        }
+      });
 
       if (!resp.data.personalFontColor.length) {
         this.setArrProxyData(this.personalFontColor, resp.data.sysFontColor || []);
@@ -228052,8 +228426,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
 
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 22 modules
-var directives = __webpack_require__(8047);
+// EXTERNAL MODULE: ./src/directives/index.js + 28 modules
+var directives = __webpack_require__(4251);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //
@@ -229931,7 +230305,7 @@ tf_print_render_src.install = function (Vue) {
 // EXTERNAL MODULE: ./package/tf-input/index.js + 92 modules
 var tf_input = __webpack_require__(3604);
 // EXTERNAL MODULE: ./package/tf-table/index.js + 12 modules
-var tf_table = __webpack_require__(7802);
+var tf_table = __webpack_require__(3183);
 ;// 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-vxe-table/src/index.vue?vue&type=template&id=66878ea0&scoped=true&
 var srcvue_type_template_id_66878ea0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-common-table-container"},[_c('vxe-table',_vm._b({ref:_vm.tableRef,staticClass:"tf-common-table-scrollbar",attrs:{"size":"small","data":_vm.tableData,"border":"","round":"","align":"center","height":"auto","show-overflow":"","show-header-overflow":"","checkbox-config":{ trigger: 'row', highlight: true },"tooltip-config":{ showAll: false },"column-config":{ resizable: true },"row-config":{ isCurrent: true, isHover: true, height: 36 },"edit-config":{ trigger: 'click', mode: 'cell', autoClear: false }},on:{"cell-click":_vm.cellClick,"cell-dblclick":_vm.cellDBLClick,"current-change":_vm.currentChange,"checkbox-change":_vm.checkboxChange}},'vxe-table',_vm.$attrs,false),[_c('vxe-column',{attrs:{"type":"seq","width":"40","fixed":"left"}}),_c('vxe-column',{attrs:{"type":"checkbox","width":"40","fixed":"left"}}),_vm._l((_vm.columns),function(item){return _c('vxe-column',_vm._b({key:item.field,attrs:{"min-width":"150"}},'vxe-column',item,false))}),(_vm.customColumns)?_vm._t("default"):_vm._e(),_c('template',{slot:"empty"},[_c('SvgIcon',{staticStyle:{"width":"6vw","height":"6vh"},attrs:{"icon-class":"table-empty"}}),_c('div',{staticStyle:{"font-size":"1.4vh"}},[_vm._v("暂无数据")])],1)],2)],1)}
 var srcvue_type_template_id_66878ea0_scoped_true_staticRenderFns = []
@@ -230522,7 +230896,7 @@ var srcvue_type_template_id_4a4f8486_scoped_true_staticRenderFns = []
 // EXTERNAL MODULE: ./src/mixins/init-table.js
 var init_table = __webpack_require__(4115);
 // EXTERNAL MODULE: ./package/tf-table-list/src/components/tf-table-main/index.vue + 27 modules
-var tf_table_main = __webpack_require__(5559);
+var tf_table_main = __webpack_require__(9175);
 ;// 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-list/src/components/tf-header-button/index.vue?vue&type=template&id=634038ba&scoped=true&
 var tf_header_buttonvue_type_template_id_634038ba_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-header-button-container"},[_c('div',{staticClass:"container-top"},[_c('el-scrollbar',[_c('TfButtonGroup',[_vm._t("insertReplace",function(){return [(!_vm.hiddenBtns.includes('insertReplace'))?_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":_vm.addRecord}},[_vm._v("新增")]):_vm._e()]}),_vm._t("updateReplace",function(){return [(!_vm.hiddenBtns.includes('updateReplace'))?_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":_vm.editRecord}},[_vm._v("编辑")]):_vm._e()]}),_vm._t("deleteReplace",function(){return [(!_vm.hiddenBtns.includes('deleteReplace'))?_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.loadingObj.deleteLoading},on:{"click":function($event){return _vm.buttonOperation('delete')}}},[_vm._v("删除")]):_vm._e()]}),_vm._t("submitReplace",function(){return [(!_vm.hiddenBtns.includes('submitReplace'))?_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.loadingObj.commitLoading},on:{"click":function($event){return _vm.buttonOperation('commit')}}},[_vm._v("提交")]):_vm._e()]}),_vm._t("auditReplace",function(){return [(!_vm.hiddenBtns.includes('auditReplace'))?_c('el-dropdown',{attrs:{"type":"primary","size":"mini","split-button":""},on:{"click":function($event){return _vm.buttonOperation('check')},"command":_vm.handleCommand}},[_vm._v(" 审核 "),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{attrs:{"command":"reAudit"}},[_vm._v("反审核")])],1)],1):_vm._e()]}),_vm._t("tableModeReplace",function(){return [(!_vm.hiddenBtns.includes('tableModeReplace'))?_c('el-dropdown',{attrs:{"type":"primary","size":"mini","split-button":""},on:{"command":_vm.handleCommand}},[_vm._v(" 切换表体 "),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{attrs:{"command":"default"}},[_vm._v("无")]),_vm._l((_vm.entityFields),function(entityField,index){return _c('el-dropdown-item',{key:index,attrs:{"command":entityField.tableCode}},[_vm._v(_vm._s(entityField.tableLabel))])})],2)],1):_vm._e()]}),_vm._t("importAndExport",function(){return [(!_vm.hiddenBtns.includes('importAndExport'))?_c('el-dropdown',{attrs:{"type":"primary","size":"mini","split-button":""},on:{"click":_vm.showImportPop,"command":_vm.handleCommand}},[_vm._v(" 导入 "),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{attrs:{"command":"export"}},[_vm._v("导出")])],1)],1):_vm._e()]}),_vm._t("printReplace",function(){return [_c('TfPrint',{attrs:{"selected-rows":_vm.selectedRows,"table-code":_vm.code}})]}),_vm._t("certificateReplace",function(){return [(!_vm.hiddenBtns.includes('certificateReplace'))?_c('el-button',{attrs:{"loading":_vm.loadingObj.certificateLoading,"type":"primary","size":"mini"},on:{"click":_vm.createCertificate}},[_vm._v("生成凭证")]):_vm._e()]}),_vm._t("credentialListReplace",function(){return [_c('TfCredentialRecord',{attrs:{"selected-rows":_vm.selectedRows,"table-code":_vm.code}})]}),_vm._t("refreshBefore"),_vm._t("refreshReplace",function(){return [(!_vm.hiddenBtns.includes('refreshReplace'))?_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":_vm.refreshRecord}},[_vm._v("刷新")]):_vm._e()]}),_vm._t("refreshAfter")],2)],1),_c('div',{staticClass:"content-right"},[_c('span',{on:{"click":function($event){$event.stopPropagation();return _vm.handleSetting.apply(null, arguments)}}},[_c('i',{staticClass:"el-icon-setting"})]),_c('TfFuzzySearch',{on:{"change":_vm.fuzzyChange},model:{value:(_vm.fuzzyParam),callback:function ($$v) {_vm.fuzzyParam=$$v},expression:"fuzzyParam"}})],1)],1),_c('div',[_c('TfPlanFilter',{on:{"selectPlan":_vm.selectPlan}})],1),_c('tf-setting',{ref:"tfSetting",attrs:{"header-config":_vm.headerConfig,"entity-configs":_vm.entityConfigs,"personal-filters":_vm.personalFilters,"code":_vm.currentCode,"personal-font-color":_vm.personalFontColors,"table-lists":_vm.tableLists,"table-code-to-fields":_vm.tableCodeToFields},on:{"save":_vm.saveSetting,"deleteScheme":_vm.deleteScheme,"saveScheme":_vm.saveScheme,"saveColorSetting":_vm.saveColorSetting}}),_c('tf-import',{ref:"tfImport",on:{"downloadTemplate":function($event){return _vm.$emit('downloadTemplate')},"tableImport":function($event){return _vm.$emit('tableImport', $event)}}})],1)}
 var tf_header_buttonvue_type_template_id_634038ba_scoped_true_staticRenderFns = []
@@ -230538,7 +230912,7 @@ var tf_credential_recordvue_type_template_id_bcbf5730_scoped_true_staticRenderFn
 // EXTERNAL MODULE: ./package/tf-button-group/index.js + 6 modules
 var tf_button_group = __webpack_require__(4380);
 // EXTERNAL MODULE: ./package/tf-ag-grid-table/index.js + 22 modules
-var tf_ag_grid_table = __webpack_require__(9280);
+var tf_ag_grid_table = __webpack_require__(7389);
 // EXTERNAL MODULE: ./package/tf-pagination/index.js + 6 modules
 var tf_pagination = __webpack_require__(378);
 // EXTERNAL MODULE: ./src/api/tf-table.js
@@ -231676,14 +232050,14 @@ var tf_setting_scheme_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var tf_setting_scheme = (tf_setting_scheme_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-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=template&id=0736a7b0&scoped=true&
-var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-setting-scheme-content"},[_c('div',[_c('TfButtonGroup',[_vm._t("save",function(){return [_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.buttonLoading.saveLoading},on:{"click":_vm.save}},[_vm._v("保存")])]}),_vm._t("close",function(){return [_c('el-button',{attrs:{"type":"danger","size":"mini"},on:{"click":_vm.close}},[_vm._v("关闭")])]})],2)],1),_c('div',{staticClass:"form-body-control"},[_c('span',{staticClass:"btn",on:{"click":_vm.addRow}},[_vm._v("新增行"),_c('span',[_vm._v("|")])]),_c('span',{staticClass:"btn",on:{"click":_vm.delRow}},[_vm._v("删除行")])]),_c('div',{staticClass:"tf-common-table"},[_c('ux-grid',{ref:"settingSchemeTable",attrs:{"show-overflow":"","border":"","data":_vm.datas,"max-height":"400","min-height":"100","width-resize":"","cell-style":_vm.changeCellStyle,"checkbox-config":{ highlight: true, trigger: 'row' },"edit-config":{ trigger: 'click', mode: 'cell', autoClear: false, showIcon: false }},on:{"current-change":_vm.currentChange}},[_c('ux-table-column',{attrs:{"type":"checkbox","resizable":"","align":"center","width":"60"}}),_c('ux-table-column',{attrs:{"type":"index","field":"fieldIndex","resizable":"","title":"序号","align":"center","width":"100"}}),_c('ux-table-column',{attrs:{"field":"tableCode","edit-render":"","resizable":"","align":"center","title":"表名","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
+;// 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-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=template&id=1270209a&scoped=true&
+var tf_setting_colorvue_type_template_id_1270209a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-setting-scheme-content"},[_c('div',[_c('TfButtonGroup',[_vm._t("save",function(){return [_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.buttonLoading.saveLoading},on:{"click":_vm.save}},[_vm._v("保存")])]}),_vm._t("close",function(){return [_c('el-button',{attrs:{"type":"danger","size":"mini"},on:{"click":_vm.close}},[_vm._v("关闭")])]})],2)],1),_c('div',{staticClass:"form-body-control"},[_c('span',{staticClass:"btn",on:{"click":_vm.addRow}},[_vm._v("新增行"),_c('span',[_vm._v("|")])]),_c('span',{staticClass:"btn",on:{"click":_vm.delRow}},[_vm._v("删除行")])]),_c('div',{staticClass:"tf-common-table"},[_c('ux-grid',{ref:"settingSchemeTable",attrs:{"show-overflow":"","border":"","data":_vm.datas,"max-height":"400","min-height":"100","width-resize":"","cell-style":_vm.changeCellStyle,"checkbox-config":{ highlight: true, trigger: 'row' },"edit-config":{ trigger: 'click', mode: 'cell', autoClear: false, showIcon: false }},on:{"current-change":_vm.currentChange}},[_c('ux-table-column',{attrs:{"type":"checkbox","resizable":"","align":"center","width":"60"}}),_c('ux-table-column',{attrs:{"type":"index","field":"fieldIndex","resizable":"","title":"序号","align":"center","width":"100"}}),_c('ux-table-column',{attrs:{"field":"tableCode","edit-render":"","resizable":"","align":"center","title":"表名","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
 return [_c('tf-input',{attrs:{"not-form":"","type":"select","options":_vm.tableLists},on:{"change":function($event){return _vm.handlerChange(row, $event)}},model:{value:(row.tableCode),callback:function ($$v) {_vm.$set(row, "tableCode", $$v)},expression:"row.tableCode"}})]}},{key:"default",fn:function(ref){
 var row = ref.row;
 return [_c('span',[_vm._v(_vm._s(_vm.getLabel(row, 'tableList')))])]}}])}),_c('ux-table-column',{attrs:{"field":"field","edit-render":"","resizable":"","align":"center","title":"字段","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
-return [_c('el-select',{attrs:{"filterable":"","no-data-text":"请先选择表名"},model:{value:(row.field),callback:function ($$v) {_vm.$set(row, "field", $$v)},expression:"row.field"}},_vm._l((_vm.calculateFields(row)),function(item){return _c('el-option',{key:item.field,attrs:{"label":item.title,"value":item.field}})}),1)]}},{key:"default",fn:function(ref){
+return [_c('el-select',{attrs:{"filterable":"","no-data-text":"请先选择表名"},on:{"change":function($event){return _vm.handleField(row, $event)}},model:{value:(row.field),callback:function ($$v) {_vm.$set(row, "field", $$v)},expression:"row.field"}},_vm._l((_vm.calculateFields(row)),function(item){return _c('el-option',{key:item.field,attrs:{"label":item.title,"value":item.field}})}),1)]}},{key:"default",fn:function(ref){
 var row = ref.row;
 return [_c('span',[_vm._v(_vm._s(_vm.getLabel(row, 'fieldList')))])]}}])}),_c('ux-table-column',{attrs:{"field":"symbol","edit-render":"","resizable":"","align":"center","title":"条件","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
@@ -231691,10 +232065,10 @@ return [_c('Tf-input',{attrs:{"not-form":"","type":"select","options":_vm.symbol
 var row = ref.row;
 return [_c('span',[_vm._v(_vm._s(_vm.getLabel(row, 'symbolList')))])]}}])}),_c('ux-table-column',{attrs:{"field":"value","edit-render":"","resizable":"","align":"center","title":"值","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
-return [_c('Tf-input',{attrs:{"not-form":"","type":"input"},model:{value:(row.value),callback:function ($$v) {_vm.$set(row, "value", $$v)},expression:"row.value"}})]}}])}),_c('ux-table-column',{attrs:{"field":"color","edit-render":"","resizable":"","align":"center","title":"颜色","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
+return [_c('Tf-input',{attrs:{"not-form":"","type":row.fieldType,"code":row.bindCode,"append-to-body":"","field":row.field},model:{value:(row.value),callback:function ($$v) {_vm.$set(row, "value", $$v)},expression:"row.value"}})]}},{key:"default",fn:function(scope){return [_c('span',[_vm._v(_vm._s(_vm.showMessage(scope)))])]}}])}),_c('ux-table-column',{attrs:{"field":"color","edit-render":"","resizable":"","align":"center","title":"颜色","min-width":"100"},scopedSlots:_vm._u([{key:"edit",fn:function(ref){
 var row = ref.row;
 return [_c('el-color-picker',{model:{value:(row.color),callback:function ($$v) {_vm.$set(row, "color", $$v)},expression:"row.color"}})]}}])})],1)],1)])}
-var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns = []
+var tf_setting_colorvue_type_template_id_1270209a_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=script&lang=js&
@@ -231772,6 +232146,9 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
 //
 //
 //
+//
+//
+//
 /* harmony default export */ var tf_setting_colorvue_type_script_lang_js_ = ({
   name: 'TFSettingColor',
   components: {},
@@ -231838,10 +232215,36 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
   },
 
   methods: {
+    showMessage(scope) {
+      const value = scope.row[scope.column.property];
+
+      if (typeof value === 'object') {
+        return value && value.name ? value.name : '';
+      }
+
+      return value;
+    },
+
+    /** 根据字段的类型去选择值的输入方式 */
+    handleField(row, value) {
+      const item = this.tableCodeToFields[row.code].filter(item => item.field === row.field)[0];
+      row.fieldType = item.fieldType === 'dateTime' ? 'date' : item.fieldType;
+      row.bindCode = item.code;
+      row.value = row.fieldType === 'basicData' ? null : '';
+    },
+
     /** 保存颜色设置 */
     save() {
       this.buttonLoading.saveLoading = true;
-      this.$emit('saveColorSetting', this.datas);
+      const datas = JSON.parse(JSON.stringify(this.datas)); // 处理value值
+
+      datas.map(data => {
+        if (data.value?.id) {
+          data.label = data.value.name;
+          data.value = data.value.id;
+        }
+      });
+      this.$emit('saveColorSetting', datas);
     },
 
     /** 携带表Tablename */
@@ -231877,6 +232280,12 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
             }
 
             const item = this.tableCodeToFields[row.code].filter(item => item.field === row.field)[0];
+
+            if (item) {
+              row.fieldType = item.fieldType === 'dateTime' ? 'date' : item.fieldType;
+              row.bindCode = item.code;
+            }
+
             return item ? item.title : '';
           }
       }
@@ -231900,10 +232309,11 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
         field: '',
         label: '',
         symbol: '',
-        tableCode: '',
+        bindCode: '',
         tableLabel: '',
         tableName: '',
         value: '',
+        fieldType: '',
         color: '#000000'
       });
     },
@@ -231929,10 +232339,10 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
 });
 ;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_tf_setting_colorvue_type_script_lang_js_ = (tf_setting_colorvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=style&index=0&id=0736a7b0&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-73.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-73.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-73.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-73.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=style&index=0&id=1270209a&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=style&index=0&id=0736a7b0&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue?vue&type=style&index=0&id=1270209a&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table-list/src/components/tf-header-button/components/tf-setting/components/tf-setting-color/index.vue
 
@@ -231945,11 +232355,11 @@ var tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns =
 
 var tf_setting_color_component = (0,componentNormalizer/* default */.Z)(
   components_tf_setting_colorvue_type_script_lang_js_,
-  tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_render,
-  tf_setting_colorvue_type_template_id_0736a7b0_scoped_true_staticRenderFns,
+  tf_setting_colorvue_type_template_id_1270209a_scoped_true_render,
+  tf_setting_colorvue_type_template_id_1270209a_scoped_true_staticRenderFns,
   false,
   null,
-  "0736a7b0",
+  "1270209a",
   null
   
 )