3h1-ui 2.9.8 → 2.9.10

package/es/index.js

@@ -14422,7 +14422,12 @@ const _hoisted_5$1 = {
   class: "shy-ui-advanced-search-item-value-range"
 };
 const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_7 = ["onClick"];
+const _hoisted_7 = {
+  key: 0,
+  style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
+  class: "shy-ui-advanced-minus-icon"
+};
+const _hoisted_8 = ["onClick"];
 const _sfc_main$p = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14686,13 +14691,14 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                           ]),
                           _: 2
                         }, 1024),
-                        schemasCurrent.length !== 1 ? (openBlock(), createElementBlock("div", {
-                          key: 0,
-                          style: { "margin-left": "8px", "cursor": "pointer" },
-                          onClick: ($event) => handleMinus(index2)
-                        }, [
-                          createVNode(unref(MinusCircleTwoTone$1))
-                        ], 8, _hoisted_7)) : createCommentVNode("", true)
+                        schemasCurrent.length !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7, [
+                          createElementVNode("div", {
+                            style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
+                            class: "shy-basic-minus-icon",
+                            onClick: ($event) => handleMinus(index2)
+                          }, null, 8, _hoisted_8),
+                          createVNode(unref(MinusCircleTwoTone$1), { class: "shy-ui-advanced-minus-icon" })
+                        ])) : createCommentVNode("", true)
                       ])
                     ]),
                     _: 2
@@ -15423,7 +15429,7 @@ const _sfc_main$k = defineComponent({
   emits: ["ensure"],
   setup(props2, { emit }) {
     const advancedSearchRef = ref();
-    useTableContext();
+    const table2 = useTableContext();
     const setStyle2 = () => {
       const dom = document.querySelector(".table-settings");
       if (dom) {
@@ -15439,6 +15445,31 @@ const _sfc_main$k = defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
+    const tableAdvancedSearchWrapperRef = ref();
+    const clickOutside = (e) => {
+      if (tableAdvancedSearchWrapperRef.value.contains(e.target))
+        return;
+      console.log(e.target.classList);
+      if (document.querySelector(".table-settings").contains(e.target))
+        return;
+      if (e.target.classList.contains("shy-basic-minus-icon"))
+        return;
+      const selectList = document.getElementsByClassName("ant-select-dropdown");
+      const pickList = document.getElementsByClassName("ant-picker-dropdown");
+      const domList = [...Array.from(selectList), ...Array.from(pickList)];
+      const flag = (domList == null ? void 0 : domList.length) && domList.some((dom) => {
+        return dom.contains(e.target);
+      });
+      if (flag)
+        return;
+      table2.closeAdvancedSearch();
+    };
+    onMounted(() => {
+      document.addEventListener("click", clickOutside);
+    });
+    onUnmounted(() => {
+      document.removeEventListener("click", clickOutside);
+    });
     return {
       handleEnsure,
       handleReset,
@@ -15557,6 +15588,20 @@ const _sfc_main$j = defineComponent({
         return {};
       }
     };
+    const globalSearchWrapperRef = ref();
+    const clickOutside = (e) => {
+      if (document.querySelector(".table-settings").contains(e.target))
+        return;
+      if (globalSearchWrapperRef.value.contains(e.target))
+        return;
+      table2.closeGlobalSearch();
+    };
+    onMounted(() => {
+      document.addEventListener("click", clickOutside);
+    });
+    onUnmounted(() => {
+      document.removeEventListener("click", clickOutside);
+    });
     return {
       handleReset,
       advancedSearchRef,
@@ -15569,8 +15614,8 @@ const _sfc_main$j = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_01cc6536_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-01cc6536"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_46f4dcdc_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-46f4dcdc"), n = n(), popScopeId(), n);
 const _hoisted_1$a = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -15628,7 +15673,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-01cc6536"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-46f4dcdc"]]);
 const _sfc_main$i = defineComponent({
   components: {
     TableAdvancedSearch,

package/es/style.css

@@ -25482,7 +25482,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-01cc6536] {
+}.shy-basic-table-global-search[data-v-46f4dcdc] {
   position: absolute;
   top: 40px;
   right: 131px;
@@ -25494,7 +25494,7 @@ span.iconify {
   border: 1px solid #ebebeb;
   padding: 10px;
 }
-.shy-basic-table-global-search-item-global[data-v-01cc6536] {
+.shy-basic-table-global-search-item-global[data-v-46f4dcdc] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25505,7 +25505,7 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-item-special[data-v-01cc6536] {
+.shy-basic-table-global-search-item-special[data-v-46f4dcdc] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25516,10 +25516,10 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-checkbox-wrapper[data-v-01cc6536] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-46f4dcdc] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-01cc6536] {
+.shy-basic-table-global-search .selected-bg[data-v-46f4dcdc] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;

package/es/ui/src/Table/src/components/TableAdvancedSearch.vue.d.ts

@@ -12,7 +12,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     } | {
         left?: undefined;
     };
-    tableAdvancedSearchWrapperRef: any;
+    tableAdvancedSearchWrapperRef: import("vue").Ref<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "ensure"[], "ensure", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     schemasAdvancedSearch: {
         default: () => any[];

package/lib/index.js

@@ -14424,7 +14424,12 @@ const _hoisted_5$1 = {
   class: "shy-ui-advanced-search-item-value-range"
 };
 const _hoisted_6 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_7 = ["onClick"];
+const _hoisted_7 = {
+  key: 0,
+  style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
+  class: "shy-ui-advanced-minus-icon"
+};
+const _hoisted_8 = ["onClick"];
 const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14688,13 +14693,14 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                           ]),
                           _: 2
                         }, 1024),
-                        schemasCurrent.length !== 1 ? (vue.openBlock(), vue.createElementBlock("div", {
-                          key: 0,
-                          style: { "margin-left": "8px", "cursor": "pointer" },
-                          onClick: ($event) => handleMinus(index2)
-                        }, [
-                          vue.createVNode(vue.unref(MinusCircleTwoTone$1))
-                        ], 8, _hoisted_7)) : vue.createCommentVNode("", true)
+                        schemasCurrent.length !== 1 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
+                          vue.createElementVNode("div", {
+                            style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
+                            class: "shy-basic-minus-icon",
+                            onClick: ($event) => handleMinus(index2)
+                          }, null, 8, _hoisted_8),
+                          vue.createVNode(vue.unref(MinusCircleTwoTone$1), { class: "shy-ui-advanced-minus-icon" })
+                        ])) : vue.createCommentVNode("", true)
                       ])
                     ]),
                     _: 2
@@ -15425,7 +15431,7 @@ const _sfc_main$k = vue.defineComponent({
   emits: ["ensure"],
   setup(props2, { emit }) {
     const advancedSearchRef = vue.ref();
-    useTableContext();
+    const table2 = useTableContext();
     const setStyle2 = () => {
       const dom = document.querySelector(".table-settings");
       if (dom) {
@@ -15441,6 +15447,31 @@ const _sfc_main$k = vue.defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
+    const tableAdvancedSearchWrapperRef = vue.ref();
+    const clickOutside = (e) => {
+      if (tableAdvancedSearchWrapperRef.value.contains(e.target))
+        return;
+      console.log(e.target.classList);
+      if (document.querySelector(".table-settings").contains(e.target))
+        return;
+      if (e.target.classList.contains("shy-basic-minus-icon"))
+        return;
+      const selectList = document.getElementsByClassName("ant-select-dropdown");
+      const pickList = document.getElementsByClassName("ant-picker-dropdown");
+      const domList = [...Array.from(selectList), ...Array.from(pickList)];
+      const flag = (domList == null ? void 0 : domList.length) && domList.some((dom) => {
+        return dom.contains(e.target);
+      });
+      if (flag)
+        return;
+      table2.closeAdvancedSearch();
+    };
+    vue.onMounted(() => {
+      document.addEventListener("click", clickOutside);
+    });
+    vue.onUnmounted(() => {
+      document.removeEventListener("click", clickOutside);
+    });
     return {
       handleEnsure,
       handleReset,
@@ -15559,6 +15590,20 @@ const _sfc_main$j = vue.defineComponent({
         return {};
       }
     };
+    const globalSearchWrapperRef = vue.ref();
+    const clickOutside = (e) => {
+      if (document.querySelector(".table-settings").contains(e.target))
+        return;
+      if (globalSearchWrapperRef.value.contains(e.target))
+        return;
+      table2.closeGlobalSearch();
+    };
+    vue.onMounted(() => {
+      document.addEventListener("click", clickOutside);
+    });
+    vue.onUnmounted(() => {
+      document.removeEventListener("click", clickOutside);
+    });
     return {
       handleReset,
       advancedSearchRef,
@@ -15571,8 +15616,8 @@ const _sfc_main$j = vue.defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_01cc6536_lang = "";
-const _withScopeId = (n) => (vue.pushScopeId("data-v-01cc6536"), n = n(), vue.popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_46f4dcdc_lang = "";
+const _withScopeId = (n) => (vue.pushScopeId("data-v-46f4dcdc"), n = n(), vue.popScopeId(), n);
 const _hoisted_1$a = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, null, -1));
@@ -15630,7 +15675,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-01cc6536"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-46f4dcdc"]]);
 const _sfc_main$i = vue.defineComponent({
   components: {
     TableAdvancedSearch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.9.8",
+  "version": "2.9.10",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/utils": "1.0.15",
-    "@shy-plugins/use": "1.0.4"
+    "@shy-plugins/use": "1.0.4",
+    "@shy-plugins/utils": "1.0.15"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {