bkui-vue 0.0.2-beta.11 → 0.0.2-beta.111

package/lib/search-select/input.d.ts

@@ -1,5 +1,5 @@
 import { PropType, Ref } from 'vue';
-import { GetMenuListFunc, ICommonItem, IMenuFooterItem, ISearchItem, SearchInputMode, SearchItemType, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
+import { GetMenuListFunc, ICommonItem, IMenuFooterItem, ISearchItem, SearchInputMode, SearchItemType, SearchLogical, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: PropType<ISearchItem[]>;
@@ -36,8 +36,10 @@ declare const _default: import("vue").DefineComponent<{
             id: string;
             realId?: string;
             isSelected?: boolean;
+            logical?: SearchLogical;
         };
         isSelected?: boolean;
+        logical?: SearchLogical;
     }[]>;
     menuList: Ref<ISearchItem[]>;
     menuHoverId: Ref<string>;
@@ -53,6 +55,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClickOutside: (e: MouseEvent) => void;
     handleInputFocus: (e: FocusEvent) => void;
     handleInputChange: (event: Event) => void;
+    handleLogicalChange: (logical: SearchLogical) => void;
     handleInputKeyup: (event: KeyboardEvent) => void;
     handleSelectItem: (item: ICommonItem, type?: SearchItemType) => Promise<void>;
     handleSelectCondtionItem: (item: ICommonItem) => void;
@@ -66,6 +69,7 @@ declare const _default: import("vue").DefineComponent<{
         cancel: string;
         or: string;
         and: string;
+        logical: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focus" | "add" | "delete")[], "focus" | "add" | "delete", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {

package/lib/search-select/menu.d.ts

@@ -1,5 +1,5 @@
 import { PropType, VNode } from 'vue';
-import { ICommonItem, IMenuFooterItem } from './utils';
+import { ICommonItem, IMenuFooterItem, SearchLogical } from './utils';
 declare const _default: import("vue").DefineComponent<{
     list: {
         type: PropType<ICommonItem[]>;
@@ -24,10 +24,20 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<IMenuFooterItem[]>;
         default: () => any[];
     };
+    showLogical: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    logical: {
+        type: PropType<SearchLogical>;
+        default: SearchLogical;
+    };
 }, {
     handleClick: (item: ICommonItem) => void;
     handleClickCondition: (item: ICommonItem) => void;
     handleClickFooterBtn: (item: IMenuFooterItem) => void;
+    handleSelectedChange: (e: MouseEvent, item: ICommonItem) => void;
+    handleLogicalChange: (value: unknown) => void;
     filterList: import("vue").ComputedRef<ICommonItem[]>;
     getSearchNode: (item: ICommonItem) => string | (string | VNode)[];
     localFooterBtns: import("vue").ComputedRef<IMenuFooterItem[] | ({
@@ -40,7 +50,17 @@ declare const _default: import("vue").DefineComponent<{
         disabled: boolean;
     })[]>;
     resolveClassName: (cls: string) => string;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("selectItem" | "selectCondition" | "footerClick")[], "selectItem" | "selectCondition" | "footerClick", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    t: import("vue").ComputedRef<{
+        pleaseSelect: string;
+        loading: string;
+        filterQueryMustHasValue: string;
+        ok: string;
+        cancel: string;
+        or: string;
+        and: string;
+        logical: string;
+    }>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("selectItem" | "selectCondition" | "footerClick" | "update:logical")[], "selectItem" | "selectCondition" | "footerClick" | "update:logical", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     list: {
         type: PropType<ICommonItem[]>;
     };
@@ -64,14 +84,25 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<IMenuFooterItem[]>;
         default: () => any[];
     };
+    showLogical: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    logical: {
+        type: PropType<SearchLogical>;
+        default: SearchLogical;
+    };
 }>> & {
     onSelectItem?: (...args: any[]) => any;
     onSelectCondition?: (...args: any[]) => any;
     onFooterClick?: (...args: any[]) => any;
+    "onUpdate:logical"?: (...args: any[]) => any;
 }, {
     multiple: boolean;
     selected: string[];
+    logical: SearchLogical;
     keyword: string;
     footerBtns: IMenuFooterItem[];
+    showLogical: boolean;
 }, {}>;
 export default _default;

package/lib/search-select/search-select.css

@@ -1,4 +1,126 @@
 /* stylelint-disable declaration-no-important */
+: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: 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-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);
+}
 @keyframes loading-scale-animate {
   0% {
     transform: scale(1);
@@ -12,12 +134,12 @@
     background-color: transparent;
   }
 }
-.bk-fade-transtion .bk-fade-enter-active,
-.bk-fade-transtion .bk-fade-leave-active {
+.bk-transition .bk-fade-enter-active,
+.bk-transition .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 {
+.bk-transition .bk-fade-enter,
+.bk-transition .bk-fade-leave-to {
   opacity: 0;
 }
 .clearfix-style::after {
@@ -74,13 +196,13 @@
 .bk-search-select {
   position: relative;
   z-index: 9;
-  height: 32px;
+  height: var(--component-size-base);
   overflow: inherit;
 }
 .bk-search-select .focus {
-  color: #3c96ff;
+  color: var(--search-select-focus-color);
   background: #fff !important;
-  border-color: #3a84ff !important;
+  border-color: var(--search-select-focus-border-color) !important;
 }
 .bk-search-select .div-input {
   height: 100%;
@@ -97,9 +219,9 @@
   min-height: 30px;
   overflow: hidden;
   font-size: 12px;
-  color: #63656e;
-  border: 1px solid #c4c6cc;
-  border-radius: 2px;
+  color: var(--search-select-font-color);
+  border: var(--border-width-base) var(--border-style-base) var(--border-style-color);
+  border-radius: var(--border-radius-base);
   outline: none;
   box-sizing: border-box;
   transition: border 0.2s linear;
@@ -110,9 +232,9 @@
 }
 .bk-search-select-container.is-focus {
   overflow: auto;
-  color: #3c96ff;
+  color: var(--search-select-focus-color);
   background: #fff !important;
-  border-color: #3a84ff !important;
+  border-color: var(--search-select-focus-border-color) !important;
 }
 .bk-search-select-container .search-prefix {
   flex: 0 0 auto;
@@ -141,7 +263,7 @@
   padding-left: 8px;
   margin: 0 0 4px 6px;
   line-height: 22px;
-  color: #63656e;
+  color: var(--search-select-font-color);
   background: #f0f1f5;
   border-radius: 2px;
   flex: 0 0 auto;
@@ -157,7 +279,7 @@
   background: #dcdee5;
 }
 .bk-search-select-container .search-container-selected:hover .selected-clear {
-  color: #63656e;
+  color: var(--search-select-font-color);
 }
 .bk-search-select-container .search-container-selected .selected-name {
   display: inline-block;
@@ -182,23 +304,21 @@
 }
 .bk-search-select-container .search-container-input {
   position: relative;
-  display: flex;
+  display: block;
   height: 100%;
   min-width: 40px;
   padding: 0 10px;
   margin-top: -4px;
-  color: #63656e;
+  color: var(--search-select-font-color);
   border: none;
-  flex: 1 1 auto;
-  align-items: center;
 }
 .bk-search-select-container .search-container-input .input-before:before {
-  color: #c4c6cc;
+  color: var(--search-select-placeholder-color);
   content: attr(data-placeholder);
 }
 .bk-search-select-container .search-container-input .input-after:after {
   padding-left: 2px;
-  color: #c4c6cc;
+  color: var(--search-select-placeholder-color);
   content: attr(data-tips);
 }
 .bk-search-select-container .search-container .selected-input {
@@ -208,7 +328,7 @@
   min-width: 40px;
   padding: 0 10px;
   margin-top: -4px;
-  color: #63656e;
+  color: var(--search-select-font-color);
   border: none;
   align-items: center;
 }
@@ -216,7 +336,7 @@
   position: absolute;
   top: 0;
   right: 0;
-  color: #c4c6cc;
+  color: var(--light-gray);
   flex: 0 0 auto;
   display: flex;
   align-items: center;
@@ -228,7 +348,7 @@
   height: 12px;
   margin-right: 6px;
   font-size: 12px;
-  color: #c4c6cc;
+  color: var(--light-gray);
   align-items: center;
   justify-content: center;
 }
@@ -245,9 +365,9 @@
   justify-content: center;
 }
 .bk-search-select-container .search-nextfix .search-nextfix-icon.is-focus {
-  color: #3c96ff;
+  color: var(--search-select-focus-color);
   background: #fff !important;
-  border-color: #3a84ff !important;
+  border-color: var(--search-select-focus-border-color) !important;
 }
 .bk-search-select-container::-webkit-scrollbar {
   width: 3px;
@@ -263,7 +383,7 @@
   margin-top: 5px;
   font-size: 12px;
   line-height: 16px;
-  color: #ea3636;
+  color: var(--search-select-message-color);
   align-items: center;
 }
 .bk-search-select-tips .select-tips {
@@ -278,9 +398,9 @@
 }
 .bk-search-select-menu {
   display: flex;
-  min-width: 160px;
+  min-width: 200px;
   font-size: 12px;
-  color: #63656e;
+  color: var(--search-select-font-color);
   flex-direction: column;
 }
 .bk-search-select-menu .menu-list-mixin {
@@ -292,7 +412,7 @@
   align-items: center;
   width: 100%;
   height: 32px;
-  padding: 0 12px;
+  padding: 0 8px;
   flex: 0 0 32px;
   outline: none;
 }
@@ -301,7 +421,7 @@
   background-color: #f5f7fa;
 }
 .bk-search-select-menu .menu-disabled-mixin {
-  color: #c4c6cc;
+  color: var(--light-gray);
 }
 .bk-search-select-menu .menu-disabled-mixin:hover {
   cursor: not-allowed;
@@ -310,14 +430,14 @@
 .bk-search-select-menu .menu-header {
   display: flex;
   flex-direction: column;
-  border-bottom: 1px solid #c4c6cc;
+  border-bottom: var(--border-width-base) var(--border-style-base) var(--border-style-color);
 }
 .bk-search-select-menu .menu-header-item {
   display: flex;
   align-items: center;
   width: 100%;
   height: 32px;
-  padding: 0 12px;
+  padding: 0 8px;
   flex: 0 0 32px;
   outline: none;
 }
@@ -326,25 +446,52 @@
   background-color: #f5f7fa;
 }
 .bk-search-select-menu .menu-header-item.is-disabled {
-  color: #c4c6cc;
+  color: var(--light-gray);
 }
 .bk-search-select-menu .menu-header-item.is-disabled:hover {
   cursor: not-allowed;
   background-color: white;
 }
-.bk-search-select-menu .menu-content {
+.bk-search-select-menu .menu-content-wrapper {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition {
   display: flex;
+  width: 64px;
+  padding: 8px 8px 2px 10px;
+  background-color: #f5f7fa;
   flex-direction: column;
-  flex: 1;
+  flex: 0 0 64px;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition-title {
+  display: flex;
+  margin-bottom: 12px;
+  line-height: 24px;
+  align-items: center;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition .bk-radio {
+  width: 50px;
+  margin-bottom: 14.5px;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition .bk-radio ~ .bk-radio {
+  margin-left: 0;
+}
+.bk-search-select-menu .menu-content {
+  display: flex;
   max-height: 240px;
+  padding: 4px 0;
   overflow: auto;
+  flex-direction: column;
+  flex: 1;
 }
 .bk-search-select-menu .menu-content .menu-item {
   display: flex;
   align-items: center;
   width: 100%;
   height: 32px;
-  padding: 0 12px;
+  padding: 0 8px;
   flex: 0 0 32px;
   outline: none;
   white-space: pre;
@@ -355,50 +502,43 @@
 }
 .bk-search-select-menu .menu-content .menu-item .is-keyword {
   display: inline-flex;
-  color: #3a84ff;
+  color: var(--primary-color);
 }
 .bk-search-select-menu .menu-content .menu-item .is-selected {
   display: flex;
   width: 22px;
   height: 22px;
-  margin-left: auto;
-  overflow: hidden;
-  font-size: 22px;
-  font-weight: bold;
-  color: #3a84ff;
-  align-items: center;
-  justify-content: center;
 }
 .bk-search-select-menu .menu-content .menu-item.is-hover {
-  color: #3a84ff;
+  color: var(--primary-color);
   background-color: #f5f7fa;
 }
 .bk-search-select-menu .menu-content .menu-item.is-hover .menu-name {
-  color: #3a84ff;
+  color: var(--primary-color);
 }
 .bk-search-select-menu .menu-content .menu-item.is-disabled {
-  color: #c4c6cc;
+  color: var(--light-gray);
 }
 .bk-search-select-menu .menu-content .menu-item.is-disabled:hover {
   cursor: not-allowed;
   background-color: white;
 }
 .bk-search-select-menu .menu-content .menu-item.is-disabled .menu-name {
-  color: #c4c6cc;
+  color: var(--light-gray);
 }
 .bk-search-select-menu .menu-content .menu-item .menu-name {
   display: flex;
   max-width: 100px;
   margin-right: 5px;
   font-weight: bold;
-  color: #63656e;
+  color: var(--search-select-font-color);
   align-items: center;
 }
 .bk-search-select-menu .menu-footer {
   display: flex;
   width: 100%;
   height: 32px;
-  border-top: 1px solid #dcdee5;
+  border-top: var(--border-width-base) var(--border-style-base) var(--search-select-menu-border-color);
   align-items: center;
 }
 .bk-search-select-menu .menu-footer-btn {
@@ -409,14 +549,14 @@
   height: 100%;
 }
 .bk-search-select-menu .menu-footer-btn:first-child {
-  border-right: 1px solid #dcdee5;
+  border-right: var(--border-width-base) var(--border-style-base) var(--search-select-menu-border-color);
 }
 .bk-search-select-menu .menu-footer-btn:hover {
-  color: #3a84ff;
+  color: var(--primary-color);
   cursor: pointer;
 }
 .bk-search-select-menu .menu-footer-btn.is-disabled {
-  color: #c4c6cc;
+  color: var(--light-gray);
 }
 .bk-search-select-menu .menu-footer-btn.is-disabled:hover {
   cursor: not-allowed;