yahee-components 0.0.89 → 0.0.91

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

@@ -1,7 +1,7 @@
-import { defineComponent as R, toRefs as _, ref as l, watch as k } from "vue";
+import { defineComponent as R, toRefs as _, ref as n, watch as k } from "vue";
 import v from "../_virtual/lodash.js";
-import { defaultComplexSearchProps as o } from "./props.js";
-import { ElLink as L, ElOption as P, ElButton as G, ElRow as K, ElFormItem as V, ElForm as j, ElIcon as q, ElDialog as Y, ElSelect as $, ElCheckbox as z, ElInput as J } from "element-plus";
+import { defaultComplexSearchProps as l } from "./props.js";
+import { ElLink as G, ElOption as P, ElButton as K, ElRow as V, ElFormItem as j, ElForm as q, ElIcon as Y, ElDialog as $, ElSelect as z, ElCheckbox as J, ElInput as M } 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,167 +18,179 @@ import "element-plus/theme-chalk/src/form-item.scss";
 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 { Search as M } from "@element-plus/icons-vue";
-const ye = R({
+import { Search as N } from "@element-plus/icons-vue";
+const Ce = R({
   name: "YaheeComplexSearch",
   components: {
-    ElInput: J,
-    ElCheckbox: z,
-    ElSelect: $,
-    ElDialog: Y,
-    ElIcon: q,
-    ElForm: j,
-    ElFormItem: V,
-    ElRow: K,
-    ElButton: G,
+    ElInput: M,
+    ElCheckbox: J,
+    ElSelect: z,
+    ElDialog: $,
+    ElIcon: Y,
+    ElForm: q,
+    ElFormItem: j,
+    ElRow: V,
+    ElButton: K,
     ElOption: P,
-    ElLink: L,
-    Search: M
+    ElLink: G,
+    Search: N
   },
   props: {
     defaultSearch: {
       type: String,
-      default: o().defaultSearch
+      default: l().defaultSearch
     },
     options: {
       type: Array,
-      default: o().options
+      default: l().options
     },
     placeholderText: {
       type: String,
-      default: o().placeholderText
+      default: l().placeholderText
     },
     showPatchSearch: {
       type: Boolean,
-      default: o().showPatchSearch
+      default: l().showPatchSearch
     },
     showWithinFilterCheckbox: {
       type: Boolean,
-      default: o().showWithinFilterCheckbox
+      default: l().showWithinFilterCheckbox
     },
     specialOptions: {
       type: Array,
-      default: o().specialOptions
+      default: l().specialOptions
     },
     normalOptions: {
       type: Array,
-      default: o().normalOptions
+      default: l().normalOptions
     },
     showSelect: {
       type: Boolean,
-      default: o().showSelect
+      default: l().showSelect
     },
     searchItem: {
       type: Object,
-      default: o().searchItem
+      default: l().searchItem
     },
     isBatchSelectOptionsSameWithInput: {
       type: Boolean,
-      default: o().isBatchSelectOptionsSameWithInput
+      default: l().isBatchSelectOptionsSameWithInput
     },
     batchOptions: {
       type: Array,
-      default: o().batchOptions
+      default: l().batchOptions
     }
   },
   emits: ["filterChangeGrandson", "update:searchItem"],
-  setup(y, { emit: f }) {
-    const { specialOptions: C, normalOptions: g, searchItem: E } = _(y), i = l(y.defaultSearch || "WHOLE_SEARCH"), h = l(""), p = l(!1), d = l(!1), u = l(!1), S = l(null), r = l({ searchType: "WHOLE_SEARCH", searchContent: "" }), I = [{ value: "WHOLE_SEARCH", label: "综合搜索" }], T = {
+  setup(y, { emit: i }) {
+    const { specialOptions: C, normalOptions: I, searchItem: E } = _(y), h = n(y.defaultSearch || "WHOLE_SEARCH"), o = n(""), p = n(!1), d = n(!1), u = n(!1), S = n(null), r = n({ searchType: "WHOLE_SEARCH", searchContent: "" }), T = [{ value: "WHOLE_SEARCH", label: "综合搜索" }], F = {
       searchContent: [{ required: !0, message: "请输入查询内容", trigger: "blur" }]
-    }, n = l({ ...E.value });
+    }, c = n({ ...E.value });
     k(
       () => E.value,
-      (t) => {
-        n.value = { ...t }, s();
+      (e) => {
+        c.value = { ...e }, g();
       },
       { deep: !0 }
     );
-    const b = () => {
-      s();
+    const g = () => {
+      let e = {};
+      p.value ? e = {
+        ...c.value,
+        ...o.value ? { putSearch: o.value } : {},
+        searchType: h.value
+        // 包含 searchType
+      } : e = {
+        ...c.value
+        // 注意：这里不包含 searchType
+      }, e.putSearch === "" && delete e.putSearch, console.log("左侧筛选条件变化，触发搜索:", e), p.value ? i("filterChangeGrandson", e, h.value) : i("filterChangeGrandson", e, void 0);
+    }, m = () => {
+      let e = {};
+      p.value ? e = {
+        ...c.value,
+        putSearch: o.value || "",
+        searchType: h.value
+      } : e = {
+        putSearch: o.value || "",
+        searchType: h.value
+        // 包含 searchType
+      }, e.putSearch === "" && delete e.putSearch, console.log("搜索框变化，触发搜索:", e), i("filterChangeGrandson", e, h.value);
+    }, b = () => {
+      m();
     }, w = () => {
-      h.value = "", s();
-    }, s = () => {
-      let t = {};
-      p.value ? t = {
-        ...n.value,
-        putSearch: h.value || "",
-        searchType: i.value
-      } : t = {
-        putSearch: h.value || "",
-        searchType: i.value
-      }, f("filterChangeGrandson", t, i.value);
+      o.value = "", m();
     }, W = () => {
-      s();
+      o.value ? m() : g();
     }, x = () => {
       u.value = !0;
     }, B = () => {
       u.value = !1, r.value = { searchType: "WHOLE_SEARCH", searchContent: "" };
-    }, F = (t, e) => {
-      const a = { ...t };
-      return v.map(C.value, (c) => c.key).includes(e.filterKey) ? C.value.forEach((c) => delete a[c.key]) : delete a[e.filterKey], a;
-    }, H = (t) => {
-      let e = { ...n.value };
-      v.forEach(t, (a) => {
-        e = F(e, a);
-        const { checkedValues: c, filterKey: m } = a;
-        v.isEmpty(c) ? delete e[m] : g.value.includes(m) ? e[m] = c[0] : e[m] = c;
-      }), n.value = e, f("update:searchItem", e), p.value && s();
-    }, A = (t) => {
-      const e = O(t);
-      e !== null && (h.value = e, setTimeout(() => {
-        s();
+    }, H = (e, t) => {
+      const a = { ...e };
+      return v.map(C.value, (s) => s.key).includes(t.filterKey) ? C.value.forEach((s) => delete a[s.key]) : delete a[t.filterKey], a;
+    }, A = (e) => {
+      let t = { ...c.value };
+      v.forEach(e, (a) => {
+        t = H(t, a);
+        const { checkedValues: s, filterKey: f } = a;
+        v.isEmpty(s) ? delete t[f] : I.value.includes(f) ? t[f] = s[0] : t[f] = s;
+      }), c.value = t, i("update:searchItem", t);
+    }, D = (e) => {
+      const t = O(e);
+      t !== null && (o.value = t, setTimeout(() => {
+        m();
       }, 50));
-    }, D = (t) => {
-      const e = O(t);
-      if (e) {
+    }, L = (e) => {
+      const t = O(e);
+      if (t) {
         const a = r.value.searchContent || "";
-        r.value.searchContent = a ? `${a},${e}` : e;
+        r.value.searchContent = a ? `${a},${t}` : t;
       }
-    }, O = (t) => {
+    }, O = (e) => {
       var a;
-      t.preventDefault();
-      const e = (a = t.clipboardData) == null ? void 0 : a.getData("text/plain");
-      return e == null ? void 0 : e.replace(/[\n\r\t]+/g, ",");
+      e.preventDefault();
+      const t = (a = e.clipboardData) == null ? void 0 : a.getData("text/plain");
+      return t == null ? void 0 : t.replace(/[\n\r\t]+/g, ",");
     };
     return {
-      selectedSearchType: i,
-      putSearch: h,
+      selectedSearchType: h,
+      putSearch: o,
       isWithinFilterOptions: p,
       confirmLoading: d,
       showBatchSearch: u,
       batchSearchFormRef: S,
       batchSearchForm: r,
-      defalutOptions: I,
-      rules: T,
+      defalutOptions: T,
+      rules: F,
       showBatchSearchDialog: x,
       handleBatchSearchClose: B,
       searchWithinFilterOptions: W,
       handleSearch: b,
       handleClear: w,
-      pasteFormatInput: A,
+      pasteFormatInput: D,
       confirmSearch: () => {
-        S.value && S.value.validate((t) => {
-          var e;
-          if (t && ((e = r.value.searchContent) != null && e.trim())) {
+        S.value && S.value.validate((e) => {
+          var t;
+          if (e && ((t = r.value.searchContent) != null && t.trim())) {
             d.value = !0;
             let a = {};
             p.value ? a = {
-              ...n.value,
+              ...c.value,
               putSearch: r.value.searchContent.trim(),
               searchType: r.value.searchType
             } : a = {
               putSearch: r.value.searchContent.trim(),
               searchType: r.value.searchType
-            }, f("filterChangeGrandson", a, r.value.searchType), r.value = { searchType: "WHOLE_SEARCH", searchContent: "" }, u.value = !1, d.value = !1;
+            }, i("filterChangeGrandson", a, r.value.searchType), r.value = { searchType: "WHOLE_SEARCH", searchContent: "" }, u.value = !1, d.value = !1;
           }
         });
       },
-      pasteFormat: D,
-      filterChange: H,
-      getSearchItem: () => n.value
+      pasteFormat: L,
+      filterChange: A,
+      getSearchItem: () => c.value
     };
   }
 });
 export {
-  ye as default
+  Ce as default
 };

package/package.json

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