@weitutech/by-components 1.1.81 → 1.1.83

package/lib/by-components.common.js

@@ -61092,6 +61092,38 @@ const deepClone = target => {
   // 返回最终结果
   return result;
 };
+
+/**
+    * 比较两个值是否相等，支持字符串和数字类型的自动转换
+    * @param {*} value1 第一个值
+    * @param {*} value2 第二个值
+    * @returns {boolean} 是否相等
+    */
+const isValueEqual = (value1, value2) => {
+  // 如果两个值严格相等，直接返回 true
+  if (value1 === value2) {
+    return true;
+  }
+
+  // 处理 0 的特殊情况
+  if (value1 === 0 && value2 === 0) {
+    return true;
+  }
+
+  // 尝试数字转换比较
+  const num1 = Number(value1);
+  const num2 = Number(value2);
+
+  // 如果转换后都是有效数字且相等
+  if (!isNaN(num1) && !isNaN(num2) && num1 === num2) {
+    return true;
+  }
+
+  // 尝试字符串转换比较
+  const str1 = String(value1);
+  const str2 = String(value2);
+  return str1 === str2;
+};
 ;// ./src/utils/tableUtils.js
 
 
@@ -63066,8 +63098,8 @@ var custom_date_picker_component = normalizeComponent(
 )
 
 /* harmony default export */ var custom_date_picker = (custom_date_picker_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/common-selector/ByCommonSelector.vue?vue&type=template&id=2c9d1694
-var ByCommonSelectorvue_type_template_id_2c9d1694_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/common-selector/ByCommonSelector.vue?vue&type=template&id=36584f2f
+var ByCommonSelectorvue_type_template_id_36584f2f_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -63113,7 +63145,8 @@ var ByCommonSelectorvue_type_template_id_2c9d1694_render = function render() {
       "collapse-tags": _vm.multiple && _vm.enhancedCollapseTags,
       "remote-method": _vm.getResult,
       "loading": _vm.loading,
-      "placeholder": _vm.placeholder
+      "placeholder": _vm.placeholder,
+      "disabled": _vm.enhancedDisabled
     },
     on: {
       "change": _vm.selected,
@@ -63509,7 +63542,7 @@ var ByCommonSelectorvue_type_template_id_2c9d1694_render = function render() {
     }
   }, [_vm._v(" 加载中... ")]) : _vm._e()], 2);
 };
-var ByCommonSelectorvue_type_template_id_2c9d1694_staticRenderFns = [];
+var ByCommonSelectorvue_type_template_id_36584f2f_staticRenderFns = [];
 
 ;// ./node_modules/pinyin-pro/dist/index.mjs
 
@@ -73790,8 +73823,10 @@ function segment(word, options) {
 
 
 
+
  //拼音库，用于搜索栏生成A~Z字母
 
+
 // 全部选项可能的名称
 const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'all'];
 /* harmony default export */ var ByCommonSelectorvue_type_script_lang_js = ({
@@ -73993,7 +74028,7 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
       default: 'status'
     },
     /**
-     * 增强下拉选择器中，选项的description字段是否
+     * 增强下拉选择器中，选项的description字段是否显示
      * true: 显示 标题 + 描述 （如： 何其灿 13063048088）
      * false: 只显示 标题
      */
@@ -74053,7 +74088,9 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
       // enhancedSelect 相关数据
       allData: new Map(),
       // 缓存所有数据
-      enhancedSelectOpened: false // 标记 enhancedSelect 是否已经打开过
+      enhancedSelectOpened: false,
+      // 标记 enhancedSelect 是否已经打开过
+      enhancedDisabled: false
     };
   },
   computed: {
@@ -74076,13 +74113,13 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
         if (this.multiple) {
           // 多选情况：value 是数组
           if (Array.isArray(this.value) && this.value.length > 0) {
-            const defaultItems = this.enhancedAllOptions.filter(option => this.value.includes(option.id) || this.value.includes(Number(option.id)) || this.value.includes(0) && option.id === 0);
+            const defaultItems = this.enhancedAllOptions.filter(option => this.value.some(val => isValueEqual(val, option.id)));
             return defaultItems;
           }
         } else {
           // 单选情况：value 是单个值
           if (this.value !== '') {
-            const defaultItem = this.enhancedAllOptions.find(option => option.id === this.value || option.id === Number(this.value) || this.value === 0 && option.id === 0);
+            const defaultItem = this.enhancedAllOptions.find(option => isValueEqual(this.value, option.id));
             return defaultItem ? [defaultItem] : [];
           }
         }
@@ -74190,6 +74227,25 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
       if (val !== this.localSuffixInputValue) {
         this.localSuffixInputValue = val;
       }
+    },
+    enhancedAllOptions: {
+      handler(newOptions) {
+        if (this.type === 'enhancedSelect') {
+          this.enhancedDisabled = true;
+          // 验证 enhancedAllOptions 是否已加载
+          if (!newOptions || newOptions.length === 0) {
+            // console.warn('[ByCommonSelector] enhancedSelect 类型需要提供 enhancedAllOptions 属性用于默认值回显')
+            return;
+          }
+
+          // 当 enhancedAllOptions 加载完成后，重新处理默认值
+          this.$nextTick(() => {
+            this.handleEnhancedSelectDefaultValue();
+            this.enhancedDisabled = false;
+          });
+        }
+      },
+      immediate: true
     }
   },
   created() {
@@ -74202,11 +74258,6 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
     }
   },
   mounted() {
-    // 验证 enhancedSelect 类型是否提供了 enhancedAllOptions
-    if (this.type === 'enhancedSelect' && (!this.enhancedAllOptions || this.enhancedAllOptions.length === 0)) {
-      console.error('[ByCommonSelector] enhancedSelect 类型需要提供 enhancedAllOptions 属性用于默认值回显');
-    }
-
     // 在组件挂载后，检查是否需要展开按钮
     this.$nextTick(() => {
       this.checkNeedExpand();
@@ -74370,10 +74421,6 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
           this.$nextTick(() => {
             this.checkNeedExpand();
             this.scheduleExpandCheck();
-            // 异步加载数据后，重新处理默认值（仅 enhancedSelect）
-            if (this.type === 'enhancedSelect') {
-              this.handleEnhancedSelectDefaultValue();
-            }
           });
         } else {
           //   console.error('loadOptions函数返回值必须是数组')
@@ -74555,14 +74602,14 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
           // 修复：优先从 enhancedAllOptions 中查找，确保多选时能正确获取对象数组
           if (Array.isArray(value) && value.length > 0) {
             // 从 enhancedAllOptions 中查找所有匹配的选项
-            const items = this.enhancedAllOptions.filter(option => value.includes(option.id) || value.includes(Number(option.id)) || value.includes(0) && option.id === 0);
+            const items = this.enhancedAllOptions.filter(option => value.some(val => isValueEqual(val, option.id)));
             obj = items;
           }
         } else {
           obj = {};
           if (value !== undefined && value !== null && value !== '') {
             // 优先从 enhancedAllOptions 中查找
-            const item = this.enhancedAllOptions.find(option => option.id === value || option.id === Number(value) || value === 0 && option.id === 0);
+            const item = this.enhancedAllOptions.find(option => isValueEqual(value, option.id));
             if (item) {
               obj[this.enhancedDescriptionKey] = item[this.enhancedDescriptionKey];
               obj[this.enhancedTitleKey] = item[this.enhancedTitleKey];
@@ -74570,7 +74617,7 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
             } else {
               // 如果从 enhancedAllOptions 中找不到，再从 dataList 中查找
               this.dataList.forEach(item => {
-                if (value === item.id || value === 0 && item.id === 0) {
+                if (isValueEqual(value, item.id)) {
                   obj[this.enhancedDescriptionKey] = item[this.enhancedDescriptionKey];
                   obj[this.enhancedTitleKey] = item[this.enhancedTitleKey];
                   obj.id = item.id;
@@ -74660,7 +74707,6 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
       }
     },
     emitChange(value) {
-      //   console.log('001:触发了-emitChange ==:', value)
       this.$emit('input', value);
     },
     handleSuffixInputChange(value) {
@@ -74669,37 +74715,27 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
       this.$emit('update:suffixInputValue', value);
     },
     // ********************  enhancedSelect 相关方法  ********************
+
     getResult(q) {
-      // 设置加载状态
       this.loading = true;
-
-      // 触发外部搜索事件，让外部控制数据
       this.$emit('search', q);
-
-      // 返回 Promise 以满足 remote 的要求
       return Promise.resolve();
     },
+    // 处理 enhancedSelect 类型的默认值
     handleEnhancedSelectDefaultValue() {
-      // console.log('001:this.value ==:', this.value)
-      // console.log('002:this.enhancedAllOptions ==:', this.enhancedAllOptions)
-      // 针对 enhancedSelect 类型处理默认值
-      if (this.value !== undefined && this.value !== null && this.value !== '') {
+      if (this.value !== undefined && this.value !== null && this.value !== '' && this.enhancedAllOptions && this.enhancedAllOptions.length > 0) {
         // 确保默认值能正确显示
         this.selectedValue = this.value;
         if (this.multiple) {
-          // 多选情况：value 是数组
           if (Array.isArray(this.value) && this.value.length > 0) {
-            // 在 enhancedAllOptions 数组中查找所有对应的选项
-            const items = this.enhancedAllOptions.filter(option => this.value.includes(option.id) || this.value.includes(Number(option.id)) || this.value.includes(0) && option.id === 0);
+            const items = this.enhancedAllOptions.filter(option => this.value.some(val => isValueEqual(val, option.id)));
             if (items.length > 0) {
               this.$emit('input', this.value);
               this.$emit('change', items);
             }
           }
         } else {
-          // 单选情况：value 是单个值
-          // 在 enhancedAllOptions 数组中查找对应的选项
-          const item = this.enhancedAllOptions.find(option => option.id === this.value || option.id === Number(this.value) || this.value === 0 && option.id === 0);
+          const item = this.enhancedAllOptions.find(option => isValueEqual(this.value, option.id));
           if (item) {
             let obj = {};
             obj[this.enhancedDescriptionKey] = item[this.enhancedDescriptionKey];
@@ -74736,8 +74772,8 @@ const allOptionsNames = ['全部', '全选', '所有', '全部选项', 'All', 'a
 ;
 var ByCommonSelector_component = normalizeComponent(
   common_selector_ByCommonSelectorvue_type_script_lang_js,
-  ByCommonSelectorvue_type_template_id_2c9d1694_render,
-  ByCommonSelectorvue_type_template_id_2c9d1694_staticRenderFns,
+  ByCommonSelectorvue_type_template_id_36584f2f_render,
+  ByCommonSelectorvue_type_template_id_36584f2f_staticRenderFns,
   false,
   null,
   null,