3h1-ui 2.9.0 → 2.9.4

package/es/index.js

@@ -14399,6 +14399,7 @@ const searchTypeString = searchType.filter((item) => {
 const searchTypeDate = searchType.filter((item) => {
   return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
 });
+const searchTypeSelect = [{ label: "等于", value: "eq" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
@@ -14445,7 +14446,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     const formRef = ref();
     const schemasCurrent = reactive([]);
     if (props2.schemas.length !== 0)
-      schemasCurrent.push({ field: props2.schemas[0].field });
+      schemasCurrent.push({ field: props2.schemas[0].field, op: "eq" });
     const dicColumn = computed(() => {
       const temp = [];
       props2.schemas.forEach((schama) => {
@@ -14461,7 +14462,10 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       return temp;
     });
     const handleAdd = () => {
-      schemasCurrent.push({ field: "" });
+      const item = dicColumn.value.find((item2) => {
+        return item2.disabled === false;
+      });
+      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op: "eq" });
     };
     const handleMinus = (index2) => {
       schemasCurrent.splice(index2, 1);
@@ -14482,6 +14486,8 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
           return searchTypeString;
         case "date":
           return searchTypeDate;
+        case "select":
+          return searchTypeSelect;
       }
     };
     const getComponent = (field) => {
@@ -14572,14 +14578,18 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                           class: "shy-ui-advanced-search-item-op",
                           name: `${schema.field}-op`
                         }, {
-                          default: withCtx(() => [
-                            createVNode(unref(Select), {
-                              value: schema.op,
-                              "onUpdate:value": ($event) => schema.op = $event,
-                              style: { "width": "120px" },
-                              options: getSearchType(schema == null ? void 0 : schema.field)
-                            }, null, 8, ["value", "onUpdate:value", "options"])
-                          ]),
+                          default: withCtx(() => {
+                            var _a2;
+                            return [
+                              createVNode(unref(Select), {
+                                value: schema.op,
+                                "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"])
+                            ];
+                          }),
                           _: 2
                         }, 1032, ["name"]),
                         createVNode(unref(FormItem), { class: "shy-ui-advanced-search-item-value" }, {
@@ -14645,7 +14655,16 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                                 "onUpdate:value": ($event) => schema[schema.field] = $event,
                                 "value-format": "YYYY-MM-DD HH:mm:ss"
                               }, null, 8, ["value", "onUpdate:value"]))
-                            ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+                            ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "select" ? (openBlock(), createBlock(unref(FormItem), { key: 2 }, {
+                              default: withCtx(() => [
+                                createVNode(unref(Select), mergeProps({
+                                  value: schema[`${schema.field}`],
+                                  "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                  valueModifiers: { number: true }
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])
+                              ]),
+                              _: 2
+                            }, 1024)) : (openBlock(), createElementBlock(Fragment, { key: 3 }, [
                               getComponent(schema.field) === "Input" ? (openBlock(), createBlock(unref(Input), mergeProps({
                                 key: 0,
                                 value: schema[schema.field],
@@ -14796,23 +14815,26 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ColumnSetting = resolveComponent("ColumnSetting");
   const _component_FullScreenSetting = resolveComponent("FullScreenSetting");
   return openBlock(), createElementBlock("div", _hoisted_1$d, [
-    createVNode(_component_GlobalSearch),
-    createVNode(_component_AdvancedSearchSetting, { getPopupContainer: _ctx.getTableContainer }, null, 8, ["getPopupContainer"]),
+    _ctx.getBindValues.useAdvancedSearch ? (openBlock(), createBlock(_component_GlobalSearch, { key: 0 })) : createCommentVNode("", true),
+    _ctx.getBindValues.useAdvancedSearch ? (openBlock(), createBlock(_component_AdvancedSearchSetting, {
+      key: 1,
+      getPopupContainer: _ctx.getTableContainer
+    }, null, 8, ["getPopupContainer"])) : createCommentVNode("", true),
     ((_b = (_a2 = _ctx.getBindValues) == null ? void 0 : _a2.formConfig) == null ? void 0 : _b.schemas) && ((_e = (_d = (_c = _ctx.getBindValues) == null ? void 0 : _c.formConfig) == null ? void 0 : _d.schemas) == null ? void 0 : _e.length) !== 0 ? (openBlock(), createBlock(_component_ShowSearchSetting, {
-      key: 0,
+      key: 2,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : createCommentVNode("", true),
     _ctx.getSetting.size ? (openBlock(), createBlock(_component_SizeSetting, {
-      key: 1,
+      key: 3,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : createCommentVNode("", true),
     _ctx.getSetting.setting ? (openBlock(), createBlock(_component_ColumnSetting, {
-      key: 2,
+      key: 4,
       onColumnsChange: _ctx.handleColumnChange,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["onColumnsChange", "getPopupContainer"])) : createCommentVNode("", true),
     _ctx.getSetting.fullScreen ? (openBlock(), createBlock(_component_FullScreenSetting, {
-      key: 3,
+      key: 5,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : createCommentVNode("", true)
   ]);
@@ -15396,7 +15418,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.handleEnsure
           }, {
             default: withCtx(() => [
-              createTextVNode("确定")
+              createTextVNode("搜索")
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -21531,6 +21553,7 @@ export {
   searchType,
   searchTypeDate,
   searchTypeNumber,
+  searchTypeSelect,
   searchTypeString,
   treeEmits,
   treeProps,

package/es/style.css

@@ -25453,8 +25453,9 @@ span.iconify {
   align-items: center;
   font-size: 14px;
   font-weight: 400;
-  color: #81B2FB;
+  color: #5C9AF9;
   cursor: pointer;
+  line-height: 30px;
 }.table-settings {
   display: flex;
   align-items: center;

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

@@ -14,4 +14,8 @@ export declare const searchTypeDate: {
     label: string;
     value: string;
 }[];
+export declare const searchTypeSelect: {
+    label: string;
+    value: string;
+}[];
 export declare const getGlobalAdvancedType: (fieldList: any, value: any) => {};

package/lib/index.js

@@ -14401,6 +14401,7 @@ const searchTypeString = searchType.filter((item) => {
 const searchTypeDate = searchType.filter((item) => {
   return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
 });
+const searchTypeSelect = [{ label: "等于", value: "eq" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
@@ -14447,7 +14448,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
     const formRef = vue.ref();
     const schemasCurrent = vue.reactive([]);
     if (props2.schemas.length !== 0)
-      schemasCurrent.push({ field: props2.schemas[0].field });
+      schemasCurrent.push({ field: props2.schemas[0].field, op: "eq" });
     const dicColumn = vue.computed(() => {
       const temp = [];
       props2.schemas.forEach((schama) => {
@@ -14463,7 +14464,10 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
       return temp;
     });
     const handleAdd = () => {
-      schemasCurrent.push({ field: "" });
+      const item = dicColumn.value.find((item2) => {
+        return item2.disabled === false;
+      });
+      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op: "eq" });
     };
     const handleMinus = (index2) => {
       schemasCurrent.splice(index2, 1);
@@ -14484,6 +14488,8 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
           return searchTypeString;
         case "date":
           return searchTypeDate;
+        case "select":
+          return searchTypeSelect;
       }
     };
     const getComponent = (field) => {
@@ -14574,14 +14580,18 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                           class: "shy-ui-advanced-search-item-op",
                           name: `${schema.field}-op`
                         }, {
-                          default: vue.withCtx(() => [
-                            vue.createVNode(vue.unref(antDesignVue.Select), {
-                              value: schema.op,
-                              "onUpdate:value": ($event) => schema.op = $event,
-                              style: { "width": "120px" },
-                              options: getSearchType(schema == null ? void 0 : schema.field)
-                            }, null, 8, ["value", "onUpdate:value", "options"])
-                          ]),
+                          default: vue.withCtx(() => {
+                            var _a2;
+                            return [
+                              vue.createVNode(vue.unref(antDesignVue.Select), {
+                                value: schema.op,
+                                "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"])
+                            ];
+                          }),
                           _: 2
                         }, 1032, ["name"]),
                         vue.createVNode(vue.unref(antDesignVue.FormItem), { class: "shy-ui-advanced-search-item-value" }, {
@@ -14647,7 +14657,16 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                                 "onUpdate:value": ($event) => schema[schema.field] = $event,
                                 "value-format": "YYYY-MM-DD HH:mm:ss"
                               }, null, 8, ["value", "onUpdate:value"]))
-                            ], 64)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
+                            ], 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({
+                                  value: schema[`${schema.field}`],
+                                  "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                  valueModifiers: { number: true }
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])
+                              ]),
+                              _: 2
+                            }, 1024)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 3 }, [
                               getComponent(schema.field) === "Input" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), vue.mergeProps({
                                 key: 0,
                                 value: schema[schema.field],
@@ -14798,23 +14817,26 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ColumnSetting = vue.resolveComponent("ColumnSetting");
   const _component_FullScreenSetting = vue.resolveComponent("FullScreenSetting");
   return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$d, [
-    vue.createVNode(_component_GlobalSearch),
-    vue.createVNode(_component_AdvancedSearchSetting, { getPopupContainer: _ctx.getTableContainer }, null, 8, ["getPopupContainer"]),
+    _ctx.getBindValues.useAdvancedSearch ? (vue.openBlock(), vue.createBlock(_component_GlobalSearch, { key: 0 })) : vue.createCommentVNode("", true),
+    _ctx.getBindValues.useAdvancedSearch ? (vue.openBlock(), vue.createBlock(_component_AdvancedSearchSetting, {
+      key: 1,
+      getPopupContainer: _ctx.getTableContainer
+    }, null, 8, ["getPopupContainer"])) : vue.createCommentVNode("", true),
     ((_b = (_a2 = _ctx.getBindValues) == null ? void 0 : _a2.formConfig) == null ? void 0 : _b.schemas) && ((_e = (_d = (_c = _ctx.getBindValues) == null ? void 0 : _c.formConfig) == null ? void 0 : _d.schemas) == null ? void 0 : _e.length) !== 0 ? (vue.openBlock(), vue.createBlock(_component_ShowSearchSetting, {
-      key: 0,
+      key: 2,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : vue.createCommentVNode("", true),
     _ctx.getSetting.size ? (vue.openBlock(), vue.createBlock(_component_SizeSetting, {
-      key: 1,
+      key: 3,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : vue.createCommentVNode("", true),
     _ctx.getSetting.setting ? (vue.openBlock(), vue.createBlock(_component_ColumnSetting, {
-      key: 2,
+      key: 4,
       onColumnsChange: _ctx.handleColumnChange,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["onColumnsChange", "getPopupContainer"])) : vue.createCommentVNode("", true),
     _ctx.getSetting.fullScreen ? (vue.openBlock(), vue.createBlock(_component_FullScreenSetting, {
-      key: 3,
+      key: 5,
       getPopupContainer: _ctx.getTableContainer
     }, null, 8, ["getPopupContainer"])) : vue.createCommentVNode("", true)
   ]);
@@ -15398,7 +15420,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.handleEnsure
           }, {
             default: vue.withCtx(() => [
-              vue.createTextVNode("确定")
+              vue.createTextVNode("搜索")
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -21532,6 +21554,7 @@ exports.getGlobalAdvancedType = getGlobalAdvancedType;
 exports.searchType = searchType;
 exports.searchTypeDate = searchTypeDate;
 exports.searchTypeNumber = searchTypeNumber;
+exports.searchTypeSelect = searchTypeSelect;
 exports.searchTypeString = searchTypeString;
 exports.treeEmits = treeEmits;
 exports.treeProps = treeProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.9.0",
+  "version": "2.9.4",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/use": "1.0.4",
-    "@shy-plugins/utils": "1.0.15"
+    "@shy-plugins/utils": "1.0.15",
+    "@shy-plugins/use": "1.0.4"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {