bkui-vue 2.0.1-beta.51.select.2 → 2.0.1-beta.52

package/lib/pagination/index.js

@@ -242,24 +242,22 @@ function _isSlot(s) {
     if (!proxy.showLimit) {
       return null;
     }
-    return (0,external_vue_namespaceObject.createVNode)("div", (0,external_vue_namespaceObject.mergeProps)({
+    return (0,external_vue_namespaceObject.createVNode)("div", {
       "class": _defineProperty(_defineProperty(_defineProperty({}, resolveClassName('pagination-limit'), true), 'is-first', isFirst), 'is-last', isLast)
-    }, {
-      disabled: proxy.disabled
-    }), [(0,external_vue_namespaceObject.createVNode)("div", null, [t.value.eachPage]), (0,external_vue_namespaceObject.createVNode)(select_namespaceObject["default"], {
+    }, [(0,external_vue_namespaceObject.createVNode)("div", null, [t.value.eachPage]), (0,external_vue_namespaceObject.createVNode)(select_namespaceObject["default"], {
       "class": "".concat(resolveClassName('pagination-limit-select')),
       "clearable": false,
+      "disabled": proxy.disabled,
+      "filterable": false,
+      "modelValue": localLimit.value,
       "size": "small",
       "withValidate": false,
-      "modelValue": localLimit.value,
-      "onChange": handleLimitChange,
-      "disabled": proxy.disabled,
-      "filterable": false
+      "onChange": handleLimitChange
     }, _isSlot(_slot = proxy.limitList.map(function (num, index) {
       return (0,external_vue_namespaceObject.createVNode)(select_namespaceObject.BkOption, {
         "id": num,
-        "name": "".concat(num),
-        "key": "".concat(index, "_").concat(num)
+        "key": "".concat(index, "_").concat(num),
+        "name": "".concat(num)
       }, null);
     })) ? _slot : {
       "default": function _default() {
@@ -371,6 +369,9 @@ var PAGE_ITEMS_NUM = 5;
    * @desc 上一页
    */
   var handlePrePage = function handlePrePage() {
+    if (proxy.disabled) {
+      return;
+    }
     if (isPagePreDisabled.value) {
       return;
     }
@@ -380,6 +381,9 @@ var PAGE_ITEMS_NUM = 5;
    * @desc 下一页
    */
   var handleNextPage = function handleNextPage() {
+    if (proxy.disabled) {
+      return;
+    }
     if (isPageNextDisabled.value) {
       return;
     }
@@ -390,6 +394,9 @@ var PAGE_ITEMS_NUM = 5;
    * @param { Number } totalPageNum
    */
   var handleItemClick = function handleItemClick(totalPageNum) {
+    if (proxy.disabled) {
+      return;
+    }
     if (totalPageNum === localCurrent.value) {
       return;
     }
@@ -399,12 +406,18 @@ var PAGE_ITEMS_NUM = 5;
    * @desc 上一批分页
    */
   var handlePreBatch = function handlePreBatch() {
+    if (proxy.disabled) {
+      return;
+    }
     localCurrent.value = Math.max(1, localCurrent.value - PAGE_ITEMS_NUM);
   };
   /**
    * @desc 下一批分页
    */
   var handleNextBatch = function handleNextBatch() {
+    if (proxy.disabled) {
+      return;
+    }
     localCurrent.value = Math.min(proxy.totalPageNum, localCurrent.value + PAGE_ITEMS_NUM);
   };
   var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
@@ -418,8 +431,8 @@ var PAGE_ITEMS_NUM = 5;
       "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-pre')), true), 'is-disabled', isPagePreDisabled.value),
       "onClick": handlePrePage
     }, [proxy.prevText || (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleLeft, null, null)]), (0,external_vue_namespaceObject.createVNode)("div", {
-      "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === 1),
       "key": "1",
+      "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === 1),
       "onClick": function onClick() {
         return handleItemClick(1);
       }
@@ -429,8 +442,8 @@ var PAGE_ITEMS_NUM = 5;
       "onClick": handlePreBatch
     }, [(0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.Ellipsis, null, null)]), list.value.map(function (num) {
       return (0,external_vue_namespaceObject.createVNode)("div", {
-        "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === num),
         "key": num,
+        "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === num),
         "onClick": function onClick() {
           return handleItemClick(num);
         }
@@ -440,8 +453,8 @@ var PAGE_ITEMS_NUM = 5;
       "class": "".concat(resolveClassName('pagination-list-next-batch')),
       "onClick": handleNextBatch
     }, [(0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.Ellipsis, null, null)]), proxy.totalPageNum > 1 && (0,external_vue_namespaceObject.createVNode)("div", {
-      "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === proxy.totalPageNum),
       "key": "last",
+      "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-list-item')), true), 'is-active', localCurrent.value === proxy.totalPageNum),
       "onClick": function onClick() {
         return handleItemClick(proxy.totalPageNum);
       }
@@ -549,6 +562,9 @@ const popover_less_namespaceObject = popover_less_x({  });
    * @desc 上一页
    */
   var handlePrePage = function handlePrePage() {
+    if (proxy.disabled) {
+      return;
+    }
     if (isPagePreDisabled.value) {
       return;
     }
@@ -558,6 +574,9 @@ const popover_less_namespaceObject = popover_less_x({  });
    * @desc 下一页
    */
   var handleNextPage = function handleNextPage() {
+    if (proxy.disabled) {
+      return;
+    }
     if (isPageNextDisabled.value) {
       return;
     }
@@ -567,6 +586,9 @@ const popover_less_namespaceObject = popover_less_x({  });
    * @desc 获得焦点
    */
   var handlePageEditorFocus = function handlePageEditorFocus() {
+    if (proxy.disabled) {
+      return;
+    }
     isFocused.value = true;
   };
   /**
@@ -618,12 +640,13 @@ const popover_less_namespaceObject = popover_less_x({  });
       "class": _defineProperty(_defineProperty({}, "".concat(resolveClassName('pagination-btn-pre')), true), 'is-disabled', isPagePreDisabled.value),
       "onClick": handlePrePage
     }, [(0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleLeft, null, null)]), (0,external_vue_namespaceObject.createVNode)(popover_namespaceObject["default"], {
-      "theme": "light",
-      "trigger": "click",
-      "arrow": false,
       "width": 56,
+      "arrow": false,
       "boundary": "body",
-      "placement": "bottom"
+      "disabled": proxy.disabled,
+      "placement": "bottom",
+      "theme": "light",
+      "trigger": "click"
     }, {
       "default": function _default() {
         return (0,external_vue_namespaceObject.createVNode)("div", {
@@ -631,10 +654,10 @@ const popover_less_namespaceObject = popover_less_x({  });
         }, [(0,external_vue_namespaceObject.createVNode)("span", {
           "ref": inputRef,
           "class": "".concat(resolveClassName('pagination-editor')),
-          "contenteditable": true,
+          "contenteditable": !proxy.disabled,
           "spellcheck": "false",
-          "onFocus": handlePageEditorFocus,
           "onBlur": handlePageEditorBlur,
+          "onFocus": handlePageEditorFocus,
           "onInput": handlePageEditorInput,
           "onKeydown": handlePageEditorKeydown
         }, [localCurrent.value]), (0,external_vue_namespaceObject.createVNode)("span", null, [(0,external_vue_namespaceObject.createTextVNode)("/")]), (0,external_vue_namespaceObject.createVNode)("span", {
@@ -646,11 +669,11 @@ const popover_less_namespaceObject = popover_less_x({  });
           "class": "".concat(resolveClassName('pagination-picker-list'))
         }, [list.value.map(function (item) {
           return (0,external_vue_namespaceObject.createVNode)("div", {
+            "key": item,
             "class": {
               item: true,
               'is-actived': item === localCurrent.value
             },
-            "key": item,
             "onClick": function onClick() {
               return handlePageChange(item);
             }
@@ -762,13 +785,11 @@ var paginationProps = {
   type: shared_namespaceObject.PropTypes.oneOf(['default', 'compact']).def('default'),
   location: shared_namespaceObject.PropTypes.oneOf(['left', 'right']).def('right'),
   align: shared_namespaceObject.PropTypes.oneOf(['left', 'center', 'right']).def('left'),
-  size: shared_namespaceObject.PropTypes.size(),
   small: shared_namespaceObject.PropTypes.bool.def(false),
   showTotalCount: shared_namespaceObject.PropTypes.bool.def(true),
   prevText: shared_namespaceObject.PropTypes.string,
   nextText: shared_namespaceObject.PropTypes.string,
   disabled: shared_namespaceObject.PropTypes.bool.def(false),
-  beforeChange: shared_namespaceObject.PropTypes.func,
   layout: shared_namespaceObject.PropTypes.custom(function (value) {
     var layoutNameMap = {
       total: true,
@@ -836,7 +857,7 @@ var paginationProps = {
   },
   render: function render() {
     var _this = this;
-    var paginationClass = (0,shared_namespaceObject.classes)(_defineProperty(_defineProperty(_defineProperty({}, "".concat(this.resolveClassName('pagination')), true), "".concat(this.resolveClassName("pagination--".concat(this.size))), true), "is-align-".concat(this.align), true));
+    var paginationClass = (0,shared_namespaceObject.classes)(_defineProperty(_defineProperty(_defineProperty({}, "".concat(this.resolveClassName('pagination')), true), "is-align-".concat(this.align), true), 'is-disabled', this.disabled));
     var layoutMap = {
       total: this.renderTotal,
       list: this.small ? this.renderSmallList : this.renderList,

package/lib/pagination/pagination.css

@@ -1,12 +1,142 @@
+: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;
+  --disable-bg-color: #f9fafd;
+  --border-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;
+  --component-size-small-padding: 0 12px;
+  --component-size-base-padding: 0 14px;
+  --component-size-large-padding: 0 16px;
+  --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: 8px;
+  --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-strip-color: #fafbfd;
+  --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);
+  --select-active-color: #e1ecff;
+  --select-hover-color: #f5f7fa;
+}
 .bk-pagination {
   display: flex;
   align-items: center;
   font-size: 12px;
-  letter-spacing: normal;
   color: #63656e;
+  letter-spacing: normal;
   user-select: none;
 }
-.bk-pagination.is-disabled {
+.bk-pagination.is-disabled * {
   cursor: not-allowed;
 }
 .bk-pagination.is-align-left {
@@ -46,16 +176,16 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 32px;
   min-width: 32px;
+  height: 32px;
   padding: 0 4px;
   margin-right: 2px;
   margin-left: 2px;
   color: #63656e;
   cursor: pointer;
+  user-select: none;
   background: #fff;
   border-radius: 2px;
-  user-select: none;
 }
 .bk-pagination-list-pre-batch.is-active,
 .bk-pagination-list-next-batch.is-active,
@@ -130,13 +260,13 @@
 }
 .bk-pagination-small-list .bk-pagination-picker {
   display: flex;
+  align-items: center;
   height: 26px;
   margin: 0 4px;
   cursor: pointer;
   background-color: #f0f1f5;
   border: 1px solid #f0f1f5;
   border-radius: 2px;
-  align-items: center;
 }
 .bk-pagination-small-list .bk-pagination-picker:hover {
   background-color: #eaebf0;
@@ -148,8 +278,8 @@
   box-shadow: 0px 0px 4px rgba(58, 132, 255, 0.4);
 }
 .bk-pagination-editor {
-  height: 16px;
   min-width: 23px;
+  height: 16px;
   padding-right: 4px;
   padding-left: 8px;
   line-height: 16px;
@@ -167,13 +297,13 @@
 .bk-pagination-btn-pre,
 .bk-pagination-btn-next {
   display: flex;
+  align-items: center;
+  justify-content: center;
   width: 26px;
   height: 26px;
   font-size: 20px;
   color: #979ba5;
   cursor: pointer;
-  justify-content: center;
-  align-items: center;
 }
 .bk-pagination-btn-pre:hover,
 .bk-pagination-btn-next:hover {
@@ -186,7 +316,7 @@
   cursor: not-allowed;
 }
 .bk-pagination-picker-list {
-  max-height: 216px;
+  max-height: var(--popover-max-height);
   padding: 7px 0;
   margin: -7px -14px;
   overflow: auto;

package/lib/pagination/pagination.d.ts

@@ -34,7 +34,6 @@ export declare const paginationProps: {
     align: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge">;
     small: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -56,9 +55,6 @@ export declare const paginationProps: {
     } & {
         default: boolean;
     };
-    beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
-        default: (...args: any[]) => any;
-    };
     layout: import("vue-types").VueTypeDef<string[]> & {
         default: () => string[];
     };
@@ -99,7 +95,6 @@ declare const _default: import("vue").DefineComponent<{
     align: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge">;
     small: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -121,9 +116,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
-        default: (...args: any[]) => any;
-    };
     layout: import("vue-types").VueTypeDef<string[]> & {
         default: () => string[];
     };
@@ -178,7 +170,6 @@ declare const _default: import("vue").DefineComponent<{
     align: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<"default" | "small" | "large" | "huge">;
     small: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -200,9 +191,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    beforeChange: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
-        default: (...args: any[]) => any;
-    };
     layout: import("vue-types").VueTypeDef<string[]> & {
         default: () => string[];
     };
@@ -219,7 +207,6 @@ declare const _default: import("vue").DefineComponent<{
     location: string;
     count: number;
     modelValue: number;
-    beforeChange: (...args: any[]) => any;
     prevText: string;
     nextText: string;
     align: string;

package/lib/pagination/pagination.less

@@ -4,12 +4,14 @@
   display: flex;
   align-items: center;
   font-size: 12px;
-  letter-spacing: normal;
   color: #63656e;
+  letter-spacing: normal;
   user-select: none;
 
   &.is-disabled {
-    cursor: not-allowed;
+    * {
+      cursor: not-allowed;
+    }
   }
 
   &.is-align-left {
@@ -17,11 +19,11 @@
   }
 
   &.is-align-center {
-    justify-content: center;;
+    justify-content: center;
   }
 
   &.is-align-right {
-    justify-content: flex-end;;
+    justify-content: flex-end;
   }
 
   & > * {
@@ -35,7 +37,6 @@
   & > .is-last {
     margin-right: 0;
   }
-
 }
 .@{bk-prefix}-pagination-total {
   display: flex;
@@ -59,16 +60,16 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 32px;
   min-width: 32px;
+  height: 32px;
   padding: 0 4px;
   margin-right: 2px;
   margin-left: 2px;
   color: #63656e;
   cursor: pointer;
+  user-select: none;
   background: #fff;
   border-radius: 2px;
-  user-select: none;
 
   &.is-active {
     color: #3a84ff;
@@ -149,13 +150,13 @@
 
   .@{bk-prefix}-pagination-picker {
     display: flex;
+    align-items: center;
     height: 26px;
     margin: 0 4px;
     cursor: pointer;
     background-color: #f0f1f5;
     border: 1px solid #f0f1f5;
     border-radius: 2px;
-    align-items: center;
 
     &:hover {
       background-color: #eaebf0;
@@ -165,14 +166,14 @@
     &.is-focused {
       background-color: #fff;
       border-color: #3a84ff;
-      box-shadow: 0px 0px 4px rgba(58, 132, 255, .4);
+      box-shadow: 0px 0px 4px rgba(58, 132, 255, 0.4);
     }
   }
 }
 
 .@{bk-prefix}-pagination-editor {
-  height: 16px;
   min-width: 23px;
+  height: 16px;
   padding-right: 4px;
   padding-left: 8px;
   line-height: 16px;
@@ -181,7 +182,7 @@
   border: 0;
   border-radius: 2px;
   outline: none;
-  transition: all .15s
+  transition: all 0.15s;
 }
 .@{bk-prefix}-pagination-small-list-total {
   padding-right: 8px;
@@ -190,13 +191,13 @@
 .@{bk-prefix}-pagination-btn-pre,
 .@{bk-prefix}-pagination-btn-next {
   display: flex;
+  align-items: center;
+  justify-content: center;
   width: 26px;
   height: 26px;
   font-size: 20px;
   color: #979ba5;
   cursor: pointer;
-  justify-content: center;
-  align-items: center;
 
   &:hover {
     color: #3a84ff;