@weitutech/by-components 1.1.44 → 1.1.46

package/lib/by-components.common.js

@@ -60535,7 +60535,7 @@ if (typeof window !== 'undefined') {
 var es_iterator_constructor = __webpack_require__(8111);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.for-each.js
 var es_iterator_for_each = __webpack_require__(7588);
-;// ./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-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/pager/index.vue?vue&type=template&id=43bb822c
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/pager/index.vue?vue&type=template&id=43bb822c
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -60742,8 +60742,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-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=58d17823
-var tablevue_type_template_id_58d17823_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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=849a6584
+var tablevue_type_template_id_849a6584_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60807,6 +60807,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: {
@@ -60816,7 +60817,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_849a6584_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -60836,8 +60837,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-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=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":"268ca57a-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=22c5acce
+var custom_columnvue_type_template_id_22c5acce_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61038,7 +61039,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);
@@ -61087,6 +61088,324 @@ 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;
+};
+
+// 判空
+const isNullValue = value => {
+  if (value === null || value === undefined) {
+    return true;
+  }
+  if (Number.isNaN(value)) {
+    return true;
+  }
+  if (value === '' || value === 0) {
+    return true;
+  }
+  if (typeof value === 'object' && Object.keys(value).length === 0) {
+    return true;
+  }
+  if (Array.isArray(value) && value.length === 0) {
+    return true;
+  }
+  return false;
+};
+
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.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
 
 
@@ -61098,6 +61417,7 @@ const deepClone = target => {
 
 
 
+
 /* harmony default export */ var custom_columnvue_type_script_lang_js = ({
   name: 'CustomColumn',
   components: {
@@ -61117,6 +61437,14 @@ const deepClone = target => {
       type: Function,
       required: true,
       default: () => {}
+    },
+    //左侧固定列最多个数 - 默认6个 （超出个数时，左侧固定失效）
+    fixedMaxCount: {
+      type: Number,
+      default: 6,
+      validator: value => {
+        return value >= 0;
+      }
     }
   },
   data() {
@@ -61223,7 +61551,7 @@ const deepClone = target => {
         this.checkBoxMenu = this.deepClone(initColumn);
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       } else {
-        console.log('==========从未被保存过', initColumn);
+        // console.log('==========从未被保存过', initColumn)
 
         // 从未被保存过
         let num = 0;
@@ -61245,12 +61573,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() {
@@ -61340,96 +61664,35 @@ const deepClone = target => {
               }
             });
           } else {
-            params.column.push({
-              label: parent.label,
-              data: [other]
-            });
-          }
-        }
-      });
-      await this.submitMethod(params);
-
-      // changeTable 回调：返回正常排序的列数据
-      const cols = [];
-      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.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
-          });
+            params.column.push({
+              label: parent.label,
+              data: [other]
+            });
+          }
         }
       });
-      const result = [...fixedGroups, ...normalGroups];
-      console.log('==========<=6个固定列，正常分组:', result);
+      await this.submitMethod(params);
 
-      // 将固定分组添加到最前面
-      return result;
+      // changeTable 回调：返回正常排序的列数据
+      const cols = [];
+      params.column.forEach(item => {
+        cols.push(...item.data);
+      });
+      this.emitChangeTable(cols.sort((a, b) => a.sort - b.sort));
+      this.emitChangeTableGroup(params.column);
+      this.closeDialog();
+    },
+    // 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() {
@@ -61452,8 +61715,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,
@@ -61462,216 +61725,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-40.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
 
 
@@ -61693,6 +61746,34 @@ const recursiveSlot = (fields, slotSet) => {
     CustomColumn: custom_column
   },
   props: {
+    /**
+     * 表格配置项
+     * @property {Object} pagerConfig - 分页配置
+     * @property {number} pagerConfig.currentPage - 当前页码
+     * @property {number} pagerConfig.pageSize - 每页条数
+     * @property {number} pagerConfig.total - 总条数
+     * @property {number[]} pagerConfig.pageSizes - 每页条数选项
+     * @property {boolean} pagerConfig.frontendPagination - 是否启用前端分页
+     * @property {Array} columns - 表格列配置
+     * @property {Object} customColumnConfig - 自定义列配置
+     * @property {boolean} customColumnConfig.showCustomColumn - 是否显示自定义列按钮
+     * @property {Function} customColumnConfig.infoMethod - 获取自定义列信息的方法
+     * @property {Function} customColumnConfig.submitMethod - 提交自定义列配置的方法
+     * @property {number} customColumnConfig.fixedMaxCount - 固定列最大数量
+     * @property {Array} customColumnConfig.slots - 自定义插槽配置
+     * @property {Object} resizableConfig - 列宽调整配置
+     * @property {number} resizableConfig.minWidth - 最小列宽
+     * @property {Object} rowConfig - 行配置
+     * @property {number} rowConfig.height - 行高
+     * @property {boolean} rowConfig.isHover - 是否显示hover效果
+     * @property {Object} sortConfig - 排序配置
+     * @property {boolean} sortConfig.remote - 是否远程排序
+     * @property {string} sortConfig.trigger - 排序触发方式
+     * @property {Array} copyFields - 可复制字段列表
+     * @property {string} emptyText - 空数据提示文本
+     * @property {Object} loadingConfig - 加载配置
+     * @property {string} loadingConfig.text - 加载提示文本
+     */
     gridOptions: {
       type: Object,
       default: () => ({})
@@ -61722,7 +61803,10 @@ const recursiveSlot = (fields, slotSet) => {
       hasCache: false,
       // 原始列配置
       originColumns: [],
-      tempColumns: []
+      tempColumns: [],
+      // 存储所有数据（用于前端分页）
+      allData: [],
+      tableLoading: false
     };
   },
   mounted() {
@@ -61738,10 +61822,33 @@ const recursiveSlot = (fields, slotSet) => {
         this.originColumns = result;
       },
       deep: true
+    },
+    'gridOptions.data': {
+      handler() {
+        this.$nextTick(() => {
+          setTimeout(() => {
+            if (this.$refs.xGrid && this.$refs.xGrid.refreshScroll) {
+              this.$refs.xGrid.refreshScroll(); // 刷新滚动布局
+            }
+            if (this.$refs.xGrid && this.$refs.xGrid.scrollTo) {
+              this.$refs.xGrid.scrollTo({
+                top: 0,
+                left: 0
+              });
+              const tableData = this.$refs.xGrid.getTableData().fullData;
+              if (tableData && tableData.length > 0) {
+                this.$refs.xGrid.scrollToRow(tableData[0]);
+              }
+            }
+          }, 0);
+        });
+      },
+      deep: true
     }
   },
   computed: {
     options() {
+      var _others$pagerConfig;
       const {
         customColumnConfig,
         columns,
@@ -61754,21 +61861,35 @@ const recursiveSlot = (fields, slotSet) => {
       // 使用列宽缓存值(若有)
       const newColumns = replaceColumnWidthToColumns(this.name, columns);
       this.setHasCache();
+
+      // 处理前端分页
+      let data = others.data || [];
+      if ((_others$pagerConfig = others.pagerConfig) !== null && _others$pagerConfig !== void 0 && _others$pagerConfig.frontendPagination) {
+        // 保存完整数据
+        this.allData = [...data];
+        data = this.spliteListData(this.allData, others.pagerConfig.currentPage, others.pagerConfig.pageSize);
+      }
+
+      // 移除 others 中的 data，避免覆盖
+      const {
+        data: _,
+        ...restOthers
+      } = others;
       return {
         border: true,
         resizable: true,
         showOverflow: !this.autoHeight,
-        // 行高自动撑高
         height: 550,
         align: 'left',
         copyFields: [],
-        pagerConfig: false,
+        pagerConfig: others.pagerConfig,
         emptyText: '暂无数据',
+        loading: this.tableLoading,
         loadingConfig: {
           text: '加载中...'
         },
         columns: newColumns,
-        ...others,
+        data,
         resizableConfig: {
           minWidth: 50,
           ...this.gridOptions.resizableConfig
@@ -61782,7 +61903,8 @@ const recursiveSlot = (fields, slotSet) => {
           remote: true,
           trigger: 'cell',
           ...this.gridOptions.sortConfig
-        }
+        },
+        ...restOthers
       };
     },
     // 插槽集合
@@ -61830,11 +61952,58 @@ const recursiveSlot = (fields, slotSet) => {
       }
     },
     pageChange(values) {
-      // 切换页码时，将表格滚动到顶部
-      if (this.$refs.xGrid) {
-        this.$refs.xGrid.scrollTo(0, 0);
+      var _this$gridOptions$pag;
+      // 前端分页
+      if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+        this.tableLoading = true;
+        setTimeout(() => {
+          const newData = this.spliteListData(this.allData, values.page, values.limit);
+          this.$refs.xGrid.reloadData(newData);
+          setTimeout(() => {
+            if (this.$refs.xGrid) {
+              this.$refs.xGrid.scrollTo(0, 0);
+            }
+            setTimeout(() => {
+              this.tableLoading = false;
+            }, 0);
+          }, 0);
+        }, 0);
+      } else {
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.scrollTo(0, 0);
+        }
+        // 只有在后端分页模式下才触发page-change事件
+        this.$emit('page-change', values);
+      }
+    },
+    // 前端分页 - 截取当前页展示数据
+    spliteListData(allData, currentPage, pageSize) {
+      if (!Array.isArray(allData) || allData.length === 0) {
+        return [];
+      }
+
+      // 检查第一条数据是否需要特殊处理
+      const firstRow = allData[0];
+      const specialFirstRow = firstRow && typeof firstRow === 'object' && isNullValue(firstRow.id) ? firstRow : null;
+
+      // 获取实际需要分页的数据（排除特殊的第一条）
+      const normalData = specialFirstRow ? allData.slice(1) : allData;
+      const start = (currentPage - 1) * pageSize;
+      const end = start + pageSize;
+
+      // 更新分页配置
+      this.gridOptions.pagerConfig.currentPage = currentPage;
+      this.gridOptions.pagerConfig.pageSize = pageSize;
+      this.gridOptions.pagerConfig.total = allData.length;
+
+      // 获取当前页数据
+      let currentPageData = normalData.slice(start, end);
+
+      // 如果有特殊的第一条数据，添加到当前页数据的开头
+      if (specialFirstRow) {
+        currentPageData = [specialFirstRow, ...currentPageData];
       }
-      this.$emit('page-change', values);
+      return currentPageData;
     },
     copy(text) {
       const oInput = document.createElement('input');
@@ -61944,8 +62113,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_849a6584_render,
+  tablevue_type_template_id_849a6584_staticRenderFns,
   false,
   null,
   null,
@@ -61954,7 +62123,7 @@ var table_component = normalizeComponent(
 )
 
 /* harmony default export */ var table = (table_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-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/form/form.vue?vue&type=template&id=f2397dbe&scoped=true
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/form/form.vue?vue&type=template&id=f2397dbe&scoped=true
 var formvue_type_template_id_f2397dbe_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62234,7 +62403,7 @@ var formvue_type_template_id_f2397dbe_scoped_true_render = function render() {
 };
 var formvue_type_template_id_f2397dbe_scoped_true_staticRenderFns = [];
 
-;// ./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-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/form/comps/pair-number-input.vue?vue&type=template&id=3344cc16
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/form/comps/pair-number-input.vue?vue&type=template&id=3344cc16
 var pair_number_inputvue_type_template_id_3344cc16_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62338,7 +62507,7 @@ var pair_number_input_component = normalizeComponent(
 )
 
 /* harmony default export */ var pair_number_input = (pair_number_input_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-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/form/comps/custom-date-picker.vue?vue&type=template&id=2b63f178
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/form/comps/custom-date-picker.vue?vue&type=template&id=2b63f178
 var custom_date_pickervue_type_template_id_2b63f178_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62753,7 +62922,7 @@ var form_component = normalizeComponent(
 )
 
 /* harmony default export */ var form_form = (form_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-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/page-search/page-search.vue?vue&type=template&id=feae5b44
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/page-search/page-search.vue?vue&type=template&id=feae5b44
 var page_searchvue_type_template_id_feae5b44_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62923,7 +63092,7 @@ var page_search_component = normalizeComponent(
 )
 
 /* harmony default export */ var page_search = (page_search_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-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/fold-search/index.vue?vue&type=template&id=828bc332
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/fold-search/index.vue?vue&type=template&id=828bc332
 var fold_searchvue_type_template_id_828bc332_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62999,7 +63168,7 @@ var fold_search_component = normalizeComponent(
 )
 
 /* harmony default export */ var fold_search = (fold_search_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-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/form/comps/select.vue?vue&type=template&id=2ee8e5b9
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/form/comps/select.vue?vue&type=template&id=2ee8e5b9
 var selectvue_type_template_id_2ee8e5b9_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -63209,7 +63378,7 @@ var select_component = normalizeComponent(
 )
 
 /* harmony default export */ var comps_select = (select_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-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/form/comps/date-picker-range.vue?vue&type=template&id=0ae5d93f
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"268ca57a-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/form/comps/date-picker-range.vue?vue&type=template&id=0ae5d93f
 var date_picker_rangevue_type_template_id_0ae5d93f_render = function render() {
   var _vm = this,
     _c = _vm._self._c;