3h1-ui 2.14.19 → 2.14.20

package/es/index.js

@@ -12302,7 +12302,9 @@ const CellComponent$1 = ({
     {
       overlayClassName: "edit-cell-rule-popover",
       visible: !!popoverVisible,
-      ...getPopupContainer2 ? { getPopupContainer: getPopupContainer2 } : {}
+      getPopupContainer: (e) => {
+        return attrs.currIndex ? e.parentNode : document.body;
+      }
     },
     {
       default: () => DefaultComp,
@@ -12464,12 +12466,9 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
       }
       upEditDynamicDisabled(record, column, value);
       return {
-        // showCount: true,
         maxlength: 100,
         size: "small",
-        getPopupContainer: (e) => {
-          return !!index2 ? e.parentNode : unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body;
-        },
+        getPopupContainer: () => unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
         placeholder: createPlaceholderMessage(unref(getComponent)),
         ...apiSelectProps,
         ...compProps,
@@ -12845,7 +12844,8 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
         "ref": "elRef",
         "onChange": this.handleChange,
         "onOptionsChange": this.handleOptionsChange,
-        "onPressEnter": this.handleEnter
+        "onPressEnter": this.handleEnter,
+        "currIndex": this.index
       }), null), !this.getRowEditable && createVNode("div", {
         "class": `${this.prefixCls}__action`
       }, [createVNode(CheckOutlined$1, {
@@ -15593,12 +15593,15 @@ const _sfc_main$t = defineComponent({
     };
     const tableAdvancedSearchWrapperRef = ref();
     const clickOutside = (e) => {
+      var _a2;
       if (tableAdvancedSearchWrapperRef.value.contains(e.target))
         return;
-      if (document.querySelector(".table-settings").contains(e.target))
+      if ((_a2 = document.querySelector(".table-settings")) == null ? void 0 : _a2.contains(e.target))
         return;
       if (e.target.classList.contains("shy-basic-minus-icon"))
         return;
+      if (e.target.nodeName === "BODY")
+        return;
       const selectList = document.getElementsByClassName("ant-select-dropdown");
       const pickList = document.getElementsByClassName("ant-picker-dropdown");
       const domList = [...Array.from(selectList), ...Array.from(pickList)];
@@ -15735,7 +15738,8 @@ const _sfc_main$s = defineComponent({
     };
     const globalSearchWrapperRef = ref();
     const clickOutside = (e) => {
-      if (document.querySelector(".table-settings").contains(e.target))
+      var _a2;
+      if ((_a2 = document.querySelector(".table-settings")) == null ? void 0 : _a2.contains(e.target))
         return;
       if (globalSearchWrapperRef.value.contains(e.target))
         return;
@@ -15759,8 +15763,8 @@ const _sfc_main$s = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_d97ebae4_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-d97ebae4"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_90331d26_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-90331d26"), n = n(), popScopeId(), n);
 const _hoisted_1$f = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -15818,7 +15822,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$i], ["__scopeId", "data-v-d97ebae4"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$i], ["__scopeId", "data-v-90331d26"]]);
 const _sfc_main$r = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -17065,10 +17069,6 @@ const basicProps$2 = {
     type: String,
     default: () => "right"
   },
-  labelWidth: {
-    type: Number,
-    default: () => 80
-  },
   isShowColon: {
     type: Boolean,
     default: () => true
@@ -17100,6 +17100,9 @@ const Description = /* @__PURE__ */ defineComponent({
     slots
   }) {
     const prefixCls2 = "shy-basic-description";
+    const {
+      createMessage
+    } = useMessage();
     const getProps = computed(() => {
       return {
         ...props2,
@@ -17113,20 +17116,16 @@ const Description = /* @__PURE__ */ defineComponent({
         ...props3
       };
     };
-    function copyToClipboard(text) {
-      const textarea = document.createElement("textarea");
-      textarea.value = text;
-      document.body.appendChild(textarea);
-      textarea.select();
-      document.execCommand("copy");
-      document.body.removeChild(textarea);
-    }
     const handleClick = (value) => {
-      copyToClipboard(value);
+      navigator.clipboard.writeText(value).then(() => {
+        createMessage.success("复制成功");
+      }, () => {
+        createMessage.error("无法复制文本到剪贴板");
+      });
     };
     const rows = computed(() => {
       return getProps.value.schema.map((item) => {
-        var _a2, _b, _c, _d;
+        var _a2, _b, _c, _d, _e, _f, _g, _h;
         if ((item == null ? void 0 : item.component) === "Divider") {
           return createVNode(Divider$1, null, null);
         } else if ((item == null ? void 0 : item.component) === "Group") {
@@ -17143,18 +17142,23 @@ const Description = /* @__PURE__ */ defineComponent({
             "style": {
               flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
             }
-          }, [createVNode("span", {
+          }, [(slots == null ? void 0 : slots[`${item.field}Label`]) || item.label ? createVNode("span", {
             "style": {
-              width: `${getProps.value.labelWidth}px`,
-              textAlign: getProps.value.labelAlign
+              textAlign: getProps.value.labelAlign,
+              ...((_b = getProps.value) == null ? void 0 : _b.labelStyle) ? (_c = getProps.value) == null ? void 0 : _c.labelStyle : {},
+              ...(item == null ? void 0 : item.labelStyle) ? item == null ? void 0 : item.labelStyle : {}
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots, {
+          }, [slots[`${item.field}Label`] ? (_d = slots[`${item.field}Label`]) == null ? void 0 : _d.call(slots, {
             model: getProps.value.data,
             field: item.label
-          }) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), createVNode("span", {
-            "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots, {
+          }) : item.label, ((_e = getProps.value) == null ? void 0 : _e.isShowColon) ? ":" : ""]) : createVNode(Fragment, null, [createTextVNode(" ")]), createVNode("span", {
+            "class": `${prefixCls2}-value`,
+            "style": {
+              ...((_f = getProps.value) == null ? void 0 : _f.contentStyle) ? (_g = getProps.value) == null ? void 0 : _g.contentStyle : {},
+              ...(item == null ? void 0 : item.contentStyle) ? item == null ? void 0 : item.contentStyle : {}
+            }
+          }, [slots[`${item.field}Value`] ? (_h = slots[`${item.field}Value`]) == null ? void 0 : _h.call(slots, {
             model: getProps.value.data,
             field: getProps.value.data[`${item.field}`]
           }) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? createVNode("span", {

package/es/style.css

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

package/lib/index.js

@@ -12304,7 +12304,9 @@ const CellComponent$1 = ({
     {
       overlayClassName: "edit-cell-rule-popover",
       visible: !!popoverVisible,
-      ...getPopupContainer2 ? { getPopupContainer: getPopupContainer2 } : {}
+      getPopupContainer: (e) => {
+        return attrs.currIndex ? e.parentNode : document.body;
+      }
     },
     {
       default: () => DefaultComp,
@@ -12466,12 +12468,9 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
       }
       upEditDynamicDisabled(record, column, value);
       return {
-        // showCount: true,
         maxlength: 100,
         size: "small",
-        getPopupContainer: (e) => {
-          return !!index2 ? e.parentNode : vue.unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body;
-        },
+        getPopupContainer: () => vue.unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
         placeholder: createPlaceholderMessage(vue.unref(getComponent)),
         ...apiSelectProps,
         ...compProps,
@@ -12847,7 +12846,8 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
         "ref": "elRef",
         "onChange": this.handleChange,
         "onOptionsChange": this.handleOptionsChange,
-        "onPressEnter": this.handleEnter
+        "onPressEnter": this.handleEnter,
+        "currIndex": this.index
       }), null), !this.getRowEditable && vue.createVNode("div", {
         "class": `${this.prefixCls}__action`
       }, [vue.createVNode(CheckOutlined$1, {
@@ -15595,12 +15595,15 @@ const _sfc_main$t = vue.defineComponent({
     };
     const tableAdvancedSearchWrapperRef = vue.ref();
     const clickOutside = (e) => {
+      var _a2;
       if (tableAdvancedSearchWrapperRef.value.contains(e.target))
         return;
-      if (document.querySelector(".table-settings").contains(e.target))
+      if ((_a2 = document.querySelector(".table-settings")) == null ? void 0 : _a2.contains(e.target))
         return;
       if (e.target.classList.contains("shy-basic-minus-icon"))
         return;
+      if (e.target.nodeName === "BODY")
+        return;
       const selectList = document.getElementsByClassName("ant-select-dropdown");
       const pickList = document.getElementsByClassName("ant-picker-dropdown");
       const domList = [...Array.from(selectList), ...Array.from(pickList)];
@@ -15737,7 +15740,8 @@ const _sfc_main$s = vue.defineComponent({
     };
     const globalSearchWrapperRef = vue.ref();
     const clickOutside = (e) => {
-      if (document.querySelector(".table-settings").contains(e.target))
+      var _a2;
+      if ((_a2 = document.querySelector(".table-settings")) == null ? void 0 : _a2.contains(e.target))
         return;
       if (globalSearchWrapperRef.value.contains(e.target))
         return;
@@ -15761,8 +15765,8 @@ const _sfc_main$s = vue.defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_d97ebae4_lang = "";
-const _withScopeId = (n) => (vue.pushScopeId("data-v-d97ebae4"), n = n(), vue.popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_90331d26_lang = "";
+const _withScopeId = (n) => (vue.pushScopeId("data-v-90331d26"), n = n(), vue.popScopeId(), n);
 const _hoisted_1$f = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, null, -1));
@@ -15820,7 +15824,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$i], ["__scopeId", "data-v-d97ebae4"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$i], ["__scopeId", "data-v-90331d26"]]);
 const _sfc_main$r = vue.defineComponent({
   components: {
     TableAdvancedSearch,
@@ -17067,10 +17071,6 @@ const basicProps$2 = {
     type: String,
     default: () => "right"
   },
-  labelWidth: {
-    type: Number,
-    default: () => 80
-  },
   isShowColon: {
     type: Boolean,
     default: () => true
@@ -17102,6 +17102,9 @@ const Description = /* @__PURE__ */ vue.defineComponent({
     slots
   }) {
     const prefixCls2 = "shy-basic-description";
+    const {
+      createMessage
+    } = use.useMessage();
     const getProps = vue.computed(() => {
       return {
         ...props2,
@@ -17115,20 +17118,16 @@ const Description = /* @__PURE__ */ vue.defineComponent({
         ...props3
       };
     };
-    function copyToClipboard(text) {
-      const textarea = document.createElement("textarea");
-      textarea.value = text;
-      document.body.appendChild(textarea);
-      textarea.select();
-      document.execCommand("copy");
-      document.body.removeChild(textarea);
-    }
     const handleClick = (value) => {
-      copyToClipboard(value);
+      navigator.clipboard.writeText(value).then(() => {
+        createMessage.success("复制成功");
+      }, () => {
+        createMessage.error("无法复制文本到剪贴板");
+      });
     };
     const rows = vue.computed(() => {
       return getProps.value.schema.map((item) => {
-        var _a2, _b, _c, _d;
+        var _a2, _b, _c, _d, _e, _f, _g, _h;
         if ((item == null ? void 0 : item.component) === "Divider") {
           return vue.createVNode(antDesignVue.Divider, null, null);
         } else if ((item == null ? void 0 : item.component) === "Group") {
@@ -17145,18 +17144,23 @@ const Description = /* @__PURE__ */ vue.defineComponent({
             "style": {
               flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
             }
-          }, [vue.createVNode("span", {
+          }, [(slots == null ? void 0 : slots[`${item.field}Label`]) || item.label ? vue.createVNode("span", {
             "style": {
-              width: `${getProps.value.labelWidth}px`,
-              textAlign: getProps.value.labelAlign
+              textAlign: getProps.value.labelAlign,
+              ...((_b = getProps.value) == null ? void 0 : _b.labelStyle) ? (_c = getProps.value) == null ? void 0 : _c.labelStyle : {},
+              ...(item == null ? void 0 : item.labelStyle) ? item == null ? void 0 : item.labelStyle : {}
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots, {
+          }, [slots[`${item.field}Label`] ? (_d = slots[`${item.field}Label`]) == null ? void 0 : _d.call(slots, {
             model: getProps.value.data,
             field: item.label
-          }) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), vue.createVNode("span", {
-            "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots, {
+          }) : item.label, ((_e = getProps.value) == null ? void 0 : _e.isShowColon) ? ":" : ""]) : vue.createVNode(vue.Fragment, null, [vue.createTextVNode(" ")]), vue.createVNode("span", {
+            "class": `${prefixCls2}-value`,
+            "style": {
+              ...((_f = getProps.value) == null ? void 0 : _f.contentStyle) ? (_g = getProps.value) == null ? void 0 : _g.contentStyle : {},
+              ...(item == null ? void 0 : item.contentStyle) ? item == null ? void 0 : item.contentStyle : {}
+            }
+          }, [slots[`${item.field}Value`] ? (_h = slots[`${item.field}Value`]) == null ? void 0 : _h.call(slots, {
             model: getProps.value.data,
             field: getProps.value.data[`${item.field}`]
           }) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? vue.createVNode("span", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.14.19",
+  "version": "2.14.20",
   "description": "",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -29,8 +29,8 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/utils": "1.1.1",
-    "@shy-plugins/use": "1.0.5"
+    "@shy-plugins/use": "1.0.5",
+    "@shy-plugins/utils": "1.1.1"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {