@weitutech/by-components 1.1.130 → 1.1.131

package/lib/by-components.common.js

@@ -60751,8 +60751,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":"ffbc40de-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=3aefd0b0
-var tablevue_type_template_id_3aefd0b0_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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=5b90b233
+var tablevue_type_template_id_5b90b233_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60826,7 +60826,7 @@ var tablevue_type_template_id_3aefd0b0_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_3aefd0b0_staticRenderFns = [];
+var tablevue_type_template_id_5b90b233_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61899,7 +61899,7 @@ var custom_column_component = normalizeComponent(
       handler() {
         this.$nextTick(() => {
           setTimeout(() => {
-            var _this$gridOptions$pag;
+            var _this$gridOptions$pag, _this$gridOptions$sor;
             if (this.$refs.xGrid && this.$refs.xGrid.refreshScroll) {
               this.$refs.xGrid.refreshScroll(); // 刷新滚动布局
             }
@@ -61910,11 +61910,11 @@ var custom_column_component = normalizeComponent(
               });
             }
 
-            // 前端分页模式下，数据变化时确保默认排序高亮
-            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+            // 前端分页或前端排序模式下，数据变化时确保默认排序高亮
+            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination || (_this$gridOptions$sor = this.gridOptions.sortConfig) !== null && _this$gridOptions$sor !== void 0 && _this$gridOptions$sor.frontendSort) {
               this.ensureDefaultSortHighlight();
             } else {
-              // 非前端分页模式，恢复之前的排序高亮
+              // 后端模式，恢复之前的排序高亮
               if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
                 setTimeout(() => {
                   this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
@@ -62357,12 +62357,12 @@ var custom_column_component = normalizeComponent(
      * @param event
      */
     handleSortChange(event) {
-      var _this$gridOptions$pag3, _this$gridOptions$sor;
+      var _this$gridOptions$pag3, _this$gridOptions$sor2;
       const {
         property,
         order
       } = event;
-      const shouldHandleSort = ((_this$gridOptions$pag3 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag3 === void 0 ? void 0 : _this$gridOptions$pag3.frontendPagination) || ((_this$gridOptions$sor = this.gridOptions.sortConfig) === null || _this$gridOptions$sor === void 0 ? void 0 : _this$gridOptions$sor.frontendSort);
+      const shouldHandleSort = ((_this$gridOptions$pag3 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag3 === void 0 ? void 0 : _this$gridOptions$pag3.frontendPagination) || ((_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.frontendSort);
 
       // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
       this.sortState.field = property;
@@ -62426,17 +62426,35 @@ var custom_column_component = normalizeComponent(
           silent: true
         });
       }, 100);
+
+      // 🔧 修复：重置后自动应用默认排序（支持虚拟滚动和前端分页）
+      this.$nextTick(() => {
+        var _this$gridOptions$sor3;
+        const defaultSort = (_this$gridOptions$sor3 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor3 === void 0 ? void 0 : _this$gridOptions$sor3.defaultSort;
+        if (defaultSort && defaultSort.field && defaultSort.order) {
+          this.sortState.field = defaultSort.field;
+          this.sortState.order = defaultSort.order;
+          setTimeout(() => {
+            if (this.$refs.xGrid) {
+              this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+                silent: true
+              });
+            }
+          }, 150);
+        }
+      });
     },
     /**
-     * 前端分页模式下初始化默认排序
+     * 初始化默认排序（支持前端分页和虚拟滚动）
      */
     initDefaultSortForFrontendPagination() {
-      var _this$gridOptions$pag7, _this$gridOptions$sor2;
-      // 只在前端分页模式下处理默认排序
-      if (!((_this$gridOptions$pag7 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag7 !== void 0 && _this$gridOptions$pag7.frontendPagination)) {
+      var _this$gridOptions$pag7, _this$gridOptions$sor4, _this$gridOptions$sor5;
+      // 支持前端分页或前端排序模式（包括虚拟滚动）
+      const shouldInitSort = ((_this$gridOptions$pag7 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag7 === void 0 ? void 0 : _this$gridOptions$pag7.frontendPagination) || ((_this$gridOptions$sor4 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor4 === void 0 ? void 0 : _this$gridOptions$sor4.frontendSort);
+      if (!shouldInitSort) {
         return;
       }
-      const defaultSort = (_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.defaultSort;
+      const defaultSort = (_this$gridOptions$sor5 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor5 === void 0 ? void 0 : _this$gridOptions$sor5.defaultSort;
       if (defaultSort && defaultSort.field && defaultSort.order) {
         // 设置排序状态
         this.sortState.field = defaultSort.field;
@@ -62456,14 +62474,16 @@ var custom_column_component = normalizeComponent(
       }
     },
     /**
-     * 确保默认排序高亮（前端分页模式下数据变化时调用）
+     * 确保默认排序高亮（数据变化时调用，支持前端分页和虚拟滚动）
      */
     ensureDefaultSortHighlight() {
-      var _this$gridOptions$pag8, _this$gridOptions$sor3;
-      if (!((_this$gridOptions$pag8 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag8 !== void 0 && _this$gridOptions$pag8.frontendPagination)) {
+      var _this$gridOptions$pag8, _this$gridOptions$sor6, _this$gridOptions$sor7;
+      // 支持前端分页或前端排序模式（包括虚拟滚动）
+      const shouldEnsureSort = ((_this$gridOptions$pag8 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag8 === void 0 ? void 0 : _this$gridOptions$pag8.frontendPagination) || ((_this$gridOptions$sor6 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor6 === void 0 ? void 0 : _this$gridOptions$sor6.frontendSort);
+      if (!shouldEnsureSort) {
         return;
       }
-      const defaultSort = (_this$gridOptions$sor3 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor3 === void 0 ? void 0 : _this$gridOptions$sor3.defaultSort;
+      const defaultSort = (_this$gridOptions$sor7 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor7 === void 0 ? void 0 : _this$gridOptions$sor7.defaultSort;
       if (defaultSort && defaultSort.field && defaultSort.order) {
         // 确保排序状态与默认排序一致
         this.sortState.field = defaultSort.field;
@@ -62493,8 +62513,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_3aefd0b0_render,
-  tablevue_type_template_id_3aefd0b0_staticRenderFns,
+  tablevue_type_template_id_5b90b233_render,
+  tablevue_type_template_id_5b90b233_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -60761,8 +60761,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":"ffbc40de-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=3aefd0b0
-var tablevue_type_template_id_3aefd0b0_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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=5b90b233
+var tablevue_type_template_id_5b90b233_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -60836,7 +60836,7 @@ var tablevue_type_template_id_3aefd0b0_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_3aefd0b0_staticRenderFns = [];
+var tablevue_type_template_id_5b90b233_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61909,7 +61909,7 @@ var custom_column_component = normalizeComponent(
       handler() {
         this.$nextTick(() => {
           setTimeout(() => {
-            var _this$gridOptions$pag;
+            var _this$gridOptions$pag, _this$gridOptions$sor;
             if (this.$refs.xGrid && this.$refs.xGrid.refreshScroll) {
               this.$refs.xGrid.refreshScroll(); // 刷新滚动布局
             }
@@ -61920,11 +61920,11 @@ var custom_column_component = normalizeComponent(
               });
             }
 
-            // 前端分页模式下，数据变化时确保默认排序高亮
-            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+            // 前端分页或前端排序模式下，数据变化时确保默认排序高亮
+            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination || (_this$gridOptions$sor = this.gridOptions.sortConfig) !== null && _this$gridOptions$sor !== void 0 && _this$gridOptions$sor.frontendSort) {
               this.ensureDefaultSortHighlight();
             } else {
-              // 非前端分页模式，恢复之前的排序高亮
+              // 后端模式，恢复之前的排序高亮
               if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
                 setTimeout(() => {
                   this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
@@ -62367,12 +62367,12 @@ var custom_column_component = normalizeComponent(
      * @param event
      */
     handleSortChange(event) {
-      var _this$gridOptions$pag3, _this$gridOptions$sor;
+      var _this$gridOptions$pag3, _this$gridOptions$sor2;
       const {
         property,
         order
       } = event;
-      const shouldHandleSort = ((_this$gridOptions$pag3 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag3 === void 0 ? void 0 : _this$gridOptions$pag3.frontendPagination) || ((_this$gridOptions$sor = this.gridOptions.sortConfig) === null || _this$gridOptions$sor === void 0 ? void 0 : _this$gridOptions$sor.frontendSort);
+      const shouldHandleSort = ((_this$gridOptions$pag3 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag3 === void 0 ? void 0 : _this$gridOptions$pag3.frontendPagination) || ((_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.frontendSort);
 
       // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
       this.sortState.field = property;
@@ -62436,17 +62436,35 @@ var custom_column_component = normalizeComponent(
           silent: true
         });
       }, 100);
+
+      // 🔧 修复：重置后自动应用默认排序（支持虚拟滚动和前端分页）
+      this.$nextTick(() => {
+        var _this$gridOptions$sor3;
+        const defaultSort = (_this$gridOptions$sor3 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor3 === void 0 ? void 0 : _this$gridOptions$sor3.defaultSort;
+        if (defaultSort && defaultSort.field && defaultSort.order) {
+          this.sortState.field = defaultSort.field;
+          this.sortState.order = defaultSort.order;
+          setTimeout(() => {
+            if (this.$refs.xGrid) {
+              this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+                silent: true
+              });
+            }
+          }, 150);
+        }
+      });
     },
     /**
-     * 前端分页模式下初始化默认排序
+     * 初始化默认排序（支持前端分页和虚拟滚动）
      */
     initDefaultSortForFrontendPagination() {
-      var _this$gridOptions$pag7, _this$gridOptions$sor2;
-      // 只在前端分页模式下处理默认排序
-      if (!((_this$gridOptions$pag7 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag7 !== void 0 && _this$gridOptions$pag7.frontendPagination)) {
+      var _this$gridOptions$pag7, _this$gridOptions$sor4, _this$gridOptions$sor5;
+      // 支持前端分页或前端排序模式（包括虚拟滚动）
+      const shouldInitSort = ((_this$gridOptions$pag7 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag7 === void 0 ? void 0 : _this$gridOptions$pag7.frontendPagination) || ((_this$gridOptions$sor4 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor4 === void 0 ? void 0 : _this$gridOptions$sor4.frontendSort);
+      if (!shouldInitSort) {
         return;
       }
-      const defaultSort = (_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.defaultSort;
+      const defaultSort = (_this$gridOptions$sor5 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor5 === void 0 ? void 0 : _this$gridOptions$sor5.defaultSort;
       if (defaultSort && defaultSort.field && defaultSort.order) {
         // 设置排序状态
         this.sortState.field = defaultSort.field;
@@ -62466,14 +62484,16 @@ var custom_column_component = normalizeComponent(
       }
     },
     /**
-     * 确保默认排序高亮（前端分页模式下数据变化时调用）
+     * 确保默认排序高亮（数据变化时调用，支持前端分页和虚拟滚动）
      */
     ensureDefaultSortHighlight() {
-      var _this$gridOptions$pag8, _this$gridOptions$sor3;
-      if (!((_this$gridOptions$pag8 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag8 !== void 0 && _this$gridOptions$pag8.frontendPagination)) {
+      var _this$gridOptions$pag8, _this$gridOptions$sor6, _this$gridOptions$sor7;
+      // 支持前端分页或前端排序模式（包括虚拟滚动）
+      const shouldEnsureSort = ((_this$gridOptions$pag8 = this.gridOptions.pagerConfig) === null || _this$gridOptions$pag8 === void 0 ? void 0 : _this$gridOptions$pag8.frontendPagination) || ((_this$gridOptions$sor6 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor6 === void 0 ? void 0 : _this$gridOptions$sor6.frontendSort);
+      if (!shouldEnsureSort) {
         return;
       }
-      const defaultSort = (_this$gridOptions$sor3 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor3 === void 0 ? void 0 : _this$gridOptions$sor3.defaultSort;
+      const defaultSort = (_this$gridOptions$sor7 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor7 === void 0 ? void 0 : _this$gridOptions$sor7.defaultSort;
       if (defaultSort && defaultSort.field && defaultSort.order) {
         // 确保排序状态与默认排序一致
         this.sortState.field = defaultSort.field;
@@ -62503,8 +62523,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_3aefd0b0_render,
-  tablevue_type_template_id_3aefd0b0_staticRenderFns,
+  tablevue_type_template_id_5b90b233_render,
+  tablevue_type_template_id_5b90b233_staticRenderFns,
   false,
   null,
   null,