yahee-components 0.0.90 → 0.0.91

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

@@ -82,8 +82,8 @@ const Ce = R({
     }
   },
   emits: ["filterChangeGrandson", "update:searchItem"],
-  setup(y, { emit: p }) {
-    const { specialOptions: C, normalOptions: I, searchItem: E } = _(y), s = n(y.defaultSearch || "WHOLE_SEARCH"), o = n(""), i = n(!1), S = n(!1), u = n(!1), d = n(null), r = n({ searchType: "WHOLE_SEARCH", searchContent: "" }), T = [{ value: "WHOLE_SEARCH", label: "综合搜索" }], F = {
+  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" }]
     }, c = n({ ...E.value });
     k(
@@ -95,24 +95,26 @@ const Ce = R({
     );
     const g = () => {
       let e = {};
-      i.value ? e = {
+      p.value ? e = {
         ...c.value,
         ...o.value ? { putSearch: o.value } : {},
-        searchType: s.value
+        searchType: h.value
+        // 包含 searchType
       } : e = {
-        ...c.value,
-        searchType: s.value
-      }, e.putSearch === "" && delete e.putSearch, console.log("左侧筛选条件变化，触发搜索:", e), p("filterChangeGrandson", e, s.value);
+        ...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 = {};
-      i.value ? e = {
+      p.value ? e = {
         ...c.value,
         putSearch: o.value || "",
-        searchType: s.value
+        searchType: h.value
       } : e = {
         putSearch: o.value || "",
-        searchType: s.value
-      }, e.putSearch === "" && delete e.putSearch, console.log("搜索框变化，触发搜索:", e), p("filterChangeGrandson", e, s.value);
+        searchType: h.value
+        // 包含 searchType
+      }, e.putSearch === "" && delete e.putSearch, console.log("搜索框变化，触发搜索:", e), i("filterChangeGrandson", e, h.value);
     }, b = () => {
       m();
     }, w = () => {
@@ -125,14 +127,14 @@ const Ce = R({
       u.value = !1, r.value = { searchType: "WHOLE_SEARCH", searchContent: "" };
     }, H = (e, t) => {
       const a = { ...e };
-      return v.map(C.value, (h) => h.key).includes(t.filterKey) ? C.value.forEach((h) => delete a[h.key]) : delete a[t.filterKey], a;
+      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: h, filterKey: f } = a;
-        v.isEmpty(h) ? delete t[f] : I.value.includes(f) ? t[f] = h[0] : t[f] = h;
-      }), c.value = t, p("update:searchItem", t);
+        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(() => {
@@ -151,12 +153,12 @@ const Ce = R({
       return t == null ? void 0 : t.replace(/[\n\r\t]+/g, ",");
     };
     return {
-      selectedSearchType: s,
+      selectedSearchType: h,
       putSearch: o,
-      isWithinFilterOptions: i,
-      confirmLoading: S,
+      isWithinFilterOptions: p,
+      confirmLoading: d,
       showBatchSearch: u,
-      batchSearchFormRef: d,
+      batchSearchFormRef: S,
       batchSearchForm: r,
       defalutOptions: T,
       rules: F,
@@ -167,19 +169,19 @@ const Ce = R({
       handleClear: w,
       pasteFormatInput: D,
       confirmSearch: () => {
-        d.value && d.value.validate((e) => {
+        S.value && S.value.validate((e) => {
           var t;
           if (e && ((t = r.value.searchContent) != null && t.trim())) {
-            S.value = !0;
+            d.value = !0;
             let a = {};
-            i.value ? a = {
+            p.value ? a = {
               ...c.value,
               putSearch: r.value.searchContent.trim(),
               searchType: r.value.searchType
             } : a = {
               putSearch: r.value.searchContent.trim(),
               searchType: r.value.searchType
-            }, p("filterChangeGrandson", a, r.value.searchType), r.value = { searchType: "WHOLE_SEARCH", searchContent: "" }, u.value = !1, S.value = !1;
+            }, i("filterChangeGrandson", a, r.value.searchType), r.value = { searchType: "WHOLE_SEARCH", searchContent: "" }, u.value = !1, d.value = !1;
           }
         });
       },

package/package.json

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

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

@@ -0,0 +1,3 @@
+import { DefineComponent } from 'vue';
+declare const _default: DefineComponent;
+export default _default;

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

@@ -0,0 +1,7 @@
+import { SFCWithInstall } from '../utils/typescript';
+import { DefineComponent } from 'vue';
+export declare const YaheeComplexSearch: SFCWithInstall<DefineComponent> & Record<string, any>;
+export default YaheeComplexSearch;
+export * from './complex-search.vue';
+export * from './complex-search';
+export * from './props';