@weitutech/by-components 1.1.128 → 1.1.130

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=d8d0f56a
-var tablevue_type_template_id_d8d0f56a_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=3aefd0b0
+var tablevue_type_template_id_3aefd0b0_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_d8d0f56a_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_d8d0f56a_staticRenderFns = [];
+var tablevue_type_template_id_3aefd0b0_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61874,6 +61874,9 @@ var custom_column_component = normalizeComponent(
       this.checkDeviceType();
       this.initResizeListener();
     }
+
+    // 前端分页模式下初始化默认排序
+    this.initDefaultSortForFrontendPagination();
   },
   beforeDestroy() {
     // 确保只在客户端环境中移除事件监听
@@ -61896,6 +61899,7 @@ var custom_column_component = normalizeComponent(
       handler() {
         this.$nextTick(() => {
           setTimeout(() => {
+            var _this$gridOptions$pag;
             if (this.$refs.xGrid && this.$refs.xGrid.refreshScroll) {
               this.$refs.xGrid.refreshScroll(); // 刷新滚动布局
             }
@@ -61905,13 +61909,19 @@ var custom_column_component = normalizeComponent(
                 left: 0
               });
             }
-            // 数据变化后恢复排序高亮
-            if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
-              setTimeout(() => {
-                this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
-                  silent: true
-                });
-              }, 100);
+
+            // 前端分页模式下，数据变化时确保默认排序高亮
+            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+              this.ensureDefaultSortHighlight();
+            } else {
+              // 非前端分页模式，恢复之前的排序高亮
+              if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
+                setTimeout(() => {
+                  this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
+                    silent: true
+                  });
+                }, 100);
+              }
             }
           }, 0);
         });
@@ -62121,9 +62131,9 @@ var custom_column_component = normalizeComponent(
      * @param values 分页参数
      */
     pageChange(values) {
-      var _this$gridOptions$pag;
+      var _this$gridOptions$pag2;
       // 前端分页
-      if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+      if ((_this$gridOptions$pag2 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag2 !== void 0 && _this$gridOptions$pag2.frontendPagination) {
         setTimeout(() => {
           const newData = this.spliteListData(this.allData, values.page, values.limit);
           this.$refs.xGrid.reloadData(newData);
@@ -62347,19 +62357,19 @@ var custom_column_component = normalizeComponent(
      * @param event
      */
     handleSortChange(event) {
-      var _this$gridOptions$pag2, _this$gridOptions$sor;
+      var _this$gridOptions$pag3, _this$gridOptions$sor;
       const {
         property,
         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);
+      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);
 
       // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
       this.sortState.field = property;
       this.sortState.order = order;
       if (shouldHandleSort) {
-        var _this$gridOptions$pag3, _this$gridOptions$pag4;
-        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);
+        var _this$gridOptions$pag4, _this$gridOptions$pag5;
+        const newData = this.spliteListData(this.allData, (_this$gridOptions$pag4 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag4 !== void 0 && _this$gridOptions$pag4.frontendPagination ? this.gridOptions.pagerConfig.currentPage : null, (_this$gridOptions$pag5 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag5 !== void 0 && _this$gridOptions$pag5.frontendPagination ? this.gridOptions.pagerConfig.pageSize : null);
         if (this.$refs.xGrid) {
           this.$refs.xGrid.reloadData(newData);
           this.$nextTick(() => {
@@ -62372,8 +62382,8 @@ var custom_column_component = normalizeComponent(
               }, 100);
             }
             setTimeout(() => {
-              var _this$gridOptions$pag5;
-              if ((_this$gridOptions$pag5 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag5 !== void 0 && _this$gridOptions$pag5.frontendPagination && this.$refs.xGrid) {
+              var _this$gridOptions$pag6;
+              if ((_this$gridOptions$pag6 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag6 !== void 0 && _this$gridOptions$pag6.frontendPagination && this.$refs.xGrid) {
                 // 前端分页时，排序状态变化，回到第一页
                 const currentPage = this.gridOptions.pagerConfig.currentPage;
                 if (currentPage !== 1) {
@@ -62416,6 +62426,58 @@ var custom_column_component = normalizeComponent(
           silent: true
         });
       }, 100);
+    },
+    /**
+     * 前端分页模式下初始化默认排序
+     */
+    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)) {
+        return;
+      }
+      const defaultSort = (_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.defaultSort;
+      if (defaultSort && defaultSort.field && defaultSort.order) {
+        // 设置排序状态
+        this.sortState.field = defaultSort.field;
+        this.sortState.order = defaultSort.order;
+
+        // 在下一个tick中应用排序高亮
+        this.$nextTick(() => {
+          if (this.$refs.xGrid) {
+            setTimeout(() => {
+              // 只高亮排序图标，不触发排序事件
+              this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+                silent: true
+              });
+            }, 100);
+          }
+        });
+      }
+    },
+    /**
+     * 确保默认排序高亮（前端分页模式下数据变化时调用）
+     */
+    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)) {
+        return;
+      }
+      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;
+
+        // 应用排序高亮
+        if (this.$refs.xGrid) {
+          setTimeout(() => {
+            this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+              silent: true
+            });
+          }, 100);
+        }
+      }
     }
   }
 });
@@ -62431,8 +62493,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_d8d0f56a_render,
-  tablevue_type_template_id_d8d0f56a_staticRenderFns,
+  tablevue_type_template_id_3aefd0b0_render,
+  tablevue_type_template_id_3aefd0b0_staticRenderFns,
   false,
   null,
   null,
@@ -74979,8 +75041,8 @@ var ByCommonSelector_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByCommonSelector = (ByCommonSelector_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/batch-query-selector/BatchQuerySelector.vue?vue&type=template&id=39d784a5
-var BatchQuerySelectorvue_type_template_id_39d784a5_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/batch-query-selector/BatchQuerySelector.vue?vue&type=template&id=ae023dca
+var BatchQuerySelectorvue_type_template_id_ae023dca_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -75126,6 +75188,9 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_render = function render() {
       "disabled": _vm.disabled || _vm.loading,
       "size": _vm.size
     },
+    on: {
+      "click": _vm.handleBatchButtonClick
+    },
     slot: "reference"
   }, [_c('i', {
     staticClass: "el-icon-edit-outline",
@@ -75135,7 +75200,7 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_render = function render() {
     }
   })])], 1)], 1)]);
 };
-var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
+var BatchQuerySelectorvue_type_template_id_ae023dca_staticRenderFns = [];
 
 ;// ./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/batch-query-selector/BatchQuerySelector.vue?vue&type=script&lang=js
 
@@ -75376,9 +75441,23 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
     // 处理下拉框显示/隐藏
     handleDropdownVisibleChange(visible) {
       this.dropdownVisible = visible;
+      if (visible) {
+        // 下拉框打开时，重置搜索关键词，确保显示所有选项
+        this.keyword = '';
+        this.filteredOptions = [...this.optionsList];
+        this.currentPage = this.initialPageCount;
+        this.updateVisibleOptions();
 
-      // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
-      if (!visible) {
+        // 清空 el-select 的搜索输入框
+        this.$nextTick(() => {
+          var _this$$refs$elSelect, _this$$refs$elSelect$, _this$$refs$elSelect$2, _this$$refs$elSelect$3;
+          const selectInput = (_this$$refs$elSelect = this.$refs.elSelect) === null || _this$$refs$elSelect === void 0 ? void 0 : (_this$$refs$elSelect$ = _this$$refs$elSelect.$refs) === null || _this$$refs$elSelect$ === void 0 ? void 0 : (_this$$refs$elSelect$2 = _this$$refs$elSelect$.input) === null || _this$$refs$elSelect$2 === void 0 ? void 0 : (_this$$refs$elSelect$3 = _this$$refs$elSelect$2.$refs) === null || _this$$refs$elSelect$3 === void 0 ? void 0 : _this$$refs$elSelect$3.input;
+          if (selectInput) {
+            selectInput.value = '';
+          }
+        });
+      } else {
+        // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
         this.hasFocused = false;
       }
     },
@@ -75505,8 +75584,14 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
         this.updateVisibleOptions();
       }, 200);
     },
+    // 处理批量按钮点击 (为了在还未加载过数据的情况下触发加载数据)
+    handleBatchButtonClick(e) {
+      if (this.optionsList.length === 0 && !this.loadOptions) {
+        this.$emit('batch-selector-focus', e);
+      }
+    },
     // 处理批量输入
-    handleBatchInput() {
+    async handleBatchInput() {
       if (!this.batchInputContent.trim()) {
         this.popoverVisible = false;
         return;
@@ -75519,6 +75604,17 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
         return;
       }
 
+      // 如果optionsList为空且提供了loadOptions，先加载数据
+      if (this.optionsList.length === 0 && this.loadOptions) {
+        try {
+          await this.fetchOptions();
+        } catch (error) {
+          console.error('批量查询时加载选项失败:', error);
+          this.popoverVisible = false;
+          return;
+        }
+      }
+
       // 根据输入类型匹配数据
       let matchedValues = [];
       let matchedItems = [];
@@ -75621,8 +75717,8 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
 ;
 var BatchQuerySelector_component = normalizeComponent(
   batch_query_selector_BatchQuerySelectorvue_type_script_lang_js,
-  BatchQuerySelectorvue_type_template_id_39d784a5_render,
-  BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns,
+  BatchQuerySelectorvue_type_template_id_ae023dca_render,
+  BatchQuerySelectorvue_type_template_id_ae023dca_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=d8d0f56a
-var tablevue_type_template_id_d8d0f56a_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=3aefd0b0
+var tablevue_type_template_id_3aefd0b0_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_d8d0f56a_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_d8d0f56a_staticRenderFns = [];
+var tablevue_type_template_id_3aefd0b0_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -61884,6 +61884,9 @@ var custom_column_component = normalizeComponent(
       this.checkDeviceType();
       this.initResizeListener();
     }
+
+    // 前端分页模式下初始化默认排序
+    this.initDefaultSortForFrontendPagination();
   },
   beforeDestroy() {
     // 确保只在客户端环境中移除事件监听
@@ -61906,6 +61909,7 @@ var custom_column_component = normalizeComponent(
       handler() {
         this.$nextTick(() => {
           setTimeout(() => {
+            var _this$gridOptions$pag;
             if (this.$refs.xGrid && this.$refs.xGrid.refreshScroll) {
               this.$refs.xGrid.refreshScroll(); // 刷新滚动布局
             }
@@ -61915,13 +61919,19 @@ var custom_column_component = normalizeComponent(
                 left: 0
               });
             }
-            // 数据变化后恢复排序高亮
-            if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
-              setTimeout(() => {
-                this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
-                  silent: true
-                });
-              }, 100);
+
+            // 前端分页模式下，数据变化时确保默认排序高亮
+            if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+              this.ensureDefaultSortHighlight();
+            } else {
+              // 非前端分页模式，恢复之前的排序高亮
+              if (this.sortState.field && this.sortState.order && this.$refs.xGrid) {
+                setTimeout(() => {
+                  this.$refs.xGrid.sort(this.sortState.field, this.sortState.order, {
+                    silent: true
+                  });
+                }, 100);
+              }
             }
           }, 0);
         });
@@ -62131,9 +62141,9 @@ var custom_column_component = normalizeComponent(
      * @param values 分页参数
      */
     pageChange(values) {
-      var _this$gridOptions$pag;
+      var _this$gridOptions$pag2;
       // 前端分页
-      if ((_this$gridOptions$pag = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag !== void 0 && _this$gridOptions$pag.frontendPagination) {
+      if ((_this$gridOptions$pag2 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag2 !== void 0 && _this$gridOptions$pag2.frontendPagination) {
         setTimeout(() => {
           const newData = this.spliteListData(this.allData, values.page, values.limit);
           this.$refs.xGrid.reloadData(newData);
@@ -62357,19 +62367,19 @@ var custom_column_component = normalizeComponent(
      * @param event
      */
     handleSortChange(event) {
-      var _this$gridOptions$pag2, _this$gridOptions$sor;
+      var _this$gridOptions$pag3, _this$gridOptions$sor;
       const {
         property,
         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);
+      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);
 
       // 无论前端还是后端分页，都保存排序状态用于恢复箭头高亮
       this.sortState.field = property;
       this.sortState.order = order;
       if (shouldHandleSort) {
-        var _this$gridOptions$pag3, _this$gridOptions$pag4;
-        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);
+        var _this$gridOptions$pag4, _this$gridOptions$pag5;
+        const newData = this.spliteListData(this.allData, (_this$gridOptions$pag4 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag4 !== void 0 && _this$gridOptions$pag4.frontendPagination ? this.gridOptions.pagerConfig.currentPage : null, (_this$gridOptions$pag5 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag5 !== void 0 && _this$gridOptions$pag5.frontendPagination ? this.gridOptions.pagerConfig.pageSize : null);
         if (this.$refs.xGrid) {
           this.$refs.xGrid.reloadData(newData);
           this.$nextTick(() => {
@@ -62382,8 +62392,8 @@ var custom_column_component = normalizeComponent(
               }, 100);
             }
             setTimeout(() => {
-              var _this$gridOptions$pag5;
-              if ((_this$gridOptions$pag5 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag5 !== void 0 && _this$gridOptions$pag5.frontendPagination && this.$refs.xGrid) {
+              var _this$gridOptions$pag6;
+              if ((_this$gridOptions$pag6 = this.gridOptions.pagerConfig) !== null && _this$gridOptions$pag6 !== void 0 && _this$gridOptions$pag6.frontendPagination && this.$refs.xGrid) {
                 // 前端分页时，排序状态变化，回到第一页
                 const currentPage = this.gridOptions.pagerConfig.currentPage;
                 if (currentPage !== 1) {
@@ -62426,6 +62436,58 @@ var custom_column_component = normalizeComponent(
           silent: true
         });
       }, 100);
+    },
+    /**
+     * 前端分页模式下初始化默认排序
+     */
+    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)) {
+        return;
+      }
+      const defaultSort = (_this$gridOptions$sor2 = this.gridOptions.sortConfig) === null || _this$gridOptions$sor2 === void 0 ? void 0 : _this$gridOptions$sor2.defaultSort;
+      if (defaultSort && defaultSort.field && defaultSort.order) {
+        // 设置排序状态
+        this.sortState.field = defaultSort.field;
+        this.sortState.order = defaultSort.order;
+
+        // 在下一个tick中应用排序高亮
+        this.$nextTick(() => {
+          if (this.$refs.xGrid) {
+            setTimeout(() => {
+              // 只高亮排序图标，不触发排序事件
+              this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+                silent: true
+              });
+            }, 100);
+          }
+        });
+      }
+    },
+    /**
+     * 确保默认排序高亮（前端分页模式下数据变化时调用）
+     */
+    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)) {
+        return;
+      }
+      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;
+
+        // 应用排序高亮
+        if (this.$refs.xGrid) {
+          setTimeout(() => {
+            this.$refs.xGrid.sort(defaultSort.field, defaultSort.order, {
+              silent: true
+            });
+          }, 100);
+        }
+      }
     }
   }
 });
@@ -62441,8 +62503,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_d8d0f56a_render,
-  tablevue_type_template_id_d8d0f56a_staticRenderFns,
+  tablevue_type_template_id_3aefd0b0_render,
+  tablevue_type_template_id_3aefd0b0_staticRenderFns,
   false,
   null,
   null,
@@ -74989,8 +75051,8 @@ var ByCommonSelector_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByCommonSelector = (ByCommonSelector_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/batch-query-selector/BatchQuerySelector.vue?vue&type=template&id=39d784a5
-var BatchQuerySelectorvue_type_template_id_39d784a5_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/batch-query-selector/BatchQuerySelector.vue?vue&type=template&id=ae023dca
+var BatchQuerySelectorvue_type_template_id_ae023dca_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -75136,6 +75198,9 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_render = function render() {
       "disabled": _vm.disabled || _vm.loading,
       "size": _vm.size
     },
+    on: {
+      "click": _vm.handleBatchButtonClick
+    },
     slot: "reference"
   }, [_c('i', {
     staticClass: "el-icon-edit-outline",
@@ -75145,7 +75210,7 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_render = function render() {
     }
   })])], 1)], 1)]);
 };
-var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
+var BatchQuerySelectorvue_type_template_id_ae023dca_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.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/batch-query-selector/BatchQuerySelector.vue?vue&type=script&lang=js
 
@@ -75386,9 +75451,23 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
     // 处理下拉框显示/隐藏
     handleDropdownVisibleChange(visible) {
       this.dropdownVisible = visible;
+      if (visible) {
+        // 下拉框打开时，重置搜索关键词，确保显示所有选项
+        this.keyword = '';
+        this.filteredOptions = [...this.optionsList];
+        this.currentPage = this.initialPageCount;
+        this.updateVisibleOptions();
 
-      // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
-      if (!visible) {
+        // 清空 el-select 的搜索输入框
+        this.$nextTick(() => {
+          var _this$$refs$elSelect, _this$$refs$elSelect$, _this$$refs$elSelect$2, _this$$refs$elSelect$3;
+          const selectInput = (_this$$refs$elSelect = this.$refs.elSelect) === null || _this$$refs$elSelect === void 0 ? void 0 : (_this$$refs$elSelect$ = _this$$refs$elSelect.$refs) === null || _this$$refs$elSelect$ === void 0 ? void 0 : (_this$$refs$elSelect$2 = _this$$refs$elSelect$.input) === null || _this$$refs$elSelect$2 === void 0 ? void 0 : (_this$$refs$elSelect$3 = _this$$refs$elSelect$2.$refs) === null || _this$$refs$elSelect$3 === void 0 ? void 0 : _this$$refs$elSelect$3.input;
+          if (selectInput) {
+            selectInput.value = '';
+          }
+        });
+      } else {
+        // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
         this.hasFocused = false;
       }
     },
@@ -75515,8 +75594,14 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
         this.updateVisibleOptions();
       }, 200);
     },
+    // 处理批量按钮点击 (为了在还未加载过数据的情况下触发加载数据)
+    handleBatchButtonClick(e) {
+      if (this.optionsList.length === 0 && !this.loadOptions) {
+        this.$emit('batch-selector-focus', e);
+      }
+    },
     // 处理批量输入
-    handleBatchInput() {
+    async handleBatchInput() {
       if (!this.batchInputContent.trim()) {
         this.popoverVisible = false;
         return;
@@ -75529,6 +75614,17 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
         return;
       }
 
+      // 如果optionsList为空且提供了loadOptions，先加载数据
+      if (this.optionsList.length === 0 && this.loadOptions) {
+        try {
+          await this.fetchOptions();
+        } catch (error) {
+          console.error('批量查询时加载选项失败:', error);
+          this.popoverVisible = false;
+          return;
+        }
+      }
+
       // 根据输入类型匹配数据
       let matchedValues = [];
       let matchedItems = [];
@@ -75631,8 +75727,8 @@ var BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns = [];
 ;
 var BatchQuerySelector_component = normalizeComponent(
   batch_query_selector_BatchQuerySelectorvue_type_script_lang_js,
-  BatchQuerySelectorvue_type_template_id_39d784a5_render,
-  BatchQuerySelectorvue_type_template_id_39d784a5_staticRenderFns,
+  BatchQuerySelectorvue_type_template_id_ae023dca_render,
+  BatchQuerySelectorvue_type_template_id_ae023dca_staticRenderFns,
   false,
   null,
   null,