yahee-components 0.0.39 → 0.0.40

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

@@ -1,11 +1,11 @@
 import E from "./complex-search.vue2.js";
-import { createBlock as t, openBlock as n, withCtx as o, createElementVNode as c, createVNode as r, withKeys as f, createSlots as S, createElementBlock as m, Fragment as i, renderList as h, createCommentVNode as s, createTextVNode as u, toDisplayString as d } from "vue";
-import b from "../_virtual/_plugin-vue_export-helper.js";
-const y = { class: "yahee-complex-search" }, F = { class: "search-type-checkbox" }, C = { class: "dialog-footer" };
-function V(B, a, k, e, w, v) {
-  return n(), t(e.ElConfigProvider, { locale: e.locale }, {
+import { createBlock as n, openBlock as t, withCtx as o, createElementVNode as h, createVNode as r, withKeys as f, createSlots as b, createElementBlock as d, Fragment as c, renderList as u, createCommentVNode as s, createTextVNode as m, toDisplayString as i } from "vue";
+import y from "../_virtual/_plugin-vue_export-helper.js";
+const S = { class: "yahee-complex-search" }, F = { class: "search-type-checkbox" }, V = { class: "dialog-footer" };
+function k(C, a, w, e, B, v) {
+  return t(), n(e.ElConfigProvider, { locale: e.locale }, {
     default: o(() => [
-      c("div", y, [
+      h("div", S, [
         r(e.ElInput, {
           modelValue: e.putSearch,
           "onUpdate:modelValue": a[2] || (a[2] = (l) => e.putSearch = l),
@@ -16,7 +16,7 @@ function V(B, a, k, e, w, v) {
           onChange: e.handleSearch,
           onKeyup: f(e.handleSearch, ["enter"]),
           onPaste: e.pasteFormat
-        }, S({
+        }, b({
           append: o(() => [
             r(e.ElIcon, {
               size: "12",
@@ -45,10 +45,10 @@ function V(B, a, k, e, w, v) {
                 class: "custom-select"
               }, {
                 default: o(() => [
-                  (n(!0), m(
-                    i,
+                  (t(!0), d(
+                    c,
                     null,
-                    h(e.options, (l) => (n(), t(e.ElOption, {
+                    u(e.options, (l) => (t(), n(e.ElOption, {
                       key: l.label,
                       label: l.label,
                       value: l.value
@@ -73,10 +73,10 @@ function V(B, a, k, e, w, v) {
                 disabled: ""
               }, {
                 default: o(() => [
-                  (n(), m(
-                    i,
+                  (t(), d(
+                    c,
                     null,
-                    h(e.defalutOptions, (l) => r(e.ElOption, {
+                    u(e.defalutOptions, (l) => r(e.ElOption, {
                       key: l.label,
                       label: l.label,
                       value: l.value
@@ -92,26 +92,26 @@ function V(B, a, k, e, w, v) {
             key: "1"
           }
         ]), 1032, ["modelValue", "placeholder", "onPaste"]),
-        c("div", F, [
-          e.showWithinFilterCheckbox ? (n(), t(e.ElCheckbox, {
+        h("div", F, [
+          e.showWithinFilterCheckbox ? (t(), n(e.ElCheckbox, {
             key: 0,
             modelValue: e.isWithinFilterOptions,
             "onUpdate:modelValue": a[3] || (a[3] = (l) => e.isWithinFilterOptions = l),
             onChange: e.searchWithinFilterOptions
           }, {
-            default: o(() => a[7] || (a[7] = [
-              u(d("在筛选条件内查询"))
+            default: o(() => a[8] || (a[8] = [
+              m(i("在筛选条件内查询"))
             ])),
             _: 1
             /* STABLE */
           }, 8, ["modelValue"])) : s("v-if", !0),
-          e.showPatchSearch ? (n(), t(e.ElLink, {
+          e.showPatchSearch ? (t(), n(e.ElLink, {
             key: 1,
             type: "primary",
             onClick: e.showBatchSearchDialog
           }, {
-            default: o(() => a[8] || (a[8] = [
-              u(d("批量查询"))
+            default: o(() => a[9] || (a[9] = [
+              m(i("批量查询"))
             ])),
             _: 1
             /* STABLE */
@@ -120,7 +120,7 @@ function V(B, a, k, e, w, v) {
       ]),
       r(e.ElDialog, {
         modelValue: e.showBatchSearch,
-        "onUpdate:modelValue": a[6] || (a[6] = (l) => e.showBatchSearch = l),
+        "onUpdate:modelValue": a[7] || (a[7] = (l) => e.showBatchSearch = l),
         title: "批量查询",
         width: "30%",
         "before-close": e.handleBatchSearchClose,
@@ -128,21 +128,21 @@ function V(B, a, k, e, w, v) {
         draggable: ""
       }, {
         footer: o(() => [
-          c("div", C, [
+          h("div", V, [
             r(e.ElButton, {
               type: "primary",
               loading: e.confirmLoading,
               onClick: e.confirmSearch
             }, {
               default: o(() => a[10] || (a[10] = [
-                u(d("确认"))
+                m(i("确认"))
               ])),
               _: 1
               /* STABLE */
             }, 8, ["loading"]),
             r(e.ElButton, { onClick: e.handleBatchSearchClose }, {
               default: o(() => a[11] || (a[11] = [
-                u(d("关闭"))
+                m(i("关闭"))
               ])),
               _: 1
               /* STABLE */
@@ -156,34 +156,22 @@ function V(B, a, k, e, w, v) {
             rules: e.rules
           }, {
             default: o(() => [
-              r(e.ElRow, { class: "row-class" }, {
-                default: o(() => a[9] || (a[9] = [
-                  c(
-                    "span",
-                    null,
-                    d("综合搜索"),
-                    -1
-                    /* HOISTED */
-                  )
-                ])),
-                _: 1
-                /* STABLE */
-              }),
               r(e.ElRow, { class: "row-class" }, {
                 default: o(() => [
                   r(e.ElFormItem, { prop: "searchType" }, {
                     default: o(() => [
-                      r(e.ElSelect, {
+                      e.showSelect ? (t(), n(e.ElSelect, {
+                        key: 0,
                         modelValue: e.batchSearchForm.searchType,
                         "onUpdate:modelValue": a[4] || (a[4] = (l) => e.batchSearchForm.searchType = l),
                         size: "small",
-                        class: "custom-select"
+                        style: { width: "95px", "background-color": "white" }
                       }, {
                         default: o(() => [
-                          (n(!0), m(
-                            i,
+                          (t(!0), d(
+                            c,
                             null,
-                            h(e.options, (l) => (n(), t(e.ElOption, {
+                            u(e.options, (l) => (t(), n(e.ElOption, {
                               key: l.label,
                               label: l.label,
                               value: l.value
@@ -194,7 +182,30 @@ function V(B, a, k, e, w, v) {
                         ]),
                         _: 1
                         /* STABLE */
-                      }, 8, ["modelValue"])
+                      }, 8, ["modelValue"])) : (t(), n(e.ElSelect, {
+                        key: 1,
+                        modelValue: e.batchSearchForm.searchType,
+                        "onUpdate:modelValue": a[5] || (a[5] = (l) => e.batchSearchForm.searchType = l),
+                        size: "small",
+                        style: { width: "95px", "background-color": "white" },
+                        disabled: ""
+                      }, {
+                        default: o(() => [
+                          (t(), d(
+                            c,
+                            null,
+                            u(e.defalutOptions, (l) => r(e.ElOption, {
+                              key: l.label,
+                              label: l.label,
+                              value: l.value
+                            }, null, 8, ["label", "value"])),
+                            64
+                            /* STABLE_FRAGMENT */
+                          ))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      }, 8, ["modelValue"]))
                     ]),
                     _: 1
                     /* STABLE */
@@ -212,7 +223,7 @@ function V(B, a, k, e, w, v) {
                     default: o(() => [
                       r(e.ElInput, {
                         modelValue: e.batchSearchForm.searchContent,
-                        "onUpdate:modelValue": a[5] || (a[5] = (l) => e.batchSearchForm.searchContent = l),
+                        "onUpdate:modelValue": a[6] || (a[6] = (l) => e.batchSearchForm.searchContent = l),
                         placeholder: "请输入批量查询内容,从EXCEL复制可自动替换为`,`",
                         type: "textarea",
                         rows: 5,
@@ -239,7 +250,7 @@ function V(B, a, k, e, w, v) {
     /* STABLE */
   }, 8, ["locale"]);
 }
-const _ = /* @__PURE__ */ b(E, [["render", V], ["__file", "E:/工作/项目代码/common_componentsweb/packages/components/src/complex-search/complex-search.vue"]]);
+const _ = /* @__PURE__ */ y(E, [["render", k], ["__file", "E:/工作/项目代码/common_componentsweb/packages/components/src/complex-search/complex-search.vue"]]);
 export {
   _ as default
 };

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

@@ -1,7 +1,7 @@
 import { defineComponent as L, mergeDefaults as V, toRefs as j, ref as a } from "vue";
 import f from "../_virtual/lodash.js";
-import { defaultComplexSearchProps as H } from "./props.js";
-import { ElConfigProvider as z, ElLink as Y, ElOption as J, ElButton as M, ElRow as N, ElFormItem as Q, ElForm as U, ElIcon as X, ElDialog as Z, ElSelect as $, ElCheckbox as ee, ElInput as te } from "element-plus";
+import { defaultComplexSearchProps as z } from "./props.js";
+import { ElConfigProvider as Y, ElLink as H, ElOption as J, ElButton as M, ElRow as N, ElFormItem as Q, ElForm as U, ElIcon as X, ElDialog as Z, ElSelect as $, ElCheckbox as ee, ElInput as te } 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";
@@ -21,7 +21,7 @@ import "element-plus/theme-chalk/src/link.scss";
 import "element-plus/theme-chalk/src/config-provider.scss";
 import { Search as re } from "@element-plus/icons-vue";
 import ae from "../packages/components/node_modules/element-plus/es/locale/lang/zh-cn.js";
-const ke = /* @__PURE__ */ L({
+const _e = /* @__PURE__ */ L({
   name: "YaheeComplexSearch",
   __name: "complex-search",
   props: /* @__PURE__ */ V({
@@ -35,14 +35,14 @@ const ke = /* @__PURE__ */ L({
     normalOptions: { type: Array, required: !1 },
     showSelect: { type: Boolean, required: !1 },
     searchItem: { type: Object, required: !1 }
-  }, H()),
+  }, z()),
   emits: ["filterChangeGrandson"],
   setup(b, { expose: q, emit: x }) {
     q();
-    const O = ae, o = x, d = b, {
+    const k = ae, o = x, d = b, {
       defaultSearch: g,
-      pasteFormat: _,
-      options: k,
+      pasteFormat: O,
+      options: _,
       showPatchSearch: w,
       specialOptions: u,
       showWithinFilterCheckbox: I,
@@ -50,22 +50,22 @@ const ke = /* @__PURE__ */ L({
       normalOptions: S,
       showSelect: P,
       searchItem: e
-    } = j(d), G = a(g.value || "integrated"), i = a(""), s = a(!1), p = a(!1), c = a(!1), E = a(null), h = a({ searchType: "WHOLE_SEARCH", searchContent: "" }), K = {
+    } = j(d), G = a(g.value || "integrated"), i = a(""), s = a(!1), p = a(!1), c = a(!1), v = a(null), h = a({ searchType: "integrated", searchContent: "" }), K = {
       selectedSearchType: [{ required: !0, message: "请输入查询类型", trigger: "blur" }],
       searchContent: [{ required: !0, message: "请输入查询内容", trigger: "blur" }]
-    }, R = [
+    }, T = [
       {
         value: "integrated",
         label: "综合搜索"
       }
-    ], T = () => {
+    ], D = () => {
       c.value = !0;
-    }, W = () => {
+    }, R = () => {
       c.value = !1;
-    }, A = () => {
+    }, W = () => {
       s.value || (delete e.value.putSearch, o("filterChangeGrandson", e.value));
-    }, v = () => e.value, D = () => {
-      i.value ? C() : o("filterChangeGrandson", v());
+    }, E = () => e.value, A = () => {
+      i.value ? C() : o("filterChangeGrandson", E());
     }, y = (l, n) => {
       const t = { ...l };
       return f.map(u.value, (r) => r.key).includes(n.filterKey) ? u.value.forEach((r) => delete t[r.key]) : delete t[n.filterKey], t;
@@ -86,8 +86,8 @@ const ke = /* @__PURE__ */ L({
       ]) : o("filterChangeGrandson", {
         putSearch: i.value
       });
-    }, F = { locale: O, emit: o, props: d, defaultSearch: g, pasteFormat: _, options: k, showPatchSearch: w, specialOptions: u, showWithinFilterCheckbox: I, placeholderText: B, normalOptions: S, showSelect: P, searchItem: e, selectedSearchType: G, putSearch: i, isWithinFilterOptions: s, confirmLoading: p, showBatchSearch: c, batchSearchFormRef: E, batchSearchForm: h, rules: K, defalutOptions: R, showBatchSearchDialog: T, handleBatchSearchClose: W, searchWithinFilterOptions: A, getSearchItem: v, handleSearch: D, deleteExistProperty: y, filterChange: m, handlePutSearch: C, confirmSearch: () => {
-      E.value.validate((l) => {
+    }, F = { locale: k, emit: o, props: d, defaultSearch: g, pasteFormat: O, options: _, showPatchSearch: w, specialOptions: u, showWithinFilterCheckbox: I, placeholderText: B, normalOptions: S, showSelect: P, searchItem: e, selectedSearchType: G, putSearch: i, isWithinFilterOptions: s, confirmLoading: p, showBatchSearch: c, batchSearchFormRef: v, batchSearchForm: h, rules: K, defalutOptions: T, showBatchSearchDialog: D, handleBatchSearchClose: R, searchWithinFilterOptions: W, getSearchItem: E, handleSearch: A, deleteExistProperty: y, filterChange: m, handlePutSearch: C, confirmSearch: () => {
+      v.value.validate((l) => {
         l && (p.value = !0, s.value ? m([
           {
             filterKey: "putSearch",
@@ -118,9 +118,9 @@ const ke = /* @__PURE__ */ L({
     }, get ElOption() {
       return J;
     }, get ElLink() {
-      return Y;
+      return H;
     }, get ElConfigProvider() {
-      return z;
+      return Y;
     }, get Search() {
       return re;
     } };
@@ -128,5 +128,5 @@ const ke = /* @__PURE__ */ L({
   }
 });
 export {
-  ke as default
+  _e as default
 };

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { ComplexSearchProps } from './props';
-import { SearchOptions, SearchDataOptions, SearchItem } from './complex-search';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+import { SearchOptions, SearchDataOptions, SearchItem } from './complex-search';
 declare const _default: DefineComponent<ComplexSearchProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     filterChangeGrandson: (...args: any[]) => void;
 }, string, PublicProps, Readonly<ComplexSearchProps> & Readonly<{