bkui-vue 0.0.1-beta.409 → 0.0.1-beta.410

package/lib/cascader/cascader.css

@@ -1,26 +1,149 @@
+@keyframes loading-scale-animate {
+  0% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0.6);
+  }
+}
+@keyframes fade {
+  100% {
+    background-color: transparent;
+  }
+}
+.bk-fade-transtion .bk-fade-enter-active,
+.bk-fade-transtion .bk-fade-leave-active {
+  transition: all 0.3s cubic-bezier(0.55, 0, 0.1, 1);
+}
+.bk-fade-transtion .bk-fade-enter,
+.bk-fade-transtion .bk-fade-leave-to {
+  opacity: 0;
+}
+.clearfix-style::after {
+  display: block;
+  height: 0;
+  clear: both;
+  font-size: 0;
+  content: '';
+  visibility: hidden;
+}
+.bk-popper {
+  display: none;
+  padding: 7px 14px;
+  font-size: 12px;
+  color: #fff;
+  background: #333;
+  border-radius: 4px;
+}
+.bk-popper.light {
+  color: #63656e;
+  background: #fff;
+  box-shadow: #dcdee5 0 0 6px 0;
+}
+.bk-popper .bk-popper-arrow,
+.bk-popper .bk-popper-arrow::before {
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background: inherit;
+}
+.bk-popper .bk-popper-arrow {
+  visibility: hidden;
+}
+.bk-popper .bk-popper-arrow::before {
+  content: '';
+  visibility: visible;
+  transform: rotate(45deg);
+}
+.bk-popper[data-show] {
+  display: block;
+}
+.bk-popper[data-popper-placement^='top'] > .bk-popper-arrow {
+  bottom: -4px;
+}
+.bk-popper[data-popper-placement^='bottom'] > .bk-popper-arrow {
+  top: -4px;
+}
+.bk-popper[data-popper-placement^='left'] > .bk-popper-arrow {
+  right: -4px;
+}
+.bk-popper[data-popper-placement^='right'] > .bk-popper-arrow {
+  left: -4px;
+}
 .bk-cascader-popover.bk-pop2-content {
   padding: 0;
 }
 .bk-cascader-popover-wrapper {
   display: block;
 }
+.bk-cascader-wrapper {
+  position: relative;
+}
+.bk-cascader-wrapper.float-mode {
+  max-height: 32px;
+}
 .bk-cascader {
   position: relative;
+  display: block;
   width: 250px;
   font-size: 12px;
   line-height: 30px;
   color: #63656e;
   cursor: pointer;
+  background: #fff;
   border: 1px solid #c4c6cc;
   border-radius: 2px;
   outline: none;
 }
-.bk-cascader.is-hover {
+.bk-cascader.is-hover:not(.is-disabled) {
   border: 1px solid #979ba5;
 }
-.bk-cascader:focus {
+.bk-cascader.is-disabled {
+  cursor: not-allowed;
+  background-color: #fafbfd;
+  border-color: #dcdee5;
+  opacity: 1;
+}
+.bk-cascader.is-disabled .bk-cascader-name,
+.bk-cascader.is-disabled input {
+  cursor: not-allowed;
+  background-color: #fafbfd;
+  opacity: 1;
+}
+.bk-cascader.is-simplicity {
+  background-color: transparent;
+  border-color: transparent;
+  border-bottom-color: #c4c6cc;
+}
+.bk-cascader.is-simplicity:hover:not(.is-disabled) {
+  background-color: #f5f7fa;
+  border-color: transparent;
+  border-bottom-color: #c4c6cc;
+  box-shadow: none;
+}
+.bk-cascader.is-simplicity:hover:not(.is-disabled) .bk-input--text,
+.bk-cascader.is-simplicity:hover:not(.is-disabled) .bk-input--suffix-icon {
+  background-color: #f5f7fa;
+}
+.bk-cascader.is-focus {
+  z-index: 1;
   border: 1px solid #3a84ff;
 }
+.bk-cascader.is-focus .bk-cascader-name .cascader-selected-text {
+  white-space: pre-wrap;
+}
+.bk-cascader.is-focus .bk-cascader-name .cascader-tag-list {
+  height: auto;
+}
+.bk-cascader.is-focus.is-simplicity.is-simplicity {
+  border-color: transparent;
+  border-bottom-color: #3a84ff;
+  box-shadow: none;
+}
+.bk-cascader.is-focus.is-simplicity.is-simplicity .bk-input--text,
+.bk-cascader.is-focus.is-simplicity.is-simplicity .bk-input--suffix-icon {
+  background-color: #f5f7fa;
+}
 .bk-cascader.bk-is-show-panel .bk-icon-angle-up {
   transform: rotate(0);
 }
@@ -61,11 +184,13 @@
   width: 100%;
 }
 .bk-cascader .bk-cascader-name {
+  position: static;
   display: block;
   max-width: 100%;
+  max-height: 120px;
   min-height: 30px;
-  padding: 0 36px 0 11px;
-  overflow: hidden;
+  padding: 0 24px 0 11px;
+  overflow-x: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -79,16 +204,26 @@
 .bk-cascader .bk-cascader-name .bk-cascader-search-input::placeholder {
   color: #c3cdd7;
 }
+.bk-cascader .bk-cascader-name .cascader-selected-text {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .bk-cascader .bk-cascader-name .cascader-tag-list {
   display: flex;
+  height: 32px;
   min-height: 30px;
   padding-top: 5px;
+  overflow: hidden;
   box-sizing: border-box;
   flex-wrap: wrap;
 }
-.bk-cascader .bk-cascader-name .cascader-tag-list .cascader-tag-item {
+.bk-cascader .bk-cascader-name .cascader-tag-list .tag-item {
   position: relative;
   height: 22px;
+  max-width: calc(100% - 50px);
   padding-right: 18px;
   margin: 0 6px 5px 0;
   overflow: hidden;
@@ -97,10 +232,10 @@
   background-color: #f0f1f5;
   border-radius: 2px;
 }
-.bk-cascader .bk-cascader-name .cascader-tag-list .cascader-tag-item:hover {
+.bk-cascader .bk-cascader-name .cascader-tag-list .tag-item:hover {
   background: #dcdee5;
 }
-.bk-cascader .bk-cascader-name .cascader-tag-list .cascader-tag-item .cascader-tag-item-name {
+.bk-cascader .bk-cascader-name .cascader-tag-list .tag-item .tag-item-name {
   display: inline-block;
   width: 100%;
   padding: 0 5px;
@@ -152,17 +287,19 @@
 }
 .bk-cascader-panel-wrapper .bk-cascader-panel .bk-cascader-node .icon-angle-right {
   position: absolute;
-  top: -1px;
+  top: 50%;
   right: 0;
   font-size: 20px;
   color: #979ba5;
+  transform: translateY(-50%);
 }
 .bk-cascader-panel-wrapper .bk-cascader-panel .bk-cascader-node .icon-spinner {
   position: absolute;
-  top: -1px;
+  top: 50%;
   right: 5px;
   font-size: 12px;
   color: #979ba5;
+  transform: translateY(-50%);
 }
 .bk-cascader-panel-wrapper .bk-cascader-search-empty {
   display: flex;

package/lib/cascader/cascader.d.ts

@@ -11,6 +11,11 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
+    behavior: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
     filterable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -90,7 +95,20 @@ declare const _default: import("vue").DefineComponent<{
     scrollWidth: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
+    collapseTags: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    floatMode: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
+    bkCascaderRef: any;
+    inputRef: any;
+    overflowTagIndex: import("vue").Ref<number>;
+    isCollapse: import("vue").ComputedRef<boolean>;
+    isFocus: import("vue").Ref<boolean>;
     store: import("vue").Ref<{
         data: {
             id: string;
@@ -157,6 +175,7 @@ declare const _default: import("vue").DefineComponent<{
         clearChecked: () => void;
         removeTag: (tag: string[]) => void;
         getFlattedNodes: (leafOnly?: boolean) => any;
+        setNodesCheck: (nodes: string[][]) => void;
         getCheckedNodes: () => any;
         getNodeByValue: (value: (string | number | string[])[]) => INode;
         getNodeById: (id: string | number) => INode;
@@ -164,7 +183,6 @@ declare const _default: import("vue").DefineComponent<{
         appendNodes: (nodeDataList: import("./interface").IData[], parentNode: import("./interface").IData) => void;
     }>;
     updateValue: (val: Array<string | number | string[]>) => void;
-    panelShow: import("vue").Ref<boolean>;
     selectedText: import("vue").Ref<string | number>;
     checkedValue: import("vue").WritableComputedRef<(string | number | string[])[]>;
     handleClear: (e: Event) => void;
@@ -181,9 +199,12 @@ declare const _default: import("vue").DefineComponent<{
     isFiltering: import("vue").Ref<boolean>;
     searchInputHandler: {
         (this: any): any;
-        cancel(): void; /** 根据val的值，设置selectedText显示内容 */
+        cancel(): void;
     };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "toggle" | "clear" | "update:modelValue")[], "change" | "toggle" | "clear" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    focusEmitter: () => void;
+    tagList: import("vue").ComputedRef<any[]>;
+    isEdit: import("vue").Ref<boolean>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focus" | "change" | "toggle" | "clear" | "update:modelValue")[], "focus" | "change" | "toggle" | "clear" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: import("vue-types").VueTypeDef<(string | number | string[])[]>;
     list: import("vue-types").VueTypeValidableDef<unknown[]> & {
         default: () => unknown[];
@@ -195,6 +216,11 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
+    behavior: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
     filterable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -274,13 +300,23 @@ declare const _default: import("vue").DefineComponent<{
     scrollWidth: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
+    collapseTags: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    floatMode: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
+    onFocus?: (...args: any[]) => any;
     onChange?: (...args: any[]) => any;
     onClear?: (...args: any[]) => any;
     "onUpdate:modelValue"?: (...args: any[]) => any;
     onToggle?: (...args: any[]) => any;
 }, {
     trigger: string;
+    behavior: string;
     disabled: boolean;
     separator: string;
     multiple: boolean;
@@ -291,6 +327,7 @@ declare const _default: import("vue").DefineComponent<{
     clearable: boolean;
     checkAnyLevel: boolean;
     filterable: boolean;
+    collapseTags: boolean;
     idKey: string;
     nameKey: string;
     childrenKey: string;
@@ -299,5 +336,6 @@ declare const _default: import("vue").DefineComponent<{
     showCompleteName: boolean;
     limitOneLine: boolean;
     scrollWidth: string | number;
+    floatMode: boolean;
 }>;
 export default _default;

package/lib/cascader/cascader.less

@@ -1,4 +1,5 @@
 @import '../styles/themes/themes.less';
+@import '../styles/mixins/mixins.less';
 
 .@{bk-prefix}-cascader-popover.bk-pop2-content {
   padding: 0;
@@ -7,24 +8,86 @@
   display: block;
 }
 
+.@{bk-prefix}-cascader-wrapper {
+  position: relative;
+
+  &.float-mode {
+    max-height: @component-size-base;
+  }
+}
+
 .@{bk-prefix}-cascader {
   position: relative;
+  display: block;
   width: 250px;
   font-size: 12px;
   line-height: 30px;
   color: #63656e;
   cursor: pointer;
+  background: #fff;
   border: 1px solid #c4c6cc;
   border-radius: 2px;
   outline: none;
 
-  &.is-hover {
+  &.is-hover:not(.is-disabled) {
     border: 1px solid #979ba5;
   }
 
-  &:focus {
+  &.is-disabled {
+    cursor: not-allowed;
+    background-color: @input-disabled-bg;
+    border-color: @disable-color;
+    opacity: 1;
+
+    .bk-cascader-name,
+    input {
+      cursor: not-allowed;
+      background-color: @input-disabled-bg;
+      opacity: 1;
+    }
+  }
+
+  &.is-simplicity {
+    background-color: transparent;
+    border-color: transparent;
+    border-bottom-color: @input-border-color;
+
+    &:hover:not(.is-disabled) {
+      background-color: @input-block-color;
+      border-color: transparent;
+      border-bottom-color: @light-gray;
+      box-shadow: none;
+      .@{bk-prefix}-input--text, .@{bk-prefix}-input--suffix-icon {
+        background-color: @input-block-color;
+      }
+    }
+  }
+
+
+  &.is-focus {
+    z-index: 1;
     border: 1px solid #3a84ff;
+
+    .bk-cascader-name {
+      .cascader-selected-text {
+        white-space: pre-wrap;
+      }
+
+      .cascader-tag-list {
+        height: auto;
+      }
+    }
+
+    &.is-simplicity.is-simplicity {
+      border-color: transparent;
+      border-bottom-color: @primary-color;
+      box-shadow: none;
+      .@{bk-prefix}-input--text, .@{bk-prefix}-input--suffix-icon {
+        background-color: @input-block-color;
+      }
+    }
   }
+
   &.@{bk-prefix}-is-show-panel {
     .@{bk-prefix}-icon-angle-up {
       transform: rotate(0);
@@ -44,7 +107,9 @@
   &.is-filterable:before {
     display: none;
   }
-  .@{bk-prefix}-icon-angle-up, .@{bk-prefix}-icon-clear-icon {
+
+  .@{bk-prefix}-icon-angle-up,
+  .@{bk-prefix}-icon-clear-icon {
     position: absolute;
     right: 2px;
     display: inline-flex;
@@ -55,6 +120,7 @@
     transition: transform .3s cubic-bezier(.4,0,.2,1);
     align-items: center;
   }
+
   .@{bk-prefix}-icon-clear-icon {
     right: 4px;
     font-size: 14px;
@@ -69,15 +135,17 @@
     width: 100%;
   }
   .@{bk-prefix}-cascader-name {
+    position: static;
     display: block;
     max-width: 100%;
+    max-height: 120px;
     min-height: 30px;
-    padding: 0 36px 0 11px;
-    overflow: hidden;
+    padding: 0 24px 0 11px;
+    overflow-x: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 
-    .bk-cascader-search-input {
+    .@{bk-prefix}-cascader-search-input {
       width: 100%;
       font-size: 12px;
       cursor: text;
@@ -88,17 +156,28 @@
         color: #c3cdd7;
       }
     }
+    
+    .cascader-selected-text {
+      display: block;
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
 
     .cascader-tag-list {
       display: flex;
+      height: @component-size-base;
       min-height: 30px;
       padding-top: 5px;
+      overflow: hidden;
       box-sizing: border-box;
       flex-wrap: wrap;
 
-      .cascader-tag-item {
+      .tag-item {
         position: relative;
         height: 22px;
+        max-width: calc(100% - 50px);
         padding-right: 18px;
         margin: 0 6px 5px 0;
         overflow: hidden;
@@ -111,7 +190,7 @@
           background: #dcdee5;
         }
 
-        .cascader-tag-item-name {
+        .tag-item-name {
           display: inline-block;
           width: 100%;
           padding: 0 5px;
@@ -143,7 +222,7 @@
       display: flex;
       padding: 0 16px;
       overflow: hidden;
-      line-height: 32px;
+      line-height: @component-size-base;
       text-overflow: ellipsis;
       white-space: nowrap;
       cursor: pointer;
@@ -171,18 +250,20 @@
 
       .icon-angle-right {
         position: absolute;
-        top: -1px;
+        top: 50%;
         right: 0;
         font-size: 20px;
         color: @gray-color;
+        transform: translateY(-50%);
       }
 
       .icon-spinner {
         position: absolute;
-        top: -1px;
+        top: 50%;
         right: 5px;
         font-size: 12px;
         color: @gray-color;
+        transform: translateY(-50%);
       }
     }
   }