3h1-ui 2.9.6 → 2.9.8

package/es/index.js

@@ -5590,7 +5590,7 @@ const _sfc_main$V = defineComponent({
   }
 });
 const _hoisted_1$m = { key: "component" };
-const _hoisted_2$a = { key: "skeleton" };
+const _hoisted_2$9 = { key: "skeleton" };
 function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Skeleton = resolveComponent("Skeleton");
   return openBlock(), createBlock(TransitionGroup, mergeProps({ class: "h-full w-full" }, _ctx.$attrs, {
@@ -5602,7 +5602,7 @@ function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
     default: withCtx(() => [
       _ctx.isInit ? (openBlock(), createElementBlock("div", _hoisted_1$m, [
         renderSlot(_ctx.$slots, "default", { loading: _ctx.loading })
-      ])) : (openBlock(), createElementBlock("div", _hoisted_2$a, [
+      ])) : (openBlock(), createElementBlock("div", _hoisted_2$9, [
         _ctx.$slots.skeleton ? renderSlot(_ctx.$slots, "skeleton", { key: 0 }) : (openBlock(), createBlock(_component_Skeleton, { key: 1 }))
       ]))
     ]),
@@ -6956,14 +6956,14 @@ function useTransition(source, options = {}) {
   });
 }
 const _hoisted_1$l = { class: "flex justify-between" };
-const _hoisted_2$9 = { key: 0 };
+const _hoisted_2$8 = { key: 0 };
 const _hoisted_3$5 = { class: "flex flex-wrap px-2" };
 const _hoisted_4$3 = ["onClick", "title"];
 const _hoisted_5$2 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$2 = {
+const _hoisted_6$1 = {
   key: 1,
   class: "p-5"
 };
@@ -7072,7 +7072,7 @@ const _sfc_main$U = /* @__PURE__ */ defineComponent({
               ])
             ]),
             content: withCtx(() => [
-              unref(getPaginationList).length ? (openBlock(), createElementBlock("div", _hoisted_2$9, [
+              unref(getPaginationList).length ? (openBlock(), createElementBlock("div", _hoisted_2$8, [
                 createVNode(unref(ScrollContainer$1), { class: "border border-solid border-t-0" }, {
                   default: withCtx(() => [
                     createElementVNode("ul", _hoisted_3$5, [
@@ -7105,7 +7105,7 @@ const _sfc_main$U = /* @__PURE__ */ defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : createCommentVNode("", true)
-              ])) : (openBlock(), createElementBlock("div", _hoisted_6$2, [
+              ])) : (openBlock(), createElementBlock("div", _hoisted_6$1, [
                 createVNode(unref(AEmpty))
               ]))
             ]),
@@ -7273,7 +7273,7 @@ function _sfc_render$y(_ctx, _cache, $props, $setup, $data, $options) {
 }
 const CountdownInput = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$y]]);
 const _hoisted_1$k = { key: 0 };
-const _hoisted_2$8 = {
+const _hoisted_2$7 = {
   key: 1,
   class: "delete-wrapper"
 };
@@ -7408,7 +7408,7 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
               }, 1032, ["rules", "name"])
             ]),
             _: 2
-          }, 1032, ["model"])) : (openBlock(), createElementBlock("div", _hoisted_2$8, [
+          }, 1032, ["model"])) : (openBlock(), createElementBlock("div", _hoisted_2$7, [
             createElementVNode("span", _hoisted_3$4, toDisplayString(index2 + 1), 1),
             createElementVNode("div", {
               class: "delete-item",
@@ -7835,9 +7835,8 @@ const _sfc_main$Q = /* @__PURE__ */ defineComponent({
         ...on2,
         ...bindValue
       };
-      console.log(compAttr);
       const handleInput = (e) => {
-        compAttr.onInputEvent(e);
+        (compAttr == null ? void 0 : compAttr.onInputEvent) && compAttr.onInputEvent(e);
       };
       if (!renderComponentContent) {
         return createVNode(Comp, mergeProps(compAttr, {
@@ -14297,14 +14296,16 @@ const _sfc_main$q = defineComponent({
   setup() {
     const { isVisibleAdvancedSearch, closeGlobalSearch } = useTableContext();
     const handleIconClick = () => {
-      isVisibleAdvancedSearch.value = !isVisibleAdvancedSearch.value;
-      closeGlobalSearch();
+      nextTick(() => {
+        isVisibleAdvancedSearch.value = !isVisibleAdvancedSearch.value;
+        closeGlobalSearch();
+      });
     };
     return { isVisibleAdvancedSearch, handleIconClick };
   }
 });
-const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_851e809a_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-851e809a"), n = n(), popScopeId(), n);
+const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_f74ee46a_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-f74ee46a"), n = n(), popScopeId(), n);
 const _hoisted_1$f = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", null, "高级搜索", -1));
 function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FilterOutlined = resolveComponent("FilterOutlined");
@@ -14322,7 +14323,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$h], ["__scopeId", "data-v-851e809a"]]);
+const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$h], ["__scopeId", "data-v-f74ee46a"]]);
 const index$2 = "";
 const searchType = [
   {
@@ -14409,20 +14410,19 @@ const getGlobalAdvancedType = (fieldList, value) => {
   temp.gexpr = fieldList.join("|");
   return temp;
 };
-const _hoisted_1$e = { class: "shy-ui-advanced-search" };
-const _hoisted_2$7 = { class: "shy-ui-advanced-search-add" };
-const _hoisted_3$3 = { class: "shy-ui-advanced-search-item-wrapper" };
-const _hoisted_4$1 = {
+const _hoisted_1$e = { class: "shy-ui-advanced-search-add" };
+const _hoisted_2$6 = { class: "shy-ui-advanced-search-item-wrapper" };
+const _hoisted_3$3 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_5$1 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_6$1 = {
+const _hoisted_4$1 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_5$1 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_7 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_8 = ["onClick"];
+const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_7 = ["onClick"];
 const _sfc_main$p = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14444,6 +14444,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
   setup(__props, { expose }) {
     const props2 = __props;
     reactive({});
+    const advancedSearchRef = ref();
     const formRef = ref();
     const schemasCurrent = reactive([]);
     if (props2.schemas.length !== 0)
@@ -14538,11 +14539,16 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     };
     expose({
       getSearchFrom,
-      resetFields
+      resetFields,
+      advancedSearchRef
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$e, [
-        createElementVNode("div", _hoisted_2$7, [
+      return openBlock(), createElementBlock("div", {
+        class: "shy-ui-advanced-search",
+        ref_key: "advancedSearchRef",
+        ref: advancedSearchRef
+      }, [
+        createElementVNode("div", _hoisted_1$e, [
           createVNode(unref(PlusCircleOutlined$1)),
           createElementVNode("div", {
             style: { "margin-left": "8px" },
@@ -14560,7 +14566,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                 (openBlock(true), createElementBlock(Fragment, null, renderList(schemasCurrent, (schema, index2) => {
                   return openBlock(), createBlock(unref(Col), normalizeProps(mergeProps({ key: index2 }, (schema == null ? void 0 : schema.colProps) || { span: 24 })), {
                     default: withCtx(() => [
-                      createElementVNode("div", _hoisted_3$3, [
+                      createElementVNode("div", _hoisted_2$6, [
                         createVNode(unref(FormItem), {
                           class: "shy-ui-advanced-search-item-op",
                           name: `${schema.field}-op`
@@ -14597,7 +14603,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                         createVNode(unref(FormItem), { class: "shy-ui-advanced-search-item-value" }, {
                           default: withCtx(() => [
                             getTypeByField(schema == null ? void 0 : schema.field) === "number" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_4$1, [
+                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_3$3, [
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(InputNumber), {
@@ -14608,7 +14614,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_5$1,
+                                _hoisted_4$1,
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(InputNumber), {
@@ -14627,7 +14633,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                                 valueModifiers: { number: true }
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "date" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_6$1, [
+                              schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_5$1, [
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(DatePicker), {
@@ -14639,7 +14645,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_7,
+                                _hoisted_6,
                                 createVNode(unref(FormItem), null, {
                                   default: withCtx(() => [
                                     createVNode(unref(DatePicker), {
@@ -14686,7 +14692,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                           onClick: ($event) => handleMinus(index2)
                         }, [
                           createVNode(unref(MinusCircleTwoTone$1))
-                        ], 8, _hoisted_8)) : createCommentVNode("", true)
+                        ], 8, _hoisted_7)) : createCommentVNode("", true)
                       ])
                     ]),
                     _: 2
@@ -14698,7 +14704,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
         }, 8, ["model"])
-      ]);
+      ], 512);
     };
   }
 });
@@ -14875,7 +14881,7 @@ const _sfc_main$m = defineComponent({
 });
 const TableHeader_vue_vue_type_style_index_0_lang = "";
 const _hoisted_1$c = { style: { "width": "100%" } };
-const _hoisted_2$6 = {
+const _hoisted_2$5 = {
   key: 0,
   style: { "margin": "5px" }
 };
@@ -14883,7 +14889,7 @@ const _hoisted_3$2 = { class: "flex items-center" };
 function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TableSetting = resolveComponent("TableSetting");
   return openBlock(), createElementBlock("div", _hoisted_1$c, [
-    _ctx.$slots.headerTop ? (openBlock(), createElementBlock("div", _hoisted_2$6, [
+    _ctx.$slots.headerTop ? (openBlock(), createElementBlock("div", _hoisted_2$5, [
       renderSlot(_ctx.$slots, "headerTop")
     ])) : createCommentVNode("", true),
     createElementVNode("div", _hoisted_3$2, [
@@ -15417,6 +15423,15 @@ const _sfc_main$k = defineComponent({
   emits: ["ensure"],
   setup(props2, { emit }) {
     const advancedSearchRef = ref();
+    useTableContext();
+    const setStyle2 = () => {
+      const dom = document.querySelector(".table-settings");
+      if (dom) {
+        return { left: `${dom.offsetLeft - 370}px` };
+      } else {
+        return {};
+      }
+    };
     const handleEnsure = () => {
       const form = advancedSearchRef.value.getSearchFrom();
       emit("ensure", form);
@@ -15424,21 +15439,30 @@ const _sfc_main$k = defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
-    return { handleEnsure, handleReset, advancedSearchRef };
+    return {
+      handleEnsure,
+      handleReset,
+      advancedSearchRef,
+      setStyle: setStyle2,
+      tableAdvancedSearchWrapperRef
+    };
   }
 });
-const _hoisted_1$b = { class: "shy-basic-table-advanced-search" };
-const _hoisted_2$5 = { class: "shy-basic-table-advanced-search-footer" };
+const _hoisted_1$b = { class: "shy-basic-table-advanced-search-footer" };
 function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_AdvancedSearch = resolveComponent("AdvancedSearch");
   const _component_BasicButton = resolveComponent("BasicButton");
   const _component_Space = resolveComponent("Space");
-  return openBlock(), createElementBlock("div", _hoisted_1$b, [
+  return openBlock(), createElementBlock("div", {
+    class: "shy-basic-table-advanced-search",
+    ref: "tableAdvancedSearchWrapperRef",
+    style: normalizeStyle(_ctx.setStyle())
+  }, [
     createVNode(_component_AdvancedSearch, {
       ref: "advancedSearchRef",
       schemas: _ctx.schemasAdvancedSearch
     }, null, 8, ["schemas"]),
-    createElementVNode("div", _hoisted_2$5, [
+    createElementVNode("div", _hoisted_1$b, [
       createVNode(_component_Space, null, {
         default: withCtx(() => [
           createVNode(_component_BasicButton, {
@@ -15460,7 +15484,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       })
     ])
-  ]);
+  ], 4);
 }
 const TableAdvancedSearch = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$d]]);
 const _sfc_main$j = defineComponent({
@@ -15525,45 +15549,58 @@ const _sfc_main$j = defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
+    const setStyle2 = () => {
+      const dom = document.querySelector(".table-settings");
+      if (dom) {
+        return { left: `${dom.offsetLeft}px` };
+      } else {
+        return {};
+      }
+    };
     return {
       handleReset,
       advancedSearchRef,
       fieldList,
       curSelected,
       handleSelectedClick,
-      handleCheckboxChange
+      handleCheckboxChange,
+      setStyle: setStyle2,
+      globalSearchWrapperRef
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_fa3d98b2_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-fa3d98b2"), n = n(), popScopeId(), n);
-const _hoisted_1$a = { class: "shy-basic-table-global-search" };
-const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
-const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
-const _hoisted_4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
-const _hoisted_5 = { class: "shy-basic-table-global-search-checkbox-wrapper" };
-const _hoisted_6 = { style: { "color": "#131415", "font-size": "12px" } };
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_01cc6536_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-01cc6536"), 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));
+const _hoisted_4 = { class: "shy-basic-table-global-search-checkbox-wrapper" };
+const _hoisted_5 = { style: { "color": "#131415", "font-size": "12px" } };
 function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_CheckOutlined = resolveComponent("CheckOutlined");
   const _component_Checkbox = resolveComponent("Checkbox");
   const _component_CheckboxGroup = resolveComponent("CheckboxGroup");
-  return openBlock(), createElementBlock("div", _hoisted_1$a, [
+  return openBlock(), createElementBlock("div", {
+    class: "shy-basic-table-global-search",
+    style: normalizeStyle(_ctx.setStyle()),
+    ref: "globalSearchWrapperRef"
+  }, [
     createElementVNode("div", {
       class: normalizeClass(["shy-basic-table-global-search-item-global", { "selected-bg": _ctx.curSelected === 1 }]),
       onClick: _cache[0] || (_cache[0] = ($event) => _ctx.handleSelectedClick(1))
     }, [
-      _hoisted_2$4,
+      _hoisted_1$a,
       _ctx.curSelected === 1 ? (openBlock(), createBlock(_component_CheckOutlined, { key: 0 })) : createCommentVNode("", true)
     ], 2),
     createElementVNode("div", {
       class: normalizeClass(["shy-basic-table-global-search-item-special", { "selected-bg": _ctx.curSelected === 2 }]),
       onClick: _cache[1] || (_cache[1] = ($event) => _ctx.handleSelectedClick(2))
     }, [
-      _hoisted_3$1,
+      _hoisted_2$4,
       _ctx.curSelected === 2 ? (openBlock(), createBlock(_component_CheckOutlined, { key: 0 })) : createCommentVNode("", true)
     ], 2),
-    _hoisted_4,
-    createElementVNode("div", _hoisted_5, [
+    _hoisted_3$1,
+    createElementVNode("div", _hoisted_4, [
       createVNode(_component_CheckboxGroup, {
         value: _ctx.fieldList,
         "onUpdate:value": _cache[2] || (_cache[2] = ($event) => _ctx.fieldList = $event),
@@ -15579,7 +15616,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
                 value: item.field
               }, {
                 default: withCtx(() => [
-                  createElementVNode("span", _hoisted_6, toDisplayString(item.label), 1)
+                  createElementVNode("span", _hoisted_5, toDisplayString(item.label), 1)
                 ]),
                 _: 2
               }, 1032, ["value"])
@@ -15589,9 +15626,9 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       }, 8, ["value", "onChange"])
     ])
-  ]);
+  ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-fa3d98b2"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-01cc6536"]]);
 const _sfc_main$i = defineComponent({
   components: {
     TableAdvancedSearch,

package/es/style.css

@@ -25412,7 +25412,7 @@ span.iconify {
 }
 .shy-basic-column-setting__cloumn-list .scrollbar {
   height: 220px;
-}.icon-selected[data-v-851e809a] {
+}.icon-selected[data-v-f74ee46a] {
   color: #498bf8;
 }.shy-ui-advanced-search .ant-form-item {
   margin-bottom: 0;
@@ -25482,7 +25482,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-fa3d98b2] {
+}.shy-basic-table-global-search[data-v-01cc6536] {
   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-fa3d98b2] {
+.shy-basic-table-global-search-item-global[data-v-01cc6536] {
   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-fa3d98b2] {
+.shy-basic-table-global-search-item-special[data-v-01cc6536] {
   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-fa3d98b2] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-01cc6536] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-fa3d98b2] {
+.shy-basic-table-global-search .selected-bg[data-v-01cc6536] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;
@@ -25583,16 +25583,18 @@ span.iconify {
 }
 .shy-basic-table-advanced-search {
   position: absolute;
-  top: 30px;
-  right: 100px;
+  top: 40px;
+  right: 106px;
   width: 600px;
-  max-height: 800px;
-  overflow: auto;
   z-index: 100;
   background-color: #fff;
   border: 1px solid #ebebeb;
   padding: 10px 10px 42px 10px;
 }
+.shy-basic-table-advanced-search .shy-ui-advanced-search {
+  max-height: 500px;
+  overflow: auto;
+}
 .shy-basic-table-advanced-search-footer {
   position: absolute;
   left: 10px;

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

@@ -7,6 +7,12 @@ declare const _sfc_main: import("vue").DefineComponent<{
     handleEnsure: () => void;
     handleReset: () => void;
     advancedSearchRef: import("vue").Ref<any>;
+    setStyle: () => {
+        left: string;
+    } | {
+        left?: undefined;
+    };
+    tableAdvancedSearchWrapperRef: 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

@@ -5592,7 +5592,7 @@ const _sfc_main$V = vue.defineComponent({
   }
 });
 const _hoisted_1$m = { key: "component" };
-const _hoisted_2$a = { key: "skeleton" };
+const _hoisted_2$9 = { key: "skeleton" };
 function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Skeleton = vue.resolveComponent("Skeleton");
   return vue.openBlock(), vue.createBlock(vue.TransitionGroup, vue.mergeProps({ class: "h-full w-full" }, _ctx.$attrs, {
@@ -5604,7 +5604,7 @@ function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
     default: vue.withCtx(() => [
       _ctx.isInit ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$m, [
         vue.renderSlot(_ctx.$slots, "default", { loading: _ctx.loading })
-      ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$a, [
+      ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$9, [
         _ctx.$slots.skeleton ? vue.renderSlot(_ctx.$slots, "skeleton", { key: 0 }) : (vue.openBlock(), vue.createBlock(_component_Skeleton, { key: 1 }))
       ]))
     ]),
@@ -6958,14 +6958,14 @@ function useTransition(source, options = {}) {
   });
 }
 const _hoisted_1$l = { class: "flex justify-between" };
-const _hoisted_2$9 = { key: 0 };
+const _hoisted_2$8 = { key: 0 };
 const _hoisted_3$5 = { class: "flex flex-wrap px-2" };
 const _hoisted_4$3 = ["onClick", "title"];
 const _hoisted_5$2 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$2 = {
+const _hoisted_6$1 = {
   key: 1,
   class: "p-5"
 };
@@ -7074,7 +7074,7 @@ const _sfc_main$U = /* @__PURE__ */ vue.defineComponent({
               ])
             ]),
             content: vue.withCtx(() => [
-              vue.unref(getPaginationList).length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$9, [
+              vue.unref(getPaginationList).length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$8, [
                 vue.createVNode(vue.unref(ScrollContainer$1), { class: "border border-solid border-t-0" }, {
                   default: vue.withCtx(() => [
                     vue.createElementVNode("ul", _hoisted_3$5, [
@@ -7107,7 +7107,7 @@ const _sfc_main$U = /* @__PURE__ */ vue.defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : vue.createCommentVNode("", true)
-              ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$2, [
+              ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$1, [
                 vue.createVNode(vue.unref(AEmpty))
               ]))
             ]),
@@ -7275,7 +7275,7 @@ function _sfc_render$y(_ctx, _cache, $props, $setup, $data, $options) {
 }
 const CountdownInput = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$y]]);
 const _hoisted_1$k = { key: 0 };
-const _hoisted_2$8 = {
+const _hoisted_2$7 = {
   key: 1,
   class: "delete-wrapper"
 };
@@ -7410,7 +7410,7 @@ const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({
               }, 1032, ["rules", "name"])
             ]),
             _: 2
-          }, 1032, ["model"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$8, [
+          }, 1032, ["model"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$7, [
             vue.createElementVNode("span", _hoisted_3$4, vue.toDisplayString(index2 + 1), 1),
             vue.createElementVNode("div", {
               class: "delete-item",
@@ -7837,9 +7837,8 @@ const _sfc_main$Q = /* @__PURE__ */ vue.defineComponent({
         ...on,
         ...bindValue
       };
-      console.log(compAttr);
       const handleInput = (e) => {
-        compAttr.onInputEvent(e);
+        (compAttr == null ? void 0 : compAttr.onInputEvent) && compAttr.onInputEvent(e);
       };
       if (!renderComponentContent) {
         return vue.createVNode(Comp, vue.mergeProps(compAttr, {
@@ -14299,14 +14298,16 @@ const _sfc_main$q = vue.defineComponent({
   setup() {
     const { isVisibleAdvancedSearch, closeGlobalSearch } = useTableContext();
     const handleIconClick = () => {
-      isVisibleAdvancedSearch.value = !isVisibleAdvancedSearch.value;
-      closeGlobalSearch();
+      vue.nextTick(() => {
+        isVisibleAdvancedSearch.value = !isVisibleAdvancedSearch.value;
+        closeGlobalSearch();
+      });
     };
     return { isVisibleAdvancedSearch, handleIconClick };
   }
 });
-const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_851e809a_lang = "";
-const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-851e809a"), n = n(), vue.popScopeId(), n);
+const AdvancedSearchSetting_vue_vue_type_style_index_0_scoped_f74ee46a_lang = "";
+const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-f74ee46a"), n = n(), vue.popScopeId(), n);
 const _hoisted_1$f = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ vue.createElementVNode("span", null, "高级搜索", -1));
 function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FilterOutlined = vue.resolveComponent("FilterOutlined");
@@ -14324,7 +14325,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$h], ["__scopeId", "data-v-851e809a"]]);
+const AdvancedSearchSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$h], ["__scopeId", "data-v-f74ee46a"]]);
 const index$2 = "";
 const searchType = [
   {
@@ -14411,20 +14412,19 @@ const getGlobalAdvancedType = (fieldList, value) => {
   temp.gexpr = fieldList.join("|");
   return temp;
 };
-const _hoisted_1$e = { class: "shy-ui-advanced-search" };
-const _hoisted_2$7 = { class: "shy-ui-advanced-search-add" };
-const _hoisted_3$3 = { class: "shy-ui-advanced-search-item-wrapper" };
-const _hoisted_4$1 = {
+const _hoisted_1$e = { class: "shy-ui-advanced-search-add" };
+const _hoisted_2$6 = { class: "shy-ui-advanced-search-item-wrapper" };
+const _hoisted_3$3 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_5$1 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_6$1 = {
+const _hoisted_4$1 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_5$1 = {
   key: 0,
   class: "shy-ui-advanced-search-item-value-range"
 };
-const _hoisted_7 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
-const _hoisted_8 = ["onClick"];
+const _hoisted_6 = /* @__PURE__ */ vue.createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
+const _hoisted_7 = ["onClick"];
 const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
   __name: "AdvancedSearch",
   props: {
@@ -14446,6 +14446,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { expose }) {
     const props2 = __props;
     vue.reactive({});
+    const advancedSearchRef = vue.ref();
     const formRef = vue.ref();
     const schemasCurrent = vue.reactive([]);
     if (props2.schemas.length !== 0)
@@ -14540,11 +14541,16 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
     };
     expose({
       getSearchFrom,
-      resetFields
+      resetFields,
+      advancedSearchRef
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$e, [
-        vue.createElementVNode("div", _hoisted_2$7, [
+      return vue.openBlock(), vue.createElementBlock("div", {
+        class: "shy-ui-advanced-search",
+        ref_key: "advancedSearchRef",
+        ref: advancedSearchRef
+      }, [
+        vue.createElementVNode("div", _hoisted_1$e, [
           vue.createVNode(vue.unref(PlusCircleOutlined$1)),
           vue.createElementVNode("div", {
             style: { "margin-left": "8px" },
@@ -14562,7 +14568,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(schemasCurrent, (schema, index2) => {
                   return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Col), vue.normalizeProps(vue.mergeProps({ key: index2 }, (schema == null ? void 0 : schema.colProps) || { span: 24 })), {
                     default: vue.withCtx(() => [
-                      vue.createElementVNode("div", _hoisted_3$3, [
+                      vue.createElementVNode("div", _hoisted_2$6, [
                         vue.createVNode(vue.unref(antDesignVue.FormItem), {
                           class: "shy-ui-advanced-search-item-op",
                           name: `${schema.field}-op`
@@ -14599,7 +14605,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                         vue.createVNode(vue.unref(antDesignVue.FormItem), { class: "shy-ui-advanced-search-item-value" }, {
                           default: vue.withCtx(() => [
                             getTypeByField(schema == null ? void 0 : schema.field) === "number" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-                              schema.op === "bt" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$1, [
+                              schema.op === "bt" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$3, [
                                 vue.createVNode(vue.unref(antDesignVue.FormItem), null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(antDesignVue.InputNumber), {
@@ -14610,7 +14616,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_5$1,
+                                _hoisted_4$1,
                                 vue.createVNode(vue.unref(antDesignVue.FormItem), null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(antDesignVue.InputNumber), {
@@ -14629,7 +14635,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                                 valueModifiers: { number: true }
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "date" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-                              schema.op === "bt" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$1, [
+                              schema.op === "bt" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5$1, [
                                 vue.createVNode(vue.unref(antDesignVue.FormItem), null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(antDesignVue.DatePicker), {
@@ -14641,7 +14647,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                                   ]),
                                   _: 2
                                 }, 1024),
-                                _hoisted_7,
+                                _hoisted_6,
                                 vue.createVNode(vue.unref(antDesignVue.FormItem), null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(antDesignVue.DatePicker), {
@@ -14688,7 +14694,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
                           onClick: ($event) => handleMinus(index2)
                         }, [
                           vue.createVNode(vue.unref(MinusCircleTwoTone$1))
-                        ], 8, _hoisted_8)) : vue.createCommentVNode("", true)
+                        ], 8, _hoisted_7)) : vue.createCommentVNode("", true)
                       ])
                     ]),
                     _: 2
@@ -14700,7 +14706,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
           ]),
           _: 1
         }, 8, ["model"])
-      ]);
+      ], 512);
     };
   }
 });
@@ -14877,7 +14883,7 @@ const _sfc_main$m = vue.defineComponent({
 });
 const TableHeader_vue_vue_type_style_index_0_lang = "";
 const _hoisted_1$c = { style: { "width": "100%" } };
-const _hoisted_2$6 = {
+const _hoisted_2$5 = {
   key: 0,
   style: { "margin": "5px" }
 };
@@ -14885,7 +14891,7 @@ const _hoisted_3$2 = { class: "flex items-center" };
 function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TableSetting = vue.resolveComponent("TableSetting");
   return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$c, [
-    _ctx.$slots.headerTop ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$6, [
+    _ctx.$slots.headerTop ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$5, [
       vue.renderSlot(_ctx.$slots, "headerTop")
     ])) : vue.createCommentVNode("", true),
     vue.createElementVNode("div", _hoisted_3$2, [
@@ -15419,6 +15425,15 @@ const _sfc_main$k = vue.defineComponent({
   emits: ["ensure"],
   setup(props2, { emit }) {
     const advancedSearchRef = vue.ref();
+    useTableContext();
+    const setStyle2 = () => {
+      const dom = document.querySelector(".table-settings");
+      if (dom) {
+        return { left: `${dom.offsetLeft - 370}px` };
+      } else {
+        return {};
+      }
+    };
     const handleEnsure = () => {
       const form = advancedSearchRef.value.getSearchFrom();
       emit("ensure", form);
@@ -15426,21 +15441,30 @@ const _sfc_main$k = vue.defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
-    return { handleEnsure, handleReset, advancedSearchRef };
+    return {
+      handleEnsure,
+      handleReset,
+      advancedSearchRef,
+      setStyle: setStyle2,
+      tableAdvancedSearchWrapperRef
+    };
   }
 });
-const _hoisted_1$b = { class: "shy-basic-table-advanced-search" };
-const _hoisted_2$5 = { class: "shy-basic-table-advanced-search-footer" };
+const _hoisted_1$b = { class: "shy-basic-table-advanced-search-footer" };
 function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_AdvancedSearch = vue.resolveComponent("AdvancedSearch");
   const _component_BasicButton = vue.resolveComponent("BasicButton");
   const _component_Space = vue.resolveComponent("Space");
-  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$b, [
+  return vue.openBlock(), vue.createElementBlock("div", {
+    class: "shy-basic-table-advanced-search",
+    ref: "tableAdvancedSearchWrapperRef",
+    style: vue.normalizeStyle(_ctx.setStyle())
+  }, [
     vue.createVNode(_component_AdvancedSearch, {
       ref: "advancedSearchRef",
       schemas: _ctx.schemasAdvancedSearch
     }, null, 8, ["schemas"]),
-    vue.createElementVNode("div", _hoisted_2$5, [
+    vue.createElementVNode("div", _hoisted_1$b, [
       vue.createVNode(_component_Space, null, {
         default: vue.withCtx(() => [
           vue.createVNode(_component_BasicButton, {
@@ -15462,7 +15486,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       })
     ])
-  ]);
+  ], 4);
 }
 const TableAdvancedSearch = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$d]]);
 const _sfc_main$j = vue.defineComponent({
@@ -15527,45 +15551,58 @@ const _sfc_main$j = vue.defineComponent({
     const handleReset = () => {
       advancedSearchRef.value.resetFields();
     };
+    const setStyle2 = () => {
+      const dom = document.querySelector(".table-settings");
+      if (dom) {
+        return { left: `${dom.offsetLeft}px` };
+      } else {
+        return {};
+      }
+    };
     return {
       handleReset,
       advancedSearchRef,
       fieldList,
       curSelected,
       handleSelectedClick,
-      handleCheckboxChange
+      handleCheckboxChange,
+      setStyle: setStyle2,
+      globalSearchWrapperRef
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_fa3d98b2_lang = "";
-const _withScopeId = (n) => (vue.pushScopeId("data-v-fa3d98b2"), n = n(), vue.popScopeId(), n);
-const _hoisted_1$a = { class: "shy-basic-table-global-search" };
-const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索全部", -1));
-const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索特定字段", -1));
-const _hoisted_4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, null, -1));
-const _hoisted_5 = { class: "shy-basic-table-global-search-checkbox-wrapper" };
-const _hoisted_6 = { style: { "color": "#131415", "font-size": "12px" } };
+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 _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));
+const _hoisted_4 = { class: "shy-basic-table-global-search-checkbox-wrapper" };
+const _hoisted_5 = { style: { "color": "#131415", "font-size": "12px" } };
 function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_CheckOutlined = vue.resolveComponent("CheckOutlined");
   const _component_Checkbox = vue.resolveComponent("Checkbox");
   const _component_CheckboxGroup = vue.resolveComponent("CheckboxGroup");
-  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$a, [
+  return vue.openBlock(), vue.createElementBlock("div", {
+    class: "shy-basic-table-global-search",
+    style: vue.normalizeStyle(_ctx.setStyle()),
+    ref: "globalSearchWrapperRef"
+  }, [
     vue.createElementVNode("div", {
       class: vue.normalizeClass(["shy-basic-table-global-search-item-global", { "selected-bg": _ctx.curSelected === 1 }]),
       onClick: _cache[0] || (_cache[0] = ($event) => _ctx.handleSelectedClick(1))
     }, [
-      _hoisted_2$4,
+      _hoisted_1$a,
       _ctx.curSelected === 1 ? (vue.openBlock(), vue.createBlock(_component_CheckOutlined, { key: 0 })) : vue.createCommentVNode("", true)
     ], 2),
     vue.createElementVNode("div", {
       class: vue.normalizeClass(["shy-basic-table-global-search-item-special", { "selected-bg": _ctx.curSelected === 2 }]),
       onClick: _cache[1] || (_cache[1] = ($event) => _ctx.handleSelectedClick(2))
     }, [
-      _hoisted_3$1,
+      _hoisted_2$4,
       _ctx.curSelected === 2 ? (vue.openBlock(), vue.createBlock(_component_CheckOutlined, { key: 0 })) : vue.createCommentVNode("", true)
     ], 2),
-    _hoisted_4,
-    vue.createElementVNode("div", _hoisted_5, [
+    _hoisted_3$1,
+    vue.createElementVNode("div", _hoisted_4, [
       vue.createVNode(_component_CheckboxGroup, {
         value: _ctx.fieldList,
         "onUpdate:value": _cache[2] || (_cache[2] = ($event) => _ctx.fieldList = $event),
@@ -15581,7 +15618,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
                 value: item.field
               }, {
                 default: vue.withCtx(() => [
-                  vue.createElementVNode("span", _hoisted_6, vue.toDisplayString(item.label), 1)
+                  vue.createElementVNode("span", _hoisted_5, vue.toDisplayString(item.label), 1)
                 ]),
                 _: 2
               }, 1032, ["value"])
@@ -15591,9 +15628,9 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       }, 8, ["value", "onChange"])
     ])
-  ]);
+  ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-fa3d98b2"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-01cc6536"]]);
 const _sfc_main$i = vue.defineComponent({
   components: {
     TableAdvancedSearch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.9.6",
+  "version": "2.9.8",
   "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/use": "1.0.4",
-    "@shy-plugins/utils": "1.0.15"
+    "@shy-plugins/utils": "1.0.15",
+    "@shy-plugins/use": "1.0.4"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {