@weitutech/by-components 1.1.149 → 1.1.151

package/lib/by-components.common.js

@@ -61778,8 +61778,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var pager = (component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/table/index.vue?vue&type=template&id=2e785b4e
-var tablevue_type_template_id_2e785b4e_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/table/index.vue?vue&type=template&id=1531768e
+var tablevue_type_template_id_1531768e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -61848,13 +61848,16 @@ var tablevue_type_template_id_2e785b4e_render = function render() {
       "dialog-visible": _vm.customTableVisible
     },
     on: {
+      "update:dialogVisible": function ($event) {
+        _vm.customTableVisible = $event;
+      },
       "closeDialog": _vm.closeCustomColumnDialog,
       "changeTable": _vm.changeTableFields,
       "changeTableGroup": _vm.changeTableGroupFields
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_2e785b4e_staticRenderFns = [];
+var tablevue_type_template_id_1531768e_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61876,8 +61879,8 @@ var es_set_is_superset_of_v2 = __webpack_require__(2475);
 var es_set_symmetric_difference_v2 = __webpack_require__(5024);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.union.v2.js
 var es_set_union_v2 = __webpack_require__(1698);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/custom-column/index.vue?vue&type=template&id=45a54e5a
-var custom_columnvue_type_template_id_45a54e5a_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/custom-column/index.vue?vue&type=template&id=16e15909
+var custom_columnvue_type_template_id_16e15909_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61897,12 +61900,10 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
       "buttons": _vm.dialogButtons
     },
     on: {
-      "update:visible": [function ($event) {
-        _vm.dialogVisible = $event;
-      }, _vm.handleVisibleChange],
       "close": _vm.closeDialog,
       "cancel": _vm.closeDialog,
-      "confirm": _vm.submit
+      "confirm": _vm.submit,
+      "update:visible": _vm.handleVisibleChange
     }
   }, [_c('div', {
     staticClass: "el-dialog-box"
@@ -62008,12 +62009,16 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
     staticClass: "right_header"
   }, [_c('span', {
     staticClass: "drag_title"
-  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('span', {
+  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('el-button', {
     staticClass: "recover",
+    attrs: {
+      "type": "text",
+      "size": "mini"
+    },
     on: {
       "click": _vm.recoverDefault
     }
-  }, [_vm._v("恢复默认")])]), !_vm.useMultiLevelHeader ? _c('div', {
+  }, [_vm._v("恢复默认")])], 1), !_vm.useMultiLevelHeader ? _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
     ref: "rightScrollContainer",
@@ -62266,7 +62271,7 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_45a54e5a_staticRenderFns = [];
+var custom_columnvue_type_template_id_16e15909_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -63325,7 +63330,11 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       }
       this.emitChangeTable(this.draggableMenu.filter(item => item.key !== 'sort-cut-off').sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(this.checkBoxMenu);
+
+      // 只有在使用多级表头时才触发 changeTableGroup 事件
+      if (this.useMultiLevelHeader) {
+        this.emitChangeTableGroup(this.checkBoxMenu);
+      }
 
       // 多级表头模式下，初始化分组渲染数据
       if (this.useMultiLevelHeader) {
@@ -63733,7 +63742,10 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         cols.push(...item.data);
       });
       this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(params.column);
+      // 只有在使用多级表头时才触发 changeTableGroup 事件
+      if (this.useMultiLevelHeader) {
+        this.emitChangeTableGroup(params.column);
+      }
 
       // ByDialog 的自动关闭逻辑会在confirm事件时处理
       // 但我们需要重置搜索和高亮状态
@@ -63748,6 +63760,9 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // changeTableGroup
     emitChangeTableGroup(cols) {
+      if (!this.useMultiLevelHeader) {
+        return;
+      }
       //表头左侧固定逻辑(对固定列进行重新分组)
       const groupedCols = groupedColumnsForTable(cols, this.fixedMaxCount);
       this.$emit('changeTableGroup', groupedCols);
@@ -63763,6 +63778,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // 处理弹窗可见性变化
     handleVisibleChange(value) {
+      // 通过事件通知父组件更新 dialogVisible，而不是直接修改 prop
+      this.$emit('update:dialogVisible', value);
       if (!value) {
         // 弹窗关闭时重置状态
         this.closeDialog();
@@ -63782,8 +63799,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 ;
 var custom_column_component = normalizeComponent(
   components_custom_columnvue_type_script_lang_js,
-  custom_columnvue_type_template_id_45a54e5a_render,
-  custom_columnvue_type_template_id_45a54e5a_staticRenderFns,
+  custom_columnvue_type_template_id_16e15909_render,
+  custom_columnvue_type_template_id_16e15909_staticRenderFns,
   false,
   null,
   null,
@@ -64214,6 +64231,11 @@ var custom_column_component = normalizeComponent(
     },
     // 改变表头字段
     changeTableFields(cols) {
+      var _this$gridOptions$cus3;
+      const useMultiLevelHeader = (_this$gridOptions$cus3 = this.gridOptions.customColumnConfig) === null || _this$gridOptions$cus3 === void 0 ? void 0 : _this$gridOptions$cus3.useMultiLevelHeader;
+      if (useMultiLevelHeader === true) {
+        return;
+      }
       const columns = [];
       cols.forEach(item => {
         if (!columns.some(col => col.field === item.key) && item.type) {
@@ -64240,6 +64262,13 @@ var custom_column_component = normalizeComponent(
     },
     // 多层级表头
     changeTableGroupFields(cols) {
+      var _this$gridOptions$cus4;
+      // 如果不使用多级表头，则忽略多级表头事件
+      const useMultiLevelHeader = (_this$gridOptions$cus4 = this.gridOptions.customColumnConfig) === null || _this$gridOptions$cus4 === void 0 ? void 0 : _this$gridOptions$cus4.useMultiLevelHeader;
+      if (useMultiLevelHeader !== true) {
+        return;
+      }
+
       // 保证组内顺序严格按后端/保存的 sort 值或当前顺序
       const sortGroupItems = groups => (groups || []).map(g => ({
         ...g,
@@ -64295,10 +64324,6 @@ var custom_column_component = normalizeComponent(
       // 根层分组也按 sort 排序（保持与右侧面板/后端一致）
       const sortedRoot = sortGroupItems(cols);
       const groupColumns = recursiveData(sortedRoot);
-      // 主动刷新 vxe-grid 表头（避免仅 emit 而外层未接收导致不生效）
-      if (this.$refs.xGrid && this.$refs.xGrid.reloadColumn) {
-        this.$refs.xGrid.reloadColumn(groupColumns);
-      }
       this.$emit('setGroupColumn', groupColumns);
     },
     // 关闭自定义表头弹框
@@ -64595,8 +64620,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_2e785b4e_render,
-  tablevue_type_template_id_2e785b4e_staticRenderFns,
+  tablevue_type_template_id_1531768e_render,
+  tablevue_type_template_id_1531768e_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -61788,8 +61788,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var pager = (component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/table/index.vue?vue&type=template&id=2e785b4e
-var tablevue_type_template_id_2e785b4e_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/table/index.vue?vue&type=template&id=1531768e
+var tablevue_type_template_id_1531768e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -61858,13 +61858,16 @@ var tablevue_type_template_id_2e785b4e_render = function render() {
       "dialog-visible": _vm.customTableVisible
     },
     on: {
+      "update:dialogVisible": function ($event) {
+        _vm.customTableVisible = $event;
+      },
       "closeDialog": _vm.closeCustomColumnDialog,
       "changeTable": _vm.changeTableFields,
       "changeTableGroup": _vm.changeTableGroupFields
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_2e785b4e_staticRenderFns = [];
+var tablevue_type_template_id_1531768e_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61886,8 +61889,8 @@ var es_set_is_superset_of_v2 = __webpack_require__(2475);
 var es_set_symmetric_difference_v2 = __webpack_require__(5024);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.union.v2.js
 var es_set_union_v2 = __webpack_require__(1698);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/custom-column/index.vue?vue&type=template&id=45a54e5a
-var custom_columnvue_type_template_id_45a54e5a_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ddfb4ac0-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/custom-column/index.vue?vue&type=template&id=16e15909
+var custom_columnvue_type_template_id_16e15909_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61907,12 +61910,10 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
       "buttons": _vm.dialogButtons
     },
     on: {
-      "update:visible": [function ($event) {
-        _vm.dialogVisible = $event;
-      }, _vm.handleVisibleChange],
       "close": _vm.closeDialog,
       "cancel": _vm.closeDialog,
-      "confirm": _vm.submit
+      "confirm": _vm.submit,
+      "update:visible": _vm.handleVisibleChange
     }
   }, [_c('div', {
     staticClass: "el-dialog-box"
@@ -62018,12 +62019,16 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
     staticClass: "right_header"
   }, [_c('span', {
     staticClass: "drag_title"
-  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('span', {
+  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('el-button', {
     staticClass: "recover",
+    attrs: {
+      "type": "text",
+      "size": "mini"
+    },
     on: {
       "click": _vm.recoverDefault
     }
-  }, [_vm._v("恢复默认")])]), !_vm.useMultiLevelHeader ? _c('div', {
+  }, [_vm._v("恢复默认")])], 1), !_vm.useMultiLevelHeader ? _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
     ref: "rightScrollContainer",
@@ -62276,7 +62281,7 @@ var custom_columnvue_type_template_id_45a54e5a_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_45a54e5a_staticRenderFns = [];
+var custom_columnvue_type_template_id_16e15909_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -63335,7 +63340,11 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       }
       this.emitChangeTable(this.draggableMenu.filter(item => item.key !== 'sort-cut-off').sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(this.checkBoxMenu);
+
+      // 只有在使用多级表头时才触发 changeTableGroup 事件
+      if (this.useMultiLevelHeader) {
+        this.emitChangeTableGroup(this.checkBoxMenu);
+      }
 
       // 多级表头模式下，初始化分组渲染数据
       if (this.useMultiLevelHeader) {
@@ -63743,7 +63752,10 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         cols.push(...item.data);
       });
       this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(params.column);
+      // 只有在使用多级表头时才触发 changeTableGroup 事件
+      if (this.useMultiLevelHeader) {
+        this.emitChangeTableGroup(params.column);
+      }
 
       // ByDialog 的自动关闭逻辑会在confirm事件时处理
       // 但我们需要重置搜索和高亮状态
@@ -63758,6 +63770,9 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // changeTableGroup
     emitChangeTableGroup(cols) {
+      if (!this.useMultiLevelHeader) {
+        return;
+      }
       //表头左侧固定逻辑(对固定列进行重新分组)
       const groupedCols = groupedColumnsForTable(cols, this.fixedMaxCount);
       this.$emit('changeTableGroup', groupedCols);
@@ -63773,6 +63788,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // 处理弹窗可见性变化
     handleVisibleChange(value) {
+      // 通过事件通知父组件更新 dialogVisible，而不是直接修改 prop
+      this.$emit('update:dialogVisible', value);
       if (!value) {
         // 弹窗关闭时重置状态
         this.closeDialog();
@@ -63792,8 +63809,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 ;
 var custom_column_component = normalizeComponent(
   components_custom_columnvue_type_script_lang_js,
-  custom_columnvue_type_template_id_45a54e5a_render,
-  custom_columnvue_type_template_id_45a54e5a_staticRenderFns,
+  custom_columnvue_type_template_id_16e15909_render,
+  custom_columnvue_type_template_id_16e15909_staticRenderFns,
   false,
   null,
   null,
@@ -64224,6 +64241,11 @@ var custom_column_component = normalizeComponent(
     },
     // 改变表头字段
     changeTableFields(cols) {
+      var _this$gridOptions$cus3;
+      const useMultiLevelHeader = (_this$gridOptions$cus3 = this.gridOptions.customColumnConfig) === null || _this$gridOptions$cus3 === void 0 ? void 0 : _this$gridOptions$cus3.useMultiLevelHeader;
+      if (useMultiLevelHeader === true) {
+        return;
+      }
       const columns = [];
       cols.forEach(item => {
         if (!columns.some(col => col.field === item.key) && item.type) {
@@ -64250,6 +64272,13 @@ var custom_column_component = normalizeComponent(
     },
     // 多层级表头
     changeTableGroupFields(cols) {
+      var _this$gridOptions$cus4;
+      // 如果不使用多级表头，则忽略多级表头事件
+      const useMultiLevelHeader = (_this$gridOptions$cus4 = this.gridOptions.customColumnConfig) === null || _this$gridOptions$cus4 === void 0 ? void 0 : _this$gridOptions$cus4.useMultiLevelHeader;
+      if (useMultiLevelHeader !== true) {
+        return;
+      }
+
       // 保证组内顺序严格按后端/保存的 sort 值或当前顺序
       const sortGroupItems = groups => (groups || []).map(g => ({
         ...g,
@@ -64305,10 +64334,6 @@ var custom_column_component = normalizeComponent(
       // 根层分组也按 sort 排序（保持与右侧面板/后端一致）
       const sortedRoot = sortGroupItems(cols);
       const groupColumns = recursiveData(sortedRoot);
-      // 主动刷新 vxe-grid 表头（避免仅 emit 而外层未接收导致不生效）
-      if (this.$refs.xGrid && this.$refs.xGrid.reloadColumn) {
-        this.$refs.xGrid.reloadColumn(groupColumns);
-      }
       this.$emit('setGroupColumn', groupColumns);
     },
     // 关闭自定义表头弹框
@@ -64605,8 +64630,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_2e785b4e_render,
-  tablevue_type_template_id_2e785b4e_staticRenderFns,
+  tablevue_type_template_id_1531768e_render,
+  tablevue_type_template_id_1531768e_staticRenderFns,
   false,
   null,
   null,