@tongfun/tf-widget 0.1.155 → 0.1.157

package/lib/tf-widget.common.js

@@ -140081,7 +140081,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/utils/index.js
 var utils = __webpack_require__(42325);
 // EXTERNAL MODULE: ./src/directives/index.js + 33 modules
-var directives = __webpack_require__(65146);
+var directives = __webpack_require__(52141);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/index.vue?vue&type=script&lang=js&
 //
 //
@@ -140831,7 +140831,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 65146:
+/***/ 52141:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -141068,25 +141068,25 @@ async function initColumnDrag(el, binding, vNode) {
     handle: '.elx-header--column:not(.col--fixed)',
     ghostClass: 'dragColbg',
     chosenClass: 'dragColbg',
-    onEnd: ({
+    onEnd: async ({
       newIndex,
       oldIndex
     }) => {
-      const {
-        collectColumn,
-        tableColumn
-      } = tableInstance.getTableColumn(); // 转换真实索引
-
-      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
-      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
-
-      if (newColumnIndex === oldColumnIndex) {
+      if (newIndex === oldIndex) {
         return;
-      } // 移动到目标列
-
+      }
 
-      const currRow = collectColumn.splice(oldColumnIndex, 1)[0];
-      collectColumn.splice(newColumnIndex, 0, currRow);
+      const {
+        collectColumn
+      } = tableInstance.getTableColumn();
+      const newColumns = collectColumn.filter(item => item.visible);
+      const oldProperty = newColumns[oldIndex].property;
+      const newProperty = newColumns[newIndex].property;
+      const oldMoveIndex = collectColumn.findIndex(d => d.property === oldProperty);
+      const newMoveIndex = collectColumn.findIndex(d => d.property === newProperty); // 移动到目标列
+
+      const currRow = collectColumn.splice(oldMoveIndex, 1)[0];
+      collectColumn.splice(newMoveIndex, 0, currRow);
       tableInstance.loadColumn(collectColumn); // 配置更新
 
       columnChange(el, binding, vNode);
@@ -141378,9 +141378,9 @@ var tf_settingvue_type_template_id_89b35bfc_scoped_true_render = function () {va
 var tf_settingvue_type_template_id_89b35bfc_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=template&id=18b2ec14&scoped=true&
-var tf_setting_formvue_type_template_id_18b2ec14_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tf-setting-form-content"},[_c('div',{staticClass:"tf-header-group"},[_c('div',{staticClass:"tf-search-text"},[_c('el-input',{attrs:{"placeholder":"搜索字段名称","clearable":""},on:{"input":_vm.handleSearchField},model:{value:(_vm.searchContent),callback:function ($$v) {_vm.searchContent=$$v},expression:"searchContent"}},[_c('i',{staticClass:"el-input__icon el-icon-search",attrs:{"slot":"prefix"},slot:"prefix"})])],1),_c('TfButtonGroup',[_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('showChange')}}},[_vm._v("显/隐切换")]),_c('el-button',{attrs:{"type":"primary","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('freeze')}}},[_vm._v("冻结/固定")]),_c('el-button',{attrs:{"type":"primary","size":"mini","loading":_vm.saveLoading},on:{"click":function($event){return _vm.handlerButtons('save')}}},[_vm._v("保存")]),_c('el-button',{attrs:{"type":"danger","size":"mini"},on:{"click":function($event){return _vm.handlerButtons('close')}}},[_vm._v("关闭")])],1)],1),_c('div',{staticClass:"tf-common-table"},[_c('TfAgGridTable',{ref:"settingTable",attrs:{"columns":_vm.mainColumns,"table-data":_vm.showTableData,"row-drag-managed":false,"row-drag-entire-row":false,"row-drag-multi-row":false,"enable-cell-text-selection":false},on:{"rowDragEnd":_vm.rowDragEnd,"handleChangeCellValue":_vm.handleChangeCellValue,"sortRow":_vm.sortRow,"selectChange":_vm.selectChange}})],1)])}
-var tf_setting_formvue_type_template_id_18b2ec14_scoped_true_staticRenderFns = []
+;// 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=3634d456&scoped=true&
+var tf_setting_formvue_type_template_id_3634d456_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_3634d456_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./package/tf-button-group/index.js + 6 modules
@@ -141687,10 +141687,7 @@ var tf_ag_grid_table = __webpack_require__(90945);
         field: item.field,
         isShow: item.isShow,
         fieldIndex: index + 1,
-        isFreeze: item.isFreeze // isSort: item.isSort,
-        // digit: item.digit,
-        // isSum: item.isSum,
-
+        isFreeze: item.isFreeze
       }));
     }
 
@@ -141698,10 +141695,10 @@ var tf_ag_grid_table = __webpack_require__(90945);
 });
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_tf_setting_formvue_type_script_lang_js_ = (tf_setting_formvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=18b2ec14&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue?vue&type=style&index=0&id=3634d456&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=18b2ec14&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=3634d456&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-table/src/components/tf-setting/components/tf-setting-form/index.vue
 
@@ -141714,11 +141711,11 @@ var tf_ag_grid_table = __webpack_require__(90945);
 
 var tf_setting_form_component = (0,componentNormalizer/* default */.Z)(
   components_tf_setting_formvue_type_script_lang_js_,
-  tf_setting_formvue_type_template_id_18b2ec14_scoped_true_render,
-  tf_setting_formvue_type_template_id_18b2ec14_scoped_true_staticRenderFns,
+  tf_setting_formvue_type_template_id_3634d456_scoped_true_render,
+  tf_setting_formvue_type_template_id_3634d456_scoped_true_staticRenderFns,
   false,
   null,
-  "18b2ec14",
+  "3634d456",
   null
   
 )
@@ -141847,12 +141844,15 @@ function initTableConfig(el, binding, vNode) {
     configTableName: '',
     userConfigList: [],
     tableConfigList: []
-  };
+  }; // 记录是否查到用户数据
+
+  el.isGetUserConfig = false;
   el.umyTableSetting.configTableName = module + '-' + (vm.$route.meta.module || vm.$route.name) + '-' + binding.value;
   (0,tf_table/* getUserEntityConfigs */.eM)({
     tableName: el.umyTableSetting.configTableName
   }).then(async res => {
     el.umyTableSetting.userConfigList = res.data || [];
+    el.isGetUserConfig = true;
     await initTableConfigList(el, binding, vNode);
     reloadColumns(el, binding, vNode);
   }); // 动态添加class名，用于隐藏自带排序图标等
@@ -141920,6 +141920,7 @@ function saveSetting(el, binding, vNode, closeLoading = false) {
     if (res.code === 0) {
       if (closeLoading) {
         reloadColumns(el, binding, vNode);
+        syncConfig(el, binding, vNode);
         el.tfSettingInstance.close();
       }
     } else {
@@ -141931,6 +141932,19 @@ function saveSetting(el, binding, vNode, closeLoading = false) {
     closeLoading && el.tfSettingInstance.closeLoading();
   });
 }
+/** 将弹框中的数据同步 */
+
+function syncConfig(el, binding, vNode) {
+  const configs = getSaveData(el, binding, vNode);
+  el.umyTableSetting.tableConfigList.map(item => {
+    const current = configs.find(d => item.field && d.field === item.field);
+
+    if (current) {
+      item.isShow = current.isShow;
+      item.isFreeze = current.isFreeze;
+    }
+  });
+}
 /** 获取保存时的数据 */
 
 function getSaveData(el, binding, vNode) {
@@ -142233,7 +142247,10 @@ const umyTableSetting = {
       return;
     }
 
-    saveSetting(el, binding, vNode);
+    if (el.isGetUserConfig) {
+      saveSetting(el, binding, vNode);
+    }
+
     el.tfSettingInstance.$destroy();
   }
 
@@ -244404,7 +244421,7 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
   }
 });
 // EXTERNAL MODULE: ./src/directives/index.js + 33 modules
-var directives = __webpack_require__(65146);
+var directives = __webpack_require__(52141);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-data-list/main.vue?vue&type=script&lang=js&
 //
 //