@weitutech/by-components 1.1.47 → 1.1.49

package/lib/by-components.common.js

@@ -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":"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=45d515ca
-var tablevue_type_template_id_45d515ca_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=1187e743
+var tablevue_type_template_id_1187e743_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60817,7 +60817,7 @@ var tablevue_type_template_id_45d515ca_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_45d515ca_staticRenderFns = [];
+var tablevue_type_template_id_1187e743_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61858,7 +61858,7 @@ var custom_column_component = normalizeComponent(
   },
   computed: {
     options() {
-      var _others$pagerConfig, _others$sortConfig, _others$pagerConfig2, _others$pagerConfig3, _others$sortConfig2;
+      var _others$pagerConfig, _others$sortConfig, _others$pagerConfig2, _others$pagerConfig3, _others$sortConfig2, _sortConfig$remote;
       const {
         customColumnConfig,
         columns,
@@ -61899,7 +61899,6 @@ var custom_column_component = normalizeComponent(
         return specialFirstRow ? rowIndex : rowIndex + 1;
       };
       return {
-        ...otherConfigs,
         border: true,
         resizable: true,
         showOverflow: !this.autoHeight,
@@ -61926,15 +61925,16 @@ var custom_column_component = normalizeComponent(
         sortConfig: {
           ...sortConfig,
           // 只在前端排序/分页时强制 remote: true
-          // 其他情况保持外部配置
-          remote: (_others$pagerConfig3 = others.pagerConfig) !== null && _others$pagerConfig3 !== void 0 && _others$pagerConfig3.frontendPagination || (_others$sortConfig2 = others.sortConfig) !== null && _others$sortConfig2 !== void 0 && _others$sortConfig2.frontendSort ? true : sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.remote,
+          // 其他情况保持外部配置，但确保后端分页时remote为false
+          remote: (_others$pagerConfig3 = others.pagerConfig) !== null && _others$pagerConfig3 !== void 0 && _others$pagerConfig3.frontendPagination || (_others$sortConfig2 = others.sortConfig) !== null && _others$sortConfig2 !== void 0 && _others$sortConfig2.frontendSort ? true : (_sortConfig$remote = sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.remote) !== null && _sortConfig$remote !== void 0 ? _sortConfig$remote : false,
           trigger: 'cell',
           ...this.gridOptions.sortConfig
         },
         seqConfig: {
           ...userSeqConfig,
           seqMethod: userSeqConfig.seqMethod || defaultSeqMethod
-        }
+        },
+        ...otherConfigs
       };
     },
     // 插槽集合
@@ -62192,10 +62192,22 @@ var custom_column_component = normalizeComponent(
         // 字符串类型排序
         const aStr = String(aValue).toLowerCase();
         const bStr = String(bValue).toLowerCase();
-        if (order === 'asc') {
-          return aStr.localeCompare(bStr);
+        const isPercentA = typeof aValue === 'string' && aValue.trim().endsWith('%') && !isNaN(aValue.trim().slice(0, -1));
+        const isPercentB = typeof bValue === 'string' && bValue.trim().endsWith('%') && !isNaN(bValue.trim().slice(0, -1));
+        if (isPercentA && isPercentB) {
+          // 百分比字符串，去掉%后转数字比较
+          const numA = parseFloat(aValue);
+          const numB = parseFloat(bValue);
+          return order === 'asc' ? numA - numB : numB - numA;
+        }
+        const isANum = !isNaN(aStr) && aStr.trim() !== '';
+        const isBNum = !isNaN(bStr) && bStr.trim() !== '';
+        if (isANum && isBNum) {
+          // 都是数字字符串，按数字比较
+          return order === 'asc' ? Number(aStr) - Number(bStr) : Number(bStr) - Number(aStr);
         } else {
-          return bStr.localeCompare(aStr);
+          // 普通字符串比较
+          return order === 'asc' ? aStr.localeCompare(bStr) : bStr.localeCompare(aStr);
         }
       });
     },
@@ -62210,10 +62222,12 @@ var custom_column_component = normalizeComponent(
         order
       } = event;
       const shouldHandleSort = ((_this$gridOptions$pag2 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag2 === void 0 ? void 0 : _this$gridOptions$pag2.frontendPagination) || ((_this$gridOptions$sor = this.gridOptions.sortConfig) === null || _this$gridOptions$sor === void 0 ? void 0 : _this$gridOptions$sor.frontendSort);
+
+      // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
+      this.sortState.field = property;
+      this.sortState.order = order;
       if (shouldHandleSort) {
         var _this$gridOptions$pag3, _this$gridOptions$pag4;
-        this.sortState.field = property;
-        this.sortState.order = order;
         const newData = this.spliteListData(this.allData, (_this$gridOptions$pag3 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag3 !== void 0 && _this$gridOptions$pag3.frontendPagination ? this.gridOptions.pagerConfig.currentPage : null, (_this$gridOptions$pag4 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag4 !== void 0 && _this$gridOptions$pag4.frontendPagination ? this.gridOptions.pagerConfig.pageSize : null);
         if (this.$refs.xGrid) {
           this.$refs.xGrid.reloadData(newData);
@@ -62245,6 +62259,17 @@ var custom_column_component = normalizeComponent(
             }, 0);
           });
         }
+      } else {
+        // 后端分页模式下，确保排序箭头高亮
+        this.$nextTick(() => {
+          if (property && order && this.$refs.xGrid) {
+            setTimeout(() => {
+              this.$refs.xGrid.sort(property, order, {
+                silent: true
+              });
+            }, 100);
+          }
+        });
       }
       this.$emit('sort-change', event);
     },
@@ -62275,8 +62300,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_45d515ca_render,
-  tablevue_type_template_id_45d515ca_staticRenderFns,
+  tablevue_type_template_id_1187e743_render,
+  tablevue_type_template_id_1187e743_staticRenderFns,
   false,
   null,
   null,
@@ -63330,8 +63355,8 @@ 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":"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() {
+;// ./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=2e80ec4b
+var selectvue_type_template_id_2e80ec4b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-select', _vm._b({
@@ -63339,7 +63364,7 @@ var selectvue_type_template_id_2ee8e5b9_render = function render() {
     attrs: {
       "value": _vm.value,
       "placeholder": _vm.config && _vm.config.placeholder || '请选择',
-      "loading": _vm.loading
+      "loading": _vm.innerLoading
     },
     on: {
       "change": _vm.change,
@@ -63374,7 +63399,7 @@ var selectvue_type_template_id_2ee8e5b9_render = function render() {
     });
   })], 2);
 };
-var selectvue_type_template_id_2ee8e5b9_staticRenderFns = [];
+var selectvue_type_template_id_2e80ec4b_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/element-ui.common.js
 var element_ui_common = __webpack_require__(4927);
@@ -63421,7 +63446,7 @@ var element_ui_common = __webpack_require__(4927);
     return {
       searchVal: '',
       filterData: [],
-      loading: false,
+      innerLoading: false,
       asyncOptions: []
     };
   },
@@ -63452,7 +63477,7 @@ var element_ui_common = __webpack_require__(4927);
     async loadAsyncOptions() {
       if (!this.loadOptions) return;
       try {
-        this.loading = true;
+        this.innerLoading = true;
         const result = await this.loadOptions();
 
         // 支持直接返回数组或返回包含 data 属性的对象
@@ -63462,7 +63487,7 @@ var element_ui_common = __webpack_require__(4927);
         console.error('加载选项数据失败:', error);
         this.$emit('load-error', error);
       } finally {
-        this.loading = false;
+        this.innerLoading = false;
       }
     },
     // 手动刷新数据
@@ -63530,8 +63555,8 @@ var element_ui_common = __webpack_require__(4927);
 ;
 var select_component = normalizeComponent(
   comps_selectvue_type_script_lang_js,
-  selectvue_type_template_id_2ee8e5b9_render,
-  selectvue_type_template_id_2ee8e5b9_staticRenderFns,
+  selectvue_type_template_id_2e80ec4b_render,
+  selectvue_type_template_id_2e80ec4b_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -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":"268ca57a-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=45d515ca
-var tablevue_type_template_id_45d515ca_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-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=1187e743
+var tablevue_type_template_id_1187e743_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60827,7 +60827,7 @@ var tablevue_type_template_id_45d515ca_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_45d515ca_staticRenderFns = [];
+var tablevue_type_template_id_1187e743_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61868,7 +61868,7 @@ var custom_column_component = normalizeComponent(
   },
   computed: {
     options() {
-      var _others$pagerConfig, _others$sortConfig, _others$pagerConfig2, _others$pagerConfig3, _others$sortConfig2;
+      var _others$pagerConfig, _others$sortConfig, _others$pagerConfig2, _others$pagerConfig3, _others$sortConfig2, _sortConfig$remote;
       const {
         customColumnConfig,
         columns,
@@ -61909,7 +61909,6 @@ var custom_column_component = normalizeComponent(
         return specialFirstRow ? rowIndex : rowIndex + 1;
       };
       return {
-        ...otherConfigs,
         border: true,
         resizable: true,
         showOverflow: !this.autoHeight,
@@ -61936,15 +61935,16 @@ var custom_column_component = normalizeComponent(
         sortConfig: {
           ...sortConfig,
           // 只在前端排序/分页时强制 remote: true
-          // 其他情况保持外部配置
-          remote: (_others$pagerConfig3 = others.pagerConfig) !== null && _others$pagerConfig3 !== void 0 && _others$pagerConfig3.frontendPagination || (_others$sortConfig2 = others.sortConfig) !== null && _others$sortConfig2 !== void 0 && _others$sortConfig2.frontendSort ? true : sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.remote,
+          // 其他情况保持外部配置，但确保后端分页时remote为false
+          remote: (_others$pagerConfig3 = others.pagerConfig) !== null && _others$pagerConfig3 !== void 0 && _others$pagerConfig3.frontendPagination || (_others$sortConfig2 = others.sortConfig) !== null && _others$sortConfig2 !== void 0 && _others$sortConfig2.frontendSort ? true : (_sortConfig$remote = sortConfig === null || sortConfig === void 0 ? void 0 : sortConfig.remote) !== null && _sortConfig$remote !== void 0 ? _sortConfig$remote : false,
           trigger: 'cell',
           ...this.gridOptions.sortConfig
         },
         seqConfig: {
           ...userSeqConfig,
           seqMethod: userSeqConfig.seqMethod || defaultSeqMethod
-        }
+        },
+        ...otherConfigs
       };
     },
     // 插槽集合
@@ -62202,10 +62202,22 @@ var custom_column_component = normalizeComponent(
         // 字符串类型排序
         const aStr = String(aValue).toLowerCase();
         const bStr = String(bValue).toLowerCase();
-        if (order === 'asc') {
-          return aStr.localeCompare(bStr);
+        const isPercentA = typeof aValue === 'string' && aValue.trim().endsWith('%') && !isNaN(aValue.trim().slice(0, -1));
+        const isPercentB = typeof bValue === 'string' && bValue.trim().endsWith('%') && !isNaN(bValue.trim().slice(0, -1));
+        if (isPercentA && isPercentB) {
+          // 百分比字符串，去掉%后转数字比较
+          const numA = parseFloat(aValue);
+          const numB = parseFloat(bValue);
+          return order === 'asc' ? numA - numB : numB - numA;
+        }
+        const isANum = !isNaN(aStr) && aStr.trim() !== '';
+        const isBNum = !isNaN(bStr) && bStr.trim() !== '';
+        if (isANum && isBNum) {
+          // 都是数字字符串，按数字比较
+          return order === 'asc' ? Number(aStr) - Number(bStr) : Number(bStr) - Number(aStr);
         } else {
-          return bStr.localeCompare(aStr);
+          // 普通字符串比较
+          return order === 'asc' ? aStr.localeCompare(bStr) : bStr.localeCompare(aStr);
         }
       });
     },
@@ -62220,10 +62232,12 @@ var custom_column_component = normalizeComponent(
         order
       } = event;
       const shouldHandleSort = ((_this$gridOptions$pag2 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag2 === void 0 ? void 0 : _this$gridOptions$pag2.frontendPagination) || ((_this$gridOptions$sor = this.gridOptions.sortConfig) === null || _this$gridOptions$sor === void 0 ? void 0 : _this$gridOptions$sor.frontendSort);
+
+      // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
+      this.sortState.field = property;
+      this.sortState.order = order;
       if (shouldHandleSort) {
         var _this$gridOptions$pag3, _this$gridOptions$pag4;
-        this.sortState.field = property;
-        this.sortState.order = order;
         const newData = this.spliteListData(this.allData, (_this$gridOptions$pag3 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag3 !== void 0 && _this$gridOptions$pag3.frontendPagination ? this.gridOptions.pagerConfig.currentPage : null, (_this$gridOptions$pag4 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag4 !== void 0 && _this$gridOptions$pag4.frontendPagination ? this.gridOptions.pagerConfig.pageSize : null);
         if (this.$refs.xGrid) {
           this.$refs.xGrid.reloadData(newData);
@@ -62255,6 +62269,17 @@ var custom_column_component = normalizeComponent(
             }, 0);
           });
         }
+      } else {
+        // 后端分页模式下，确保排序箭头高亮
+        this.$nextTick(() => {
+          if (property && order && this.$refs.xGrid) {
+            setTimeout(() => {
+              this.$refs.xGrid.sort(property, order, {
+                silent: true
+              });
+            }, 100);
+          }
+        });
       }
       this.$emit('sort-change', event);
     },
@@ -62285,8 +62310,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_45d515ca_render,
-  tablevue_type_template_id_45d515ca_staticRenderFns,
+  tablevue_type_template_id_1187e743_render,
+  tablevue_type_template_id_1187e743_staticRenderFns,
   false,
   null,
   null,
@@ -63340,8 +63365,8 @@ 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":"268ca57a-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/form/comps/select.vue?vue&type=template&id=2ee8e5b9
-var selectvue_type_template_id_2ee8e5b9_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-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/form/comps/select.vue?vue&type=template&id=2e80ec4b
+var selectvue_type_template_id_2e80ec4b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-select', _vm._b({
@@ -63349,7 +63374,7 @@ var selectvue_type_template_id_2ee8e5b9_render = function render() {
     attrs: {
       "value": _vm.value,
       "placeholder": _vm.config && _vm.config.placeholder || '请选择',
-      "loading": _vm.loading
+      "loading": _vm.innerLoading
     },
     on: {
       "change": _vm.change,
@@ -63384,7 +63409,7 @@ var selectvue_type_template_id_2ee8e5b9_render = function render() {
     });
   })], 2);
 };
-var selectvue_type_template_id_2ee8e5b9_staticRenderFns = [];
+var selectvue_type_template_id_2e80ec4b_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/element-ui.common.js
 var element_ui_common = __webpack_require__(3421);
@@ -63431,7 +63456,7 @@ var element_ui_common = __webpack_require__(3421);
     return {
       searchVal: '',
       filterData: [],
-      loading: false,
+      innerLoading: false,
       asyncOptions: []
     };
   },
@@ -63462,7 +63487,7 @@ var element_ui_common = __webpack_require__(3421);
     async loadAsyncOptions() {
       if (!this.loadOptions) return;
       try {
-        this.loading = true;
+        this.innerLoading = true;
         const result = await this.loadOptions();
 
         // 支持直接返回数组或返回包含 data 属性的对象
@@ -63472,7 +63497,7 @@ var element_ui_common = __webpack_require__(3421);
         console.error('加载选项数据失败:', error);
         this.$emit('load-error', error);
       } finally {
-        this.loading = false;
+        this.innerLoading = false;
       }
     },
     // 手动刷新数据
@@ -63540,8 +63565,8 @@ var element_ui_common = __webpack_require__(3421);
 ;
 var select_component = normalizeComponent(
   comps_selectvue_type_script_lang_js,
-  selectvue_type_template_id_2ee8e5b9_render,
-  selectvue_type_template_id_2ee8e5b9_staticRenderFns,
+  selectvue_type_template_id_2e80ec4b_render,
+  selectvue_type_template_id_2e80ec4b_staticRenderFns,
   false,
   null,
   null,