@weitutech/by-components 1.1.148 → 1.1.150

package/lib/by-components.common.js

@@ -61876,8 +61876,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=4e4c01d8
-var custom_columnvue_type_template_id_4e4c01d8_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=208dd294
+var custom_columnvue_type_template_id_208dd294_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62008,14 +62008,19 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
     staticClass: "right_header"
   }, [_c('span', {
     staticClass: "drag_title"
-  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('span', {
+  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('el-button', {
     staticClass: "recover",
+    attrs: {
+      "type": "text",
+      "size": "mini"
+    },
     on: {
       "click": _vm.recoverDefault
     }
-  }, [_vm._v("恢复默认")])]), !_vm.useMultiLevelHeader ? _c('div', {
+  }, [_vm._v("恢复默认")])], 1), !_vm.useMultiLevelHeader ? _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
+    ref: "rightScrollContainer",
     staticClass: "drag_ul"
   }, [_c('draggable', {
     attrs: {
@@ -62071,6 +62076,7 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
   }), 0)], 1)], 1)]) : _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
+    ref: "rightScrollContainer",
     staticClass: "drag_ul"
   }, [_c('div', {
     staticStyle: {
@@ -62264,7 +62270,7 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_4e4c01d8_staticRenderFns = [];
+var custom_columnvue_type_template_id_208dd294_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -62951,37 +62957,103 @@ const groupedColumnsForTable = (columns, fixed_max_count = 6) => {
   }
 
   // 固定列数量<=6个时，才进行重新分组
-  const fixedGroups = [];
-  const normalGroups = [];
+  // 先收集所有固定列，按 sort 值排序，保持用户配置的顺序
+  const allFixedCols = [];
   columns.forEach(group => {
-    const fixedItems = [];
-    const normalItems = [];
     group.data.forEach(col => {
-      if (col.fixed === 'left') {
-        fixedItems.push(col);
-      } else {
-        normalItems.push(col);
+      if (col.fixed === 'left' && ['true', true, '1', 1].includes(col.type)) {
+        allFixedCols.push({
+          ...col,
+          __groupLabel: group.label
+        });
       }
     });
+  });
+  // 按 sort 值排序固定列，确保表头显示顺序与配置顺序一致
+  allFixedCols.sort((a, b) => {
+    const sa = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+    const sb = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+    return sa - sb;
+  });
 
-    // 如果有固定的列，加入固定分组
-    if (fixedItems.length > 0) {
-      fixedGroups.push({
-        label: group.label,
-        fixed: 'left',
-        data: fixedItems
-      });
+  // 按原始分组组织固定列，并记录每个分组的最小 sort 值用于排序分组
+  const fixedColsByGroup = new Map(); // groupLabel -> fixedCols[]
+  const groupMinSortMap = new Map(); // groupLabel -> minSort
+  allFixedCols.forEach(col => {
+    const groupLabel = col.__groupLabel;
+    const sortValue = typeof col.sort === 'number' ? col.sort : Number(col.sort) || 0;
+
+    // 收集固定列到对应分组
+    if (!fixedColsByGroup.has(groupLabel)) {
+      fixedColsByGroup.set(groupLabel, []);
+      groupMinSortMap.set(groupLabel, sortValue);
+    } else {
+      // 更新分组的最小 sort 值
+      const currentMin = groupMinSortMap.get(groupLabel);
+      if (sortValue < currentMin) {
+        groupMinSortMap.set(groupLabel, sortValue);
+      }
     }
+    // 移除临时属性
+    const {
+      __groupLabel,
+      ...colData
+    } = col;
+    fixedColsByGroup.get(groupLabel).push(colData);
+  });
+
+  // 构建固定分组，分组内的列已按 sort 排序（因为 allFixedCols 已排序）
+  // 分组本身按最小 sort 值排序，确保跨分组的固定列顺序正确
+  const fixedGroups = Array.from(fixedColsByGroup.entries()).map(([groupLabel, cols]) => ({
+    label: groupLabel,
+    fixed: 'left',
+    data: cols
+  })).sort((a, b) => {
+    var _groupMinSortMap$get, _groupMinSortMap$get2;
+    const aMinSort = (_groupMinSortMap$get = groupMinSortMap.get(a.label)) !== null && _groupMinSortMap$get !== void 0 ? _groupMinSortMap$get : 99999;
+    const bMinSort = (_groupMinSortMap$get2 = groupMinSortMap.get(b.label)) !== null && _groupMinSortMap$get2 !== void 0 ? _groupMinSortMap$get2 : 99999;
+    return aMinSort - bMinSort;
+  });
 
-    // 如果有普通列，加入普通分组
+  // 处理普通列（非固定列）
+  // 为了保持原始分组顺序，需要记录每个分组在原始 columns 中的索引
+  const groupOriginalIndexMap = new Map(); // groupLabel -> originalIndex
+  columns.forEach((group, index) => {
+    groupOriginalIndexMap.set(group.label, index);
+  });
+  const normalGroups = [];
+  // 按照原始 columns 的顺序遍历，确保分组顺序正确
+  columns.forEach(group => {
+    const normalItems = group.data.filter(col => col.fixed !== 'left');
     if (normalItems.length > 0) {
+      // 普通列也需要按 sort 排序
+      normalItems.sort((a, b) => {
+        const sa = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+        const sb = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+        return sa - sb;
+      });
       normalGroups.push({
         label: group.label,
-        data: normalItems
+        data: normalItems,
+        __originalIndex: groupOriginalIndexMap.get(group.label) // 保存原始索引用于排序
       });
     }
   });
-  const result = [...fixedGroups, ...normalGroups];
+
+  // 按照原始索引排序普通分组，确保取消固定后能回到原位置
+  normalGroups.sort((a, b) => {
+    var _a$__originalIndex, _b$__originalIndex;
+    const aIndex = (_a$__originalIndex = a.__originalIndex) !== null && _a$__originalIndex !== void 0 ? _a$__originalIndex : 99999;
+    const bIndex = (_b$__originalIndex = b.__originalIndex) !== null && _b$__originalIndex !== void 0 ? _b$__originalIndex : 99999;
+    return aIndex - bIndex;
+  });
+
+  // 移除临时属性
+  const cleanNormalGroups = normalGroups.map(({
+    __originalIndex,
+    ...group
+  }) => group);
+  const result = [...fixedGroups, ...cleanNormalGroups];
 
   // 将固定分组添加到最前面
   return result;
@@ -63350,6 +63422,21 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         this.baseGroupOrder = [];
       }
       this.initTableList(this.deepClone(this.columnList));
+      // 恢复默认后，滚动到顶部
+      this.$nextTick(() => {
+        this.$nextTick(() => {
+          setTimeout(() => {
+            const scrollContainer = this.$refs.rightScrollContainer;
+            if (scrollContainer) {
+              // 使用 scrollTo 方法实现平滑滚动
+              scrollContainer.scrollTo({
+                top: 0,
+                behavior: 'smooth'
+              });
+            }
+          }, 50);
+        });
+      });
     },
     /**
      * @describe 判断分组的勾选状态
@@ -63699,8 +63786,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_4e4c01d8_render,
-  custom_columnvue_type_template_id_4e4c01d8_staticRenderFns,
+  custom_columnvue_type_template_id_208dd294_render,
+  custom_columnvue_type_template_id_208dd294_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -61886,8 +61886,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=4e4c01d8
-var custom_columnvue_type_template_id_4e4c01d8_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=208dd294
+var custom_columnvue_type_template_id_208dd294_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62018,14 +62018,19 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
     staticClass: "right_header"
   }, [_c('span', {
     staticClass: "drag_title"
-  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('span', {
+  }, [_vm._v(_vm._s(`已选指标(${_vm.number})`))]), _c('el-button', {
     staticClass: "recover",
+    attrs: {
+      "type": "text",
+      "size": "mini"
+    },
     on: {
       "click": _vm.recoverDefault
     }
-  }, [_vm._v("恢复默认")])]), !_vm.useMultiLevelHeader ? _c('div', {
+  }, [_vm._v("恢复默认")])], 1), !_vm.useMultiLevelHeader ? _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
+    ref: "rightScrollContainer",
     staticClass: "drag_ul"
   }, [_c('draggable', {
     attrs: {
@@ -62081,6 +62086,7 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
   }), 0)], 1)], 1)]) : _c('div', {
     staticClass: "drag_box"
   }, [_c('div', {
+    ref: "rightScrollContainer",
     staticClass: "drag_ul"
   }, [_c('div', {
     staticStyle: {
@@ -62274,7 +62280,7 @@ var custom_columnvue_type_template_id_4e4c01d8_render = function render() {
     }), 0)], 1)], 1)]);
   }), 0)], 1)], 1)])])])])], 1);
 };
-var custom_columnvue_type_template_id_4e4c01d8_staticRenderFns = [];
+var custom_columnvue_type_template_id_208dd294_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -62961,37 +62967,103 @@ const groupedColumnsForTable = (columns, fixed_max_count = 6) => {
   }
 
   // 固定列数量<=6个时，才进行重新分组
-  const fixedGroups = [];
-  const normalGroups = [];
+  // 先收集所有固定列，按 sort 值排序，保持用户配置的顺序
+  const allFixedCols = [];
   columns.forEach(group => {
-    const fixedItems = [];
-    const normalItems = [];
     group.data.forEach(col => {
-      if (col.fixed === 'left') {
-        fixedItems.push(col);
-      } else {
-        normalItems.push(col);
+      if (col.fixed === 'left' && ['true', true, '1', 1].includes(col.type)) {
+        allFixedCols.push({
+          ...col,
+          __groupLabel: group.label
+        });
       }
     });
+  });
+  // 按 sort 值排序固定列，确保表头显示顺序与配置顺序一致
+  allFixedCols.sort((a, b) => {
+    const sa = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+    const sb = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+    return sa - sb;
+  });
 
-    // 如果有固定的列，加入固定分组
-    if (fixedItems.length > 0) {
-      fixedGroups.push({
-        label: group.label,
-        fixed: 'left',
-        data: fixedItems
-      });
+  // 按原始分组组织固定列，并记录每个分组的最小 sort 值用于排序分组
+  const fixedColsByGroup = new Map(); // groupLabel -> fixedCols[]
+  const groupMinSortMap = new Map(); // groupLabel -> minSort
+  allFixedCols.forEach(col => {
+    const groupLabel = col.__groupLabel;
+    const sortValue = typeof col.sort === 'number' ? col.sort : Number(col.sort) || 0;
+
+    // 收集固定列到对应分组
+    if (!fixedColsByGroup.has(groupLabel)) {
+      fixedColsByGroup.set(groupLabel, []);
+      groupMinSortMap.set(groupLabel, sortValue);
+    } else {
+      // 更新分组的最小 sort 值
+      const currentMin = groupMinSortMap.get(groupLabel);
+      if (sortValue < currentMin) {
+        groupMinSortMap.set(groupLabel, sortValue);
+      }
     }
+    // 移除临时属性
+    const {
+      __groupLabel,
+      ...colData
+    } = col;
+    fixedColsByGroup.get(groupLabel).push(colData);
+  });
+
+  // 构建固定分组，分组内的列已按 sort 排序（因为 allFixedCols 已排序）
+  // 分组本身按最小 sort 值排序，确保跨分组的固定列顺序正确
+  const fixedGroups = Array.from(fixedColsByGroup.entries()).map(([groupLabel, cols]) => ({
+    label: groupLabel,
+    fixed: 'left',
+    data: cols
+  })).sort((a, b) => {
+    var _groupMinSortMap$get, _groupMinSortMap$get2;
+    const aMinSort = (_groupMinSortMap$get = groupMinSortMap.get(a.label)) !== null && _groupMinSortMap$get !== void 0 ? _groupMinSortMap$get : 99999;
+    const bMinSort = (_groupMinSortMap$get2 = groupMinSortMap.get(b.label)) !== null && _groupMinSortMap$get2 !== void 0 ? _groupMinSortMap$get2 : 99999;
+    return aMinSort - bMinSort;
+  });
 
-    // 如果有普通列，加入普通分组
+  // 处理普通列（非固定列）
+  // 为了保持原始分组顺序，需要记录每个分组在原始 columns 中的索引
+  const groupOriginalIndexMap = new Map(); // groupLabel -> originalIndex
+  columns.forEach((group, index) => {
+    groupOriginalIndexMap.set(group.label, index);
+  });
+  const normalGroups = [];
+  // 按照原始 columns 的顺序遍历，确保分组顺序正确
+  columns.forEach(group => {
+    const normalItems = group.data.filter(col => col.fixed !== 'left');
     if (normalItems.length > 0) {
+      // 普通列也需要按 sort 排序
+      normalItems.sort((a, b) => {
+        const sa = typeof a.sort === 'number' ? a.sort : Number(a.sort) || 0;
+        const sb = typeof b.sort === 'number' ? b.sort : Number(b.sort) || 0;
+        return sa - sb;
+      });
       normalGroups.push({
         label: group.label,
-        data: normalItems
+        data: normalItems,
+        __originalIndex: groupOriginalIndexMap.get(group.label) // 保存原始索引用于排序
       });
     }
   });
-  const result = [...fixedGroups, ...normalGroups];
+
+  // 按照原始索引排序普通分组，确保取消固定后能回到原位置
+  normalGroups.sort((a, b) => {
+    var _a$__originalIndex, _b$__originalIndex;
+    const aIndex = (_a$__originalIndex = a.__originalIndex) !== null && _a$__originalIndex !== void 0 ? _a$__originalIndex : 99999;
+    const bIndex = (_b$__originalIndex = b.__originalIndex) !== null && _b$__originalIndex !== void 0 ? _b$__originalIndex : 99999;
+    return aIndex - bIndex;
+  });
+
+  // 移除临时属性
+  const cleanNormalGroups = normalGroups.map(({
+    __originalIndex,
+    ...group
+  }) => group);
+  const result = [...fixedGroups, ...cleanNormalGroups];
 
   // 将固定分组添加到最前面
   return result;
@@ -63360,6 +63432,21 @@ var pin_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAA
         this.baseGroupOrder = [];
       }
       this.initTableList(this.deepClone(this.columnList));
+      // 恢复默认后，滚动到顶部
+      this.$nextTick(() => {
+        this.$nextTick(() => {
+          setTimeout(() => {
+            const scrollContainer = this.$refs.rightScrollContainer;
+            if (scrollContainer) {
+              // 使用 scrollTo 方法实现平滑滚动
+              scrollContainer.scrollTo({
+                top: 0,
+                behavior: 'smooth'
+              });
+            }
+          }, 50);
+        });
+      });
     },
     /**
      * @describe 判断分组的勾选状态
@@ -63709,8 +63796,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_4e4c01d8_render,
-  custom_columnvue_type_template_id_4e4c01d8_staticRenderFns,
+  custom_columnvue_type_template_id_208dd294_render,
+  custom_columnvue_type_template_id_208dd294_staticRenderFns,
   false,
   null,
   null,