yahee-components 0.0.88 → 0.0.90

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

@@ -1,12 +1,12 @@
 import T from "./complex-search.vue2.js";
-import { resolveComponent as r, createElementBlock as d, openBlock as n, Fragment as u, createElementVNode as b, createVNode as t, withKeys as B, createSlots as U, withCtx as a, renderList as c, createBlock as s, createCommentVNode as V, createTextVNode as i, toDisplayString as h } from "vue";
+import { resolveComponent as r, createElementBlock as d, openBlock as t, Fragment as u, createElementVNode as b, createVNode as n, withKeys as B, createSlots as U, withCtx as a, renderList as i, createBlock as s, createCommentVNode as V, createTextVNode as c, toDisplayString as h } from "vue";
 import O from "../_virtual/_plugin-vue_export-helper.js";
 const z = { class: "yahee-complex-search" }, E = { class: "search-type-checkbox" }, P = { class: "dialog-footer" };
 function W(e, o, N, $, K, L) {
   const m = r("el-option"), p = r("el-select"), C = r("Search"), w = r("el-icon"), f = r("el-input"), g = r("el-checkbox"), v = r("el-link"), y = r("el-form-item"), S = r("el-row"), F = r("el-form"), k = r("el-button"), _ = r("el-dialog");
-  return n(), d(u, null, [
+  return t(), d(u, null, [
     b("div", z, [
-      t(f, {
+      n(f, {
         modelValue: e.putSearch,
         "onUpdate:modelValue": o[2] || (o[2] = (l) => e.putSearch = l),
         placeholder: e.placeholderText,
@@ -15,10 +15,11 @@ function W(e, o, N, $, K, L) {
         maxlength: "30",
         onChange: e.handleSearch,
         onKeyup: B(e.handleSearch, ["enter"]),
-        onPaste: e.pasteFormatInput
+        onPaste: e.pasteFormatInput,
+        onClear: e.handleClear
       }, U({
         append: a(() => [
-          t(w, {
+          n(w, {
             size: "12",
             color: "#3366cc",
             style: { cursor: "pointer" },
@@ -26,7 +27,7 @@ function W(e, o, N, $, K, L) {
             onClick: e.handleSearch
           }, {
             default: a(() => [
-              t(C)
+              n(C)
             ]),
             _: 1
           }, 8, ["onClick"])
@@ -36,14 +37,14 @@ function W(e, o, N, $, K, L) {
         e.showSelect ? {
           name: "prepend",
           fn: a(() => [
-            t(p, {
+            n(p, {
               modelValue: e.selectedSearchType,
               "onUpdate:modelValue": o[0] || (o[0] = (l) => e.selectedSearchType = l),
               size: "small",
               class: "custom-select"
             }, {
               default: a(() => [
-                (n(!0), d(u, null, c(e.options, (l) => (n(), s(m, {
+                (t(!0), d(u, null, i(e.options, (l) => (t(), s(m, {
                   key: l.label,
                   label: l.label,
                   value: l.value
@@ -56,7 +57,7 @@ function W(e, o, N, $, K, L) {
         } : {
           name: "prepend",
           fn: a(() => [
-            t(p, {
+            n(p, {
               modelValue: e.selectedSearchType,
               "onUpdate:modelValue": o[1] || (o[1] = (l) => e.selectedSearchType = l),
               size: "small",
@@ -64,7 +65,7 @@ function W(e, o, N, $, K, L) {
               disabled: ""
             }, {
               default: a(() => [
-                (n(!0), d(u, null, c(e.defalutOptions, (l) => (n(), s(m, {
+                (t(!0), d(u, null, i(e.defalutOptions, (l) => (t(), s(m, {
                   key: l.label,
                   label: l.label,
                   value: l.value
@@ -75,34 +76,34 @@ function W(e, o, N, $, K, L) {
           ]),
           key: "1"
         }
-      ]), 1032, ["modelValue", "placeholder", "onChange", "onKeyup", "onPaste"]),
+      ]), 1032, ["modelValue", "placeholder", "onChange", "onKeyup", "onPaste", "onClear"]),
       b("div", E, [
-        e.showWithinFilterCheckbox ? (n(), s(g, {
+        e.showWithinFilterCheckbox ? (t(), s(g, {
           key: 0,
           modelValue: e.isWithinFilterOptions,
           "onUpdate:modelValue": o[3] || (o[3] = (l) => e.isWithinFilterOptions = l),
           onChange: e.searchWithinFilterOptions
         }, {
           default: a(() => o[8] || (o[8] = [
-            i(h("在筛选条件内查询"))
+            c(h("在筛选条件内查询"))
           ])),
           _: 1,
           __: [8]
         }, 8, ["modelValue", "onChange"])) : V("", !0),
-        e.showPatchSearch ? (n(), s(v, {
+        e.showPatchSearch ? (t(), s(v, {
           key: 1,
           type: "primary",
           onClick: e.showBatchSearchDialog
         }, {
           default: a(() => o[9] || (o[9] = [
-            i(h("批量查询"))
+            c(h("批量查询"))
           ])),
           _: 1,
           __: [9]
         }, 8, ["onClick"])) : V("", !0)
       ])
     ]),
-    t(_, {
+    n(_, {
       modelValue: e.showBatchSearch,
       "onUpdate:modelValue": o[7] || (o[7] = (l) => e.showBatchSearch = l),
       title: "批量查询",
@@ -113,20 +114,20 @@ function W(e, o, N, $, K, L) {
     }, {
       footer: a(() => [
         b("div", P, [
-          t(k, {
+          n(k, {
             type: "primary",
             loading: e.confirmLoading,
             onClick: e.confirmSearch
           }, {
             default: a(() => o[10] || (o[10] = [
-              i(h("确认"))
+              c(h("确认"))
             ])),
             _: 1,
             __: [10]
           }, 8, ["loading", "onClick"]),
-          t(k, { onClick: e.handleBatchSearchClose }, {
+          n(k, { onClick: e.handleBatchSearchClose }, {
             default: a(() => o[11] || (o[11] = [
-              i(h("关闭"))
+              c(h("关闭"))
             ])),
             _: 1,
             __: [11]
@@ -134,17 +135,17 @@ function W(e, o, N, $, K, L) {
         ])
       ]),
       default: a(() => [
-        t(F, {
+        n(F, {
           ref: "batchSearchFormRef",
           model: e.batchSearchForm,
           rules: e.rules
         }, {
           default: a(() => [
-            t(S, { class: "row-class" }, {
+            n(S, { class: "row-class" }, {
               default: a(() => [
-                t(y, { prop: "searchType" }, {
+                n(y, { prop: "searchType" }, {
                   default: a(() => [
-                    e.showSelect ? (n(), s(p, {
+                    e.showSelect ? (t(), s(p, {
                       key: 0,
                       modelValue: e.batchSearchForm.searchType,
                       "onUpdate:modelValue": o[4] || (o[4] = (l) => e.batchSearchForm.searchType = l),
@@ -152,14 +153,14 @@ function W(e, o, N, $, K, L) {
                       style: { width: "100px", "background-color": "white" }
                     }, {
                       default: a(() => [
-                        (n(!0), d(u, null, c(e.isBatchSelectOptionsSameWithInput ? e.options : e.batchOptions, (l) => (n(), s(m, {
+                        (t(!0), d(u, null, i(e.isBatchSelectOptionsSameWithInput ? e.options : e.batchOptions, (l) => (t(), s(m, {
                           key: l.label,
                           label: l.label,
                           value: l.value
                         }, null, 8, ["label", "value"]))), 128))
                       ]),
                       _: 1
-                    }, 8, ["modelValue"])) : (n(), s(p, {
+                    }, 8, ["modelValue"])) : (t(), s(p, {
                       key: 1,
                       modelValue: e.batchSearchForm.searchType,
                       "onUpdate:modelValue": o[5] || (o[5] = (l) => e.batchSearchForm.searchType = l),
@@ -168,7 +169,7 @@ function W(e, o, N, $, K, L) {
                       disabled: ""
                     }, {
                       default: a(() => [
-                        (n(!0), d(u, null, c(e.defalutOptions, (l) => (n(), s(m, {
+                        (t(!0), d(u, null, i(e.defalutOptions, (l) => (t(), s(m, {
                           key: l.label,
                           label: l.label,
                           value: l.value
@@ -182,14 +183,14 @@ function W(e, o, N, $, K, L) {
               ]),
               _: 1
             }),
-            t(S, { class: "row-class" }, {
+            n(S, { class: "row-class" }, {
               default: a(() => [
-                t(y, {
+                n(y, {
                   prop: "searchContent",
                   style: { width: "100%" }
                 }, {
                   default: a(() => [
-                    t(f, {
+                    n(f, {
                       modelValue: e.batchSearchForm.searchContent,
                       "onUpdate:modelValue": o[6] || (o[6] = (l) => e.batchSearchForm.searchContent = l),
                       placeholder: "请输入批量查询内容,从EXCEL复制可自动替换为`,`",

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

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

package/package.json

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

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

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

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

@@ -1,7 +0,0 @@
-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';