bkui-vue 0.0.2-beta.89 → 0.0.2-beta.90

package/lib/select/index.d.ts

@@ -42,7 +42,6 @@ declare const BkSelect: {
             allowEmptyValues?: unknown[];
             autoFocus?: boolean;
             keepSearchValue?: boolean;
-            filterOption?: boolean | Function;
             class?: unknown;
             style?: unknown;
             onFocus?: (...args: any[]) => any;
@@ -99,6 +98,7 @@ declare const BkSelect: {
             "onScroll-end"?: (...args: any[]) => any;
             "onTag-remove"?: (...args: any[]) => any;
             onDeselect?: (...args: any[]) => any;
+            readonly filterOption?: Function;
         };
         $attrs: {
             [x: string]: unknown;
@@ -401,8 +401,7 @@ declare const BkSelect: {
                 default: "checkbox" | "check";
             };
             filterOption: {
-                type: (BooleanConstructor | FunctionConstructor)[];
-                default: boolean;
+                type: FunctionConstructor;
             };
         }>> & {
             onFocus?: (...args: any[]) => any;
@@ -843,7 +842,6 @@ declare const BkSelect: {
             allowEmptyValues: unknown[];
             autoFocus: boolean;
             keepSearchValue: boolean;
-            filterOption: boolean | Function;
         }, {}, string, {}> & {
             beforeCreate?: (() => void) | (() => void)[];
             created?: (() => void) | (() => void)[];
@@ -1152,8 +1150,7 @@ declare const BkSelect: {
             default: "checkbox" | "check";
         };
         filterOption: {
-            type: (BooleanConstructor | FunctionConstructor)[];
-            default: boolean;
+            type: FunctionConstructor;
         };
     }>> & {
         onFocus?: (...args: any[]) => any;
@@ -1848,8 +1845,7 @@ declare const BkSelect: {
         default: "checkbox" | "check";
     };
     filterOption: {
-        type: (BooleanConstructor | FunctionConstructor)[];
-        default: boolean;
+        type: FunctionConstructor;
     };
 }>> & {
     onFocus?: (...args: any[]) => any;
@@ -2290,7 +2286,6 @@ declare const BkSelect: {
     allowEmptyValues: unknown[];
     autoFocus: boolean;
     keepSearchValue: boolean;
-    filterOption: boolean | Function;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]> & Readonly<{
     Option: import("vue").DefineComponent<{
         id: {

package/lib/select/index.js

@@ -1346,8 +1346,7 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
     prefix: external_shared_namespaceObject.PropTypes.string,
     selectedStyle: (0,external_shared_namespaceObject.SelectedType)(),
     filterOption: {
-      type: [Boolean, Function],
-      "default": true
+      type: Function
     } // 配置当前options的过滤规则
   },
 
@@ -1450,6 +1449,9 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
         return pre;
       }, {});
     });
+    (0,external_vue_namespaceObject.watch)([optionsMap, list], function () {
+      handleSetSelectedData();
+    });
     (0,external_vue_namespaceObject.watch)(modelValue, function () {
       handleSetSelectedData();
       if (props.withValidate) {
@@ -1467,7 +1469,10 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
     var virtualList = (0,external_vue_namespaceObject.computed)(function () {
       return isRemoteSearch.value ? list.value : list.value.filter(function (item) {
         var _toLowerCase;
-        return filterOptionFunc.value(searchKey.value, item) && ((_toLowerCase = toLowerCase(String(item[displayKey.value]))) === null || _toLowerCase === void 0 ? void 0 : _toLowerCase.includes(toLowerCase(searchKey.value)));
+        if (hasFilterOptionFunc.value) {
+          return !!filterOption.value(searchKey.value, item);
+        }
+        return (_toLowerCase = toLowerCase(String(item[displayKey.value]))) === null || _toLowerCase === void 0 ? void 0 : _toLowerCase.includes(toLowerCase(searchKey.value));
       });
     });
     // select组件是否禁用
@@ -1514,11 +1519,9 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       return filterable.value && typeof remoteMethod.value === 'function';
     });
     // options过滤函数
-    var filterOptionFunc = (0,external_vue_namespaceObject.computed)(function () {
-      if (typeof filterOption.value === 'function') return filterOption.value;
-      return function () {
-        return filterOption.value;
-      };
+    var hasFilterOptionFunc = (0,external_vue_namespaceObject.computed)(function () {
+      if (filterOption.value && typeof filterOption.value === 'function') return true;
+      return false;
     });
     // 是否显示select下拉内容
     var isShowSelectContent = (0,external_vue_namespaceObject.computed)(function () {
@@ -1633,8 +1636,12 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
         });
       } else {
         options.value.forEach(function (option) {
-          var _toLowerCase2;
-          option.visible = filterOptionFunc.value(value, select_objectSpread(select_objectSpread({}, option.$attrs), option.$props)) && ((_toLowerCase2 = toLowerCase(String(option.optionName))) === null || _toLowerCase2 === void 0 ? void 0 : _toLowerCase2.includes(toLowerCase(value)));
+          if (hasFilterOptionFunc.value) {
+            option.visible = !!filterOption.value(value, select_objectSpread(select_objectSpread({}, option.$props), option.$attrs));
+          } else {
+            var _toLowerCase2;
+            option.visible = (_toLowerCase2 = toLowerCase(String(option.optionName))) === null || _toLowerCase2 === void 0 ? void 0 : _toLowerCase2.includes(toLowerCase(value));
+          }
         });
       }
     };

package/lib/select/select.d.ts

@@ -288,8 +288,7 @@ declare const _default: import("vue").DefineComponent<{
         default: "checkbox" | "check";
     };
     filterOption: {
-        type: (BooleanConstructor | FunctionConstructor)[];
-        default: boolean;
+        type: FunctionConstructor;
     };
 }, {
     selected: import("vue").Ref<{
@@ -969,8 +968,7 @@ declare const _default: import("vue").DefineComponent<{
         default: "checkbox" | "check";
     };
     filterOption: {
-        type: (BooleanConstructor | FunctionConstructor)[];
-        default: boolean;
+        type: FunctionConstructor;
     };
 }>> & {
     onFocus?: (...args: any[]) => any;
@@ -1021,6 +1019,5 @@ declare const _default: import("vue").DefineComponent<{
     allowEmptyValues: unknown[];
     autoFocus: boolean;
     keepSearchValue: boolean;
-    filterOption: boolean | Function;
 }, {}>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.89",
+  "version": "0.0.2-beta.90",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",