@weitutech/by-components 1.1.151 → 1.1.152

package/lib/by-components.common.js

@@ -61879,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=16e15909
-var custom_columnvue_type_template_id_16e15909_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', {
@@ -62271,7 +62271,7 @@ var custom_columnvue_type_template_id_16e15909_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_16e15909_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);
@@ -62279,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);
@@ -63124,7 +63122,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 
 
 
-
 
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
@@ -63252,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 属性分类排序
@@ -63329,16 +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));
-
-      // 只有在使用多级表头时才触发 changeTableGroup 事件
       if (this.useMultiLevelHeader) {
-        this.emitChangeTableGroup(this.checkBoxMenu);
+        // 多级表头模式
+        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);
         }
@@ -63567,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 的固定区
@@ -63711,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
+            });
           }
         });
       }
@@ -63739,16 +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));
-      // 只有在使用多级表头时才触发 changeTableGroup 事件
       if (this.useMultiLevelHeader) {
-        this.emitChangeTableGroup(params.column);
+        // 多级表头模式
+        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));
       }
-
-      // ByDialog 的自动关闭逻辑会在confirm事件时处理
-      // 但我们需要重置搜索和高亮状态
       this.search = '';
       this.activeId = 0;
     },
@@ -63760,9 +63787,6 @@ 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);
@@ -63799,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_16e15909_render,
-  custom_columnvue_type_template_id_16e15909_staticRenderFns,
+  custom_columnvue_type_template_id_11e72a7d_render,
+  custom_columnvue_type_template_id_11e72a7d_staticRenderFns,
   false,
   null,
   null,
@@ -65812,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

@@ -61889,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=16e15909
-var custom_columnvue_type_template_id_16e15909_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', {
@@ -62281,7 +62281,7 @@ var custom_columnvue_type_template_id_16e15909_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_16e15909_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);
@@ -62289,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);
@@ -63134,7 +63132,6 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
 
 
 
-
 
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
@@ -63262,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 属性分类排序
@@ -63339,16 +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));
-
-      // 只有在使用多级表头时才触发 changeTableGroup 事件
       if (this.useMultiLevelHeader) {
-        this.emitChangeTableGroup(this.checkBoxMenu);
+        // 多级表头模式
+        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);
         }
@@ -63577,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 的固定区
@@ -63721,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
+            });
           }
         });
       }
@@ -63749,16 +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));
-      // 只有在使用多级表头时才触发 changeTableGroup 事件
       if (this.useMultiLevelHeader) {
-        this.emitChangeTableGroup(params.column);
+        // 多级表头模式
+        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));
       }
-
-      // ByDialog 的自动关闭逻辑会在confirm事件时处理
-      // 但我们需要重置搜索和高亮状态
       this.search = '';
       this.activeId = 0;
     },
@@ -63770,9 +63797,6 @@ 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);
@@ -63809,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_16e15909_render,
-  custom_columnvue_type_template_id_16e15909_staticRenderFns,
+  custom_columnvue_type_template_id_11e72a7d_render,
+  custom_columnvue_type_template_id_11e72a7d_staticRenderFns,
   false,
   null,
   null,
@@ -65822,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