@weitutech/by-components 1.1.70 → 1.1.71

package/lib/by-components.common.js

@@ -74200,8 +74200,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":"7d802f52-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=14840bc6
-var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-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=8d409226
+var BatchQuerySelectorvue_type_template_id_8d409226_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -74221,7 +74221,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
       "collapse-tags": _vm.collapseTags,
       "filterable": "",
       "loading": _vm.loading,
-      "filter-method": _vm.filterOptions
+      "filter-method": _vm.filterOptions,
+      "value-key": _vm.valueKey
     },
     on: {
       "change": _vm.handleChange,
@@ -74354,7 +74355,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
     }
   })])], 1)], 1)]);
 };
-var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
+var BatchQuerySelectorvue_type_template_id_8d409226_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
 
@@ -74368,6 +74369,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
 
 
 
+
 /* harmony default export */ var BatchQuerySelectorvue_type_script_lang_js = ({
   name: 'BatchQuerySelector',
   props: {
@@ -74482,7 +74484,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
       debounceTimer: null,
       dropdownVisible: false,
       currentPage: 1,
-      loadingMore: false
+      loadingMore: false,
+      hasFocused: false // 添加一个标记，用于跟踪是否已经触发过focus事件
     };
   },
   computed: {
@@ -74568,6 +74571,14 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
     },
     // 处理获取焦点
     handleFocus(e) {
+      // 如果已经触发过focus事件，且下拉框是打开的，则不再触发
+      if (this.hasFocused && this.dropdownVisible) {
+        return;
+      }
+
+      // 标记已经触发过focus事件
+      this.hasFocused = true;
+
       // 如果配置了自动加载且提供了loadOptions方法，每次获取焦点时都加载数据
       if (this.autoLoad && this.loadOptions) {
         this.fetchOptions();
@@ -74577,6 +74588,11 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
     // 处理下拉框显示/隐藏
     handleDropdownVisibleChange(visible) {
       this.dropdownVisible = visible;
+
+      // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
+      if (!visible) {
+        this.hasFocused = false;
+      }
     },
     // 设置滚动监听
     setupScrollListener() {
@@ -74727,7 +74743,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
         // 默认映射逻辑
         const searchKey = this.inputType === 'id' ? this.valueKey : this.labelKey;
 
-        // 先获取匹配的完整选项对象
+        // 先获取匹配的完整选项对象 - 从完整的optionsList中查找，而不仅仅是visibleOptions
         matchedItems = this.optionsList.filter(item => {
           // 排除禁用的选项
           if (this.isOptionDisabled(item)) {
@@ -74765,6 +74781,28 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
         }
       }
 
+      // TODO: ***确保匹配的选项在下拉框中可见
+      if (matchedValues.length > 0) {
+        // 确保所有匹配项都被添加到visibleOptions中，以便正确显示名称
+        const matchedItemsMap = {};
+        matchedItems.forEach(item => {
+          matchedItemsMap[item[this.valueKey]] = item;
+        });
+
+        // 检查是否所有匹配项都在visibleOptions中
+        const missingItems = matchedValues.filter(value => !this.visibleOptions.some(option => option[this.valueKey] === value));
+
+        // 如果有缺失的项，将它们添加到visibleOptions中
+        if (missingItems.length > 0) {
+          const additionalOptions = missingItems.map(value => matchedItemsMap[value]).filter(Boolean);
+
+          // 将这些项添加到visibleOptions的开头，确保它们可见
+          if (additionalOptions.length > 0) {
+            this.visibleOptions = [...additionalOptions, ...this.visibleOptions];
+          }
+        }
+      }
+
       // 关闭弹出框
       this.popoverVisible = false;
       this.batchInputContent = '';
@@ -74795,8 +74833,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
 ;
 var BatchQuerySelector_component = normalizeComponent(
   batch_query_selector_BatchQuerySelectorvue_type_script_lang_js,
-  BatchQuerySelectorvue_type_template_id_14840bc6_render,
-  BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns,
+  BatchQuerySelectorvue_type_template_id_8d409226_render,
+  BatchQuerySelectorvue_type_template_id_8d409226_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -74210,8 +74210,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":"7d802f52-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=14840bc6
-var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-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=8d409226
+var BatchQuerySelectorvue_type_template_id_8d409226_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -74231,7 +74231,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
       "collapse-tags": _vm.collapseTags,
       "filterable": "",
       "loading": _vm.loading,
-      "filter-method": _vm.filterOptions
+      "filter-method": _vm.filterOptions,
+      "value-key": _vm.valueKey
     },
     on: {
       "change": _vm.handleChange,
@@ -74364,7 +74365,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_render = function render() {
     }
   })])], 1)], 1)]);
 };
-var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
+var BatchQuerySelectorvue_type_template_id_8d409226_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
 
@@ -74378,6 +74379,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
 
 
 
+
 /* harmony default export */ var BatchQuerySelectorvue_type_script_lang_js = ({
   name: 'BatchQuerySelector',
   props: {
@@ -74492,7 +74494,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
       debounceTimer: null,
       dropdownVisible: false,
       currentPage: 1,
-      loadingMore: false
+      loadingMore: false,
+      hasFocused: false // 添加一个标记，用于跟踪是否已经触发过focus事件
     };
   },
   computed: {
@@ -74578,6 +74581,14 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
     },
     // 处理获取焦点
     handleFocus(e) {
+      // 如果已经触发过focus事件，且下拉框是打开的，则不再触发
+      if (this.hasFocused && this.dropdownVisible) {
+        return;
+      }
+
+      // 标记已经触发过focus事件
+      this.hasFocused = true;
+
       // 如果配置了自动加载且提供了loadOptions方法，每次获取焦点时都加载数据
       if (this.autoLoad && this.loadOptions) {
         this.fetchOptions();
@@ -74587,6 +74598,11 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
     // 处理下拉框显示/隐藏
     handleDropdownVisibleChange(visible) {
       this.dropdownVisible = visible;
+
+      // 如果下拉框关闭，重置hasFocused标记，以便下次打开时能够正确触发focus事件
+      if (!visible) {
+        this.hasFocused = false;
+      }
     },
     // 设置滚动监听
     setupScrollListener() {
@@ -74737,7 +74753,7 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
         // 默认映射逻辑
         const searchKey = this.inputType === 'id' ? this.valueKey : this.labelKey;
 
-        // 先获取匹配的完整选项对象
+        // 先获取匹配的完整选项对象 - 从完整的optionsList中查找，而不仅仅是visibleOptions
         matchedItems = this.optionsList.filter(item => {
           // 排除禁用的选项
           if (this.isOptionDisabled(item)) {
@@ -74775,6 +74791,28 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
         }
       }
 
+      // TODO: ***确保匹配的选项在下拉框中可见
+      if (matchedValues.length > 0) {
+        // 确保所有匹配项都被添加到visibleOptions中，以便正确显示名称
+        const matchedItemsMap = {};
+        matchedItems.forEach(item => {
+          matchedItemsMap[item[this.valueKey]] = item;
+        });
+
+        // 检查是否所有匹配项都在visibleOptions中
+        const missingItems = matchedValues.filter(value => !this.visibleOptions.some(option => option[this.valueKey] === value));
+
+        // 如果有缺失的项，将它们添加到visibleOptions中
+        if (missingItems.length > 0) {
+          const additionalOptions = missingItems.map(value => matchedItemsMap[value]).filter(Boolean);
+
+          // 将这些项添加到visibleOptions的开头，确保它们可见
+          if (additionalOptions.length > 0) {
+            this.visibleOptions = [...additionalOptions, ...this.visibleOptions];
+          }
+        }
+      }
+
       // 关闭弹出框
       this.popoverVisible = false;
       this.batchInputContent = '';
@@ -74805,8 +74843,8 @@ var BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns = [];
 ;
 var BatchQuerySelector_component = normalizeComponent(
   batch_query_selector_BatchQuerySelectorvue_type_script_lang_js,
-  BatchQuerySelectorvue_type_template_id_14840bc6_render,
-  BatchQuerySelectorvue_type_template_id_14840bc6_staticRenderFns,
+  BatchQuerySelectorvue_type_template_id_8d409226_render,
+  BatchQuerySelectorvue_type_template_id_8d409226_staticRenderFns,
   false,
   null,
   null,