bkui-vue 0.0.2-beta.99 → 0.0.2-modal-refactor.2

package/lib/cascader/index.js

@@ -574,16 +574,20 @@ function usePopover(config, triggerRef) {
   };
 }
 function useRemoteSearch(method, callBack) {
-  var searchKey = useDebouncedRef('');
+  var customOptionName = useDebouncedRef(''); // 自定义创建选项（自定义创建也会触发搜索）
+  var searchValue = useDebouncedRef('');
+  var curSearchValue = computed(function () {
+    return searchValue.value || customOptionName.value;
+  });
   var searchLoading = ref(false);
-  watch(searchKey, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  watch(curSearchValue, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           searchLoading.value = true;
           _context.next = 4;
-          return method(searchKey.value);
+          return method(curSearchValue.value);
         case 4:
           searchLoading.value = false;
           _context.next = 10;
@@ -603,7 +607,9 @@ function useRemoteSearch(method, callBack) {
     }, _callee, null, [[0, 7, 10, 13]]);
   })));
   return {
-    searchKey: searchKey,
+    customOptionName: customOptionName,
+    searchValue: searchValue,
+    curSearchValue: curSearchValue,
     searchLoading: searchLoading
   };
 }
@@ -858,7 +864,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
   emits: ['update:modelValue'],
   setup: function setup(props, _ref) {
     var emit = _ref.emit;
-    var t = (0,external_config_provider_namespaceObject.useLocale)('select');
+    var t = (0,external_config_provider_namespaceObject.useLocale)('cascader');
     var store = props.store;
     var menus = (0,external_vue_namespaceObject.reactive)({
       list: [props.store.getNodes()]
@@ -986,6 +992,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       return events;
     };
     var noDataText = t.value.noData;
+    var emptyText = t.value.emptyText;
     var isNodeInPath = function isNodeInPath(node) {
       var currentLevel = activePath.value[node.level - 1] || {};
       return currentLevel.id === node.id;
@@ -1040,6 +1047,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       searchPanelEvents: searchPanelEvents,
       expandByNodeList: expandByNodeList,
       noDataText: noDataText,
+      emptyText: emptyText,
       resolveClassName: resolveClassName
     };
   },
@@ -1068,7 +1076,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         "style": {
           width: emptyWidth
         }
-      }, [(0,external_vue_namespaceObject.createVNode)("span", null, [(0,external_vue_namespaceObject.createTextVNode)("\u6682\u65E0\u641C\u7D22\u7ED3\u679C")])]);
+      }, [(0,external_vue_namespaceObject.createVNode)("span", null, [_this.noDataText])]);
     };
     return (0,external_vue_namespaceObject.createVNode)("div", {
       "class": this.resolveClassName('cascader-panel-wrapper')
@@ -1560,11 +1568,6 @@ var Store = /*#__PURE__*/function () {
   directives: {
     bkTooltips: external_directives_namespaceObject.bkTooltips
   },
-  components: {
-    CascaderPanel: cascader_panel,
-    BkPopover: external_popover_namespaceObject["default"],
-    Tag: external_tag_namespaceObject["default"]
-  },
   props: {
     modelValue: external_shared_namespaceObject.PropTypes.arrayOf(external_shared_namespaceObject.PropTypes.oneOfType([(0,external_vue_types_namespaceObject.array)(), String, Number])),
     list: external_shared_namespaceObject.PropTypes.array.def([]),
@@ -1604,7 +1607,7 @@ var Store = /*#__PURE__*/function () {
   setup: function setup(props, _ref) {
     var emit = _ref.emit,
       slots = _ref.slots;
-    var t = (0,external_config_provider_namespaceObject.useLocale)('select');
+    var t = (0,external_config_provider_namespaceObject.useLocale)('cascader');
     var separator = props.separator,
       multiple = props.multiple;
     // 用useHover自定义hook来处理鼠标hover状态
@@ -1665,6 +1668,15 @@ var Store = /*#__PURE__*/function () {
     var updateSearchKey = function updateSearchKey() {
       searchKey.value = selectedText.value;
     };
+    var searchBlueHandler = function searchBlueHandler() {
+      // 单选搜索框与选择框互斥，因此一旦失去焦点，认为是没有选择，还原选择框的内容
+      if (!props.multiple) {
+        searchKey.value = selectedText.value;
+        return;
+      }
+      // 多选下，失去焦点则需要删除搜索框
+      searchKey.value = '';
+    };
     // 更新选中
     var updateValue = function updateValue(val) {
       // 更新多选情况下的选中标签
@@ -1729,6 +1741,8 @@ var Store = /*#__PURE__*/function () {
       oldValue !== undefined && emit('change', value); // oldValue = undefined代表初始化，init不派发change事件
       // 如果有过滤搜索，选择后，自动focus到input
       inputRef === null || inputRef === void 0 || (_inputRef$value = inputRef.value) === null || _inputRef$value === void 0 ? void 0 : _inputRef$value.focus();
+      // 选择后过滤条件清除，面板初始化渲染
+      isFiltering.value = false;
     };
     // list的监听函数
     var listChangeHandler = function listChangeHandler() {
@@ -1847,7 +1861,8 @@ var Store = /*#__PURE__*/function () {
       isEdit: isEdit,
       displayText: displayText,
       resolveClassName: resolveClassName,
-      isShowPanel: isShowPanel
+      isShowPanel: isShowPanel,
+      searchBlueHandler: searchBlueHandler
     };
   },
   render: function render() {
@@ -1863,7 +1878,7 @@ var Store = /*#__PURE__*/function () {
       }
       // 否则渲染展开/收起图标
       return (0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.AngleUp, {
-        "class": _this.resolveClassName('icon-angle-up')
+        "class": [_this.resolveClassName('icon-angle-up'), _this.isShowPanel ? 'active' : '']
       }, null);
     };
     // 因为cascader的tag长短不一，在计算时如果overflowIndex为0，会出现直接+n渲染的情况，因此需要对其进行修正
@@ -1925,6 +1940,7 @@ var Store = /*#__PURE__*/function () {
         "trigger": "click",
         "arrow": false,
         "disabled": _this.disabled,
+        "offset": 4,
         "class": _this.resolveClassName('cascader-popover-wrapper'),
         "ref": "popover",
         "onAfterHidden": _this.popoverChangeEmitter,
@@ -1943,6 +1959,7 @@ var Store = /*#__PURE__*/function () {
             }],
             "type": "text",
             "onInput": _this.searchInputHandler,
+            "onBlur": _this.searchBlueHandler,
             "placeholder": _this.calcuPlaceholder,
             "value": _this.searchKey,
             "disabled": _this.disabled,

package/lib/checkbox/checkbox.css

@@ -1,125 +1,3 @@
-:root {
-  --bk-prefix: bk;
-  --popover-max-height: 216px;
-  --primary-color: #3a84ff;
-  --success-color: #2dcb56;
-  --warning-color: #ff9c01;
-  --danger-color: #ea3636;
-  --default-color: #63656e;
-  --gray-color: #979ba5;
-  --light-gray: #c4c6cc;
-  --white-color: white;
-  --whitesmoke-color: #fafbfd;
-  --disable-color: #dcdee5;
-  --font-size-base: 12px;
-  --font-size-medium: 14px;
-  --font-size-large: 16px;
-  --line-height-base: 16px;
-  --line-height-medium: 16px;
-  --line-height-large: 18px;
-  --component-size-small: 26px;
-  --component-size-base: 32px;
-  --component-size-large: 40px;
-  --border-width-base: 1px;
-  --border-style-base: solid;
-  --border-radius-base: 2px;
-  --border-style-color: var(--light-gray);
-  --input-disabled-bg: #fafbfd;
-  --input-disabled-border: var(--disable-color);
-  --input-height-base: var(--component-size-base);
-  --input-color: var(--default-color);
-  --input-bg: white;
-  --input-border-color: var(--light-gray);
-  --input-broder-radius: 3px;
-  --input-shadow-color: #a3c5fd;
-  --input-horizontal-padding: 10px;
-  --input-block-color: #f5f7fa;
-  --input-block-hover-color: #eaebf0;
-  --input-icon-size: var(--font-size-medium);
-  --input-maxlength-color: #979ba5;
-  --button-primary-hover-color: #5594fa;
-  --button-danger-hover-color: #ff5656;
-  --button-success-hover-color: #45e35f;
-  --button-warning-hover-color: #ffb848;
-  --button-default-hover-border-color: #979ba5;
-  --button-primary-active-color: #2c77f4;
-  --button-danger-active-color: #db2626;
-  --button-success-active-color: #1ab943;
-  --button-warning-active-color: #eb9000;
-  --button-selected-bg-color: #e1ecff;
-  --button-disabled-selected-bg-color: #f0f1f5;
-  --radio-font-color: #63656e;
-  --radio-active-color: #3a84ff;
-  --radio-hover-border-color: #979ba5;
-  --radio-disabled-border: #dcdee5;
-  --radio-disabled-font-color: #c4c6cc;
-  --radio-disabled-checked-bg: #a3c5fd;
-  --radio-button-checked-bg: #e1ecff;
-  --radio-button-disabled-checked-bg: #fafbfd;
-  --checkbox-disabled-checked-bg: #a3c5fd;
-  --fixed-navbar-background: #fff;
-  --fixed-navbar-boxshadow-color: rgba(0, 0, 0, 0.1);
-  --switch-default-color: #fff;
-  --switch-grey-color: #c4c6cc;
-  --breadcrumb-black-color: #979ba5;
-  --breadcrumb-primary-hover-color: #0082ff;
-  --breadcrumb-fn-main-color: #63656e;
-  --link-default-hover-color: #979ba5;
-  --link-primary-hover-color: #699df4;
-  --link-success-hover-color: #45e35f;
-  --link-warning-hover-color: #ffb848;
-  --link-danger-hover-color: #ff5656;
-  --link-default-disabled-color: #dcdee5;
-  --link-primary-disabled-color: #a3c5fd;
-  --link-success-disabled-color: #94f5a4;
-  --link-warning-disabled-color: #ffd695;
-  --link-danger-disabled-color: #fd9c9c;
-  --message-color: var(--default-color);
-  --message-primary-bg-color: #f0f8ff;
-  --message-primary-border-color: #e1ecff;
-  --message-primary-shadow-color: #e1e8f4;
-  --message-warning-bg-color: #fff4e2;
-  --message-warning-border-color: #ffe8c3;
-  --message-warning-shadow-color: #ede6db;
-  --message-success-bg-color: #f2fff4;
-  --message-success-border-color: #dcffe2;
-  --message-success-shadow-color: #cef0d7;
-  --message-danger-bg-color: #ffeded;
-  --message-danger-border-color: #ffdddd;
-  --message-danger-shadow-color: #f6dada;
-  --slider-default-bg: #dcdee5;
-  --slider-disable-bar-bg: #979ba5;
-  --menu-bg-color: #182132;
-  --submenu-bg-color: #151d2c;
-  --menu-active-bg-color: linear-gradient(90deg, #3f87ff 0%, #3a84ff 100%);
-  --menu-color: #96a2b9;
-  --menu-group-color: var(--default-color);
-  --menu-width: 260px;
-  --menu-collapse-width: 60px;
-  --menu-active-color: white;
-  --nav-header-bg-color: #182132;
-  --nav-bg-color: #182132;
-  --date-picker-disabled-bg: #fafbfd;
-  --date-picker-dropdown-mb: 4px;
-  --date-picker-dropdown-bg: #fff;
-  --table-bg-color: var(--white-color);
-  --table-border-color: #dcdee5;
-  --table-head-bg-color: #fafbfd;
-  --table-head-font-color: #313238;
-  --table-body-font-color: #63656E;
-  --table-row-hover-bg-color: #f5f7fa;
-  --table-row-active-bg-color: #f0f1f5;
-  --cascader-panel-border-color: #dcdee5;
-  --cascader-panel-hover: #f5f7fa;
-  --cascader-panel-active: #e1ecff;
-  --cascader-panel-disabled-bg: #fff;
-  --search-select-focus-border-color: var(--primary-color);
-  --search-select-focus-color: #3c96ff;
-  --search-select-font-color: var(--default-color);
-  --search-select-placeholder-color: var(--light-gray);
-  --search-select-message-color: var(--danger-color);
-  --search-select-menu-border-color: var(--disable-color);
-}
 .bk-checkbox-group {
   display: inline-flex;
   letter-spacing: normal;
@@ -135,11 +13,11 @@
   user-select: none;
 }
 .bk-checkbox ~ .bk-checkbox {
-  margin-left: 30px;
+  margin-left: 24px;
 }
 .bk-checkbox.is-checked .bk-checkbox-input {
-  background: var(--primary-color);
-  border-color: var(--primary-color);
+  background: #3a84ff;
+  border-color: #3a84ff;
   transition: all 0.1s;
 }
 .bk-checkbox.is-checked .bk-checkbox-input.small::after {
@@ -160,8 +38,8 @@
   transform-origin: center;
 }
 .bk-checkbox.is-indeterminated .bk-checkbox-input {
-  background: var(--primary-color);
-  border-color: var(--primary-color);
+  background: #3a84ff;
+  border-color: #3a84ff;
   transition: all 0.1s;
 }
 .bk-checkbox.is-indeterminated .bk-checkbox-input.small::after {
@@ -186,17 +64,23 @@
 }
 .bk-checkbox.is-disabled .bk-checkbox-input {
   background: #fafbfd;
-  border-color: var(--disable-color);
+  border-color: #dcdee5;
 }
 .bk-checkbox.is-disabled .bk-checkbox-input::after {
-  background: var(--disable-color);
+  background: #dcdee5;
 }
 .bk-checkbox.is-disabled.is-checked .bk-checkbox-input {
-  background: var(--checkbox-disabled-checked-bg);
-  border-color: var(--checkbox-disabled-checked-bg);
+  background: #a3c5fd;
+  border-color: #a3c5fd;
 }
 .bk-checkbox.is-disabled.is-checked .bk-checkbox-input::after {
-  background: var(--checkbox-disabled-checked-bg);
+  background: #a3c5fd;
+}
+.bk-checkbox.is-prechecking {
+  position: relative;
+}
+.bk-checkbox.is-prechecking .bk-checkbox-input {
+  visibility: hidden;
 }
 .bk-checkbox-input {
   position: relative;
@@ -224,3 +108,9 @@
   margin-left: 6px;
   vertical-align: middle;
 }
+.bk-checkbox-checking {
+  position: absolute;
+  font-size: 16px;
+  color: #3a84ff;
+  animation: loading 1s linear infinite;
+}

package/lib/checkbox/checkbox.d.ts

@@ -24,8 +24,8 @@ export declare const checkboxProps: {
     beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large"> & {
-        default: "default" | "small" | "large";
+    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge"> & {
+        default: "default" | "small" | "large" | "huge";
     };
     immediateEmitChange: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
@@ -59,8 +59,8 @@ declare const _default: import("vue").DefineComponent<{
     beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large"> & {
-        default: "default" | "small" | "large";
+    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge"> & {
+        default: "default" | "small" | "large" | "huge";
     };
     immediateEmitChange: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
@@ -71,12 +71,13 @@ declare const _default: import("vue").DefineComponent<{
     inputRef: import("vue").Ref<any>;
     isFocus: import("vue").Ref<boolean>;
     isChecked: import("vue").Ref<boolean>;
+    isPrechecking: import("vue").Ref<boolean>;
     isDisabled: import("vue").ComputedRef<boolean>;
     setChecked: (value?: boolean) => void;
     handleBlur: () => void;
     handleFocus: () => void;
     handleChange: (event: Event) => void;
-    size: "default" | "small" | "large";
+    size: "default" | "small" | "large" | "huge";
     resolveClassName: (cls: string) => string;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (value: any) => boolean;
@@ -107,8 +108,8 @@ declare const _default: import("vue").DefineComponent<{
     beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
         default: (...args: any[]) => any;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large"> & {
-        default: "default" | "small" | "large";
+    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge"> & {
+        default: "default" | "small" | "large" | "huge";
     };
     immediateEmitChange: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
@@ -121,7 +122,7 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:modelValue"?: (value: any) => any;
 }, {
     disabled: boolean;
-    size: "default" | "small" | "large";
+    size: "default" | "small" | "large" | "huge";
     trueLabel: string | number | boolean;
     falseLabel: string | number | boolean;
     checked: boolean;

package/lib/checkbox/checkbox.less

@@ -16,7 +16,7 @@
   user-select: none;
 
   & ~ .@{bk-prefix}-checkbox {
-    margin-left: 30px;
+    margin-left: 24px;
   }
 
   &.is-checked {
@@ -100,6 +100,13 @@
       }
     }
   }
+
+  &.is-prechecking {
+    position: relative;
+    .@{bk-prefix}-checkbox-input {
+      visibility: hidden;
+    }
+  }
 }
 
 .@{bk-prefix}-checkbox-input {
@@ -131,3 +138,10 @@
   margin-left: 6px;
   vertical-align: middle;
 }
+
+.@{bk-prefix}-checkbox-checking {
+  position: absolute;
+  font-size: 16px;
+  color: #3a84ff;
+  animation: loading 1s linear infinite;
+}