yahee-components 0.0.17 → 0.0.19

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

@@ -1,6 +1,6 @@
-import { defineComponent as oe, toRefs as re, ref as u, reactive as se, openBlock as c, createBlock as f, unref as e, withCtx as a, createElementVNode as C, createVNode as o, withKeys as ne, createSlots as ie, createElementBlock as T, Fragment as _, renderList as P, createTextVNode as g, toDisplayString as v, createCommentVNode as I } from "vue";
+import { defineComponent as oe, toRefs as re, ref as i, openBlock as c, createBlock as f, unref as e, withCtx as t, createElementVNode as C, createVNode as o, withKeys as se, createSlots as ne, createElementBlock as T, Fragment as _, renderList as I, createTextVNode as g, toDisplayString as v, createCommentVNode as P } from "vue";
 import y from "../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/lodash.js";
-import { ElConfigProvider as ue, ElInput as K, ElIcon as ce, ElSelect as G, ElOption as U, ElCheckbox as de, ElLink as pe, ElDialog as me, ElButton as L, ElForm as he, ElRow as E, ElFormItem as N } from "element-plus";
+import { ElConfigProvider as ue, ElInput as K, ElIcon as ie, ElSelect as G, ElOption as U, ElCheckbox as ce, ElLink as de, ElDialog as pe, ElButton as L, ElForm as me, ElRow as E, ElFormItem as N } 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";
@@ -18,9 +18,9 @@ import "element-plus/theme-chalk/src/row.scss";
 import "element-plus/theme-chalk/src/button.scss";
 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.8.3_vue@3.5.12_typescript@5.6.2_/node_modules/element-plus/es/locale/lang/zh-cn.js";
-const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-checkbox" }, ge = { class: "dialog-footer" }, De = /* @__PURE__ */ oe({
+import { Search as he } from "@element-plus/icons-vue";
+import fe from "../node_modules/.pnpm/element-plus@2.8.3_vue@3.5.12_typescript@5.6.2_/node_modules/element-plus/es/locale/lang/zh-cn.js";
+const ve = { class: "yahee-comporehensive-search" }, ye = { class: "search-type-checkbox" }, Ce = { class: "dialog-footer" }, ze = /* @__PURE__ */ oe({
   name: "YaheeComprehensiveSearch",
   __name: "comprehensive-search",
   props: {
@@ -33,11 +33,12 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
     showWithinFilterCheckbox: { type: Boolean, default: !1 },
     specialOptions: { default: () => [] },
     normalOptions: { default: () => [] },
-    showSelect: { type: Boolean, default: !1 }
+    showSelect: { type: Boolean, default: !1 },
+    searchItem: { default: () => ({}) }
   },
   emits: ["filterChangeGrandson"],
   setup(R, { emit: W }) {
-    const z = ve, p = W, D = R, {
+    const z = fe, p = W, D = R, {
       dealSearch: q,
       defaultSearch: H,
       pasteFormat: b,
@@ -47,8 +48,9 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
       showWithinFilterCheckbox: J,
       placeholderText: X,
       normalOptions: Y,
-      showSelect: $
-    } = re(D), S = u(H.value), d = u(""), m = u(!1), V = u(!1), h = u(!1), x = u(null), s = u({ searchType: "WHOLE_SEARCH", searchContent: "" }), r = se({}), j = {
+      showSelect: $,
+      searchItem: r
+    } = re(D), S = i(H.value), d = i(""), m = i(!1), V = i(!1), h = i(!1), x = i(null), s = i({ searchType: "WHOLE_SEARCH", searchContent: "" }), j = {
       selectedSearchType: [{ required: !0, message: "请输入查询类型", trigger: "blur" }],
       searchContent: [{ required: !0, message: "请输入查询内容", trigger: "blur" }]
     }, M = () => {
@@ -56,19 +58,19 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
     }, B = () => {
       h.value = !1;
     }, Q = () => {
-      m.value || (delete r.simpleSearch, p("filterChangeGrandson", r));
-    }, Z = () => r, k = () => {
+      m.value || (delete r.value.simpleSearch, p("filterChangeGrandson", r.value));
+    }, Z = () => r.value, k = () => {
       d.value ? le() : p("filterChangeGrandson", Z());
     }, ee = (n, l) => {
-      const t = { ...n };
-      return y.map(F.value, (i) => i.key).includes(l.filterKey) ? F.value.forEach((i) => delete t[i.key]) : delete t[l.filterKey], t;
+      const a = { ...n };
+      return y.map(F.value, (u) => u.key).includes(l.filterKey) ? F.value.forEach((u) => delete a[u.key]) : delete a.value[l.filterKey], a.value;
     };
     function O(n) {
-      console.log("displayFilter filterChange start", n, r), y.forEach(n, (l) => {
-        ee(r, l);
-        const { checkedValues: t, filterKey: i } = l;
-        y.isEmpty(t) || (Y.value.includes(i) ? r[i] = t[0] : r[i] = t);
-      }), p("filterChangeGrandson", r), console.log(`searchItem - ${JSON.stringify(r)}`), console.log("displayFilter filterChange end");
+      console.log("displayFilter filterChange start", n, r.value), y.forEach(n, (l) => {
+        ee(r.value, l);
+        const { checkedValues: a, filterKey: u } = l;
+        y.isEmpty(a) || (Y.value.includes(u) ? r.value[u] = a[0] : r.value[u] = a);
+      }), p("filterChangeGrandson", r.value), console.log(`searchItem - ${JSON.stringify(r.value)}`), console.log("displayFilter filterChange end");
     }
     const le = () => {
       m.value ? O([
@@ -79,9 +81,9 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
       ]) : p("filterChangeGrandson", {
         simpleSearch: d.value
       });
-    }, te = () => {
-      q.value(S.value, d.value);
     }, ae = () => {
+      q.value(S.value, d.value);
+    }, te = () => {
       x.value.validate((n) => {
         n && (V.value = !0, m.value ? O([
           {
@@ -94,30 +96,30 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
       });
     };
     return (n, l) => (c(), f(e(ue), { locale: e(z) }, {
-      default: a(() => [
-        C("div", ye, [
+      default: t(() => [
+        C("div", ve, [
           o(e(K), {
             modelValue: d.value,
-            "onUpdate:modelValue": l[1] || (l[1] = (t) => d.value = t),
+            "onUpdate:modelValue": l[1] || (l[1] = (a) => d.value = a),
             placeholder: e(X),
             class: "input-with-select",
             clearable: "",
             maxlength: "30",
             onChange: k,
-            onKeyup: ne(k, ["enter"]),
+            onKeyup: se(k, ["enter"]),
             onPaste: e(b),
-            onClear: te
-          }, ie({
-            append: a(() => [
-              o(e(ce), {
+            onClear: ae
+          }, ne({
+            append: t(() => [
+              o(e(ie), {
                 size: "12",
                 color: "#3366cc",
                 style: { cursor: "pointer" },
                 class: "icon-cusor",
                 onClick: k
               }, {
-                default: a(() => [
-                  o(e(fe))
+                default: t(() => [
+                  o(e(he))
                 ]),
                 _: 1
               })
@@ -126,18 +128,18 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
           }, [
             e($) ? {
               name: "prepend",
-              fn: a(() => [
+              fn: t(() => [
                 o(e(G), {
                   modelValue: S.value,
-                  "onUpdate:modelValue": l[0] || (l[0] = (t) => S.value = t),
+                  "onUpdate:modelValue": l[0] || (l[0] = (a) => S.value = a),
                   size: "small",
                   class: "custom-select"
                 }, {
-                  default: a(() => [
-                    (c(!0), T(_, null, P(e(w), (t) => (c(), f(e(U), {
-                      key: t.label,
-                      label: t.label,
-                      value: t.value
+                  default: t(() => [
+                    (c(!0), T(_, null, I(e(w), (a) => (c(), f(e(U), {
+                      key: a.label,
+                      label: a.label,
+                      value: a.value
                     }, null, 8, ["label", "value"]))), 128))
                   ]),
                   _: 1
@@ -146,88 +148,88 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
               key: "0"
             } : void 0
           ]), 1032, ["modelValue", "placeholder", "onPaste"]),
-          C("div", Ce, [
-            e(J) ? (c(), f(e(de), {
+          C("div", ye, [
+            e(J) ? (c(), f(e(ce), {
               key: 0,
               modelValue: m.value,
-              "onUpdate:modelValue": l[2] || (l[2] = (t) => m.value = t),
+              "onUpdate:modelValue": l[2] || (l[2] = (a) => m.value = a),
               onChange: Q
             }, {
-              default: a(() => l[6] || (l[6] = [
+              default: t(() => l[6] || (l[6] = [
                 g(v("在筛选条件内查询"))
               ])),
               _: 1
-            }, 8, ["modelValue"])) : I("", !0),
-            e(A) ? (c(), f(e(pe), {
+            }, 8, ["modelValue"])) : P("", !0),
+            e(A) ? (c(), f(e(de), {
               key: 1,
               type: "primary",
               onClick: M
             }, {
-              default: a(() => l[7] || (l[7] = [
+              default: t(() => l[7] || (l[7] = [
                 g(v("批量查询"))
               ])),
               _: 1
-            })) : I("", !0)
+            })) : P("", !0)
           ])
         ]),
-        o(e(me), {
+        o(e(pe), {
           modelValue: h.value,
-          "onUpdate:modelValue": l[5] || (l[5] = (t) => h.value = t),
+          "onUpdate:modelValue": l[5] || (l[5] = (a) => h.value = a),
           title: "批量查询",
           width: "30%",
           "before-close": B,
           "append-to-body": !0,
           draggable: ""
         }, {
-          footer: a(() => [
-            C("div", ge, [
+          footer: t(() => [
+            C("div", Ce, [
               o(e(L), {
                 type: "primary",
                 loading: V.value,
-                onClick: ae
+                onClick: te
               }, {
-                default: a(() => l[9] || (l[9] = [
+                default: t(() => l[9] || (l[9] = [
                   g(v("确认"))
                 ])),
                 _: 1
               }, 8, ["loading"]),
               o(e(L), { onClick: B }, {
-                default: a(() => l[10] || (l[10] = [
+                default: t(() => l[10] || (l[10] = [
                   g(v("关闭"))
                 ])),
                 _: 1
               })
             ])
           ]),
-          default: a(() => [
-            o(e(he), {
+          default: t(() => [
+            o(e(me), {
               ref_key: "batchSearchFormRef",
               ref: x,
               model: s.value,
               rules: j
             }, {
-              default: a(() => [
+              default: t(() => [
                 o(e(E), { class: "row-class" }, {
-                  default: a(() => l[8] || (l[8] = [
+                  default: t(() => l[8] || (l[8] = [
                     C("span", null, v("综合搜索"), -1)
                   ])),
                   _: 1
                 }),
                 o(e(E), { class: "row-class" }, {
-                  default: a(() => [
+                  default: t(() => [
                     o(e(N), { prop: "searchType" }, {
-                      default: a(() => [
+                      default: t(() => [
                         o(e(G), {
                           modelValue: s.value.searchType,
-                          "onUpdate:modelValue": l[3] || (l[3] = (t) => s.value.searchType = t),
+                          "onUpdate:modelValue": l[3] || (l[3] = (a) => s.value.searchType = a),
                           size: "small",
                           class: "custom-select"
                         }, {
-                          default: a(() => [
-                            (c(!0), T(_, null, P(e(w), (t) => (c(), f(e(U), {
-                              key: t.label,
-                              label: t.label,
-                              value: t.value
+                          default: t(() => [
+                            (c(!0), T(_, null, I(e(w), (a) => (c(), f(e(U), {
+                              key: a.label,
+                              label: a.label,
+                              value: a.value
                             }, null, 8, ["label", "value"]))), 128))
                           ]),
                           _: 1
@@ -239,15 +241,15 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
                   _: 1
                 }),
                 o(e(E), { class: "row-class" }, {
-                  default: a(() => [
+                  default: t(() => [
                     o(e(N), {
                       prop: "searchContent",
                       style: { width: "100%" }
                     }, {
-                      default: a(() => [
+                      default: t(() => [
                         o(e(K), {
                           modelValue: s.value.searchContent,
-                          "onUpdate:modelValue": l[4] || (l[4] = (t) => s.value.searchContent = t),
+                          "onUpdate:modelValue": l[4] || (l[4] = (a) => s.value.searchContent = a),
                           placeholder: "请输入批量查询内容,从EXCEL复制可自动替换为`,`",
                           type: "textarea",
                           rows: 5,
@@ -271,5 +273,5 @@ const ye = { class: "yahee-comporehensive-search" }, Ce = { class: "search-type-
   }
 });
 export {
-  De as default
+  ze as default
 };

package/package.json

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

package/types/src/comprehensive-search/comprehensive-search.vue.d.ts

@@ -4,6 +4,10 @@ interface SearchDataOptions {
     label: string;
     key: string;
 }
+type FilterValue = string | number | boolean | string[] | number[];
+interface SearchItem {
+    [key: string]: FilterValue;
+}
 declare const _default: DefineComponent<{
     dealSearch?: (selectedSearchType: string, searchQuery: string) => void;
     pasteFormat?: () => void;
@@ -15,6 +19,7 @@ declare const _default: DefineComponent<{
     specialOptions?: SearchDataOptions[];
     normalOptions?: string[];
     showSelect?: boolean;
+    searchItem?: SearchItem;
 }, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     filterChangeGrandson: (...args: any[]) => void;
 }, string, PublicProps, Readonly<{
@@ -28,6 +33,7 @@ declare const _default: DefineComponent<{
     specialOptions?: SearchDataOptions[];
     normalOptions?: string[];
     showSelect?: boolean;
+    searchItem?: SearchItem;
 }> & Readonly<{
     onFilterChangeGrandson?: (...args: any[]) => any;
 }>, {
@@ -41,5 +47,6 @@ declare const _default: DefineComponent<{
     specialOptions: SearchDataOptions[];
     normalOptions: string[];
     showSelect: boolean;
+    searchItem: SearchItem;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 export default _default;