@weitutech/by-components 1.1.150 → 1.1.152

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=208dd294
-var custom_columnvue_type_template_id_208dd294_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=11e72a7d
+var custom_columnvue_type_template_id_11e72a7d_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61897,12 +61900,10 @@ var custom_columnvue_type_template_id_208dd294_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"
@@ -62270,7 +62271,7 @@ var custom_columnvue_type_template_id_208dd294_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_208dd294_staticRenderFns = [];
+var custom_columnvue_type_template_id_11e72a7d_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -62278,8 +62279,6 @@ var es_iterator_filter = __webpack_require__(2489);
 var es_iterator_find = __webpack_require__(116);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.flat-map.js
 var es_iterator_flat_map = __webpack_require__(531);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
-var es_iterator_some = __webpack_require__(3579);
 // EXTERNAL MODULE: ./node_modules/vuedraggable/dist/vuedraggable.umd.js
 var vuedraggable_umd = __webpack_require__(9135);
 var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
@@ -63123,7 +63122,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 
 
 
-
 
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
@@ -63251,7 +63249,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
      * @param { object[] } bePreservedColumn 被保存过的列数据
      */
     initTableList(initColumn, bePreservedColumn = []) {
-      // this.$message.success('目前是' + (this.useMultiLevelHeader ? '多级' : '一级') + '表头模式')
       //设置拖拽列表数据
       const setDraggableMenu = arr => {
         // 扁平化所有列并按 fixed 属性分类排序
@@ -63328,12 +63325,19 @@ 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);
-
-      // 多级表头模式下，初始化分组渲染数据
       if (this.useMultiLevelHeader) {
-        // 初始化基础分组顺序，仅在首次时赋值
+        // 多级表头模式
+        const clonedCheckBoxMenu = this.checkBoxMenu.map(group => ({
+          ...group,
+          data: group.data.map(col => this.deepClone(col))
+        }));
+        this.emitChangeTableGroup(clonedCheckBoxMenu);
+      } else {
+        const clonedDraggableMenu = this.draggableMenu.filter(item => item.key !== 'sort-cut-off').map(item => this.deepClone(item)).sort((a, b) => a.sort - b.sort);
+        this.emitChangeTable(clonedDraggableMenu);
+      }
+      if (this.useMultiLevelHeader) {
+        // 多级表头模式
         if (this.baseGroupOrder.length === 0) {
           this.baseGroupOrder = this.checkBoxMenu.map(g => g.label);
         }
@@ -63562,13 +63566,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         items: this.deepClone(labelToItems[l])
       }));
       this.groupCards = nextGroups;
-      try {
-        console.debug('[custom-column] refreshMultiHeaderDerivedData', {
-          separatorIndex,
-          fixedCount: fixed.length,
-          groupCount: nextGroups.length
-        });
-      } catch (e) {}
     },
     onFixedEnd() {
       // 将 fixedAreaList 的顺序同步回 draggableMenu 的固定区
@@ -63706,26 +63703,59 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         });
       } else {
         // 处理普通的列分组（按原有的 parent.label 分组）
-        this.draggableMenu.forEach(item => {
-          if (item.key !== 'sort-cut-off') {
-            const {
-              parent,
-              ...other
-            } = item;
-            // 是否存在
-            const isExit = params.column.some(col => col.label === parent.label);
-            if (isExit) {
-              params.column.forEach(col => {
-                if (col.label === parent.label) {
-                  col.data.push(other);
+        // 注意：从 checkBoxMenu 构建保存数据，确保保存原始 fixed 属性
+        // 但需要根据 draggableMenu 中的顺序和位置来确定最终的 sort 和 fixed
+        const separatorIndex = this.draggableMenu.findIndex(i => i.key === 'sort-cut-off');
+        this.checkBoxMenu.forEach(group => {
+          // 收集该分组下所有选中的列
+          const groupCols = [];
+          group.data.forEach(col => {
+            if (col.type) {
+              // 深拷贝列数据，避免修改原始数据
+              const {
+                parent,
+                ...colData
+              } = col;
+              const clonedCol = this.deepClone(colData);
+
+              // 从 draggableMenu 中获取当前的 sort 值
+              const dragItem = this.draggableMenu.find(item => item.key === col.key);
+              if (dragItem && dragItem.sort !== undefined) {
+                clonedCol.sort = dragItem.sort;
+              }
+
+              // 判断 fixed 状态：如果 draggableMenu 中该项在分割线之前，则它是固定列
+              if (separatorIndex > -1) {
+                const itemIndex = this.draggableMenu.findIndex(i => i.key === col.key);
+                if (itemIndex !== -1 && itemIndex < separatorIndex) {
+                  clonedCol.fixed = 'left';
+                } else {
+                  // 不在固定区，删除 fixed（即使原始数据中有 fixed）
+                  delete clonedCol.fixed;
                 }
-              });
-            } else {
-              params.column.push({
-                label: parent.label,
-                data: [other]
-              });
+              } else {
+                // 没有分割线，保持原始 fixed 状态
+                if (col.fixed === 'left') {
+                  clonedCol.fixed = 'left';
+                } else {
+                  delete clonedCol.fixed;
+                }
+              }
+              groupCols.push(clonedCol);
             }
+          });
+
+          // 按照 sort 值排序，确保同一分组内的列顺序与用户拖拽后的顺序一致
+          if (groupCols.length > 0) {
+            groupCols.sort((a, b) => {
+              const sortA = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+              const sortB = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+              return sortA - sortB;
+            });
+            params.column.push({
+              label: group.label,
+              data: groupCols
+            });
           }
         });
       }
@@ -63734,13 +63764,18 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
       // changeTable 回调：返回正常排序的列数据
       const cols = [];
       params.column.forEach(item => {
-        cols.push(...item.data);
+        cols.push(...item.data.map(col => this.deepClone(col)));
       });
-      this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(params.column);
-
-      // ByDialog 的自动关闭逻辑会在confirm事件时处理
-      // 但我们需要重置搜索和高亮状态
+      if (this.useMultiLevelHeader) {
+        // 多级表头模式
+        const clonedColumn = params.column.map(group => ({
+          ...group,
+          data: group.data.map(col => this.deepClone(col))
+        }));
+        this.emitChangeTableGroup(clonedColumn);
+      } else {
+        this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
+      }
       this.search = '';
       this.activeId = 0;
     },
@@ -63767,6 +63802,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // 处理弹窗可见性变化
     handleVisibleChange(value) {
+      // 通过事件通知父组件更新 dialogVisible，而不是直接修改 prop
+      this.$emit('update:dialogVisible', value);
       if (!value) {
         // 弹窗关闭时重置状态
         this.closeDialog();
@@ -63786,8 +63823,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_208dd294_render,
-  custom_columnvue_type_template_id_208dd294_staticRenderFns,
+  custom_columnvue_type_template_id_11e72a7d_render,
+  custom_columnvue_type_template_id_11e72a7d_staticRenderFns,
   false,
   null,
   null,
@@ -64218,6 +64255,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) {
@@ -64244,6 +64286,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,
@@ -64299,10 +64348,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);
     },
     // 关闭自定义表头弹框
@@ -64599,8 +64644,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,
@@ -65791,6 +65836,8 @@ var ByCommonSelectorvue_type_template_id_73eac40e_render = function render() {
 };
 var ByCommonSelectorvue_type_template_id_73eac40e_staticRenderFns = [];
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
+var es_iterator_some = __webpack_require__(3579);
 ;// ./node_modules/pinyin-pro/dist/index.mjs
 
 

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=208dd294
-var custom_columnvue_type_template_id_208dd294_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=11e72a7d
+var custom_columnvue_type_template_id_11e72a7d_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61907,12 +61910,10 @@ var custom_columnvue_type_template_id_208dd294_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"
@@ -62280,7 +62281,7 @@ var custom_columnvue_type_template_id_208dd294_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_208dd294_staticRenderFns = [];
+var custom_columnvue_type_template_id_11e72a7d_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -62288,8 +62289,6 @@ var es_iterator_filter = __webpack_require__(2489);
 var es_iterator_find = __webpack_require__(116);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.flat-map.js
 var es_iterator_flat_map = __webpack_require__(531);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
-var es_iterator_some = __webpack_require__(3579);
 // EXTERNAL MODULE: ./node_modules/vuedraggable/dist/vuedraggable.umd.js
 var vuedraggable_umd = __webpack_require__(3741);
 var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
@@ -63133,7 +63132,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 
 
 
-
 
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
@@ -63261,7 +63259,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
      * @param { object[] } bePreservedColumn 被保存过的列数据
      */
     initTableList(initColumn, bePreservedColumn = []) {
-      // this.$message.success('目前是' + (this.useMultiLevelHeader ? '多级' : '一级') + '表头模式')
       //设置拖拽列表数据
       const setDraggableMenu = arr => {
         // 扁平化所有列并按 fixed 属性分类排序
@@ -63338,12 +63335,19 @@ 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);
-
-      // 多级表头模式下，初始化分组渲染数据
       if (this.useMultiLevelHeader) {
-        // 初始化基础分组顺序，仅在首次时赋值
+        // 多级表头模式
+        const clonedCheckBoxMenu = this.checkBoxMenu.map(group => ({
+          ...group,
+          data: group.data.map(col => this.deepClone(col))
+        }));
+        this.emitChangeTableGroup(clonedCheckBoxMenu);
+      } else {
+        const clonedDraggableMenu = this.draggableMenu.filter(item => item.key !== 'sort-cut-off').map(item => this.deepClone(item)).sort((a, b) => a.sort - b.sort);
+        this.emitChangeTable(clonedDraggableMenu);
+      }
+      if (this.useMultiLevelHeader) {
+        // 多级表头模式
         if (this.baseGroupOrder.length === 0) {
           this.baseGroupOrder = this.checkBoxMenu.map(g => g.label);
         }
@@ -63572,13 +63576,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         items: this.deepClone(labelToItems[l])
       }));
       this.groupCards = nextGroups;
-      try {
-        console.debug('[custom-column] refreshMultiHeaderDerivedData', {
-          separatorIndex,
-          fixedCount: fixed.length,
-          groupCount: nextGroups.length
-        });
-      } catch (e) {}
     },
     onFixedEnd() {
       // 将 fixedAreaList 的顺序同步回 draggableMenu 的固定区
@@ -63716,26 +63713,59 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         });
       } else {
         // 处理普通的列分组（按原有的 parent.label 分组）
-        this.draggableMenu.forEach(item => {
-          if (item.key !== 'sort-cut-off') {
-            const {
-              parent,
-              ...other
-            } = item;
-            // 是否存在
-            const isExit = params.column.some(col => col.label === parent.label);
-            if (isExit) {
-              params.column.forEach(col => {
-                if (col.label === parent.label) {
-                  col.data.push(other);
+        // 注意：从 checkBoxMenu 构建保存数据，确保保存原始 fixed 属性
+        // 但需要根据 draggableMenu 中的顺序和位置来确定最终的 sort 和 fixed
+        const separatorIndex = this.draggableMenu.findIndex(i => i.key === 'sort-cut-off');
+        this.checkBoxMenu.forEach(group => {
+          // 收集该分组下所有选中的列
+          const groupCols = [];
+          group.data.forEach(col => {
+            if (col.type) {
+              // 深拷贝列数据，避免修改原始数据
+              const {
+                parent,
+                ...colData
+              } = col;
+              const clonedCol = this.deepClone(colData);
+
+              // 从 draggableMenu 中获取当前的 sort 值
+              const dragItem = this.draggableMenu.find(item => item.key === col.key);
+              if (dragItem && dragItem.sort !== undefined) {
+                clonedCol.sort = dragItem.sort;
+              }
+
+              // 判断 fixed 状态：如果 draggableMenu 中该项在分割线之前，则它是固定列
+              if (separatorIndex > -1) {
+                const itemIndex = this.draggableMenu.findIndex(i => i.key === col.key);
+                if (itemIndex !== -1 && itemIndex < separatorIndex) {
+                  clonedCol.fixed = 'left';
+                } else {
+                  // 不在固定区，删除 fixed（即使原始数据中有 fixed）
+                  delete clonedCol.fixed;
                 }
-              });
-            } else {
-              params.column.push({
-                label: parent.label,
-                data: [other]
-              });
+              } else {
+                // 没有分割线，保持原始 fixed 状态
+                if (col.fixed === 'left') {
+                  clonedCol.fixed = 'left';
+                } else {
+                  delete clonedCol.fixed;
+                }
+              }
+              groupCols.push(clonedCol);
             }
+          });
+
+          // 按照 sort 值排序，确保同一分组内的列顺序与用户拖拽后的顺序一致
+          if (groupCols.length > 0) {
+            groupCols.sort((a, b) => {
+              const sortA = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+              const sortB = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+              return sortA - sortB;
+            });
+            params.column.push({
+              label: group.label,
+              data: groupCols
+            });
           }
         });
       }
@@ -63744,13 +63774,18 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
       // changeTable 回调：返回正常排序的列数据
       const cols = [];
       params.column.forEach(item => {
-        cols.push(...item.data);
+        cols.push(...item.data.map(col => this.deepClone(col)));
       });
-      this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
-      this.emitChangeTableGroup(params.column);
-
-      // ByDialog 的自动关闭逻辑会在confirm事件时处理
-      // 但我们需要重置搜索和高亮状态
+      if (this.useMultiLevelHeader) {
+        // 多级表头模式
+        const clonedColumn = params.column.map(group => ({
+          ...group,
+          data: group.data.map(col => this.deepClone(col))
+        }));
+        this.emitChangeTableGroup(clonedColumn);
+      } else {
+        this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
+      }
       this.search = '';
       this.activeId = 0;
     },
@@ -63777,6 +63812,8 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
     },
     // 处理弹窗可见性变化
     handleVisibleChange(value) {
+      // 通过事件通知父组件更新 dialogVisible，而不是直接修改 prop
+      this.$emit('update:dialogVisible', value);
       if (!value) {
         // 弹窗关闭时重置状态
         this.closeDialog();
@@ -63796,8 +63833,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_208dd294_render,
-  custom_columnvue_type_template_id_208dd294_staticRenderFns,
+  custom_columnvue_type_template_id_11e72a7d_render,
+  custom_columnvue_type_template_id_11e72a7d_staticRenderFns,
   false,
   null,
   null,
@@ -64228,6 +64265,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) {
@@ -64254,6 +64296,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,
@@ -64309,10 +64358,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);
     },
     // 关闭自定义表头弹框
@@ -64609,8 +64654,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,
@@ -65801,6 +65846,8 @@ var ByCommonSelectorvue_type_template_id_73eac40e_render = function render() {
 };
 var ByCommonSelectorvue_type_template_id_73eac40e_staticRenderFns = [];
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.some.js
+var es_iterator_some = __webpack_require__(3579);
 ;// ./node_modules/pinyin-pro/dist/index.mjs