yahee-components 0.0.61 → 0.0.63

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

@@ -1,7 +1,7 @@
-import { defineComponent as re, mergeDefaults as se, toRefs as ue, ref as d, createBlock as p, openBlock as n, unref as a, withCtx as t, createElementVNode as x, createVNode as o, withKeys as ne, createSlots as ce, createElementBlock as y, Fragment as C, renderList as b, createCommentVNode as U, createTextVNode as g, toDisplayString as S } from "vue";
+import { defineComponent as ue, mergeDefaults as ne, toRefs as ce, ref as p, createBlock as d, openBlock as n, unref as a, withCtx as t, createElementVNode as x, createVNode as o, withKeys as ie, createSlots as pe, createElementBlock as y, Fragment as b, renderList as S, createCommentVNode as P, createTextVNode as C, toDisplayString as g } from "vue";
 import T from "../_virtual/lodash.js";
-import { defaultComplexSearchProps as ie } from "./props.js";
-import { ElConfigProvider as de, ElInput as L, ElIcon as pe, ElSelect as V, ElOption as k, ElCheckbox as me, ElLink as he, ElDialog as fe, ElForm as ve, ElRow as R, ElFormItem as W, ElButton as z } from "element-plus";
+import { defaultComplexSearchProps as de } from "./props.js";
+import { ElConfigProvider as me, ElInput as U, ElIcon as he, ElSelect as V, ElOption as k, ElCheckbox as fe, ElLink as ve, ElDialog as ye, ElForm as be, ElRow as L, ElFormItem as R, ElButton as z } 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";
@@ -19,12 +19,12 @@ 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 ye } from "@element-plus/icons-vue";
+import { Search as Se } from "@element-plus/icons-vue";
 import Ce 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 be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbox" }, Se = { class: "dialog-footer" }, qe = /* @__PURE__ */ re({
+const ge = { class: "yahee-complex-search" }, Ve = { class: "search-type-checkbox" }, ke = { class: "dialog-footer" }, Ye = /* @__PURE__ */ ue({
   name: "YaheeComplexSearch",
   __name: "complex-search",
-  props: /* @__PURE__ */ se({
+  props: /* @__PURE__ */ ne({
     pasteFormat: { type: Function },
     defaultSearch: {},
     options: {},
@@ -34,58 +34,62 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
     specialOptions: {},
     normalOptions: {},
     showSelect: { type: Boolean },
-    searchItem: {}
-  }, ie()),
+    searchItem: {},
+    isBatchSelectOptionsSameWithInput: { type: Boolean },
+    batchOptions: {}
+  }, de()),
   emits: ["filterChangeGrandson"],
   setup(G, { emit: H }) {
     const N = Ce, h = H, A = G, {
       defaultSearch: q,
-      options: F,
+      options: O,
       showPatchSearch: X,
-      specialOptions: O,
+      specialOptions: F,
       showWithinFilterCheckbox: Y,
       placeholderText: j,
       normalOptions: J,
       showSelect: B,
-      searchItem: c
-    } = ue(A), u = d(q.value || "WHOLE_SEARCH"), m = d(""), f = d(!1), E = d(!1), v = d(!1), _ = d(null), s = d({ searchType: "WHOLE_SEARCH", searchContent: "" }), M = {
+      searchItem: c,
+      isBatchSelectOptionsSameWithInput: M,
+      batchOptions: Q
+    } = ce(A), u = p(q.value || "WHOLE_SEARCH"), m = p(""), f = p(!1), E = p(!1), v = p(!1), I = p(null), s = p({ searchType: "WHOLE_SEARCH", searchContent: "" }), Z = {
       selectedSearchType: [{ required: !0, message: "请输入查询类型", trigger: "blur" }],
       searchContent: [{ required: !0, message: "请输入查询内容", trigger: "blur" }]
-    }, K = [
+    }, _ = [
       {
         value: "WHOLE_SEARCH",
         label: "综合搜索"
       }
-    ], Q = () => {
+    ], $ = () => {
       v.value = !0;
-    }, D = () => {
+    }, K = () => {
       v.value = !1;
-    }, Z = () => {
+    }, ee = () => {
       f.value || (delete c.value.putSearch, h("filterChangeGrandson", c.value, u.value));
-    }, $ = () => c.value, w = () => {
-      m.value ? te() : h("filterChangeGrandson", $(), u.value);
-    }, ee = (r, l) => {
+    }, le = () => c.value, w = () => {
+      m.value ? re() : h("filterChangeGrandson", le(), u.value);
+    }, ae = (r, l) => {
       const e = { ...r };
-      return T.map(O.value, (i) => i.key).includes(l.filterKey) ? O.value.forEach((i) => delete e[i.key]) : delete e[l.filterKey], e;
+      return T.map(F.value, (i) => i.key).includes(l.filterKey) ? F.value.forEach((i) => delete e[i.key]) : delete e[l.filterKey], e;
     };
-    function I(r) {
+    function W(r) {
       T.forEach(r, (l) => {
-        ee(c.value, l);
+        ae(c.value, l);
         const { checkedValues: e, filterKey: i } = l;
         T.isEmpty(e) || (J.value.includes(i) ? c.value[i] = e[0] : c.value[i] = e);
       }), h("filterChangeGrandson", c.value, u.value);
     }
-    const le = (r) => {
-      m.value = P(r) || "";
-    }, ae = (r) => {
-      s.value.searchContent = P(r) || "";
-    }, P = (r) => {
+    const te = (r) => {
+      m.value = D(r) || "";
+    }, oe = (r) => {
+      s.value.searchContent = D(r) || "";
+    }, D = (r) => {
       var e;
       r.preventDefault();
       const l = (e = r.clipboardData) == null ? void 0 : e.getData("text/plain");
       return l == null ? void 0 : l.replace(/[\n\r\t]+/g, ",");
-    }, te = () => {
-      f.value ? I([
+    }, re = () => {
+      f.value ? W([
         {
           filterKey: "putSearch",
           checkedValues: m.value
@@ -102,9 +106,9 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
         },
         u.value
       );
-    }, oe = () => {
-      _.value.validate((r) => {
-        r && (E.value = !0, f.value ? I([
+    }, se = () => {
+      I.value.validate((r) => {
+        r && (E.value = !0, f.value ? W([
           {
             filterKey: "putSearch",
             checkedValues: s.value.searchContent
@@ -123,10 +127,10 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
         ), v.value = !1, E.value = !1);
       });
     };
-    return (r, l) => (n(), p(a(de), { locale: a(N) }, {
+    return (r, l) => (n(), d(a(me), { locale: a(N) }, {
       default: t(() => [
-        x("div", be, [
-          o(a(L), {
+        x("div", ge, [
+          o(a(U), {
             modelValue: m.value,
             "onUpdate:modelValue": l[2] || (l[2] = (e) => m.value = e),
             placeholder: a(j),
@@ -134,11 +138,11 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
             clearable: "",
             maxlength: "30",
             onChange: w,
-            onKeyup: ne(w, ["enter"]),
-            onPaste: le
-          }, ce({
+            onKeyup: ie(w, ["enter"]),
+            onPaste: te
+          }, pe({
             append: t(() => [
-              o(a(pe), {
+              o(a(he), {
                 size: "12",
                 color: "#3366cc",
                 style: { cursor: "pointer" },
@@ -146,7 +150,7 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                 onClick: w
               }, {
                 default: t(() => [
-                  o(a(ye))
+                  o(a(Se))
                 ]),
                 _: 1
               })
@@ -163,7 +167,7 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                   class: "custom-select"
                 }, {
                   default: t(() => [
-                    (n(!0), y(C, null, b(a(F), (e) => (n(), p(a(k), {
+                    (n(!0), y(b, null, S(a(O), (e) => (n(), d(a(k), {
                       key: e.label,
                       label: e.label,
                       value: e.value
@@ -184,7 +188,7 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                   disabled: ""
                 }, {
                   default: t(() => [
-                    (n(), y(C, null, b(K, (e) => o(a(k), {
+                    (n(), y(b, null, S(_, (e) => o(a(k), {
                       key: e.label,
                       label: e.label,
                       value: e.value
@@ -196,72 +200,72 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
               key: "1"
             }
           ]), 1032, ["modelValue", "placeholder"]),
-          x("div", ge, [
-            a(Y) ? (n(), p(a(me), {
+          x("div", Ve, [
+            a(Y) ? (n(), d(a(fe), {
               key: 0,
               modelValue: f.value,
               "onUpdate:modelValue": l[3] || (l[3] = (e) => f.value = e),
-              onChange: Z
+              onChange: ee
             }, {
               default: t(() => l[8] || (l[8] = [
-                g(S("在筛选条件内查询"))
+                C(g("在筛选条件内查询"))
               ])),
               _: 1
-            }, 8, ["modelValue"])) : U("", !0),
-            a(X) ? (n(), p(a(he), {
+            }, 8, ["modelValue"])) : P("", !0),
+            a(X) ? (n(), d(a(ve), {
               key: 1,
               type: "primary",
-              onClick: Q
+              onClick: $
             }, {
               default: t(() => l[9] || (l[9] = [
-                g(S("批量查询"))
+                C(g("批量查询"))
               ])),
               _: 1
-            })) : U("", !0)
+            })) : P("", !0)
           ])
         ]),
-        o(a(fe), {
+        o(a(ye), {
           modelValue: v.value,
           "onUpdate:modelValue": l[7] || (l[7] = (e) => v.value = e),
           title: "批量查询",
           width: "30%",
-          "before-close": D,
+          "before-close": K,
           "append-to-body": !0,
           draggable: ""
         }, {
           footer: t(() => [
-            x("div", Se, [
+            x("div", ke, [
               o(a(z), {
                 type: "primary",
                 loading: E.value,
-                onClick: oe
+                onClick: se
               }, {
                 default: t(() => l[10] || (l[10] = [
-                  g(S("确认"))
+                  C(g("确认"))
                 ])),
                 _: 1
               }, 8, ["loading"]),
-              o(a(z), { onClick: D }, {
+              o(a(z), { onClick: K }, {
                 default: t(() => l[11] || (l[11] = [
-                  g(S("关闭"))
+                  C(g("关闭"))
                 ])),
                 _: 1
               })
             ])
           ]),
           default: t(() => [
-            o(a(ve), {
+            o(a(be), {
               ref_key: "batchSearchFormRef",
-              ref: _,
+              ref: I,
               model: s.value,
-              rules: M
+              rules: Z
             }, {
               default: t(() => [
-                o(a(R), { class: "row-class" }, {
+                o(a(L), { class: "row-class" }, {
                   default: t(() => [
-                    o(a(W), { prop: "searchType" }, {
+                    o(a(R), { prop: "searchType" }, {
                       default: t(() => [
-                        a(B) ? (n(), p(a(V), {
+                        a(B) ? (n(), d(a(V), {
                           key: 0,
                           modelValue: s.value.searchType,
                           "onUpdate:modelValue": l[4] || (l[4] = (e) => s.value.searchType = e),
@@ -269,14 +273,14 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                           style: { width: "100px", "background-color": "white" }
                         }, {
                           default: t(() => [
-                            (n(!0), y(C, null, b(a(F), (e) => (n(), p(a(k), {
+                            (n(!0), y(b, null, S(a(M) ? a(O) : a(Q), (e) => (n(), d(a(k), {
                               key: e.label,
                               label: e.label,
                               value: e.value
                             }, null, 8, ["label", "value"]))), 128))
                           ]),
                           _: 1
-                        }, 8, ["modelValue"])) : (n(), p(a(V), {
+                        }, 8, ["modelValue"])) : (n(), d(a(V), {
                           key: 1,
                           modelValue: s.value.searchType,
                           "onUpdate:modelValue": l[5] || (l[5] = (e) => s.value.searchType = e),
@@ -285,7 +289,7 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                           disabled: ""
                         }, {
                           default: t(() => [
-                            (n(), y(C, null, b(K, (e) => o(a(k), {
+                            (n(), y(b, null, S(_, (e) => o(a(k), {
                               key: e.label,
                               label: e.label,
                               value: e.value
@@ -299,20 +303,20 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
                   ]),
                   _: 1
                 }),
-                o(a(R), { class: "row-class" }, {
+                o(a(L), { class: "row-class" }, {
                   default: t(() => [
-                    o(a(W), {
+                    o(a(R), {
                       prop: "searchContent",
                       style: { width: "100%" }
                     }, {
                       default: t(() => [
-                        o(a(L), {
+                        o(a(U), {
                           modelValue: s.value.searchContent,
                           "onUpdate:modelValue": l[6] || (l[6] = (e) => s.value.searchContent = e),
                           placeholder: "请输入批量查询内容,从EXCEL复制可自动替换为`,`",
                           type: "textarea",
                           rows: 5,
-                          onPaste: ae
+                          onPaste: oe
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -332,5 +336,5 @@ const be = { class: "yahee-complex-search" }, ge = { class: "search-type-checkbo
   }
 });
 export {
-  qe as default
+  Ye as default
 };

package/es/left-condition/left-condition.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent as re, toRefs as ie, ref as v, computed as ce, watch as fe, onMounted as de, nextTick as L, resolveComponent as K, createElementBlock as V, openBlock as p, createVNode as b, withCtx as q, unref as s, createCommentVNode as z, normalizeStyle as ve, toDisplayString as F, Fragment as me, renderList as pe, createBlock as ge, createTextVNode as M } from "vue";
+import { defineComponent as re, toRefs as ie, ref as v, computed as ce, watch as fe, onMounted as de, nextTick as L, resolveComponent as K, createElementBlock as b, openBlock as p, createVNode as C, withCtx as q, unref as s, createCommentVNode as z, normalizeStyle as ve, toDisplayString as F, Fragment as me, renderList as pe, createBlock as ge, createTextVNode as M } from "vue";
 import l from "../_virtual/lodash.js";
 import ye from "./left-condition-sub.vue.js";
 import { stylesUtils as he } from "../utils/style.js";
@@ -35,7 +35,7 @@ const ke = { class: "yahee-left-condition" }, Ne = {
   setup(O, { expose: Y, emit: j }) {
     const G = O, {
       multiSelectList: w,
-      displayRangeInput: C,
+      displayRangeInput: R,
       selectList: g,
       hasNum: H,
       allIsEmpty: Q,
@@ -46,15 +46,15 @@ const ke = { class: "yahee-left-condition" }, Ne = {
       rangeEndKey: i,
       noNeedRefreshNumFilterName: $,
       defaultValues: h,
-      totalCount: R,
-      countList: _,
+      totalCount: _,
+      countList: x,
       showTotal: Z
-    } = ie(G), x = j, E = v(R.value), f = v(), d = v(), T = v(_.value), u = /* @__PURE__ */ new Map(), c = v(!0), m = v([]), k = () => {
+    } = ie(G), E = j, A = v(_.value), f = v(), d = v(), T = v(x.value), u = /* @__PURE__ */ new Map(), c = v(!0), m = v([]), k = () => {
       console.log("left condition notifyParent start"), L(() => {
-        var o, S;
+        var o, V;
         const e = N(), t = ue();
         if (l.isEmpty(e) && l.isEmpty(t)) {
-          I();
+          S();
           return;
         }
         const a = [
@@ -63,20 +63,20 @@ const ke = { class: "yahee-left-condition" }, Ne = {
             checkedValues: l.map(e, (n) => n.value)
           }
         ];
-        C.value && (a.push({
+        R.value && (a.push({
           filterKey: r.value,
           checkedValues: [(o = u.get(r.value)) == null ? void 0 : o.value]
         }), a.push({
           filterKey: i.value,
-          checkedValues: [(S = u.get(i.value)) == null ? void 0 : S.value]
-        })), x("filterChange", a), console.log(
+          checkedValues: [(V = u.get(i.value)) == null ? void 0 : V.value]
+        })), E("filterChange", a), console.log(
           `left condition notifyParent nextTick after emit, filterKey: ${y.value}, checkedValues: ${JSON.stringify(l.map(e, (n) => n.value))}`
         );
       });
     }, ee = () => {
-      x("setNoNeedRefreshNumFilterName");
+      E("setNoNeedRefreshNumFilterName");
     }, U = () => {
-      B(), A({ label: r.value, selected: !0, value: f.value }), A({ label: i.value, selected: !0, value: d.value });
+      I(), B({ label: r.value, selected: !0, value: f.value }), B({ label: i.value, selected: !0, value: d.value });
     }, te = () => {
       const e = u.get(r.value);
       l.isEmpty(e) && !f.value || l.get(e, "value") === f.value || (U(), k());
@@ -84,7 +84,7 @@ const ke = { class: "yahee-left-condition" }, Ne = {
       const e = u.get(i.value);
       l.isEmpty(e) && !d.value || l.get(e, "value") === d.value || (U(), k());
     };
-    function A(e) {
+    function B(e) {
       console.log(`left condition setSelectedStatusMap start, item: ${JSON.stringify(e)}`), u.set(e.label, {
         selected: e.selected,
         value: e.value
@@ -93,7 +93,7 @@ const ke = { class: "yahee-left-condition" }, Ne = {
     function P(e) {
       return l.includes(w.value, e.value);
     }
-    function B() {
+    function I() {
       const e = l.map(N(), (t) => t.value);
       u.clear(), l.forEach(m.value, (t) => {
         l.includes(e, t.getValue().value) && t.resetValue();
@@ -103,7 +103,7 @@ const ke = { class: "yahee-left-condition" }, Ne = {
       const e = l.map(N(), (t) => t.value);
       u.clear(), l.forEach(m.value, (t) => {
         l.includes(e, t.getValue().value) && t.resetValue();
-      }), c.value = !0;
+      }), c.value = !0, S();
     }
     const N = () => {
       const e = l.filter(
@@ -122,25 +122,25 @@ const ke = { class: "yahee-left-condition" }, Ne = {
     }, se = ce(() => l.sortBy(g.value, (e) => P(e))), D = () => {
       f.value = void 0, d.value = void 0, u.delete(r.value), u.delete(i.value);
     };
-    function I() {
-      B(), L(() => {
+    function S() {
+      I(), L(() => {
         console.log("selectList.value:", g.value), c.value = !0;
         const e = g.value.filter((a) => !P(a)), t = l.map(e, (a) => a.value);
-        x("filterChange", [
+        E("filterChange", [
           {
             filterKey: y.value,
             checkedValues: Q.value ? [] : t
           }
         ]);
-      }), C.value && D();
+      }), R.value && D();
     }
     return fe(
-      [() => R.value, () => _.value],
+      [() => _.value, () => x.value],
       ([e, t], [a, o]) => {
-        console.log(e, t), console.log(a, o), (!$.value || !l.eq($.value, y.value)) && (E.value = R.value, T.value = _.value);
+        console.log(e, t), console.log(a, o), (!$.value || !l.eq($.value, y.value)) && (A.value = _.value, T.value = x.value);
       }
     ), Y({
-      clickAllSelected: I,
+      clickAllSelected: S,
       resetAllCheckedValueAndSelectAll: ae
     }), de(() => {
       if (!Array.isArray(h.value) || l.isEmpty(h.value)) {
@@ -153,19 +153,19 @@ const ke = { class: "yahee-left-condition" }, Ne = {
         }), k();
       });
     }), (e, t) => {
-      const a = K("el-input-number"), o = K("el-form-item"), S = K("el-form");
-      return p(), V("div", ke, [
-        b(S, null, {
+      const a = K("el-input-number"), o = K("el-form-item"), V = K("el-form");
+      return p(), b("div", ke, [
+        C(V, null, {
           default: q(() => [
-            b(o, { label: s(X) }, {
+            C(o, { label: s(X) }, {
               default: q(() => [
-                s(Z) ? (p(), V("span", {
+                s(Z) ? (p(), b("span", {
                   key: 0,
                   class: "el-button custom-button el-button--small",
                   style: ve(s(he).getBackgroundColor(c.value)),
-                  onClick: I
-                }, F(E.value ? `${s(J)("全部")}(${E.value})` : s(J)("全部")), 5)) : z("", !0),
-                (p(!0), V(me, null, pe(se.value, (n, oe) => (p(), ge(ye, {
+                  onClick: S
+                }, F(A.value ? `${s(J)("全部")}(${A.value})` : s(J)("全部")), 5)) : z("", !0),
+                (p(!0), b(me, null, pe(se.value, (n, oe) => (p(), ge(ye, {
                   key: oe,
                   ref_for: !0,
                   ref_key: "itemRefs",
@@ -176,16 +176,16 @@ const ke = { class: "yahee-left-condition" }, Ne = {
                   "count-list": T.value,
                   item: n,
                   "has-num": s(H),
-                  onResetAllCheckedValue: B,
-                  onSetSelectedStatusMap: A,
+                  onResetAllCheckedValue: I,
+                  onSetSelectedStatusMap: B,
                   onResetRange: D,
                   onSetNoNeedRefreshNumFilterName: ee,
                   onNotifyParent: k,
                   onResetIsSelectAll: ne
                 }, null, 8, ["all-is-checkbox", "multi-select-list", "translate-user-id", "count-list", "item", "has-num"]))), 128)),
-                s(C) ? (p(), V("div", Ne, [
+                s(R) ? (p(), b("div", Ne, [
                   M(F(e.rangeLabel) + "  ", 1),
-                  b(a, {
+                  C(a, {
                     modelValue: f.value,
                     "onUpdate:modelValue": t[0] || (t[0] = (n) => f.value = n),
                     style: { "margin-left": "2px", width: "60px", height: "22px" },
@@ -197,7 +197,7 @@ const ke = { class: "yahee-left-condition" }, Ne = {
                     onBlur: te
                   }, null, 8, ["modelValue"]),
                   M("   %   " + F(e.rangeDelimiter) + "   ", 1),
-                  b(a, {
+                  C(a, {
                     modelValue: d.value,
                     "onUpdate:modelValue": t[1] || (t[1] = (n) => d.value = n),
                     style: { width: "60px", height: "22px" },

package/package.json

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

package/types/src/complex-search/props.d.ts

@@ -50,6 +50,8 @@ export interface ComplexSearchProps {
      * default: {}
      */
     searchItem?: SearchItem;
+    isBatchSelectOptionsSameWithInput?: boolean;
+    batchOptions?: SearchOptions[];
 }
 export declare function defaultComplexSearchProps(): {
     defaultSearch: string;