@weitutech/by-components 1.1.44 → 1.1.45

package/lib/by-components.umd.js

@@ -872,7 +872,7 @@ module.exports = function (it) {
 
 var call = __webpack_require__(9565);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var tryToString = __webpack_require__(6823);
 var getIteratorMethod = __webpack_require__(851);
 
@@ -1080,7 +1080,7 @@ var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var iteratorClose = __webpack_require__(9539);
 var iteratorHelperWithoutClosingOnEarlyError = __webpack_require__(4549);
@@ -1946,7 +1946,7 @@ module.exports = function (record, fn, ITERATOR_INSTEAD_OF_RECORD) {
 var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var getIteratorFlattenable = __webpack_require__(8646);
 var createIteratorProxy = __webpack_require__(9462);
@@ -2663,25 +2663,6 @@ module.exports = function (it) {
 };
 
 
-/***/ }),
-
-/***/ 932:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-
-var isObject = __webpack_require__(34);
-
-var $String = String;
-var $TypeError = TypeError;
-
-// `Assert: Type(argument) is Object`
-module.exports = function (argument) {
-  if (isObject(argument)) return argument;
-  throw new $TypeError($String(argument) + ' is not an object');
-};
-
-
 /***/ }),
 
 /***/ 936:
@@ -4740,7 +4721,7 @@ var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var iteratorClose = __webpack_require__(9539);
 var iteratorHelperWithoutClosingOnEarlyError = __webpack_require__(4549);
@@ -10056,7 +10037,7 @@ $({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike('uni
 var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var createIteratorProxy = __webpack_require__(9462);
 var callWithSafeIterationClosing = __webpack_require__(6319);
@@ -10119,7 +10100,7 @@ module.exports = function (obj) {
 "use strict";
 
 var $ = __webpack_require__(6518);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var iterate = __webpack_require__(2652);
 var getIteratorDirect = __webpack_require__(1767);
 
@@ -11670,7 +11651,7 @@ module.exports = !fails(function () {
 "use strict";
 
 /* global ActiveXObject -- old IE, WSH */
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var definePropertiesModule = __webpack_require__(6801);
 var enumBugKeys = __webpack_require__(8727);
 var hiddenKeys = __webpack_require__(421);
@@ -12184,7 +12165,7 @@ $({ target: 'Set', proto: true, real: true, forced: INCORRECT }, {
 var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var createIteratorProxy = __webpack_require__(9462);
 var callWithSafeIterationClosing = __webpack_require__(6319);
@@ -13019,7 +13000,7 @@ module.exports = function (name) {
 
 var bind = __webpack_require__(6080);
 var call = __webpack_require__(9565);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var tryToString = __webpack_require__(6823);
 var isArrayIteratorMethod = __webpack_require__(4209);
 var lengthOfArrayLike = __webpack_require__(6198);
@@ -24162,7 +24143,7 @@ var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var iteratorClose = __webpack_require__(9539);
 var iteratorHelperWithoutClosingOnEarlyError = __webpack_require__(4549);
@@ -26914,7 +26895,7 @@ __webpack_require__(8237);
 "use strict";
 
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var call = __webpack_require__(9565);
 var toIntegerOrInfinity = __webpack_require__(1291);
 var getIteratorDirect = __webpack_require__(1767);
@@ -29544,7 +29525,7 @@ module.exports = typeof documentAll == 'undefined' && documentAll !== undefined
 var DESCRIPTORS = __webpack_require__(3724);
 var IE8_DOM_DEFINE = __webpack_require__(5917);
 var V8_PROTOTYPE_DEFINE_BUG = __webpack_require__(8686);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var toPropertyKey = __webpack_require__(6969);
 
 var $TypeError = TypeError;
@@ -30182,7 +30163,7 @@ module.exports = function (it) {
 
 var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var notANaN = __webpack_require__(4149);
 var toPositiveInteger = __webpack_require__(9590);
@@ -30432,7 +30413,7 @@ var getBuiltIn = __webpack_require__(7751);
 var uncurryThis = __webpack_require__(9504);
 var getOwnPropertyNamesModule = __webpack_require__(8480);
 var getOwnPropertySymbolsModule = __webpack_require__(3717);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 
 var concat = uncurryThis([].concat);
 
@@ -34293,7 +34274,7 @@ module.exports = function (target, src, options) {
 
 "use strict";
 
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var iteratorClose = __webpack_require__(9539);
 
 // call something on iterator step with safe closing on error
@@ -36039,7 +36020,7 @@ if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
 var DESCRIPTORS = __webpack_require__(3724);
 var V8_PROTOTYPE_DEFINE_BUG = __webpack_require__(8686);
 var definePropertyModule = __webpack_require__(4913);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var toIndexedObject = __webpack_require__(5397);
 var objectKeys = __webpack_require__(1072);
 
@@ -38089,7 +38070,7 @@ var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
 var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var iteratorClose = __webpack_require__(9539);
 var iteratorHelperWithoutClosingOnEarlyError = __webpack_require__(4549);
@@ -40493,7 +40474,7 @@ module.exports = function (argument) {
 var $ = __webpack_require__(6518);
 var globalThis = __webpack_require__(4576);
 var anInstance = __webpack_require__(679);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var isCallable = __webpack_require__(4901);
 var getPrototypeOf = __webpack_require__(2787);
 var defineBuiltInAccessor = __webpack_require__(2106);
@@ -40593,7 +40574,7 @@ module.exports = function (name) {
 var $ = __webpack_require__(6518);
 var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var iteratorClose = __webpack_require__(9539);
 var iteratorHelperWithoutClosingOnEarlyError = __webpack_require__(4549);
@@ -41430,6 +41411,25 @@ module.exports = function isSupersetOf(other) {
   return deCh;
 });
 
+/***/ }),
+
+/***/ 8551:
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var isObject = __webpack_require__(34);
+
+var $String = String;
+var $TypeError = TypeError;
+
+// `Assert: Type(argument) is Object`
+module.exports = function (argument) {
+  if (isObject(argument)) return argument;
+  throw new $TypeError($String(argument) + ' is not an object');
+};
+
+
 /***/ }),
 
 /***/ 8560:
@@ -41539,7 +41539,7 @@ module.exports = isCallable(WeakMap) && /native code/.test(String(WeakMap));
 "use strict";
 
 var call = __webpack_require__(9565);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var getIteratorMethod = __webpack_require__(851);
 
@@ -52560,7 +52560,7 @@ module.exports = function (argument) {
 
 var $ = __webpack_require__(6518);
 var call = __webpack_require__(9565);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
 var notANaN = __webpack_require__(4149);
 var toPositiveInteger = __webpack_require__(9590);
@@ -53062,7 +53062,7 @@ module.exports = version;
 "use strict";
 
 var call = __webpack_require__(9565);
-var anObject = __webpack_require__(932);
+var anObject = __webpack_require__(8551);
 var getMethod = __webpack_require__(5966);
 
 module.exports = function (iterator, kind, value) {
@@ -60752,8 +60752,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":"72942c6c-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=58d17823
-var tablevue_type_template_id_58d17823_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"72942c6c-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=4926859a
+var tablevue_type_template_id_4926859a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60817,6 +60817,7 @@ var tablevue_type_template_id_58d17823_render = function render() {
     attrs: {
       "info-method": _vm.gridOptions.customColumnConfig.infoMethod,
       "submit-method": _vm.gridOptions.customColumnConfig.submitMethod,
+      "fixed-max-count": _vm.gridOptions.customColumnConfig.fixedMaxCount,
       "dialog-visible": _vm.customTableVisible
     },
     on: {
@@ -60826,7 +60827,7 @@ var tablevue_type_template_id_58d17823_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_58d17823_staticRenderFns = [];
+var tablevue_type_template_id_4926859a_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -60846,8 +60847,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":"72942c6c-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=6ff46ecd
-var custom_columnvue_type_template_id_6ff46ecd_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"72942c6c-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=22c5acce
+var custom_columnvue_type_template_id_22c5acce_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61048,7 +61049,7 @@ var custom_columnvue_type_template_id_6ff46ecd_render = function render() {
     }) : _vm._e()]);
   }), 0)], 1)], 1)], 1)])])])], 1);
 };
-var custom_columnvue_type_template_id_6ff46ecd_staticRenderFns = [];
+var custom_columnvue_type_template_id_22c5acce_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -61097,6 +61098,304 @@ const deepClone = target => {
   // 返回最终结果
   return result;
 };
+;// ./src/utils/tableUtils.js
+
+
+
+
+
+
+/**
+ * 判断是否缓存了表格列宽
+ * @param {*} name 表格名称
+ * @returns
+ */
+const isCachedTableColumns = name => {
+  if (!name) return false;
+  return !!localStorage.getItem(name);
+};
+
+/**
+ * 删除表格列宽缓存
+ * @param {*} name 表格名称
+ */
+const removeCachedTableColumns = name => {
+  localStorage.removeItem(name);
+};
+
+/**
+ * 缓存列宽
+ * @param {*} name 表格名称
+ * @param {*} context
+ */
+const saveCachedColumns = (name, context) => {
+  if (!name) return;
+  // 获取列宽信息
+  const collectColumn = context.$table.collectColumn;
+  // 获取已缓存的列宽数据
+  const cachedColumns = getCachedColumns(name);
+
+  // 递归查找并更新列宽
+  const updateColumnWidth = (columns, targetField, newWidth) => {
+    const result = [];
+    for (const col of columns) {
+      if (col.children) {
+        const updatedChildren = updateColumnWidth(col.children, targetField, newWidth);
+        if (updatedChildren.length > 0) {
+          result.push({
+            field: col.field,
+            width: newWidth,
+            children: updatedChildren
+          });
+        }
+      } else if (targetField && targetField !== '' && col.field === targetField) {
+        //如果没设置field不缓存
+        result.push({
+          field: col.field,
+          width: newWidth
+        });
+      }
+    }
+    return result;
+  };
+
+  //当前拖动的列
+  const currentColumn = context.column;
+
+  // 更新被拖动列的宽度（只缓存被拖动的列）
+  const updatedColumns = updateColumnWidth(collectColumn, currentColumn.field, currentColumn.renderWidth);
+
+  // 合并新的列宽信息到缓存中
+  const mergeColumns = (newColumns, cachedColumns) => {
+    const result = [...cachedColumns];
+    for (const newCol of newColumns) {
+      const existingIndex = result.findIndex(col => col.field === newCol.field);
+      if (existingIndex !== -1) {
+        // 如果存在子列，递归合并
+        if (newCol.children && result[existingIndex].children) {
+          result[existingIndex].children = mergeColumns(newCol.children, result[existingIndex].children);
+        } else {
+          // 更新宽度
+          result[existingIndex].width = newCol.width;
+        }
+      } else {
+        // 添加新的列信息
+        result.push(newCol);
+      }
+    }
+    return result;
+  };
+
+  // 合并并保存更新后的列宽数据
+  const finalColumns = mergeColumns(updatedColumns, cachedColumns);
+
+  //缓存列宽
+  localStorage.setItem(name, JSON.stringify(finalColumns));
+};
+
+/**
+ * 获取列宽缓存
+ * @param {*} name 表格名称
+ * @returns
+ */
+const getCachedColumns = name => {
+  return JSON.parse(localStorage.getItem(name) || '[]');
+};
+
+/**
+ * 替换列宽 - 表格列数据替换成缓存中的列宽（若有列宽缓存）
+ * @param {*} name
+ * @param {*} columns
+ * @returns
+ */
+const replaceColumnWidthToColumns = (name, columns) => {
+  if (!name) {
+    return columns;
+  }
+  const cacheColumns = getCachedColumns(name);
+  if (!cacheColumns) {
+    return columns;
+  }
+
+  // 递归处理多级表头的列宽
+  const processColumnWidth = (columns, cacheColumns) => {
+    return columns.map(column => {
+      if (column.children) {
+        const cacheColumn = cacheColumns.find(col => col.field === column.field);
+        return {
+          ...column,
+          ...((cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.width) && {
+            width: cacheColumn.width
+          }),
+          children: processColumnWidth(column.children, (cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.children) || [])
+        };
+      }
+      const cacheColumn = cacheColumns.filter(col => col.field && col.field !== '') //有设置field才替换width给列
+      .find(col => col.field === column.field);
+      return {
+        ...column,
+        ...((cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.width) && {
+          width: cacheColumn.width
+        })
+      };
+    });
+  };
+  return processColumnWidth(columns, cacheColumns);
+};
+
+/**
+ * 重写列宽 （v3是否要替换这个方法的逻辑？？？）
+ * @param fromColumns 原始列
+ * @param toColumns 目标列
+ * @returns 重写后的列
+ */
+const rewriteWidthColumns = (fromColumns, toColumns) => {
+  if (!fromColumns || !toColumns) return [];
+  if (!fromColumns || fromColumns.length === 0) return toColumns;
+  const result = [];
+  for (const col of toColumns) {
+    const fromCol = fromColumns.find(from => from.field === col.field);
+    if (col.children) {
+      // 递归处理子列
+      const newCol = {
+        ...col,
+        children: rewriteWidthColumns((fromCol === null || fromCol === void 0 ? void 0 : fromCol.children) || [], col.children)
+      };
+      // 如果 fromCol 有 width，则添加 width，否则不添加 width 字段
+      if (fromCol) {
+        if (fromCol !== null && fromCol !== void 0 && fromCol.width) {
+          newCol.width = fromCol.width;
+        } else {
+          delete newCol.width;
+        }
+      }
+      result.push(newCol);
+    } else {
+      const newCol = {
+        ...col
+      };
+      // 如果 fromCol 有 width，则添加 width，否则不添加 width 字段
+      if (fromCol) {
+        if (fromCol !== null && fromCol !== void 0 && fromCol.width) {
+          newCol.width = fromCol.width;
+        } else {
+          delete newCol.width;
+        }
+      }
+      result.push(newCol);
+    }
+  }
+  return result;
+};
+
+/**
+ * 递归增加slot
+ * @param {*} fields 字段信息
+ * @param {*} slotSet 收集的slot
+ */
+const recursiveSlot = (fields, slotSet) => {
+  if (!fields || !Array.isArray(fields)) {
+    return;
+  }
+  fields.forEach(col => {
+    if (col.slots) {
+      const slots = Object.values(col.slots);
+      slots.forEach(slot => slotSet.add(slot));
+    }
+    if (col.children) {
+      recursiveSlot(col.children, slotSet);
+    }
+  });
+};
+
+/**
+ * 为表格创建分组列结构（将固定列按一级表头分组） -- 有二级表头情况
+ * @param columns 原始列分组数据
+ * @param fixed_max_count 固定列最大数量
+ */
+const groupedColumnsForTable = (columns, fixed_max_count = 6) => {
+  let fixedCount = 0; // 先统计所有固定列的数量
+  columns.forEach(group => {
+    group.data.forEach(col => {
+      if (col.fixed === 'left' && ['true', true, '1', 1].includes(col.type)) {
+        fixedCount++;
+      }
+    });
+  });
+
+  //如果固定列数量>固定列最大数量，直接返回原始分组结构，但去除所有fixed属性
+  if (fixedCount > fixed_max_count) {
+    //超过fixed_max_count个固定列，取消所有固定
+    const result = columns.map(group => ({
+      ...group,
+      fixed: undefined,
+      data: group.data.map(col => ({
+        ...col,
+        fixed: undefined
+      }))
+    }));
+    return result;
+  }
+
+  // 固定列数量<=6个时，才进行重新分组
+  const fixedGroups = [];
+  const normalGroups = [];
+  columns.forEach(group => {
+    const fixedItems = [];
+    const normalItems = [];
+    group.data.forEach(col => {
+      if (col.fixed === 'left') {
+        fixedItems.push(col);
+      } else {
+        normalItems.push(col);
+      }
+    });
+
+    // 如果有固定的列，加入固定分组
+    if (fixedItems.length > 0) {
+      fixedGroups.push({
+        label: group.label,
+        fixed: 'left',
+        data: fixedItems
+      });
+    }
+
+    // 如果有普通列，加入普通分组
+    if (normalItems.length > 0) {
+      normalGroups.push({
+        label: group.label,
+        data: normalItems
+      });
+    }
+  });
+  const result = [...fixedGroups, ...normalGroups];
+
+  // 将固定分组添加到最前面
+  return result;
+};
+
+/**
+ * 判断左侧固定个数，决定是否左侧固定还是取消固定 -- 无二级表头情况
+ * @param {*} cols 列数据
+ * @param {*} fixed_max_count 固定列最大数量
+ * @returns
+ */
+const resetFixedColumns = (cols, fixed_max_count = 6) => {
+  if (!cols) return [];
+  let fixedCount = 0;
+  cols.forEach(col => {
+    if (col.fixed === 'left' && ['true', true, '1', 1].includes(col.type)) {
+      fixedCount++;
+    }
+  });
+  if (fixedCount > fixed_max_count) {
+    cols.map(item => {
+      item.fixed = false;
+    });
+  }
+  return cols;
+};
+
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./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=script&lang=js
 
 
@@ -61108,6 +61407,7 @@ const deepClone = target => {
 
 
 
+
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
   components: {
@@ -61127,6 +61427,14 @@ const deepClone = target => {
       type: Function,
       required: true,
       default: () => {}
+    },
+    //左侧固定列最多个数 - 默认6个 （超出个数时，左侧固定失效）
+    fixedMaxCount: {
+      type: Number,
+      default: 6,
+      validator: value => {
+        return value >= 0;
+      }
     }
   },
   data() {
@@ -61233,7 +61541,7 @@ const deepClone = target => {
         this.checkBoxMenu = this.deepClone(initColumn);
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       } else {
-        console.log('==========从未被保存过', initColumn);
+        // console.log('==========从未被保存过', initColumn)
 
         // 从未被保存过
         let num = 0;
@@ -61255,12 +61563,8 @@ const deepClone = target => {
         this.checkBoxMenu = this.deepClone(initColumn);
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       }
-      this.$emit('changeTable', this.draggableMenu.filter(item => item.key !== 'sort-cut-off').sort((a, b) => a.sort - b.sort));
-
-      // changeTableGroup 回调：对固定列进行重新分组
-      const groupedColumns = this.createGroupedColumnsForTable(this.checkBoxMenu);
-      this.$emit('changeTableGroup', groupedColumns);
-      // this.$emit('changeTableGroup', this.checkBoxMenu)
+      this.emitChangeTable(this.draggableMenu.filter(item => item.key !== 'sort-cut-off').sort((a, b) => a.sort - b.sort));
+      this.emitChangeTableGroup(this.checkBoxMenu);
     },
     // 全不选
     selectNone() {
@@ -61364,82 +61668,21 @@ const deepClone = target => {
       params.column.forEach(item => {
         cols.push(...item.data);
       });
-      this.$emit('changeTable', cols.sort((a, b) => a.sort - b.sort));
-
-      // changeTableGroup 回调：对固定列进行重新分组
-      const groupedColumns = this.createGroupedColumnsForTable(params.column);
-      this.$emit('changeTableGroup', groupedColumns);
+      this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
+      this.emitChangeTableGroup(params.column);
       this.closeDialog();
     },
-    /**
-     * 为表格创建分组列结构（将固定列按一级表头分组）
-     * @param columns 原始列分组数据
-     */
-    createGroupedColumnsForTable(columns) {
-      console.log('==========columns', columns);
-
-      // 先统计所有固定列的数量
-      let fixedCount = 0;
-      columns.forEach(group => {
-        group.data.forEach(col => {
-          if (col.fixed === 'left' && ['true', true, '1', 1].includes(col.type)) {
-            fixedCount++;
-          }
-        });
-      });
-      console.log('==========固定列个数：', fixedCount);
-
-      // *** 如果固定列数量>6个，直接返回原始分组结构，但去除所有fixed属性 start
-      if (fixedCount > 6) {
-        const result = columns.map(group => ({
-          ...group,
-          fixed: undefined,
-          data: group.data.map(col => ({
-            ...col,
-            fixed: undefined
-          }))
-        }));
-        console.log('==========超过6个固定列，取消所有固定:', result);
-        return result;
-      }
-      // *** 如果固定列数量>6个，直接返回原始分组结构，但去除所有fixed属性 end
-
-      // 固定列数量<=6个时，才进行重新分组
-      const fixedGroups = [];
-      const normalGroups = [];
-      columns.forEach(group => {
-        const fixedItems = [];
-        const normalItems = [];
-        group.data.forEach(col => {
-          if (col.fixed === 'left') {
-            fixedItems.push(col);
-          } else {
-            normalItems.push(col);
-          }
-        });
-
-        // 如果有固定的列，加入固定分组
-        if (fixedItems.length > 0) {
-          fixedGroups.push({
-            label: group.label,
-            fixed: 'left',
-            data: fixedItems
-          });
-        }
-
-        // 如果有普通列，加入普通分组
-        if (normalItems.length > 0) {
-          normalGroups.push({
-            label: group.label,
-            data: normalItems
-          });
-        }
-      });
-      const result = [...fixedGroups, ...normalGroups];
-      console.log('==========<=6个固定列，正常分组:', result);
-
-      // 将固定分组添加到最前面
-      return result;
+    // changeTable
+    emitChangeTable(cols) {
+      //表头左侧固定逻辑(对固定列fixed重新赋值)
+      const reCols = resetFixedColumns(cols, this.fixedMaxCount);
+      this.$emit('changeTable', reCols);
+    },
+    // changeTableGroup
+    emitChangeTableGroup(cols) {
+      //表头左侧固定逻辑(对固定列进行重新分组)
+      const groupedCols = groupedColumnsForTable(cols, this.fixedMaxCount);
+      this.$emit('changeTableGroup', groupedCols);
     },
     // 关闭弹窗
     closeDialog() {
@@ -61462,8 +61705,8 @@ const deepClone = target => {
 ;
 var custom_column_component = normalizeComponent(
   components_custom_columnvue_type_script_lang_js,
-  custom_columnvue_type_template_id_6ff46ecd_render,
-  custom_columnvue_type_template_id_6ff46ecd_staticRenderFns,
+  custom_columnvue_type_template_id_22c5acce_render,
+  custom_columnvue_type_template_id_22c5acce_staticRenderFns,
   false,
   null,
   null,
@@ -61472,216 +61715,6 @@ var custom_column_component = normalizeComponent(
 )
 
 /* harmony default export */ var custom_column = (custom_column_component.exports);
-;// ./src/utils/tableUtils.js
-
-
-
-
-
-
-/**
- * 判断是否缓存了表格列宽
- * @param {*} name 表格名称
- * @returns
- */
-const isCachedTableColumns = name => {
-  if (!name) return false;
-  return !!localStorage.getItem(name);
-};
-
-/**
- * 删除表格列宽缓存
- * @param {*} name 表格名称
- */
-const removeCachedTableColumns = name => {
-  localStorage.removeItem(name);
-};
-
-/**
- * 缓存列宽
- * @param {*} name 表格名称
- * @param {*} context
- */
-const saveCachedColumns = (name, context) => {
-  if (!name) return;
-  // 获取列宽信息
-  const collectColumn = context.$table.collectColumn;
-  // 获取已缓存的列宽数据
-  const cachedColumns = getCachedColumns(name);
-
-  // 递归查找并更新列宽
-  const updateColumnWidth = (columns, targetField, newWidth) => {
-    const result = [];
-    for (const col of columns) {
-      if (col.children) {
-        const updatedChildren = updateColumnWidth(col.children, targetField, newWidth);
-        if (updatedChildren.length > 0) {
-          result.push({
-            field: col.field,
-            width: newWidth,
-            children: updatedChildren
-          });
-        }
-      } else if (targetField && targetField !== '' && col.field === targetField) {
-        //如果没设置field不缓存
-        result.push({
-          field: col.field,
-          width: newWidth
-        });
-      }
-    }
-    return result;
-  };
-
-  //当前拖动的列
-  const currentColumn = context.column;
-
-  // 更新被拖动列的宽度（只缓存被拖动的列）
-  const updatedColumns = updateColumnWidth(collectColumn, currentColumn.field, currentColumn.renderWidth);
-
-  // 合并新的列宽信息到缓存中
-  const mergeColumns = (newColumns, cachedColumns) => {
-    const result = [...cachedColumns];
-    for (const newCol of newColumns) {
-      const existingIndex = result.findIndex(col => col.field === newCol.field);
-      if (existingIndex !== -1) {
-        // 如果存在子列，递归合并
-        if (newCol.children && result[existingIndex].children) {
-          result[existingIndex].children = mergeColumns(newCol.children, result[existingIndex].children);
-        } else {
-          // 更新宽度
-          result[existingIndex].width = newCol.width;
-        }
-      } else {
-        // 添加新的列信息
-        result.push(newCol);
-      }
-    }
-    return result;
-  };
-
-  // 合并并保存更新后的列宽数据
-  const finalColumns = mergeColumns(updatedColumns, cachedColumns);
-
-  //缓存列宽
-  localStorage.setItem(name, JSON.stringify(finalColumns));
-};
-
-/**
- * 获取列宽缓存
- * @param {*} name 表格名称
- * @returns
- */
-const getCachedColumns = name => {
-  return JSON.parse(localStorage.getItem(name) || '[]');
-};
-
-/**
- * 替换列宽 - 表格列数据替换成缓存中的列宽（若有列宽缓存）
- * @param {*} name
- * @param {*} columns
- * @returns
- */
-const replaceColumnWidthToColumns = (name, columns) => {
-  if (!name) {
-    return columns;
-  }
-  const cacheColumns = getCachedColumns(name);
-  if (!cacheColumns) {
-    return columns;
-  }
-
-  // 递归处理多级表头的列宽
-  const processColumnWidth = (columns, cacheColumns) => {
-    return columns.map(column => {
-      if (column.children) {
-        const cacheColumn = cacheColumns.find(col => col.field === column.field);
-        return {
-          ...column,
-          ...((cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.width) && {
-            width: cacheColumn.width
-          }),
-          children: processColumnWidth(column.children, (cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.children) || [])
-        };
-      }
-      const cacheColumn = cacheColumns.filter(col => col.field && col.field !== '') //有设置field才替换width给列
-      .find(col => col.field === column.field);
-      return {
-        ...column,
-        ...((cacheColumn === null || cacheColumn === void 0 ? void 0 : cacheColumn.width) && {
-          width: cacheColumn.width
-        })
-      };
-    });
-  };
-  return processColumnWidth(columns, cacheColumns);
-};
-
-/**
- * 重写列宽 （v3是否要替换这个方法的逻辑？？？）
- * @param fromColumns 原始列
- * @param toColumns 目标列
- * @returns 重写后的列
- */
-const rewriteWidthColumns = (fromColumns, toColumns) => {
-  if (!fromColumns || !toColumns) return [];
-  if (!fromColumns || fromColumns.length === 0) return toColumns;
-  const result = [];
-  for (const col of toColumns) {
-    const fromCol = fromColumns.find(from => from.field === col.field);
-    if (col.children) {
-      // 递归处理子列
-      const newCol = {
-        ...col,
-        children: rewriteWidthColumns((fromCol === null || fromCol === void 0 ? void 0 : fromCol.children) || [], col.children)
-      };
-      // 如果 fromCol 有 width，则添加 width，否则不添加 width 字段
-      if (fromCol) {
-        if (fromCol !== null && fromCol !== void 0 && fromCol.width) {
-          newCol.width = fromCol.width;
-        } else {
-          delete newCol.width;
-        }
-      }
-      result.push(newCol);
-    } else {
-      const newCol = {
-        ...col
-      };
-      // 如果 fromCol 有 width，则添加 width，否则不添加 width 字段
-      if (fromCol) {
-        if (fromCol !== null && fromCol !== void 0 && fromCol.width) {
-          newCol.width = fromCol.width;
-        } else {
-          delete newCol.width;
-        }
-      }
-      result.push(newCol);
-    }
-  }
-  return result;
-};
-
-/**
- * 递归增加slot
- * @param {*} fields 字段信息
- * @param {*} slotSet 收集的slot
- */
-const recursiveSlot = (fields, slotSet) => {
-  if (!fields || !Array.isArray(fields)) {
-    return;
-  }
-  fields.forEach(col => {
-    if (col.slots) {
-      const slots = Object.values(col.slots);
-      slots.forEach(slot => slotSet.add(slot));
-    }
-    if (col.children) {
-      recursiveSlot(col.children, slotSet);
-    }
-  });
-};
-
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./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=script&lang=js
 
 
@@ -61954,8 +61987,8 @@ const recursiveSlot = (fields, slotSet) => {
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_58d17823_render,
-  tablevue_type_template_id_58d17823_staticRenderFns,
+  tablevue_type_template_id_4926859a_render,
+  tablevue_type_template_id_4926859a_staticRenderFns,
   false,
   null,
   null,