bkui-vue 0.0.2-beta.39 → 0.0.2-beta.40

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

@@ -400,7 +400,7 @@
 }
 .bk-search-select-menu {
   display: flex;
-  min-width: 160px;
+  min-width: 200px;
   font-size: 12px;
   color: #63656e;
   flex-direction: column;
@@ -414,7 +414,7 @@
   align-items: center;
   width: 100%;
   height: 32px;
-  padding: 0 12px;
+  padding: 0 8px;
   flex: 0 0 32px;
   outline: none;
 }
@@ -439,7 +439,7 @@
   align-items: center;
   width: 100%;
   height: 32px;
-  padding: 0 12px;
+  padding: 0 8px;
   flex: 0 0 32px;
   outline: none;
 }
@@ -454,19 +454,46 @@
   cursor: not-allowed;
   background-color: white;
 }
+.bk-search-select-menu .menu-content-wrapper {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition {
+  display: flex;
+  flex-direction: column;
+  width: 64px;
+  flex: 0 0 64px;
+  background-color: #F5F7FA;
+  padding: 8px 8px 2px 10px;
+}
+.bk-search-select-menu .menu-content-wrapper .menu-condition-title {
+  margin-bottom: 12px;
+  line-height: 24px;
+  display: flex;
+  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;
   flex-direction: column;
   flex: 1;
   max-height: 240px;
   overflow: auto;
+  padding: 4px 0;
 }
 .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;
@@ -483,13 +510,6 @@
   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;

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

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { GetMenuListFunc, ICommonItem, ISearchItem, SearchInputMode, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
+import { GetMenuListFunc, ICommonItem, ISearchItem, SearchInputMode, SearchLogical, SelectedItem, ValidateValuesFunc, ValueBehavior } from './utils';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: PropType<ISearchItem[]>;
@@ -57,8 +57,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>;
@@ -74,6 +76,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?: import("./utils").SearchItemType) => Promise<void>;
         handleSelectCondtionItem: (item: ICommonItem) => void;
@@ -87,6 +90,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/utils.d.ts

@@ -1,4 +1,4 @@
-import { ComputedRef, InjectionKey, Ref, VNode } from 'vue';
+import { InjectionKey, Ref, VNode } from 'vue';
 /**
  * @description: 获取menu list方法
  * @param {ISearchItem} item 已选择的key字段 为空则代表当前并未选择key字段
@@ -24,7 +24,6 @@ export interface ISearchSelectProvider {
     onEditBlur: () => void;
     onValidate: (str: string) => void;
     editKey: Ref<String>;
-    valueSplitCode: ComputedRef<string>;
 }
 export declare const SEARCH_SLECT_PROVIDER_KEY: InjectionKey<ISearchSelectProvider>;
 export declare const useSearchSelectProvider: (data: ISearchSelectProvider) => void;
@@ -40,10 +39,11 @@ export interface ICommonItem {
     realId?: string;
     value?: Omit<ICommonItem, 'disabled' | 'value'>;
     isSelected?: boolean;
+    logical?: SearchLogical;
 }
 export interface ISearchValue extends Omit<ICommonItem, 'disabled' | 'value'> {
     type?: SearchItemType;
-    values?: Omit<ICommonItem, 'disabled'>[];
+    values?: Omit<ICommonItem, 'disabled' | 'logical'>[];
 }
 export interface ISearchItem {
     id: string;
@@ -57,6 +57,12 @@ export interface ISearchItem {
     value?: ICommonItem;
     isSelected?: boolean;
     onlyRecommendChildren?: boolean;
+    logical?: SearchLogical;
+    showLogicalPanel?: boolean;
+}
+export declare enum SearchLogical {
+    AND = "&",
+    OR = "|"
 }
 export interface IMenuFooterItem {
     id: 'confirm' | 'cancel';
@@ -67,12 +73,12 @@ export type SearchItemType = 'text' | 'default' | 'condition';
 export declare class SelectedItem {
     searchItem: ISearchItem;
     type: SearchItemType;
-    splitCode: string;
     id: string;
     name: string;
     values: ICommonItem[];
     condition: string;
-    constructor(searchItem: ISearchItem, type?: SearchItemType, splitCode?: string);
+    logical: SearchLogical;
+    constructor(searchItem: ISearchItem, type?: SearchItemType);
     get multiple(): boolean;
     get placeholder(): string;
     get children(): ICommonItem[];
@@ -81,6 +87,7 @@ export declare class SelectedItem {
     get inputInnerText(): string;
     get keyInnerHtml(): string;
     get keyInnerText(): string;
+    get showLogical(): boolean;
     isSpecialType(): boolean;
     addValue(item: ICommonItem): void;
     toValue(): ISearchValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.39",
+  "version": "0.0.2-beta.40",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",