yahee-components 0.0.50 → 0.0.52

package/es/complex-search/complex-search.vue.js

@@ -1,7 +1,7 @@
-import { defineComponent as te, mergeDefaults as oe, toRefs as re, ref as c, createBlock as d, openBlock as s, unref as l, withCtx as t, createElementVNode as x, createVNode as o, withKeys as se, createSlots as ue, createElementBlock as y, Fragment as b, renderList as g, createCommentVNode as z, createTextVNode as C, toDisplayString as V } from "vue";
+import { defineComponent as te, mergeDefaults as oe, toRefs as re, ref as i, createBlock as d, openBlock as u, unref as l, withCtx as t, createElementVNode as x, createVNode as o, withKeys as se, createSlots as ue, createElementBlock as y, Fragment as C, renderList as b, createCommentVNode as L, createTextVNode as S, toDisplayString as V } from "vue";
 import T from "../_virtual/lodash.js";
 import { defaultComplexSearchProps as ne } from "./props.js";
-import { ElConfigProvider as ie, ElInput as G, ElIcon as ce, ElSelect as k, ElOption as S, ElCheckbox as de, ElLink as pe, ElDialog as me, ElForm as he, ElRow as D, ElFormItem as L, ElButton as N } from "element-plus";
+import { ElConfigProvider as ce, ElInput as R, ElIcon as ie, ElSelect as k, ElOption as g, ElCheckbox as de, ElLink as pe, ElDialog as me, ElForm as he, ElRow as W, ElFormItem as z, ElButton as G } from "element-plus";
 import "element-plus/theme-chalk/src/base.scss";
 import "element-plus/theme-chalk/src/input.scss";
 import "element-plus/theme-chalk/src/checkbox.scss";
@@ -21,7 +21,7 @@ import "element-plus/theme-chalk/src/link.scss";
 import "element-plus/theme-chalk/src/config-provider.scss";
 import { Search as fe } from "@element-plus/icons-vue";
 import ve from "../node_modules/.pnpm/element-plus@2.9.7_vue@3.5.13_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/zh-cn.js";
-const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbox" }, ge = { class: "dialog-footer" }, qe = /* @__PURE__ */ te({
+const ye = { class: "yahee-complex-search" }, Ce = { class: "search-type-checkbox" }, be = { class: "dialog-footer" }, Ne = /* @__PURE__ */ te({
   name: "YaheeComplexSearch",
   __name: "complex-search",
   props: /* @__PURE__ */ oe({
@@ -37,100 +37,105 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
     searchItem: {}
   }, ne()),
   emits: ["filterChangeGrandson"],
-  setup(R, { emit: W }) {
-    const q = ve, m = W, X = R, {
-      defaultSearch: Y,
+  setup(H, { emit: D }) {
+    const N = ve, m = D, A = H, {
+      defaultSearch: q,
       pasteFormat: F,
-      options: B,
-      showPatchSearch: j,
-      specialOptions: P,
-      showWithinFilterCheckbox: A,
-      placeholderText: H,
+      options: O,
+      showPatchSearch: X,
+      specialOptions: B,
+      showWithinFilterCheckbox: Y,
+      placeholderText: j,
       normalOptions: J,
-      showSelect: K,
+      showSelect: P,
       searchItem: n
-    } = re(X), u = c(Y.value || "integrated"), h = c(""), f = c(!1), w = c(!1), v = c(!1), O = c(null), r = c({ searchType: "integrated", searchContent: "" }), M = {
+    } = re(A), r = i(q.value || "WHOLE_SEARCH"), h = i(""), f = i(!1), E = i(!1), v = i(!1), _ = i(null), s = i({ searchType: "WHOLE_SEARCH", searchContent: "" }), M = {
       selectedSearchType: [{ required: !0, message: "请输入查询类型", trigger: "blur" }],
       searchContent: [{ required: !0, message: "请输入查询内容", trigger: "blur" }]
-    }, U = [
+    }, K = [
       {
-        value: "integrated",
+        value: "WHOLE_SEARCH",
         label: "综合搜索"
       }
     ], Q = () => {
       v.value = !0;
-    }, I = () => {
+    }, U = () => {
       v.value = !1;
     }, Z = () => {
-      f.value || (delete n.value.putSearch, m("filterChangeGrandson", n.value, u.value));
-    }, $ = () => n.value, E = () => {
-      h.value ? le() : m("filterChangeGrandson", $(), u.value);
+      f.value || (delete n.value.putSearch, m("filterChangeGrandson", n.value, r.value));
+    }, $ = () => n.value, w = () => {
+      h.value ? le() : m("filterChangeGrandson", $(), r.value);
     }, ee = (p, a) => {
       const e = { ...p };
-      return T.map(P.value, (i) => i.key).includes(a.filterKey) ? P.value.forEach((i) => delete e[i.key]) : delete e[a.filterKey], e;
+      return T.map(B.value, (c) => c.key).includes(a.filterKey) ? B.value.forEach((c) => delete e[c.key]) : delete e[a.filterKey], e;
     };
-    function _(p) {
+    function I(p) {
       T.forEach(p, (a) => {
         ee(n.value, a);
-        const { checkedValues: e, filterKey: i } = a;
-        T.isEmpty(e) || (J.value.includes(i) ? n.value[i] = e[0] : n.value[i] = e);
-      }), m("filterChangeGrandson", n.value, u.value);
+        const { checkedValues: e, filterKey: c } = a;
+        T.isEmpty(e) || (J.value.includes(c) ? n.value[c] = e[0] : n.value[c] = e);
+      }), m("filterChangeGrandson", n.value, r.value);
     }
     const le = () => {
-      f.value ? _([
+      f.value ? I([
         {
           filterKey: "putSearch",
           checkedValues: h.value
+        },
+        {
+          filterKey: "searchType",
+          checkedValues: r.value
         }
       ]) : m(
         "filterChangeGrandson",
         {
-          putSearch: h.value
+          putSearch: h.value,
+          searchType: r.value
         },
-        u.value
+        r.value
       );
     }, ae = () => {
-      O.value.validate((p) => {
-        p && (w.value = !0, f.value ? _([
+      _.value.validate((p) => {
+        p && (E.value = !0, f.value ? I([
           {
             filterKey: "putSearch",
-            checkedValues: r.value.searchContent
+            checkedValues: s.value.searchContent
           },
           {
             filterKey: "searchType",
-            checkedValues: r.value.searchType
+            checkedValues: s.value.searchType
           }
         ]) : m(
           "filterChangeGrandson",
           {
-            putSearch: r.value.searchContent,
-            searchType: r.value.searchType
+            putSearch: s.value.searchContent,
+            searchType: s.value.searchType
           },
-          u.value
-        ), v.value = !1, w.value = !1);
+          r.value
+        ), v.value = !1, E.value = !1);
       });
     };
-    return (p, a) => (s(), d(l(ie), { locale: l(q) }, {
+    return (p, a) => (u(), d(l(ce), { locale: l(N) }, {
       default: t(() => [
         x("div", ye, [
-          o(l(G), {
+          o(l(R), {
             modelValue: h.value,
             "onUpdate:modelValue": a[2] || (a[2] = (e) => h.value = e),
-            placeholder: l(H),
+            placeholder: l(j),
             class: "input-with-select",
             clearable: "",
             maxlength: "30",
-            onChange: E,
-            onKeyup: se(E, ["enter"]),
+            onChange: w,
+            onKeyup: se(w, ["enter"]),
             onPaste: l(F)
           }, ue({
             append: t(() => [
-              o(l(ce), {
+              o(l(ie), {
                 size: "12",
                 color: "#3366cc",
                 style: { cursor: "pointer" },
                 class: "icon-cusor",
-                onClick: E
+                onClick: w
               }, {
                 default: t(() => [
                   o(l(fe))
@@ -140,17 +145,17 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
             ]),
             _: 2
           }, [
-            l(K) ? {
+            l(P) ? {
               name: "prepend",
               fn: t(() => [
                 o(l(k), {
-                  modelValue: u.value,
-                  "onUpdate:modelValue": a[0] || (a[0] = (e) => u.value = e),
+                  modelValue: r.value,
+                  "onUpdate:modelValue": a[0] || (a[0] = (e) => r.value = e),
                   size: "small",
                   class: "custom-select"
                 }, {
                   default: t(() => [
-                    (s(!0), y(b, null, g(l(B), (e) => (s(), d(l(S), {
+                    (u(!0), y(C, null, b(l(O), (e) => (u(), d(l(g), {
                       key: e.label,
                       label: e.label,
                       value: e.value
@@ -164,14 +169,14 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
               name: "prepend",
               fn: t(() => [
                 o(l(k), {
-                  modelValue: u.value,
-                  "onUpdate:modelValue": a[1] || (a[1] = (e) => u.value = e),
+                  modelValue: r.value,
+                  "onUpdate:modelValue": a[1] || (a[1] = (e) => r.value = e),
                   size: "small",
                   class: "custom-select",
                   disabled: ""
                 }, {
                   default: t(() => [
-                    (s(), y(b, null, g(U, (e) => o(l(S), {
+                    (u(), y(C, null, b(K, (e) => o(l(g), {
                       key: e.label,
                       label: e.label,
                       value: e.value
@@ -183,28 +188,28 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
               key: "1"
             }
           ]), 1032, ["modelValue", "placeholder", "onPaste"]),
-          x("div", be, [
-            l(A) ? (s(), d(l(de), {
+          x("div", Ce, [
+            l(Y) ? (u(), d(l(de), {
               key: 0,
               modelValue: f.value,
               "onUpdate:modelValue": a[3] || (a[3] = (e) => f.value = e),
               onChange: Z
             }, {
               default: t(() => a[8] || (a[8] = [
-                C(V("在筛选条件内查询"))
+                S(V("在筛选条件内查询"))
               ])),
               _: 1
-            }, 8, ["modelValue"])) : z("", !0),
-            l(j) ? (s(), d(l(pe), {
+            }, 8, ["modelValue"])) : L("", !0),
+            l(X) ? (u(), d(l(pe), {
               key: 1,
               type: "primary",
               onClick: Q
             }, {
               default: t(() => a[9] || (a[9] = [
-                C(V("批量查询"))
+                S(V("批量查询"))
               ])),
               _: 1
-            })) : z("", !0)
+            })) : L("", !0)
           ])
         ]),
         o(l(me), {
@@ -212,25 +217,25 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
           "onUpdate:modelValue": a[7] || (a[7] = (e) => v.value = e),
           title: "批量查询",
           width: "30%",
-          "before-close": I,
+          "before-close": U,
           "append-to-body": !0,
           draggable: ""
         }, {
           footer: t(() => [
-            x("div", ge, [
-              o(l(N), {
+            x("div", be, [
+              o(l(G), {
                 type: "primary",
-                loading: w.value,
+                loading: E.value,
                 onClick: ae
               }, {
                 default: t(() => a[10] || (a[10] = [
-                  C(V("确认"))
+                  S(V("确认"))
                 ])),
                 _: 1
               }, 8, ["loading"]),
-              o(l(N), { onClick: I }, {
+              o(l(G), { onClick: U }, {
                 default: t(() => a[11] || (a[11] = [
-                  C(V("关闭"))
+                  S(V("关闭"))
                 ])),
                 _: 1
               })
@@ -239,40 +244,40 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
           default: t(() => [
             o(l(he), {
               ref_key: "batchSearchFormRef",
-              ref: O,
-              model: r.value,
+              ref: _,
+              model: s.value,
               rules: M
             }, {
               default: t(() => [
-                o(l(D), { class: "row-class" }, {
+                o(l(W), { class: "row-class" }, {
                   default: t(() => [
-                    o(l(L), { prop: "searchType" }, {
+                    o(l(z), { prop: "searchType" }, {
                       default: t(() => [
-                        l(K) ? (s(), d(l(k), {
+                        l(P) ? (u(), d(l(k), {
                           key: 0,
-                          modelValue: r.value.searchType,
-                          "onUpdate:modelValue": a[4] || (a[4] = (e) => r.value.searchType = e),
+                          modelValue: s.value.searchType,
+                          "onUpdate:modelValue": a[4] || (a[4] = (e) => s.value.searchType = e),
                           size: "small",
                           style: { width: "95px", "background-color": "white" }
                         }, {
                           default: t(() => [
-                            (s(!0), y(b, null, g(l(B), (e) => (s(), d(l(S), {
+                            (u(!0), y(C, null, b(l(O), (e) => (u(), d(l(g), {
                               key: e.label,
                               label: e.label,
                               value: e.value
                             }, null, 8, ["label", "value"]))), 128))
                           ]),
                           _: 1
-                        }, 8, ["modelValue"])) : (s(), d(l(k), {
+                        }, 8, ["modelValue"])) : (u(), d(l(k), {
                           key: 1,
-                          modelValue: r.value.searchType,
-                          "onUpdate:modelValue": a[5] || (a[5] = (e) => r.value.searchType = e),
+                          modelValue: s.value.searchType,
+                          "onUpdate:modelValue": a[5] || (a[5] = (e) => s.value.searchType = e),
                           size: "small",
                           style: { width: "95px", "background-color": "white" },
                           disabled: ""
                         }, {
                           default: t(() => [
-                            (s(), y(b, null, g(U, (e) => o(l(S), {
+                            (u(), y(C, null, b(K, (e) => o(l(g), {
                               key: e.label,
                               label: e.label,
                               value: e.value
@@ -286,16 +291,16 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
                   ]),
                   _: 1
                 }),
-                o(l(D), { class: "row-class" }, {
+                o(l(W), { class: "row-class" }, {
                   default: t(() => [
-                    o(l(L), {
+                    o(l(z), {
                       prop: "searchContent",
                       style: { width: "100%" }
                     }, {
                       default: t(() => [
-                        o(l(G), {
-                          modelValue: r.value.searchContent,
-                          "onUpdate:modelValue": a[6] || (a[6] = (e) => r.value.searchContent = e),
+                        o(l(R), {
+                          modelValue: s.value.searchContent,
+                          "onUpdate:modelValue": a[6] || (a[6] = (e) => s.value.searchContent = e),
                           placeholder: "请输入批量查询内容,从EXCEL复制可自动替换为`,`",
                           type: "textarea",
                           rows: 5,
@@ -319,5 +324,5 @@ const ye = { class: "yahee-complex-search" }, be = { class: "search-type-checkbo
   }
 });
 export {
-  qe as default
+  Ne as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yahee-components",
   "private": false,
-  "version": "0.0.50",
+  "version": "0.0.52",
   "description": "深圳前海亚讯前端组件库",
   "main": "lib",
   "module": "es",