3h1-ui 2.8.2 → 2.9.0

package/es/style.css

@@ -25036,7 +25036,7 @@ span.iconify {
   justify-content: space-between;
 }
 .shy-basic-form-action {
-  width: 200px !important;
+  width: 250px !important;
 }
 .shy-basic-form-input {
   flex: 1;
@@ -25412,7 +25412,54 @@ span.iconify {
 }
 .shy-basic-column-setting__cloumn-list .scrollbar {
   height: 220px;
-}.table-settings > * {
+}.icon-selected[data-v-851e809a] {
+  color: #498bf8;
+}.shy-ui-advanced-search .ant-form-item {
+  margin-bottom: 0;
+}
+.shy-ui-advanced-search .ant-space {
+  width: 100%;
+}
+.shy-ui-advanced-search .ant-form-horizontal {
+  padding-left: 0 !important;
+}
+.shy-ui-advanced-search-item-wrapper {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+.shy-ui-advanced-search-item-op {
+  margin-right: 8px;
+  flex: none;
+}
+.shy-ui-advanced-search-item-value {
+  flex: 1 1 0;
+}
+.shy-ui-advanced-search-item-value-range {
+  display: flex;
+  align-items: center;
+}
+.shy-ui-advanced-search-item-value-range > div {
+  flex: 1 1 0;
+}
+.shy-ui-advanced-search-item-value-range > div:first-child {
+  margin-right: 8px;
+}
+.shy-ui-advanced-search .ant-picker {
+  width: 100%;
+}
+.shy-ui-advanced-search-add {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  font-weight: 400;
+  color: #81B2FB;
+  cursor: pointer;
+}.table-settings {
+  display: flex;
+  align-items: center;
+}
+.table-settings > * {
   margin-right: 12px;
 }
 .table-settings svg {
@@ -25434,6 +25481,45 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
+}.shy-basic-table-global-search[data-v-e43dae4b] {
+  position: absolute;
+  top: 40px;
+  right: 131px;
+  width: 200px;
+  max-height: 800px;
+  overflow: auto;
+  background-color: #fff;
+  z-index: 1000;
+  border: 1px solid #ebebeb;
+  padding: 10px;
+}
+.shy-basic-table-global-search-item-global[data-v-e43dae4b] {
+  height: 32px;
+  line-height: 32px;
+  font-size: 14px;
+  color: #131415;
+  cursor: pointer;
+  padding: 0 8px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.shy-basic-table-global-search-item-special[data-v-e43dae4b] {
+  height: 32px;
+  line-height: 32px;
+  font-size: 14px;
+  color: #131415;
+  cursor: pointer;
+  padding: 0 8px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.shy-basic-table-global-search-checkbox-wrapper[data-v-e43dae4b] {
+  padding: 0 8px;
+}
+.shy-basic-table-global-search .selected-bg[data-v-e43dae4b] {
+  background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;
   align-items: center;
@@ -25494,6 +25580,29 @@ span.iconify {
 .shy-basic-table-row__striped td {
   background-color: #fafafa;
 }
+.shy-basic-table-advanced-search {
+  position: absolute;
+  top: 30px;
+  right: 100px;
+  width: 600px;
+  max-height: 800px;
+  overflow: auto;
+  z-index: 100;
+  background-color: #fff;
+  border: 1px solid #ebebeb;
+  padding: 10px 10px 42px 10px;
+}
+.shy-basic-table-advanced-search-footer {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+}
+.shy-basic-table-advanced-search-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+}
 .shy-basic-table-form-container .ant-form {
   position: relative;
   padding: 12px 10px 6px;

package/es/ui/index.d.ts

@@ -19,3 +19,4 @@ export * from './src/Icon';
 export * from './src/Loading';
 export * from './src/StrengthMeter';
 export * from './src/TablePlus';
+export * from './src/AdvancedSearch';

package/es/ui/src/AdvancedSearch/index.d.ts

@@ -0,0 +1,3 @@
+import AdvancedSearch from './src/AdvancedSearch.vue';
+export * from './src/data';
+export { AdvancedSearch };

package/es/ui/src/AdvancedSearch/src/data.d.ts

@@ -0,0 +1,17 @@
+export declare const searchType: {
+    label: string;
+    value: string;
+}[];
+export declare const searchTypeNumber: {
+    label: string;
+    value: string;
+}[];
+export declare const searchTypeString: {
+    label: string;
+    value: string;
+}[];
+export declare const searchTypeDate: {
+    label: string;
+    value: string;
+}[];
+export declare const getGlobalAdvancedType: (fieldList: any, value: any) => {};

package/es/ui/src/Table/src/components/TableAdvancedSearch.vue.d.ts

@@ -0,0 +1,20 @@
+declare const _sfc_main: import("vue").DefineComponent<{
+    schemasAdvancedSearch: {
+        default: () => any[];
+        type: ArrayConstructor;
+    };
+}, {
+    handleEnsure: () => void;
+    handleReset: () => void;
+    advancedSearchRef: import("vue").Ref<any>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "ensure"[], "ensure", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    schemasAdvancedSearch: {
+        default: () => any[];
+        type: ArrayConstructor;
+    };
+}>> & {
+    onEnsure?: (...args: any[]) => any;
+}, {
+    schemasAdvancedSearch: unknown[];
+}>;
+export default _sfc_main;

package/es/ui/src/Table/src/components/TableGlobalSearch.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _sfc_main: import("vue").DefineComponent<unknown, object, {}, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<unknown>, {}>;
+export default _sfc_main;

package/es/ui/src/Table/src/components/settings/AdvancedSearchSetting.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _sfc_main: import("vue").DefineComponent<unknown, object, {}, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<unknown>, {}>;
+export default _sfc_main;

package/es/ui/src/Table/src/const.d.ts

@@ -10,10 +10,10 @@ export declare const FETCH_SETTING: {
 };
 export declare const DEFAULT_SIZE: string;
 export declare const DEFAULT_SORT_FN: (sortInfo: SorterResult) => {
-    field: string;
-    order: import("./types/table").SortOrder;
+    sort: string;
+    order: string;
 } | {
-    field?: undefined;
+    sort?: undefined;
     order?: undefined;
 };
 export declare const DEFAULT_FILTER_FN: (data: Partial<Recordable<string[]>>) => Partial<Recordable<string[]>>;

package/es/ui/src/Table/src/hooks/useAdvancedSearch.d.ts

@@ -0,0 +1,41 @@
+export declare enum OperatorEnum {
+    'eq' = "\u7B49\u4E8E",
+    'ne' = "\u4E0D\u7B49\u4E8E",
+    'gt' = "\u5927\u4E8E",
+    'ge' = "\u5927\u4E8E\u7B49\u4E8E",
+    'lt' = "\u5C0F\u4E8E",
+    'le' = "\u5C0F\u4E8E\u7B49\u4E8E",
+    'bt' = "\u5728...\u4E4B\u95F4",
+    'nb' = "\u4E0D\u5728...\u4E4B\u95F4",
+    'ct' = "\u5305\u542B",
+    'sw' = "\u4EE5...\u5F00\u5934"
+}
+export declare const useAdvancedSearch: ({ getProps, reload }: {
+    getProps: any;
+    reload: any;
+}) => {
+    isVisibleAdvancedSearch: import("vue").Ref<boolean>;
+    schemasAdvancedSearch: import("vue").ComputedRef<any>;
+    openAdvancedSearch: () => void;
+    closeAdvancedSearch: () => void;
+    handleAdvancedEnsure: (form: any) => void;
+    setGlobalSearchType: (value: any) => void;
+    getGlobalSearchType: () => number;
+    openGlobalSearch: () => void;
+    closeGlobalSearch: () => void;
+    isVisibleGlobalSearch: import("vue").Ref<boolean>;
+    curGlobalSearchValue: import("vue").Ref<string>;
+    setGlobalSchemas: (value: any) => void;
+    getGlobalSchemas: () => any[];
+    setGlobalSearchValue: (value: any) => void;
+    getGlobalSearchValue: () => string;
+    setCurSearchParams: (value: any) => void;
+    getCurSearchParams: () => {};
+};
+export declare const useAdvancedSearchKv: () => {
+    getKvOperator: () => {
+        kvDateOperator: any[];
+        kvNumberOperator: any[];
+        kvStringOperator: any[];
+    };
+};

package/es/ui/src/Table/src/hooks/useDataSource.d.ts

@@ -8,8 +8,9 @@ interface ActionType {
     getFieldsValue: () => Recordable;
     clearSelectedRowKeys: () => void;
     tableData: Ref<Recordable[]>;
+    getCurSearchParams?: any;
 }
-export declare function useDataSource(propsRef: ComputedRef<BasicTableProps>, { getPaginationInfo, setPagination, setLoading, getFieldsValue, clearSelectedRowKeys, tableData }: ActionType, emit: EmitType): {
+export declare function useDataSource(propsRef: ComputedRef<BasicTableProps>, { getPaginationInfo, setPagination, setLoading, getFieldsValue, clearSelectedRowKeys, tableData, getCurSearchParams }: ActionType, emit: EmitType): {
     getDataSourceRef: ComputedRef<Recordable<any>[]>;
     getDataSource: <T = Recordable<any>>() => T[];
     getRawDataSource: <T_1 = Recordable<any>>() => T_1;

package/es/ui/src/Table/src/props.d.ts

@@ -142,10 +142,10 @@ export declare const basicProps: {
             readonly prototype: any;
         })[];
         default: (sortInfo: SorterResult) => {
-            field: string;
-            order: import("./types/table").SortOrder;
+            sort: string;
+            order: string;
         } | {
-            field?: undefined;
+            sort?: undefined;
             order?: undefined;
         };
     };
@@ -341,6 +341,41 @@ export declare const basicProps: {
         default?: boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean);
         validator?: (value: boolean) => boolean;
     };
+    useAdvancedSearch: {
+        readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        } & {
+            validator: import("vue-types/dist/types").ValidatorFunction<unknown>;
+        };
+        _vueTypes_name: string;
+        type?: import("vue-types/dist/types").Prop<boolean> | import("vue-types/dist/types").Prop<boolean>[];
+        readonly def: (def?: boolean) => import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        };
+        readonly isRequired: {
+            readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
+                default: boolean;
+            } & {
+                required: true;
+            } & {
+                validator: import("vue-types/dist/types").ValidatorFunction<unknown>;
+            };
+            _vueTypes_name: string;
+            type?: import("vue-types/dist/types").Prop<boolean> | import("vue-types/dist/types").Prop<boolean>[];
+            readonly def: (def?: boolean) => import("vue-types").VueTypeValidableDef<boolean> & {
+                default: boolean;
+            } & {
+                required: true;
+            };
+            readonly isRequired: any;
+            required: true;
+            default: (boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean)) & boolean;
+            validator?: (value: boolean) => boolean;
+        };
+        required?: boolean;
+        default: (boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean)) & boolean;
+        validator?: (value: boolean) => boolean;
+    };
     useTableWrapper: {
         readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;

package/es/ui/src/Table/src/types/table.d.ts

@@ -113,6 +113,20 @@ export interface TableActionType {
     setTreeExpand?: any;
     getVxeTableRef: any;
     setSelectRowByKeys?: any;
+    openAdvancedSearch?: any;
+    closeAdvancedSearch?: any;
+    isVisibleAdvancedSearch?: any;
+    isVisibleGlobalSearch?: any;
+    closeGlobalSearch?: any;
+    openGlobalSearch?: any;
+    setGlobalSearchType?: any;
+    getGlobalSearchType?: any;
+    getGlobalSchemas?: any;
+    setGlobalSchemas?: any;
+    setGlobalSearchValue?: any;
+    getGlobalSearchValue?: any;
+    setCurSearchParams?: any;
+    getCurSearchParams?: any;
 }
 export interface FetchSetting {
     pageField: string;
@@ -150,6 +164,7 @@ export interface BasicTableProps<T = any> {
     searchInfo?: Recordable;
     defSort?: Recordable;
     useSearchForm?: boolean;
+    useAdvancedSearch?: boolean;
     formConfig?: Partial<FormProps>;
     columns: BasicColumn[];
     showIndexColumn?: boolean;