bkui-vue 0.0.2-beta.106 → 0.0.2-beta.107

package/lib/select/index.js

@@ -797,9 +797,29 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
     var selectedStyle = (0,external_vue_namespaceObject.computed)(function () {
       return select === null || select === void 0 ? void 0 : select.selectedStyle;
     });
+    var isShowAll = (0,external_vue_namespaceObject.computed)(function () {
+      return select === null || select === void 0 ? void 0 : select.isShowAll;
+    });
+    var allOptionId = (0,external_vue_namespaceObject.computed)(function () {
+      return select === null || select === void 0 ? void 0 : select.allOptionId;
+    });
+    var isDisabled = (0,external_vue_namespaceObject.computed)(function () {
+      var _select$selected2;
+      if (!isShowAll.value || optionID.value === allOptionId.value) return disabled.value;
+      // 全部选项需要禁用掉其他选项
+      var exitAllOptionId = select === null || select === void 0 || (_select$selected2 = select.selected) === null || _select$selected2 === void 0 ? void 0 : _select$selected2.some(function (item) {
+        return (0,isEqual_namespaceObject["default"])(item.value, allOptionId.value);
+      });
+      return disabled.value || isShowAll.value && exitAllOptionId;
+    });
     var handleOptionClick = function handleOptionClick() {
-      if (disabled.value) return;
-      select === null || select === void 0 ? void 0 : select.handleOptionSelected(proxy);
+      if (isDisabled.value) return;
+      if (isShowAll.value && allOptionId.value === optionID.value) {
+        // 全部选项
+        select === null || select === void 0 ? void 0 : select.handleToggleAll();
+      } else {
+        select === null || select === void 0 ? void 0 : select.handleOptionSelected(proxy);
+      }
     };
     var handleMouseEnter = function handleMouseEnter() {
       select.activeOptionValue = optionID.value;
@@ -822,6 +842,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
       selectedStyle: selectedStyle,
       optionName: optionName,
       optionID: optionID,
+      isDisabled: isDisabled,
       handleOptionClick: handleOptionClick,
       handleMouseEnter: handleMouseEnter,
       resolveClassName: resolveClassName
@@ -831,7 +852,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
     var _this$$slots$default, _this$$slots$default2, _this$$slots;
     var selectItemClass = (0,external_shared_namespaceObject.classes)(_defineProperty({
       'is-selected': this.selected,
-      'is-disabled': this.disabled,
+      'is-disabled': this.isDisabled,
       'is-multiple': this.multiple,
       'is-hover': this.isHover,
       'is-checkbox': this.selectedStyle === external_shared_namespaceObject.SelectedTypeEnum.CHECKBOX
@@ -841,7 +862,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
       "onClick": this.handleOptionClick,
       "onMouseenter": this.handleMouseEnter
     }, [this.showSelectedIcon && this.selectedStyle === external_shared_namespaceObject.SelectedTypeEnum.CHECKBOX && (0,external_vue_namespaceObject.createVNode)(external_checkbox_namespaceObject["default"], {
-      "disabled": this.disabled,
+      "disabled": this.isDisabled,
       "class": this.resolveClassName('select-checkbox'),
       "modelValue": this.selected
     }, null), (_this$$slots$default = (_this$$slots$default2 = (_this$$slots = this.$slots)["default"]) === null || _this$$slots$default2 === void 0 ? void 0 : _this$$slots$default2.call(_this$$slots)) !== null && _this$$slots$default !== void 0 ? _this$$slots$default : (0,external_vue_namespaceObject.createVNode)("span", {
@@ -1300,6 +1321,7 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
 
 
 
+
 /* harmony default export */ const src_select = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'Select',
   directives: {
@@ -1315,6 +1337,8 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
     filterable: external_shared_namespaceObject.PropTypes.bool.def(false),
     remoteMethod: external_shared_namespaceObject.PropTypes.func,
     scrollHeight: external_shared_namespaceObject.PropTypes.number.def(200),
+    showAll: external_shared_namespaceObject.PropTypes.bool.def(false),
+    allOptionId: external_shared_namespaceObject.PropTypes.oneOfType([external_shared_namespaceObject.PropTypes.number, external_shared_namespaceObject.PropTypes.string]),
     showSelectAll: external_shared_namespaceObject.PropTypes.bool.def(false),
     popoverMinWidth: external_shared_namespaceObject.PropTypes.number.def(0),
     showOnInit: external_shared_namespaceObject.PropTypes.bool.def(false),
@@ -1372,6 +1396,8 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       inputSearch = _toRefs.inputSearch,
       enableVirtualRender = _toRefs.enableVirtualRender,
       showSelectAll = _toRefs.showSelectAll,
+      showAll = _toRefs.showAll,
+      allOptionId = _toRefs.allOptionId,
       scrollHeight = _toRefs.scrollHeight,
       list = _toRefs.list,
       displayKey = _toRefs.displayKey,
@@ -1531,6 +1557,9 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
     var isShowSelectAll = (0,external_vue_namespaceObject.computed)(function () {
       return multiple.value && showSelectAll.value && (!searchKey.value || !filterable.value);
     });
+    var isShowAll = (0,external_vue_namespaceObject.computed)(function () {
+      return multiple.value && showAll.value;
+    });
     // 虚拟滚动高度 12 上下边距，32 显示全选时的高度
     var virtualHeight = (0,external_vue_namespaceObject.computed)(function () {
       return scrollHeight.value - 12 - (isShowSelectAll.value ? 32 : 0);
@@ -1759,11 +1788,11 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       emit('clear', multiple.value ? [] : '');
       hidePopover();
     };
-    // 全选/取消全选
     var handleSelectedAllOptionMouseEnter = function handleSelectedAllOptionMouseEnter() {
       activeOptionValue.value = '';
     };
-    var handleToggleAll = function handleToggleAll() {
+    // 全选/取消全选
+    var handleToggleSelectAll = function handleToggleSelectAll() {
       if (isAllSelected.value) {
         selected.value = [];
       } else {
@@ -1788,6 +1817,25 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       }));
       focusInput();
     };
+    // 全部/取消全部
+    var handleToggleAll = function handleToggleAll() {
+      if (!isShowAll.value) return;
+      var index = selected.value.findIndex(function (item) {
+        return item.value === allOptionId.value;
+      });
+      if (index > -1) {
+        selected.value = [];
+      } else {
+        selected.value = [{
+          value: allOptionId.value,
+          label: t.value.all
+        }];
+      }
+      emitChange(selected.value.map(function (item) {
+        return item.value;
+      }));
+      focusInput();
+    };
     // 滚动事件
     var handleScroll = function handleScroll(e) {
       var _e$target = e.target,
@@ -1928,13 +1976,16 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       selected: selected,
       activeOptionValue: activeOptionValue,
       showSelectedIcon: showSelectedIcon,
+      isShowAll: isShowAll,
+      allOptionId: allOptionId,
       selectedStyle: selectedStyle,
       register: register,
       unregister: unregister,
       registerGroup: registerGroup,
       unregisterGroup: unregisterGroup,
       handleOptionSelected: handleOptionSelected,
-      handleGetLabelByValue: handleGetLabelByValue
+      handleGetLabelByValue: handleGetLabelByValue,
+      handleToggleAll: handleToggleAll
     }));
     (0,external_vue_namespaceObject.onMounted)(function () {
       handleSetSelectedData();
@@ -1944,6 +1995,7 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       });
     });
     return {
+      t: t,
       selected: selected,
       isInput: isInput,
       options: options,
@@ -1967,11 +2019,13 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       curContentText: curContentText,
       isGroup: isGroup,
       searchKey: searchKey,
+      isShowAll: isShowAll,
       isShowSelectAll: isShowSelectAll,
       virtualHeight: virtualHeight,
       virtualList: virtualList,
       isCollapseTags: isCollapseTags,
       popoverConfig: popoverConfig,
+      isAllSelected: isAllSelected,
       focusInput: focusInput,
       setHover: setHover,
       cancelHover: cancelHover,
@@ -1981,7 +2035,7 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
       handleClear: handleClear,
       hidePopover: hidePopover,
       showPopover: showPopover,
-      handleToggleAll: handleToggleAll,
+      handleToggleSelectAll: handleToggleSelectAll,
       handleOptionSelected: handleOptionSelected,
       handleClickOutside: handleClickOutside,
       handleScroll: handleScroll,
@@ -2034,6 +2088,28 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
         return (_this$$slots$prefix = (_this$$slots = _this.$slots).prefix) === null || _this$$slots$prefix === void 0 ? void 0 : _this$$slots$prefix.call(_this$$slots);
       } : undefined;
     };
+    // 全选
+    var renderSelectAll = function renderSelectAll() {
+      if (!_this.isShowSelectAll) return;
+      return (0,external_vue_namespaceObject.createVNode)("li", {
+        "class": _this.resolveClassName('select-option'),
+        "onMouseenter": _this.handleSelectedAllOptionMouseEnter,
+        "onClick": _this.handleToggleSelectAll
+      }, [_this.selectedStyle === 'checkbox' && (0,external_vue_namespaceObject.createVNode)(external_checkbox_namespaceObject["default"], {
+        "class": _this.resolveClassName('select-checkbox'),
+        "modelValue": _this.isAllSelected,
+        "indeterminate": !_this.isAllSelected && !!_this.selected.length
+      }, null), _this.t.selectAll]);
+    };
+    // 全部
+    var renderAll = function renderAll() {
+      // 全选和全部是互斥的，只能选一个
+      if (_this.isShowSelectAll || !_this.isShowAll) return;
+      return (0,external_vue_namespaceObject.createVNode)(src_option, {
+        "id": _this.allOptionId,
+        "name": _this.t.all
+      }, null);
+    };
     var renderTriggerInput = function renderTriggerInput() {
       if (_this.multipleMode === 'tag') {
         return (0,external_vue_namespaceObject.createVNode)(selectTagInput, {
@@ -2140,11 +2216,7 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
         "onScroll": _this.handleScroll
       }, [(0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("ul", {
         "class": _this.resolveClassName('select-options')
-      }, [_this.isShowSelectAll && (0,external_vue_namespaceObject.createVNode)("li", {
-        "class": _this.resolveClassName('select-option'),
-        "onMouseenter": _this.handleSelectedAllOptionMouseEnter,
-        "onClick": _this.handleToggleAll
-      }, [_this.localSelectAllText]), _this.enableVirtualRender ? (0,external_vue_namespaceObject.createVNode)(external_virtual_render_namespaceObject["default"], {
+      }, [renderSelectAll(), renderAll(), _this.enableVirtualRender ? (0,external_vue_namespaceObject.createVNode)(external_virtual_render_namespaceObject["default"], {
         "list": _this.virtualList,
         "height": _this.virtualHeight,
         "lineHeight": 32,

package/lib/select/option.d.ts

@@ -23,6 +23,7 @@ declare const _default: import("vue").DefineComponent<{
     selectedStyle: import("vue").ComputedRef<SelectedTypeEnum>;
     optionName: import("vue").ComputedRef<string | number>;
     optionID: import("vue").ComputedRef<unknown>;
+    isDisabled: import("vue").ComputedRef<boolean>;
     handleOptionClick: () => void;
     handleMouseEnter: () => void;
     resolveClassName: (cls: string) => string;

package/lib/select/select.d.ts

@@ -38,6 +38,12 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
+    showAll: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
+    allOptionId: import("vue-types").VueTypeDef<string | number>;
     showSelectAll: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -291,6 +297,15 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
     };
 }, {
+    t: import("vue").ComputedRef<{
+        noData: string;
+        noMatchedData: string;
+        loading: string;
+        pleaseSelect: string;
+        enterKeywords: string;
+        all: string;
+        selectAll: string;
+    }>;
     selected: import("vue").Ref<{
         value: string;
         label: string | number;
@@ -523,6 +538,7 @@ declare const _default: import("vue").DefineComponent<{
     curContentText: import("vue").ComputedRef<string>;
     isGroup: import("vue").ComputedRef<boolean>;
     searchKey: import("vue").Ref<string>;
+    isShowAll: import("vue").ComputedRef<boolean>;
     isShowSelectAll: import("vue").ComputedRef<boolean>;
     virtualHeight: import("vue").ComputedRef<number>;
     virtualList: import("vue").ComputedRef<any[]>;
@@ -655,6 +671,7 @@ declare const _default: import("vue").DefineComponent<{
             default: boolean;
         };
     }>>>>;
+    isAllSelected: import("vue").ComputedRef<boolean>;
     focusInput: () => void;
     setHover: () => void;
     cancelHover: () => void;
@@ -664,7 +681,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClear: (e: Event) => void;
     hidePopover: () => void;
     showPopover: () => void;
-    handleToggleAll: () => void;
+    handleToggleSelectAll: () => void;
     handleOptionSelected: (option: OptionInstanceType) => void;
     handleClickOutside: ({ event }: {
         event: any;
@@ -718,6 +735,12 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
+    showAll: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
+    allOptionId: import("vue-types").VueTypeDef<string | number>;
     showSelectAll: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -1005,6 +1028,7 @@ declare const _default: import("vue").DefineComponent<{
     displayKey: string;
     idKey: string;
     remoteMethod: (...args: any[]) => any;
+    showAll: boolean;
     showSelectAll: boolean;
     multipleMode: string;
     autoHeight: boolean;

package/lib/select/type.d.ts

@@ -15,12 +15,15 @@ export interface ISelectContext {
     activeOptionValue: any;
     showSelectedIcon: boolean;
     selectedStyle: SelectedTypeEnum;
+    isShowAll: Boolean;
+    allOptionId: any;
     register(key: any, option: OptionInstanceType): any;
     unregister(key: any): any;
     registerGroup(key: any, option: GroupInstanceType): any;
     unregisterGroup(key: any): any;
     handleOptionSelected(option: OptionInstanceType): void;
     handleGetLabelByValue(value: any): string | number;
+    handleToggleAll(): void;
 }
 export interface IOptionGroupContext {
     disabled: boolean;

package/package.json

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