3h1-ui 2.12.0-beta.2 → 2.12.0-beta.3

package/es/index.js

@@ -4000,10 +4000,10 @@ const _sfc_main$1f = defineComponent({
       emitData.value = args;
     }
     const filterOption = (input, option) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       const label = ((_b = (_a2 = attrs.value) == null ? void 0 : _a2.fieldNames) == null ? void 0 : _b.label) || "label";
-      console.log("label", label);
-      return option[label].toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      if (typeof option[label] === "string")
+        return ((_c = option[label]) == null ? void 0 : _c.toLowerCase().indexOf(input.toLowerCase())) >= 0;
     };
     return {
       state,
@@ -14501,15 +14501,16 @@ const searchType = [
   }
 ];
 const searchTypeNumber = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeString = searchType.filter((item) => {
-  return ["eq", "ct", "sw", "ew"].includes(item.value);
+  return ["eq", "ct", "sw", "ew", "nl"].includes(item.value);
 });
 const searchTypeDate = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeSelect = [{ label: "等于", value: "eq" }];
+const stringSearchTypeSelect = [{ label: "包含", value: "ct" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
@@ -14532,7 +14533,7 @@ const _hoisted_5$1 = {
 };
 const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
 const _hoisted_7 = {
-  key: 0,
+  key: 1,
   style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
   class: "shy-ui-advanced-minus-icon"
 };
@@ -14540,48 +14541,57 @@ const _hoisted_8 = ["onClick"];
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
-    schemas: {
-      default: () => [
-        {
-          label: "姓名",
-          field: "name"
-        },
-        {
-          label: "年龄",
-          field: "age",
-          type: "number"
-        },
-        { label: "生日", field: "birth", type: "date" }
-      ]
-    }
+    schemas: { default: () => [
+      {
+        label: "姓名",
+        field: "name",
+        advancedShow: false
+      },
+      {
+        label: "年龄",
+        field: "age",
+        type: "number"
+      },
+      { label: "生日", field: "birth", type: "date" }
+    ] }
   },
   setup(__props, { expose }) {
     const props2 = __props;
-    reactive({});
     const advancedSearchRef = ref();
     const formRef = ref();
     const schemasCurrent = reactive([]);
-    if (props2.schemas.length !== 0)
-      schemasCurrent.push({ field: props2.schemas[0].field, op: "eq" });
     const dicColumn = computed(() => {
       const temp = [];
       props2.schemas.forEach((schama) => {
+        if (!schama.advancedShow)
+          return;
         const flag = schemasCurrent.find((item) => {
           return item.field === schama.field;
         });
         temp.push({
           label: schama.label,
           value: schama.field,
-          disabled: !!flag
+          disabled: !!flag,
+          type: schama.type,
+          component: schama.component
         });
       });
       return temp;
     });
+    if (props2.schemas.length !== 0) {
+      const firstSchema = dicColumn.value[0];
+      const op = firstSchema.type === "string" && /select/i.test(firstSchema.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: firstSchema.value, op });
+    }
     const handleAdd = () => {
       const item = dicColumn.value.find((item2) => {
         return item2.disabled === false;
       });
-      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op: "eq" });
+      const column = props2.schemas.find((schema) => {
+        return schema.field === item.value;
+      });
+      const op = column.type === "string" && /select/i.test(column.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op });
     };
     const handleMinus = (index2) => {
       schemasCurrent.splice(index2, 1);
@@ -14594,6 +14604,11 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       });
       schema.op = "eq";
     };
+    const handlSetValNull = (schema) => {
+      if (schema.op === "nl") {
+        schema[schema.field] = "";
+      }
+    };
     const getSearchType = (field) => {
       const type = getTypeByField(field);
       switch (type) {
@@ -14605,6 +14620,8 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
           return searchTypeDate;
         case "select":
           return searchTypeSelect;
+        case "stringSelect":
+          return stringSearchTypeSelect;
       }
     };
     const getComponent = (field) => {
@@ -14617,8 +14634,9 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       const column = props2.schemas.find((schema) => {
         return schema.field === field;
       });
+      const stringSelect = column.type === "string" && /select/i.test(column.component);
       const type = (column == null ? void 0 : column.type) || "string";
-      return type;
+      return stringSelect ? "stringSelect" : type;
     };
     const getComponentPropsByField = (field) => {
       const column = props2.schemas.find((schema) => {
@@ -14627,7 +14645,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       return (column == null ? void 0 : column.componentProps) || {};
     };
     const getSearchFrom = () => {
-      let form2 = {};
+      let form = {};
       schemasCurrent.forEach((item) => {
         let temp = {};
         if (item.op === "bt") {
@@ -14642,13 +14660,13 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
             [`${item.field}-op`]: item.op
           };
         }
-        form2 = { ...form2, ...temp };
+        form = { ...form, ...temp };
       });
-      return form2;
+      return form;
     };
     const resetFields = () => {
       schemasCurrent.splice(0, schemasCurrent.length);
-      schemasCurrent.push({ field: props2.schemas[0].field });
+      schemasCurrent.push({ field: dicColumn.value[0].field });
       formRef.value.resetFields();
     };
     expose({
@@ -14708,13 +14726,17 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 "onUpdate:value": ($event) => schema.op = $event,
                                 style: { "width": "120px" },
                                 options: getSearchType(schema == null ? void 0 : schema.field),
-                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || ""
-                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue"])
+                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || "",
+                                onChange: ($event) => handlSetValNull(schema)
+                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue", "onChange"])
                             ];
                           }),
                           _: 2
                         }, 1032, ["name"]),
-                        createVNode(unref(FormItem), { class: "shy-ui-advanced-search-item-value" }, {
+                        schema.op !== "nl" ? (openBlock(), createBlock(unref(FormItem), {
+                          key: 0,
+                          class: "shy-ui-advanced-search-item-value"
+                        }, {
                           default: withCtx(() => [
                             getTypeByField(schema == null ? void 0 : schema.field) === "number" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                               schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_3$3, [
@@ -14779,11 +14801,17 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "select" ? (openBlock(), createBlock(unref(FormItem), { key: 2 }, {
                               default: withCtx(() => [
-                                createVNode(unref(Select), mergeProps({
+                                getComponent(schema.field) === "ApiSelect" ? (openBlock(), createBlock(ApiSelect, mergeProps({
+                                  key: 0,
+                                  value: schema[`${schema.field}`],
+                                  "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                  valueModifiers: { number: true }
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                                  key: 1,
                                   value: schema[`${schema.field}`],
                                   "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
                                   valueModifiers: { number: true }
-                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                               ]),
                               _: 2
                             }, 1024)) : (openBlock(), createElementBlock(Fragment, { key: 3 }, [
@@ -14791,15 +14819,20 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 key: 0,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
-                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : getComponent(schema.field) === "ApiSelect" ? (openBlock(), createBlock(ApiSelect, mergeProps({
                                 key: 1,
+                                value: schema[`${schema.field}`],
+                                "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                valueModifiers: { number: true }
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                                key: 2,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
                               }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                             ], 64))
                           ]),
                           _: 2
-                        }, 1024),
+                        }, 1024)) : createCommentVNode("", true),
                         schemasCurrent.length !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7, [
                           createElementVNode("div", {
                             style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
@@ -15547,7 +15580,7 @@ const _sfc_main$q = defineComponent({
     AdvancedSearch: _sfc_main$v
   },
   emits: ["ensure"],
-  setup(props2, { emit }) {
+  setup(_, { emit }) {
     const advancedSearchRef = ref();
     const table2 = useTableContext();
     const setStyle2 = () => {
@@ -15733,8 +15766,8 @@ const _sfc_main$p = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_25de0cfe_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-25de0cfe"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_bf2b3580_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-bf2b3580"), n = n(), popScopeId(), n);
 const _hoisted_1$e = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -15792,7 +15825,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-25de0cfe"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-bf2b3580"]]);
 const _sfc_main$o = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -16304,12 +16337,12 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
 const _sfc_main$m = defineComponent({
   name: "TableAction",
   components: {
-    MoreOutlined: MoreOutlined$1,
     Icon: Icon2,
     PopConfirmButton: _sfc_main$U,
     Divider: Divider$1,
     Dropdown: _sfc_main$n,
-    Tooltip
+    Tooltip,
+    MoreOutlined: MoreOutlined$1
   },
   props: {
     actions: {
@@ -16418,7 +16451,8 @@ const _sfc_main$m = defineComponent({
       getDropdownList,
       getAlign,
       onCellClick,
-      getTooltip
+      getTooltip,
+      MoreOutlined: MoreOutlined$1
     };
   }
 });
@@ -22529,6 +22563,7 @@ export {
   searchTypeNumber,
   searchTypeSelect,
   searchTypeString,
+  stringSearchTypeSelect,
   treeEmits,
   treeProps,
   useColumns,

package/es/style.css

@@ -25486,7 +25486,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-25de0cfe] {
+}.shy-basic-table-global-search[data-v-bf2b3580] {
   position: absolute;
   top: 40px;
   right: 131px;
@@ -25498,7 +25498,7 @@ span.iconify {
   border: 1px solid #ebebeb;
   padding: 10px;
 }
-.shy-basic-table-global-search-item-global[data-v-25de0cfe] {
+.shy-basic-table-global-search-item-global[data-v-bf2b3580] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25509,7 +25509,7 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-item-special[data-v-25de0cfe] {
+.shy-basic-table-global-search-item-special[data-v-bf2b3580] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25520,10 +25520,10 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-checkbox-wrapper[data-v-25de0cfe] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-bf2b3580] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-25de0cfe] {
+.shy-basic-table-global-search .selected-bg[data-v-bf2b3580] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;

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

@@ -18,4 +18,10 @@ export declare const searchTypeSelect: {
     label: string;
     value: string;
 }[];
-export declare const getGlobalAdvancedType: (fieldList: any, value: any) => {};
+export declare const stringSearchTypeSelect: {
+    label: string;
+    value: string;
+}[];
+export declare const getGlobalAdvancedType: (fieldList: any, value: any) => {
+    [key: string]: unknown;
+};

package/es/ui/src/CountTo/src/CountTo.vue.d.ts

@@ -125,13 +125,13 @@ declare const _sfc_main: import("vue").DefineComponent<{
     prefix: string;
     transition: string;
     duration: number;
+    decimal: string;
     startVal: number;
     endVal: number;
     autoplay: boolean;
     decimals: number;
     suffix: string;
     separator: string;
-    decimal: string;
     useEasing: boolean;
 }>;
 export default _sfc_main;

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

@@ -1,7 +1,8 @@
+import { schemasAdvancedSearch } from '../types/table';
 declare const _sfc_main: import("vue").DefineComponent<{
     schemasAdvancedSearch: {
         default: () => any[];
-        type: ArrayConstructor;
+        type: PropType<schemasAdvancedSearch[]>;
     };
 }, {
     handleEnsure: () => void;
@@ -16,11 +17,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
 }, 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;
+        type: PropType<schemasAdvancedSearch[]>;
     };
 }>> & {
     onEnsure?: (...args: any[]) => any;
 }, {
-    schemasAdvancedSearch: unknown[];
+    schemasAdvancedSearch: schemasAdvancedSearch[];
 }>;
 export default _sfc_main;

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

@@ -1,3 +1,4 @@
+import type { schemasAdvancedSearch } from '../types/table';
 export declare enum OperatorEnum {
     'eq' = "\u7B49\u4E8E",
     'ne' = "\u4E0D\u7B49\u4E8E",
@@ -15,7 +16,7 @@ export declare const useAdvancedSearch: ({ getProps, reload }: {
     reload: any;
 }) => {
     isVisibleAdvancedSearch: import("vue").Ref<boolean>;
-    schemasAdvancedSearch: import("vue").ComputedRef<any>;
+    schemasAdvancedSearch: import("vue").ComputedRef<schemasAdvancedSearch[]>;
     openAdvancedSearch: () => void;
     closeAdvancedSearch: () => void;
     handleAdvancedEnsure: (form: any) => void;
@@ -31,8 +32,8 @@ export declare const useAdvancedSearch: ({ getProps, reload }: {
     getGlobalSearchValue: () => string;
     setCurSearchParams: (value: any) => void;
     getCurSearchParams: () => {};
-    schemasAdvancedSearchString: import("vue").ComputedRef<any>;
-    schemasAdvancedSearchGlobal: import("vue").ComputedRef<any>;
+    schemasAdvancedSearchString: import("vue").ComputedRef<schemasAdvancedSearch[]>;
+    schemasAdvancedSearchGlobal: import("vue").ComputedRef<schemasAdvancedSearch[]>;
 };
 export declare const useAdvancedSearchKv: () => {
     getKvOperator: () => {

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

@@ -388,3 +388,13 @@ export declare type ColumnChangeParam = {
 export interface InnerHandlers {
     onColumnsChange: (data: ColumnChangeParam[]) => void;
 }
+export declare type schemasAdvancedSearch = {
+    label: string;
+    field: number | string;
+    type?: 'number' | 'string' | 'date' | 'select';
+    component?: ComponentType;
+    componentProps?: object;
+    sortShow?: boolean;
+    globalShow?: boolean;
+    advancedShow?: boolean;
+};

package/es/ui/src/Tree/src/BasicTree.vue.d.ts

@@ -69,11 +69,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
     search: boolean;
     toolbar: boolean;
     loading: import("@shy-plugins/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
+    fieldNames: undefined;
+    searchValue: string;
     helpMessage: import("@shy-plugins/utils").BuildPropType<PropType<string | string[]>, unknown, unknown>;
     selectedKeys: KeyType[];
     filterFn: (searchValue: any, node: TreeItem, fieldNames: FieldNames) => boolean;
-    fieldNames: undefined;
-    searchValue: string;
     treeData: import("ant-design-vue/es/tree").DataNode[];
     renderIcon: (params: Recordable<any>) => string;
     checkStrictly: boolean;

package/lib/index.js

@@ -4002,10 +4002,10 @@ const _sfc_main$1f = vue.defineComponent({
       emitData.value = args;
     }
     const filterOption = (input, option) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       const label = ((_b = (_a2 = attrs.value) == null ? void 0 : _a2.fieldNames) == null ? void 0 : _b.label) || "label";
-      console.log("label", label);
-      return option[label].toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      if (typeof option[label] === "string")
+        return ((_c = option[label]) == null ? void 0 : _c.toLowerCase().indexOf(input.toLowerCase())) >= 0;
     };
     return {
       state,
@@ -14503,15 +14503,16 @@ const searchType = [
   }
 ];
 const searchTypeNumber = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeString = searchType.filter((item) => {
-  return ["eq", "ct", "sw", "ew"].includes(item.value);
+  return ["eq", "ct", "sw", "ew", "nl"].includes(item.value);
 });
 const searchTypeDate = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeSelect = [{ label: "等于", value: "eq" }];
+const stringSearchTypeSelect = [{ label: "包含", value: "ct" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
@@ -14534,7 +14535,7 @@ const _hoisted_5$1 = {
 };
 const _hoisted_6 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
 const _hoisted_7 = {
-  key: 0,
+  key: 1,
   style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
   class: "shy-ui-advanced-minus-icon"
 };
@@ -14542,48 +14543,57 @@ const _hoisted_8 = ["onClick"];
 const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
   __name: "AdvancedSearch",
   props: {
-    schemas: {
-      default: () => [
-        {
-          label: "姓名",
-          field: "name"
-        },
-        {
-          label: "年龄",
-          field: "age",
-          type: "number"
-        },
-        { label: "生日", field: "birth", type: "date" }
-      ]
-    }
+    schemas: { default: () => [
+      {
+        label: "姓名",
+        field: "name",
+        advancedShow: false
+      },
+      {
+        label: "年龄",
+        field: "age",
+        type: "number"
+      },
+      { label: "生日", field: "birth", type: "date" }
+    ] }
   },
   setup(__props, { expose }) {
     const props2 = __props;
-    vue.reactive({});
     const advancedSearchRef = vue.ref();
     const formRef = vue.ref();
     const schemasCurrent = vue.reactive([]);
-    if (props2.schemas.length !== 0)
-      schemasCurrent.push({ field: props2.schemas[0].field, op: "eq" });
     const dicColumn = vue.computed(() => {
       const temp = [];
       props2.schemas.forEach((schama) => {
+        if (!schama.advancedShow)
+          return;
         const flag = schemasCurrent.find((item) => {
           return item.field === schama.field;
         });
         temp.push({
           label: schama.label,
           value: schama.field,
-          disabled: !!flag
+          disabled: !!flag,
+          type: schama.type,
+          component: schama.component
         });
       });
       return temp;
     });
+    if (props2.schemas.length !== 0) {
+      const firstSchema = dicColumn.value[0];
+      const op = firstSchema.type === "string" && /select/i.test(firstSchema.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: firstSchema.value, op });
+    }
     const handleAdd = () => {
       const item = dicColumn.value.find((item2) => {
         return item2.disabled === false;
       });
-      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op: "eq" });
+      const column = props2.schemas.find((schema) => {
+        return schema.field === item.value;
+      });
+      const op = column.type === "string" && /select/i.test(column.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op });
     };
     const handleMinus = (index2) => {
       schemasCurrent.splice(index2, 1);
@@ -14596,6 +14606,11 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
       });
       schema.op = "eq";
     };
+    const handlSetValNull = (schema) => {
+      if (schema.op === "nl") {
+        schema[schema.field] = "";
+      }
+    };
     const getSearchType = (field) => {
       const type = getTypeByField(field);
       switch (type) {
@@ -14607,6 +14622,8 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
           return searchTypeDate;
         case "select":
           return searchTypeSelect;
+        case "stringSelect":
+          return stringSearchTypeSelect;
       }
     };
     const getComponent = (field) => {
@@ -14619,8 +14636,9 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
       const column = props2.schemas.find((schema) => {
         return schema.field === field;
       });
+      const stringSelect = column.type === "string" && /select/i.test(column.component);
       const type = (column == null ? void 0 : column.type) || "string";
-      return type;
+      return stringSelect ? "stringSelect" : type;
     };
     const getComponentPropsByField = (field) => {
       const column = props2.schemas.find((schema) => {
@@ -14629,7 +14647,7 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
       return (column == null ? void 0 : column.componentProps) || {};
     };
     const getSearchFrom = () => {
-      let form2 = {};
+      let form = {};
       schemasCurrent.forEach((item) => {
         let temp = {};
         if (item.op === "bt") {
@@ -14644,13 +14662,13 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
             [`${item.field}-op`]: item.op
           };
         }
-        form2 = { ...form2, ...temp };
+        form = { ...form, ...temp };
       });
-      return form2;
+      return form;
     };
     const resetFields = () => {
       schemasCurrent.splice(0, schemasCurrent.length);
-      schemasCurrent.push({ field: props2.schemas[0].field });
+      schemasCurrent.push({ field: dicColumn.value[0].field });
       formRef.value.resetFields();
     };
     expose({
@@ -14710,13 +14728,17 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
                                 "onUpdate:value": ($event) => schema.op = $event,
                                 style: { "width": "120px" },
                                 options: getSearchType(schema == null ? void 0 : schema.field),
-                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || ""
-                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue"])
+                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || "",
+                                onChange: ($event) => handlSetValNull(schema)
+                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue", "onChange"])
                             ];
                           }),
                           _: 2
                         }, 1032, ["name"]),
-                        vue.createVNode(vue.unref(antDesignVue.FormItem), { class: "shy-ui-advanced-search-item-value" }, {
+                        schema.op !== "nl" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), {
+                          key: 0,
+                          class: "shy-ui-advanced-search-item-value"
+                        }, {
                           default: vue.withCtx(() => [
                             getTypeByField(schema == null ? void 0 : schema.field) === "number" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
                               schema.op === "bt" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$3, [
@@ -14781,11 +14803,17 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), { key: 2 }, {
                               default: vue.withCtx(() => [
-                                vue.createVNode(vue.unref(antDesignVue.Select), vue.mergeProps({
+                                getComponent(schema.field) === "ApiSelect" ? (vue.openBlock(), vue.createBlock(ApiSelect, vue.mergeProps({
+                                  key: 0,
+                                  value: schema[`${schema.field}`],
+                                  "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                  valueModifiers: { number: true }
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), vue.mergeProps({
+                                  key: 1,
                                   value: schema[`${schema.field}`],
                                   "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
                                   valueModifiers: { number: true }
-                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                               ]),
                               _: 2
                             }, 1024)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 3 }, [
@@ -14793,15 +14821,20 @@ const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
                                 key: 0,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
-                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), vue.mergeProps({
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : getComponent(schema.field) === "ApiSelect" ? (vue.openBlock(), vue.createBlock(ApiSelect, vue.mergeProps({
                                 key: 1,
+                                value: schema[`${schema.field}`],
+                                "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                valueModifiers: { number: true }
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), vue.mergeProps({
+                                key: 2,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
                               }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                             ], 64))
                           ]),
                           _: 2
-                        }, 1024),
+                        }, 1024)) : vue.createCommentVNode("", true),
                         schemasCurrent.length !== 1 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
                           vue.createElementVNode("div", {
                             style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
@@ -15549,7 +15582,7 @@ const _sfc_main$q = vue.defineComponent({
     AdvancedSearch: _sfc_main$v
   },
   emits: ["ensure"],
-  setup(props2, { emit }) {
+  setup(_, { emit }) {
     const advancedSearchRef = vue.ref();
     const table2 = useTableContext();
     const setStyle2 = () => {
@@ -15735,8 +15768,8 @@ const _sfc_main$p = vue.defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_25de0cfe_lang = "";
-const _withScopeId = (n) => (vue.pushScopeId("data-v-25de0cfe"), n = n(), vue.popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_bf2b3580_lang = "";
+const _withScopeId = (n) => (vue.pushScopeId("data-v-bf2b3580"), n = n(), vue.popScopeId(), n);
 const _hoisted_1$e = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, null, -1));
@@ -15794,7 +15827,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-25de0cfe"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-bf2b3580"]]);
 const _sfc_main$o = vue.defineComponent({
   components: {
     TableAdvancedSearch,
@@ -16306,12 +16339,12 @@ const _sfc_main$n = /* @__PURE__ */ vue.defineComponent({
 const _sfc_main$m = vue.defineComponent({
   name: "TableAction",
   components: {
-    MoreOutlined: MoreOutlined$1,
     Icon: Icon2,
     PopConfirmButton: _sfc_main$U,
     Divider: antDesignVue.Divider,
     Dropdown: _sfc_main$n,
-    Tooltip: antDesignVue.Tooltip
+    Tooltip: antDesignVue.Tooltip,
+    MoreOutlined: MoreOutlined$1
   },
   props: {
     actions: {
@@ -16420,7 +16453,8 @@ const _sfc_main$m = vue.defineComponent({
       getDropdownList,
       getAlign,
       onCellClick,
-      getTooltip
+      getTooltip,
+      MoreOutlined: MoreOutlined$1
     };
   }
 });
@@ -22530,6 +22564,7 @@ exports.searchTypeDate = searchTypeDate;
 exports.searchTypeNumber = searchTypeNumber;
 exports.searchTypeSelect = searchTypeSelect;
 exports.searchTypeString = searchTypeString;
+exports.stringSearchTypeSelect = stringSearchTypeSelect;
 exports.treeEmits = treeEmits;
 exports.treeProps = treeProps;
 exports.useColumns = useColumns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.12.0-beta.2",
+  "version": "2.12.0-beta.3",
   "description": "",
   "module": "",
   "main": "index.ts",