@weitutech/by-components 1.1.47 → 1.1.48

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=edc3cbea
+var tablevue_type_template_id_edc3cbea_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_edc3cbea_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61899,7 +61899,6 @@ var custom_column_component = normalizeComponent(
         return specialFirstRow ? rowIndex : rowIndex + 1;
       };
       return {
-        ...otherConfigs,
         border: true,
         resizable: true,
         showOverflow: !this.autoHeight,
@@ -61934,7 +61933,8 @@ var custom_column_component = normalizeComponent(
         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);
         }
       });
     },
@@ -62275,8 +62287,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_edc3cbea_render,
+  tablevue_type_template_id_edc3cbea_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=edc3cbea
+var tablevue_type_template_id_edc3cbea_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_edc3cbea_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61909,7 +61909,6 @@ var custom_column_component = normalizeComponent(
         return specialFirstRow ? rowIndex : rowIndex + 1;
       };
       return {
-        ...otherConfigs,
         border: true,
         resizable: true,
         showOverflow: !this.autoHeight,
@@ -61944,7 +61943,8 @@ var custom_column_component = normalizeComponent(
         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);
         }
       });
     },
@@ -62285,8 +62297,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_edc3cbea_render,
+  tablevue_type_template_id_edc3cbea_staticRenderFns,
   false,
   null,
   null,