bkui-vue 0.0.2-beta.10 → 0.0.2-beta.100

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

@@ -1,5 +1,5 @@
 import { PropType, ShallowRef } from 'vue';
-import { GetMenuListFunc, ICommonItem, ISearchItem, ISearchValue, SearchItemType, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
+import { GetMenuListFunc, ICommonItem, ISearchItem, ISearchValue, SearchItemType, SearchLogical, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
 export declare const SearchSelectProps: {
     data: {
         type: PropType<ISearchItem[]>;
@@ -32,16 +32,12 @@ export declare const SearchSelectProps: {
     placeholder: StringConstructor;
     getMenuList: PropType<GetMenuListFunc>;
     validateValues: PropType<ValidateValuesFunc>;
-    valueSplitCode: {
-        type: StringConstructor;
-        default: string;
-    };
     uniqueSelect: {
         type: BooleanConstructor;
         default: boolean;
     };
     valueBehavior: {
-        type: PropType<ValueBehavior>;
+        type: PropType<"all" | "need-key">;
         default: ValueBehavior;
         validator(v: ValueBehavior): boolean;
     };
@@ -78,16 +74,12 @@ declare const _default: import("vue").DefineComponent<{
     placeholder: StringConstructor;
     getMenuList: PropType<GetMenuListFunc>;
     validateValues: PropType<ValidateValuesFunc>;
-    valueSplitCode: {
-        type: StringConstructor;
-        default: string;
-    };
     uniqueSelect: {
         type: BooleanConstructor;
         default: boolean;
     };
     valueBehavior: {
-        type: PropType<ValueBehavior>;
+        type: PropType<"all" | "need-key">;
         default: ValueBehavior;
         validator(v: ValueBehavior): boolean;
     };
@@ -128,8 +120,10 @@ declare const _default: import("vue").DefineComponent<{
                 id: string;
                 realId?: string;
                 isSelected?: boolean;
+                logical?: SearchLogical;
             };
             isSelected?: boolean;
+            logical?: SearchLogical;
         }[]>;
         menuList: import("vue").Ref<ISearchItem[]>;
         menuHoverId: import("vue").Ref<string>;
@@ -145,6 +139,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;
@@ -158,6 +153,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: {
@@ -206,10 +202,13 @@ declare const _default: import("vue").DefineComponent<{
                 id: string;
                 realId?: string;
                 isSelected?: boolean;
+                logical?: SearchLogical;
             };
             isSelected?: boolean;
+            logical?: SearchLogical;
         }[];
         condition: string;
+        logical: SearchLogical;
         searchItem: {
             id: string;
             name: string;
@@ -223,8 +222,10 @@ declare const _default: import("vue").DefineComponent<{
                     id: string;
                     realId?: string;
                     isSelected?: boolean;
+                    logical?: SearchLogical;
                 };
                 isSelected?: boolean;
+                logical?: SearchLogical;
             }[];
             multiple?: boolean;
             async?: boolean;
@@ -241,13 +242,17 @@ declare const _default: import("vue").DefineComponent<{
                     id: string;
                     realId?: string;
                     isSelected?: boolean;
+                    logical?: SearchLogical;
                 };
                 isSelected?: boolean;
+                logical?: SearchLogical;
             };
             isSelected?: boolean;
+            onlyRecommendChildren?: boolean;
+            logical?: SearchLogical;
+            showLogicalPanel?: boolean;
         };
         type: SearchItemType;
-        splitCode: string;
         readonly multiple: boolean;
         readonly placeholder: string;
         readonly children: {
@@ -260,14 +265,17 @@ declare const _default: import("vue").DefineComponent<{
                 id: string;
                 realId?: string;
                 isSelected?: boolean;
+                logical?: SearchLogical;
             };
             isSelected?: boolean;
+            logical?: SearchLogical;
         }[];
         readonly validate: boolean;
         readonly inputInnerHtml: string;
         readonly inputInnerText: string;
         readonly keyInnerHtml: string;
         readonly keyInnerText: string;
+        readonly showLogical: boolean;
         isSpecialType: () => boolean;
         addValue: (item: ICommonItem) => void;
         toValue: () => ISearchValue;
@@ -276,7 +284,6 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     overflowIndex: import("vue").Ref<number>;
     validateStr: import("vue").Ref<string>;
-    splitCode: import("vue").ComputedRef<string>;
     onEditClick: (item: SelectedItem, index: number) => void;
     onEditEnter: (item: SelectedItem, index: number) => void;
     handleWrapClick: () => void;
@@ -297,6 +304,7 @@ declare const _default: import("vue").DefineComponent<{
         cancel: string;
         or: string;
         and: string;
+        logical: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("search" | "update:modelValue")[], "search" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
@@ -330,16 +338,12 @@ declare const _default: import("vue").DefineComponent<{
     placeholder: StringConstructor;
     getMenuList: PropType<GetMenuListFunc>;
     validateValues: PropType<ValidateValuesFunc>;
-    valueSplitCode: {
-        type: StringConstructor;
-        default: string;
-    };
     uniqueSelect: {
         type: BooleanConstructor;
         default: boolean;
     };
     valueBehavior: {
-        type: PropType<ValueBehavior>;
+        type: PropType<"all" | "need-key">;
         default: ValueBehavior;
         validator(v: ValueBehavior): boolean;
     };
@@ -353,8 +357,7 @@ declare const _default: import("vue").DefineComponent<{
     clearable: boolean;
     modelValue: ISearchValue[];
     conditions: ICommonItem[];
-    valueBehavior: ValueBehavior;
-    valueSplitCode: string;
+    valueBehavior: "all" | "need-key";
     shrink: boolean;
     uniqueSelect: boolean;
 }, {}>;

package/lib/search-select/search-select.less

@@ -132,15 +132,13 @@
 
       &-input {
         position: relative;
-        display: flex;
+        display: block;
         height: 100%;
         min-width: 40px;
         padding: 0 10px;
         margin-top: -4px;
         color: @search-select-font-color;
         border: none;
-        flex: 1 1 auto;
-        align-items: center;
 
         .input-before {
           &:before {
@@ -245,7 +243,7 @@
 
 .@{search-select-name}-menu {
   display: flex;
-  min-width: 160px;
+  min-width: 200px;
   font-size: 12px;
   color: @search-select-font-color;
   flex-direction: column;
@@ -260,7 +258,7 @@
     align-items: center;
     width: 100%;
     height: 32px;
-    padding: 0 12px;
+    padding: 0 8px;
     flex: 0 0 32px;
     outline: none;
   
@@ -292,12 +290,42 @@
     }
   }
 
+  .menu-content-wrapper {
+    display: flex;
+    width: 100%;
+    height: 100%;
+
+    .menu-condition {
+      display: flex;
+      width: 64px;
+      padding: 8px 8px 2px 10px;
+      background-color: #f5f7fa;
+      flex-direction: column;
+      flex: 0 0 64px;
+
+      &-title {
+        display: flex;
+        margin-bottom: 12px;
+        line-height: 24px;
+        align-items: center;
+      }
+      .@{bk-prefix}-radio {
+        width: 50px;
+        margin-bottom: 14.5px;
+      }
+      .@{bk-prefix}-radio ~ .@{bk-prefix}-radio {
+        margin-left: 0;
+      }
+    }
+  }
+
   .menu-content {
     display: flex;
-    flex-direction: column;
-    flex: 1;
     max-height: 240px;
+    padding: 4px 0;
     overflow: auto;
+    flex-direction: column;
+    flex: 1;
 
     .menu-item {
       .menu-item-mixin();
@@ -312,13 +340,6 @@
         display: flex;
         width: 22px;
         height: 22px;
-        margin-left: auto;
-        overflow: hidden;
-        font-size: 22px;
-        font-weight: bold;
-        color: @primary-color;
-        align-items: center;
-        justify-content: center;
       }
 
       &.is-hover {