hy-dispatch-ui-v3 0.2.60 → 0.2.62

package/es/components/hyDialog/dialog.vue.mjs

@@ -1,4 +1,4 @@
-import { useModel, computed, ref, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, createElementVNode, renderSlot, normalizeClass, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
+import { useModel, computed, ref, resolveDirective, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, withDirectives, renderSlot, createElementVNode, normalizeClass, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
 import { ElDialog } from 'element-plus';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyButton } from '../hyButton/index.mjs';
@@ -9,6 +9,16 @@ import "./style/dialog.scss";
 const __default__ = defineComponent({
   name: "HyDialog"
 });
+const svg = `
+  <path class="path" d="
+    M 30 15
+    L 28 17
+    M 25.61 25.61
+    A 15 15, 0, 0, 1, 15 30
+    A 15 15, 0, 1, 1, 27.99 7.5
+    L 15 15
+  " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+`;
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: /* @__PURE__ */ mergeModels({
     title: { type: String, default: "\u6807\u9898" },
@@ -186,6 +196,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       hideToWorkspace
     });
     return (_ctx, _cache) => {
+      const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock(
         Fragment,
         null,
@@ -206,6 +217,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "close-on-click-modal": false,
             "close-on-press-escape": false,
             "show-close": false,
+            "destroy-on-close": true,
             "modal-class": modalClass.value,
             modelValue: visible.value,
             "onUpdate:modelValue": ($event) => visible.value = $event,
@@ -251,7 +263,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               )
             ]),
             default: withCtx(() => [
-              createElementVNode("div", { class: "h-full flex flex-col text-main" }, [
+              withDirectives((openBlock(), createElementBlock("div", {
+                "element-loading-text": "\u52A0\u8F7D\u4E2D...",
+                "element-loading-svg": svg,
+                "element-loading-svg-view-box": "-10, -10, 50, 50",
+                "element-loading-background": "rgba(0, 0, 0, 0.8)",
+                class: "h-full flex flex-col text-main"
+              }, [
                 renderSlot(_ctx.$slots, "before-content"),
                 renderSlot(_ctx.$slots, "content", {}, () => [
                   createElementVNode(
@@ -300,7 +318,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         __props.showSubmit ? (openBlock(), createBlock(unref(HyButton), {
                           key: 1,
                           type: __props.submitType,
-                          disabled: loading.value,
+                          loading: loading.value,
                           class: "!min-w-[120px]",
                           onClick: onSubmitHandler
                         }, {
@@ -313,7 +331,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           ]),
                           _: 1
                           /* STABLE */
-                        }, 8, ["type", "disabled"])) : createCommentVNode("v-if", true)
+                        }, 8, ["type", "loading"])) : createCommentVNode("v-if", true)
                       ]),
                       renderSlot(_ctx.$slots, "operate-right-box")
                     ],
@@ -322,6 +340,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ),
                   renderSlot(_ctx.$slots, "operate-left-box")
                 ])) : createCommentVNode("v-if", true)
+              ])), [
+                [_directive_loading, loading.value]
               ])
             ]),
             _: 3

package/es/components/hyForm/cpns/locationSelect.vue.mjs

@@ -238,7 +238,9 @@ const _sfc_main = {
       if (marker) {
         marker.remove();
       }
-      map.removeMap();
+      if (map) {
+        map.removeMap();
+      }
       map = null;
       hyMap = null;
     });

package/es/components/hyMap/map.vue.mjs

@@ -1,6 +1,7 @@
 import { ref, onMounted, openBlock, createElementBlock, createElementVNode } from 'vue';
 import { useAppMapWrapper } from './js/index.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
+import { useMapConfig } from '../../hooks/useMapConfig.mjs';
 
 import "../../static/map/bigemap.css";
 
@@ -14,12 +15,18 @@ const _sfc_main = {
     // 地图配置
     mapConfig: {
       type: Object,
-      default: () => ({})
+      default: () => {
+        const { mapConfig } = useMapConfig();
+        return mapConfig.value || {};
+      }
     },
-    // 地图类型 gaode leafletjs bugMap
+    // 地图类型 gaode leafletjs bigMap
     mapType: {
       type: String,
-      default: "gaode"
+      default: () => {
+        const { mapConfig } = useMapConfig();
+        return mapConfig.value?.mapType || "gaode";
+      }
     }
   },
   emits: ["complete"],

package/es/components/hyMenu/menu.vue.mjs

@@ -1,6 +1,4 @@
-import { defineComponent, useModel, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, createBlock, unref, withCtx, withModifiers, createVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels } from 'vue';
-import { ElIcon } from 'element-plus';
-import { Download } from '@element-plus/icons-vue';
+import { defineComponent, useModel, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, createBlock, unref, withCtx, withModifiers, createVNode, toDisplayString, createCommentVNode, mergeModels } from 'vue';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
 
@@ -21,7 +19,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     },
     showShrink: {
       type: Boolean,
-      default: false
+      default: true
     }
   }, {
     "expand": { type: Boolean, default: true },
@@ -66,18 +64,27 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     }, [
                       createElementVNode("div", { class: "operator-label clickBox" }, [
                         createVNode(unref(HyIcon), {
-                          "svg-name": `${item.iconName}`,
-                          "class-name": "!w-5 !h-5 flex-shrink-0"
+                          "svg-name": `${item.iconNameV3 || item.iconName}`,
+                          "class-name": "!w-4 !h-4 flex-shrink-0"
                         }, null, 8, ["svg-name"]),
                         createElementVNode(
                           "div",
                           {
-                            class: normalizeClass([{ "ml-3": expand.value }, "over_one_line w-full px-2"])
+                            class: normalizeClass([{
+                              "ml-4 mr-3": expand.value,
+                              "text-center mt-1": !expand.value
+                            }, "over_one_line w-full"])
                           },
                           toDisplayString(expand.value ? item.label : item.tip || item.label),
                           3
                           /* TEXT, CLASS */
-                        )
+                        ),
+                        expand.value && __props.modelValue === item.path ? (openBlock(), createBlock(unref(HyIcon), {
+                          key: 0,
+                          "svg-name": "analytics-v3-card-bili",
+                          class: "text-theme",
+                          "class-name": "!w-3 !h-3 flex-shrink-0"
+                        })) : createCommentVNode("v-if", true)
                       ])
                     ], 10, ["onClick"])
                   ]),
@@ -91,23 +98,31 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           ]),
           __props.showShrink ? (openBlock(), createElementBlock("div", {
             key: 0,
-            class: normalizeClass(["w-full h-[44px] border-t border-border box-border cursor-pointer relative", { "justify-end pr-3": expand.value, "justify-center": !expand.value }]),
+            class: normalizeClass(["w-full h-[44px] border-t border-border box-border cursor-pointer relative flex items-center", { "justify-end pr-3": expand.value, "justify-center": !expand.value }]),
             onClick: ($event) => onExpandHandler()
           }, [
-            createVNode(unref(ElIcon), {
-              size: "20",
-              style: normalizeStyle({
-                transform: expand.value ? "translate(0px, -50%) rotateY(0deg) rotateZ(90deg)" : "translate(50%, -50%) rotateY(-180deg) rotateZ(90deg)",
-                transition: "all 0.3s linear"
-              }),
-              class: normalizeClass(["absolute top-1/2", { "right-3": expand.value, "right-1/2": !expand.value }])
-            }, {
-              default: withCtx(() => [
-                createVNode(unref(Download))
-              ]),
-              _: 1
-              /* STABLE */
-            }, 8, ["style", "class"])
+            expand.value ? (openBlock(), createBlock(unref(HyIcon), {
+              key: 0,
+              "svg-name": "ops-linear-shouqi",
+              "class-name": "!w-4 !h-4 flex-shrink-0"
+            })) : (openBlock(), createBlock(unref(HyIcon), {
+              key: 1,
+              "svg-name": "ops-linear-zhankai",
+              "class-name": "!w-4 !h-4 flex-shrink-0"
+            })),
+            createCommentVNode("      <el-icon"),
+            createCommentVNode('        size="20"'),
+            createCommentVNode('        :style="{'),
+            createCommentVNode("          transform: expand"),
+            createCommentVNode("            ? 'translate(0px, -50%) rotateY(0deg) rotateZ(90deg)'"),
+            createCommentVNode("            : 'translate(50%, -50%) rotateY(-180deg) rotateZ(90deg)',"),
+            createCommentVNode("          transition: 'all 0.3s linear',"),
+            createCommentVNode('        }"'),
+            createCommentVNode('        class="absolute top-1/2"'),
+            createCommentVNode(`        :class="{ 'right-3': expand, 'right-1/2': !expand }"`),
+            createCommentVNode("      >"),
+            createCommentVNode("        <Download />"),
+            createCommentVNode("      </el-icon>")
           ], 10, ["onClick"])) : createCommentVNode("v-if", true)
         ],
         2

package/es/components/hyMenu/style/menu.scss

@@ -53,6 +53,7 @@
           left: 0;
           top: 50%;
           transform: translateY(-50%);
+          border-radius: 10px;
           background-color: rgba(var(--hy-theme));
         }
         .operator-label {
@@ -115,6 +116,7 @@
           left: 0;
           top: 50%;
           transform: translateY(-50%);
+          border-radius: 10px;
           background-color: rgba(var(--hy-theme));
         }
         .operator-label {
@@ -138,7 +140,7 @@
           rgba(var(--hy-theme), 0) 2%,
           rgba(var(--hy-theme), 0.4) 100%
         );
-        border-radius: 0px 4px 4px 0px;
+        //border-radius: 0px 4px 4px 0px;
       }
     }
   }

package/es/components/hyOrgCascader/js/index.mjs

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import Axios from 'axios';
 import { unref } from 'vue';
 import { useApi } from '../../../hooks/useApi.mjs';
 
@@ -10,7 +10,7 @@ function getOrgTreeSimple() {
     if (cancelSource) {
       cancelSource.cancel("\u4E2D\u65AD\u8BF7\u6C42");
     }
-    cancelSource = axios.CancelToken.source();
+    cancelSource = Axios.CancelToken.source();
     throttleFn = new Promise((resolve, reject) => {
       unref(api).post(
         "organization/orgTreeSimple",

package/es/components/hySearch/cpns/searchItem.vue.mjs

@@ -1,5 +1,5 @@
 import { computed, unref, openBlock, createBlock, withCtx, createElementVNode, normalizeStyle, createCommentVNode, normalizeClass, renderSlot, createElementBlock, toDisplayString, Fragment, createVNode, mergeProps, withKeys, renderList } from 'vue';
-import { ElFormItem, ElSelect } from 'element-plus';
+import { ElFormItem, ElSelect, ElCascader } from 'element-plus';
 import { columnShowHandler, columnItemStyle, columnItemInputStyle, isDisabled, optionsHandler, isSelectedTimeRange, timeRangeHandler } from '../js/index.mjs';
 import { isArray } from '../../../utils/is.mjs';
 import { setValueByProp, getValueByProp, columnPlaceholderHandler, columnLabelHandler } from '../../../utils/form.mjs';
@@ -239,6 +239,22 @@ const _sfc_main = {
                       ],
                       2112
                       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+                    )) : __props.column.type === "cascader" ? (openBlock(), createElementBlock(
+                      Fragment,
+                      { key: 6 },
+                      [
+                        createCommentVNode(" \u7EA7\u8054\u9009\u62E9\u6846 "),
+                        createVNode(unref(ElCascader), mergeProps({
+                          modelValue: bindValue.value,
+                          "onUpdate:modelValue": ($event) => bindValue.value = $event
+                        }, columnAttrs.value, {
+                          disabled: unref(isDisabled)(props, __props.column),
+                          options: unref(optionsHandler)(props, __props.column),
+                          onChange: onChangeHandler
+                        }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                      ],
+                      2112
+                      /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                     )) : createCommentVNode("v-if", true)
                   ],
                   6

package/es/components/hyTable/table.vue.mjs

@@ -239,6 +239,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 表单查询
       totalElements,
       showFilter,
+      selectedList,
       getData,
       setData,
       resetFields,
@@ -741,7 +742,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 "hide-on-single-page": "",
                 onSizeChange: unref(onSizeChangeHandler),
                 onCurrentChange: unref(onCurrentChangeHandler)
-              }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"])
+              }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"]),
+              unref(selectedList) && unref(selectedList).length > 0 ? (openBlock(), createElementBlock("div", {
+                key: 0,
+                class: "absolute right-4 top-1/2 transform -translate-y-1/2"
+              }, [
+                renderSlot(_ctx.$slots, "multiple-operator-slot")
+              ])) : createCommentVNode("v-if", true)
             ])) : createCommentVNode("v-if", true)
           ]),
           createCommentVNode(" \u8868\u683C\u884C\u53F3\u952E\u5C55\u793A\u64CD\u4F5C\u5217\u8868 "),

package/es/components/hyTableForm/batchTableForm.vue.mjs

@@ -1,8 +1,8 @@
-import { defineComponent, useTemplateRef, useModel, ref, nextTick, openBlock, createElementBlock, withDirectives, createElementVNode, createVNode, unref as unref$1, withCtx, Fragment, renderList, createCommentVNode, toDisplayString, renderSlot, createTextVNode, vShow, mergeProps, createSlots, normalizeProps, guardReactiveProps, normalizeStyle, mergeModels } from 'vue';
+import { defineComponent, useTemplateRef, useModel, ref, nextTick, openBlock, createElementBlock, withDirectives, createElementVNode, createVNode, unref, withCtx, Fragment, renderList, createCommentVNode, toDisplayString, renderSlot, vShow, createTextVNode, mergeProps, createSlots, normalizeProps, guardReactiveProps, normalizeStyle, mergeModels } from 'vue';
 import { ElUpload, ElIcon, ElMessage } from 'element-plus';
 import { Loading } from '@element-plus/icons-vue';
 import _sfc_main$1 from './tableForm.vue.mjs';
-import { downloadTemplateHandler, doReadExcel } from './js/index.mjs';
+import { doReadExcel } from './js/index.mjs';
 import { useApi } from '../../hooks/useApi.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { isArray } from '../../utils/is.mjs';
@@ -64,21 +64,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     onExpandRowChange: {
       type: Function
     },
-    templateConfig: {
-      type: Object,
-      default: () => ({
-        title: "\u4E0B\u8F7D\u6A21\u677F",
-        url: "",
-        fileName: ""
-      })
-    },
-    url: {
-      type: String
+    submitHandler: {
+      type: Function
     },
-    submitParams: {
-      type: Object
+    // 是否显示添加按钮
+    showAddBtn: {
+      type: Boolean,
+      default: true
     },
-    submitHandler: {
+    // 外部整体数据处理
+    beforeDataListHandle: {
       type: Function
     }
   }, {
@@ -142,6 +137,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return tableRef.value.validate();
     }
     async function onUploadChange(file) {
+      const { beforeDataListHandle } = props;
       const type = file.raw.type;
       if (file.raw.size > 1024 * 1024 * 10) {
         ElMessage.error(`\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC710M\uFF01`);
@@ -149,31 +145,32 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       } else {
         if (type.indexOf("application") !== -1) {
           const files = { 0: file.raw };
+          isUploading.value = true;
+          emits("uploading");
           try {
-            isUploading.value = true;
-            emits("uploading");
             const data = await doReadExcel(files, props);
             if (!data) {
               ElMessage.warning("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25");
-              isUploading.value = false;
-              return;
+              throw Error("\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25");
             }
             if (!data.length) {
               ElMessage.warning("\u8BE5\u6587\u4EF6\u6CA1\u6709\u6570\u636E");
-              isUploading.value = false;
-              return;
+              throw Error("\u8BE5\u6587\u4EF6\u6CA1\u6709\u6570\u636E");
             }
             active.value++;
-            isUploading.value = false;
-            emits("uploaded");
             await nextTick();
-            setData(data);
+            if (beforeDataListHandle) {
+              const processData = await beforeDataListHandle(data);
+              setData(processData);
+            } else {
+              setData(data);
+            }
             templateFileName.value = file.name;
           } catch (err) {
-            isUploading.value = false;
             console.error(err);
-            return;
           }
+          isUploading.value = false;
+          emits("uploaded");
         } else {
           ElMessage.error("\u6587\u4EF6\u683C\u5F0F\u6709\u8BEF");
         }
@@ -205,8 +202,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       uploadRef.value.click();
     }
     async function submitDataSource() {
-      if (!props.url && !props.submitHandler) {
-        ElMessage.warning("\u8BF7\u914D\u7F6E\u63D0\u4EA4\u8868\u5355\u5730\u5740");
+      if (!props.submitHandler) {
+        ElMessage.warning("\u8BF7\u914D\u7F6E\u63D0\u4EA4\u903B\u8F91");
         return Promise.reject();
       }
       if (submitting.value) {
@@ -250,13 +247,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         if (errorMsg) {
           continue;
         }
-        let res2;
         try {
-          if (props.submitHandler) {
-            res2 = await props.submitHandler(data);
-          } else {
-            res2 = await unref(api).post(props.url, props.submitParams);
-          }
+          const res2 = await props.submitHandler(data);
           if (res2.code === 200) {
             submitNumber.value++;
             submitList.push(target);
@@ -342,7 +334,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             { class: "max-h-full overflow-y-auto scroll-body" },
             [
               createElementVNode("div", { class: "hy-batch-table-form-upload-box" }, [
-                createVNode(unref$1(ElUpload), {
+                createVNode(unref(ElUpload), {
                   accept: ".xls,.xlsx",
                   drag: "",
                   multiple: false,
@@ -352,7 +344,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   "on-change": onUploadChange
                 }, {
                   default: withCtx(() => [
-                    createVNode(unref$1(HyIcon), {
+                    createVNode(unref(HyIcon), {
                       "svg-name": "ops-file-xls",
                       "class-name": "!w-[58px] !h-[66px] mb-4"
                     }),
@@ -361,9 +353,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                       class: "flex items-center gap-2 text-auxiliary"
                     }, [
                       createElementVNode("span", { class: "text-xs" }, "\u6587\u4EF6\u4E0A\u4F20\u4E2D"),
-                      createVNode(unref$1(ElIcon), { class: "is-loading" }, {
+                      createVNode(unref(ElIcon), { class: "is-loading" }, {
                         default: withCtx(() => [
-                          createVNode(unref$1(Loading))
+                          createVNode(unref(Loading))
                         ]),
                         _: 1
                         /* STABLE */
@@ -442,23 +434,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           innerHTML: item.description,
                           class: "text-auxiliary text-center mb-3 whitespace-nowrap"
                         }, null, 8, ["innerHTML"]),
-                        index === 0 ? renderSlot(_ctx.$slots, "template-down", {}, () => [
-                          createVNode(unref$1(HyButton), {
-                            type: "primary",
-                            link: "",
-                            onClick: () => unref$1(downloadTemplateHandler)(props)
-                          }, {
-                            default: withCtx(() => [
-                              createTextVNode(
-                                toDisplayString(__props.templateConfig ? __props.templateConfig.title : "\u4E0B\u8F7D\u6A21\u677F"),
-                                1
-                                /* TEXT */
-                              )
-                            ]),
-                            _: 1
-                            /* STABLE */
-                          }, 8, ["onClick"])
-                        ], void 0, 1) : createCommentVNode("v-if", true)
+                        index === 0 ? renderSlot(_ctx.$slots, "template-down", {}, void 0, void 0, 1) : createCommentVNode("v-if", true)
                       ]);
                     }),
                     64
@@ -478,7 +454,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           }, [
             createElementVNode("div", { class: "hy-batch-table-form-template-box mb-4" }, [
               createElementVNode("div", { class: "flex items-center gap-2" }, [
-                createVNode(unref$1(HyIcon), {
+                createVNode(unref(HyIcon), {
                   "svg-name": "ops-file-xls",
                   "class-name": "!w-[18px] !h-[22px]"
                 }),
@@ -502,7 +478,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   class: "text-auxiliary"
                 }, "\u6682\u672A\u5BFC\u5165\u6587\u4EF6"))
               ]),
-              createVNode(unref$1(HyButton), {
+              createVNode(unref(HyButton), {
                 type: "primary",
                 link: "",
                 size: "small",
@@ -530,6 +506,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               rowClickExpand: __props.rowClickExpand,
               columnNum: __props.columnNum,
               size: __props.size,
+              showAddBtn: __props.showAddBtn,
               class: "h-0 flex-1"
             }), createSlots({
               _: 2
@@ -543,7 +520,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ])
                 };
               })
-            ]), 1040, ["tableColumns", "formColumns", "onExpandRowChange", "rules", "rowClickExpand", "columnNum", "size"])
+            ]), 1040, ["tableColumns", "formColumns", "onExpandRowChange", "rules", "rowClickExpand", "columnNum", "size", "showAddBtn"])
           ])) : createCommentVNode("v-if", true),
           submitting.value ? (openBlock(), createElementBlock("div", {
             key: 1,
@@ -551,7 +528,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           }, [
             createElementVNode("div", { class: "w-full h-full absolute bg-[rgba(var(--hy-background-4),0.9)] backdrop-blur-sm" }),
             createElementVNode("div", { class: "flex flex-col items-center text-theme text-xs relative" }, [
-              createVNode(unref$1(HyIcon), {
+              createVNode(unref(HyIcon), {
                 "svg-name": "ops-file-xls",
                 "class-name": "!w-[58px] !h-[66px] mb-[18px]"
               }),

package/es/components/hyTableForm/js/index.mjs

@@ -1,10 +1,6 @@
 import XLSX from 'xlsx';
-import dayjs from 'dayjs';
-import { unref } from 'vue';
 import AsyncValidator from 'async-validator';
-import { ElMessage } from 'element-plus';
 import { columnShowHandler } from '../../hyForm/js/index.mjs';
-import { useApi } from '../../../hooks/useApi.mjs';
 import { columnRuleHandler, setValueByProp, getValueByProp } from '../../../utils/form.mjs';
 import { isArray } from '../../../utils/is.mjs';
 
@@ -39,7 +35,7 @@ const doValidate = async (target = {}, columns = [], ruleList = {}) => {
   });
 };
 const doReadExcel = (files, props) => {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const { formColumns, beforeDataHandle } = props;
     const fileReader = new FileReader();
     fileReader.onload = (ev) => {
@@ -59,9 +55,13 @@ const doReadExcel = (files, props) => {
         }, JSON.stringify(ws1));
         let dataSource = JSON.parse(content);
         if (beforeDataHandle) {
-          dataSource = dataSource.map((item) => beforeDataHandle(item));
+          const handlePromises = dataSource.map(
+            (item) => Promise.resolve().then(() => beforeDataHandle(item)).catch(() => item)
+          );
+          Promise.all(handlePromises).then(resolve, reject);
+          return;
         }
-        resolve2(dataSource);
+        resolve(dataSource);
       } catch (err) {
         reject(err);
       }
@@ -69,55 +69,5 @@ const doReadExcel = (files, props) => {
     fileReader.readAsBinaryString(files[0]);
   });
 };
-const downloadTemplateHandler = async (props) => {
-  const { templateConfig } = props;
-  const { url, fileName } = templateConfig;
-  if (!url) {
-    ElMessage.warning("\u8BF7\u914D\u7F6E\u4E0B\u8F7D\u6A21\u677F\u5730\u5740");
-    return;
-  }
-  const { api } = useApi();
-  try {
-    const blob = await unref(api).get(url, {
-      responseType: "blob"
-    });
-    blobDownloadFn(blob, fileName).then(() => {
-      resolve();
-    });
-  } catch (err) {
-    console.error(err);
-  }
-};
-function blobDownloadFn(blob, name) {
-  return new Promise((resolve2, reject) => {
-    ElMessage.warning("\u5F00\u59CB\u4E0B\u8F7D");
-    const today = dayjs().format("YYYY-MM-DD HH:mm:ss");
-    const reader = new FileReader();
-    reader.readAsDataURL(blob);
-    reader.onload = function(ev) {
-      let url = null;
-      try {
-        if (window.navigator.msSaveOrOpenBlob) {
-          const blobObject = new Blob([blob]);
-          window.navigator.msSaveOrOpenBlob(blobObject, `${name}_${today}.xls`);
-        } else {
-          url = URL.createObjectURL(new Blob([blob]));
-          const a = document.createElement("a");
-          document.body.appendChild(a);
-          a.href = url;
-          a.download = `${name}_${today}.xls`;
-          a.target = "_blank";
-          a.click();
-          a.remove();
-        }
-        resolve2();
-      } catch (error) {
-        reject(error);
-      } finally {
-        if (url) URL.revokeObjectURL(url);
-      }
-    };
-  });
-}
 
-export { doReadExcel, doValidate, downloadTemplateHandler };
+export { doReadExcel, doValidate };

package/es/components/hyTableForm/tableForm.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useTemplateRef, ref, computed, openBlock, createElementBlock, createElementVNode, toDisplayString, createCommentVNode, createVNode, unref, withCtx, createTextVNode, Fragment, renderList, normalizeClass, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps, createBlock, nextTick } from 'vue';
+import { defineComponent, useTemplateRef, ref, computed, openBlock, createElementBlock, createElementVNode, toDisplayString, createCommentVNode, createBlock, unref, withCtx, createTextVNode, Fragment, renderList, normalizeClass, createVNode, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps, nextTick } from 'vue';
 import { ElIcon } from 'element-plus';
 import { Warning } from '@element-plus/icons-vue';
 import { doValidate } from './js/index.mjs';
@@ -59,6 +59,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // 'large' | 'default' | 'small'
+    },
+    // 是否显示添加按钮
+    showAddBtn: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["validate"],
@@ -330,7 +335,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               ])) : createCommentVNode("v-if", true)
             ]),
             createElementVNode("div", { class: "flex items-center gap-3" }, [
-              createVNode(unref(HyButton), {
+              __props.showAddBtn ? (openBlock(), createBlock(unref(HyButton), {
+                key: 0,
                 type: "success",
                 size: "small",
                 "svg-name": "ops-button-add",
@@ -341,7 +347,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 1
                 /* STABLE */
-              }),
+              })) : createCommentVNode("v-if", true),
               createElementVNode("div", { class: "hy-table-form-tabs" }, [
                 (openBlock(true), createElementBlock(
                   Fragment,