bm-admin-ui 1.2.45-alpha → 1.2.47-alpha

package/lib/components/float-table/src/float-table.vue.d.ts

@@ -1,69 +1,143 @@
-declare const _default: {
-    name: string;
-    props: {
-        config: {
-            type: ObjectConstructor;
-            required: boolean;
-            default: () => {};
-        };
-        pagerProps: {
-            type: ObjectConstructor;
-            default: () => {};
+declare const _default: import("vue").DefineComponent<{
+    config: {
+        type: ObjectConstructor;
+        required: true;
+        default: () => {};
+    };
+    pagerProps: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    events: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    isNeedFloatHandle: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    size: {
+        type: StringConstructor;
+        default: string;
+    };
+}, {
+    setItemRef(el: any, column: any, rowid: any): void;
+    leaveFloatTable(): void;
+    scrollTo(config?: {}): void;
+    pageNoChange(val: any): Promise<void>;
+    pageSizeChange(val: any, size: any): Promise<void>;
+    floatMouseLeave(): void;
+    floatOverMouse(): void;
+    goAnimationEndFn(): void;
+    scrollNotShowFloat(): void;
+    classes: import("vue").ComputedRef<(string | {
+        floatHandleTable: any;
+    })[]>;
+    gridOptions: import("vue").ComputedRef<{
+        resizable: boolean;
+        rowDragAble: boolean;
+        border: string;
+        highlightHoverRow: boolean;
+        showOverflow: boolean;
+        showHeaderOverflow: boolean;
+        align: null;
+        columns: never[];
+        tooltipConfig: {
+            leaveDelay: number;
         };
-        events: {
-            type: ObjectConstructor;
-            default: () => {};
+        data: never[];
+        pagerConfig: {};
+        emptyText: string;
+        checkboxConfig: {
+            reserve: boolean;
+            highlight: any;
+            trigger: string;
         };
-        isNeedFloatHandle: {
-            type: BooleanConstructor;
-            default: boolean;
+        columnConfig: {
+            useKey: boolean;
         };
-        size: {
-            type: StringConstructor;
-            default: string;
+        rowClassName: string;
+        sortConfig: {
+            trigger: string;
+            orders: (string | null)[];
         };
+    }>;
+    gridEvents: import("vue").ComputedRef<{
+        cellMouseenter?: ((e: any) => void) | undefined;
+        scroll?: ((e: any) => void) | undefined;
+        cellMouseleave?: ((e: any) => void) | undefined;
+        radioChange: (val: any) => void;
+        checkboxChange: (val: any) => void;
+        checkboxAll: (val: any) => void;
+        cellClick: (data: any) => void;
+    }>;
+    pager: import("vue").ComputedRef<{
+        size: string;
+        showTotal: (total: any) => string;
+        showQuickJumper: boolean;
+        showSizeChanger: boolean;
+        current: number;
+        pageSize: number;
+        total: number;
+        hideOnSinglePage: boolean;
+        pageSizeOptions: string[];
+    }>;
+    simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }> | null | undefined)[]>;
+    floatRefsId: import("vue").Ref<{}>;
+    floatId: import("vue").Ref<string>;
+    isShowFloatHandle: import("vue").Ref<boolean>;
+    atVisible: import("vue").Ref<boolean>;
+    goAnimationEnd: import("vue").Ref<boolean>;
+    floatPosition: import("vue").Ref<{
+        top: string;
+        height: string;
+    }>;
+    trNodes: import("vue").Ref<any>;
+    isInScroll: import("vue").Ref<boolean>;
+    inMaxScrollX: import("vue").Ref<boolean>;
+    floatRow: import("vue").Ref<{}>;
+    floatRowIndex: import("vue").Ref<undefined>;
+    floatHandleDomCol: import("vue").Ref<any>;
+    floatTable: import("vue").Ref<any>;
+    xGrid: import("vue").Ref<any>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("radioChange" | "checkboxChange" | "checkboxChangeAll" | "cellClick" | "pageChange" | "pageSizeChange")[], "radioChange" | "checkboxChange" | "checkboxChangeAll" | "cellClick" | "pageChange" | "pageSizeChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    config: {
+        type: ObjectConstructor;
+        required: true;
+        default: () => {};
+    };
+    pagerProps: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    events: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    isNeedFloatHandle: {
+        type: BooleanConstructor;
+        default: boolean;
     };
-    emits: string[];
-    setup(props: any, { emit }: {
-        emit: any;
-    }): {
-        setItemRef(el: any, column: any, rowid: any): void;
-        leaveFloatTable(): void;
-        scrollTo(config?: {}): void;
-        pageNoChange(val: any): Promise<void>;
-        pageSizeChange(val: any, size: any): Promise<void>;
-        floatMouseLeave(): void;
-        floatOverMouse(): void;
-        goAnimationEndFn(): void;
-        scrollNotShowFloat(): void;
-        classes: import("vue").ComputedRef<(string | {
-            floatHandleTable: any;
-        })[]>;
-        gridOptions: import("vue").ComputedRef<any>;
-        gridEvents: import("vue").ComputedRef<any>;
-        pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | null | undefined)[]>;
-        floatRefsId: import("vue").Ref<{}>;
-        floatId: import("vue").Ref<string>;
-        isShowFloatHandle: import("vue").Ref<boolean>;
-        atVisible: import("vue").Ref<boolean>;
-        goAnimationEnd: import("vue").Ref<boolean>;
-        floatPosition: import("vue").Ref<{
-            top: string;
-            height: string;
-        }>;
-        trNodes: import("vue").Ref<any>;
-        isInScroll: import("vue").Ref<boolean>;
-        inMaxScrollX: import("vue").Ref<boolean>;
-        floatRow: import("vue").Ref<{}>;
-        floatRowIndex: import("vue").Ref<undefined>;
-        floatHandleDomCol: import("vue").Ref<any>;
-        floatTable: import("vue").Ref<any>;
-        xGrid: import("vue").Ref<any>;
+    size: {
+        type: StringConstructor;
+        default: string;
     };
-};
+}>> & {
+    onRadioChange?: ((...args: any[]) => any) | undefined;
+    onCheckboxChange?: ((...args: any[]) => any) | undefined;
+    onCheckboxChangeAll?: ((...args: any[]) => any) | undefined;
+    onCellClick?: ((...args: any[]) => any) | undefined;
+    onPageChange?: ((...args: any[]) => any) | undefined;
+    onPageSizeChange?: ((...args: any[]) => any) | undefined;
+}, {
+    size: string;
+    config: Record<string, any>;
+    pagerProps: Record<string, any>;
+    events: Record<string, any>;
+    isNeedFloatHandle: boolean;
+}>;
 export default _default;

package/lib/components/flow-designer/index.js

@@ -287,7 +287,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
             vue.createElementVNode("span", {
               class: vue.normalizeClass(["opeator", { active: __props.isCustom }])
             }, [
-              vue.createCommentVNode(' <CopyOutlined\r\n            @click.stop="\r\n              () => {\r\n                copyCallback()\r\n              }\r\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
+              vue.createCommentVNode(' <CopyOutlined\n            @click.stop="\n              () => {\n                copyCallback()\n              }\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
               vue.createVNode(vue.unref(iconsVue.CloseOutlined), {
                 onClick: _cache[0] || (_cache[0] = vue.withModifiers(
                   () => {

package/lib/components/form-create/index.js

@@ -18780,7 +18780,7 @@ const _sfc_main$8 = /* @__PURE__ */ vue.defineComponent({
     debounceFetch("");
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-        vue.createCommentVNode(' <Input\r\n    v-model:value="inputValue"\r\n    placeholder="\u8BF7\u8F93\u5165"\r\n    :disabled="disabled"\r\n    @change="debounceFn($event.target.value)"\r\n  ></Input> '),
+        vue.createCommentVNode(' <Input\n    v-model:value="inputValue"\n    placeholder="\u8BF7\u8F93\u5165"\n    :disabled="disabled"\n    @change="debounceFn($event.target.value)"\n  ></Input> '),
         vue.createVNode(vue.unref(antDesignVue.Select), {
           value: __props.value,
           placeholder: "\u8BF7\u9009\u62E9",
@@ -26582,6 +26582,11 @@ const _hoisted_6$3 = {
   class: "bm-dc-table-widget__top-bar"
 };
 const _hoisted_7$3 = { class: "bm-dc-table-widget__table" };
+const _hoisted_8$2 = { class: "bm-confirm-modal-content" };
+const _hoisted_9$2 = { class: "bm-confirm-modal-icon" };
+const _hoisted_10$2 = { class: "bm-confirm-modal-body" };
+const _hoisted_11$3 = /* @__PURE__ */ vue.createElementVNode("div", { class: "bm-confirm-modal-title" }, "\u6279\u91CF\u5BFC\u5165", -1);
+const _hoisted_12$1 = { class: "bm-confirm-modal-text" };
 const _sfc_main$7 = vue.defineComponent({
   __name: "table-widget",
   props: [
@@ -26742,6 +26747,23 @@ const _sfc_main$7 = vue.defineComponent({
         return "";
       }
     });
+    const conflictStore = vue.reactive({
+      visible: false,
+      msg: "",
+      data: null,
+      clickType: "ok",
+      open(msg, data2) {
+        this.visible = true;
+        this.msg = msg;
+        this.data = data2;
+      },
+      close(clickType) {
+        this.visible = false;
+        this.msg = "";
+        this.data = null;
+        this.clickType = clickType;
+      }
+    });
     function isShow(key) {
       return props.rule.config.tableAdvancedFeatures.includes(key);
     }
@@ -26924,28 +26946,44 @@ const _sfc_main$7 = vue.defineComponent({
             width: "140px",
             slots: {
               default({ row }) {
-                if (item.value === "\u5546\u54C1\u56FE\u7247" && row[childField]) {
-                  return vue.h(
-                    "div",
-                    {
-                      style: {
-                        color: "#9393A3"
+                if (item.value === "\u5546\u54C1\u56FE\u7247") {
+                  if (row[childField]) {
+                    return vue.h(
+                      "div",
+                      {
+                        style: {
+                          color: "#9393A3"
+                        },
+                        class: {
+                          "bm-fc-table-img": true
+                        }
                       },
-                      class: {
-                        "bm-fc-table-img": true
-                      }
-                    },
-                    [
-                      vue.h(antDesignVue.Image, {
-                        src: props.extraConfig.common.previewImg(row[childField]),
+                      [
+                        vue.h(antDesignVue.Image, {
+                          src: props.extraConfig.common.previewImg(row[childField]),
+                          style: {
+                            width: "86px",
+                            height: "86px",
+                            padding: "8px"
+                          }
+                        })
+                      ]
+                    );
+                  } else {
+                    return vue.h(
+                      "div",
+                      {
                         style: {
-                          width: "86px",
-                          height: "86px",
-                          padding: "8px"
+                          color: "#9393A3"
+                        },
+                        class: {
+                          "bm-fc-placeholder": true,
+                          "bm-fc-table-img-placeholder": true
                         }
-                      })
-                    ]
-                  );
+                      },
+                      ["\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
+                    );
+                  }
                 }
                 if (row[childField]) {
                   return vue.h(components.BmOverTooltips, { title: row[childField] }, []);
@@ -26957,8 +26995,7 @@ const _sfc_main$7 = vue.defineComponent({
                       color: "#9393A3"
                     },
                     class: {
-                      "bm-fc-placeholder": true,
-                      "bm-fc-table-img-placeholder": true
+                      "bm-fc-placeholder": true
                     }
                   },
                   ["\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
@@ -27539,7 +27576,7 @@ const _sfc_main$7 = vue.defineComponent({
           filterByShopcode: props.rule?.config?.dataFiltering,
           dataFile: e.target.files?.[0]
         }) || {};
-        if (res.promptMessage && !await utils__default["default"].confirmModal(res.promptMessage)) {
+        if (res.promptMessage && !await showConflictModal(res.promptMessage, res)) {
           return;
         }
         if (res.templateDataList?.length) {
@@ -27609,7 +27646,27 @@ const _sfc_main$7 = vue.defineComponent({
       });
       return !!setting?.config?.doNotClearAfterFilterChange;
     }
+    async function showConflictModal(msg, data2) {
+      conflictStore.open(msg, data2);
+      return new Promise((resolve) => {
+        let timer = setInterval(() => {
+          if (conflictStore.visible === false) {
+            resolve(conflictStore.clickType === "ok");
+            clearInterval(timer);
+          }
+        }, 200);
+      });
+    }
+    function handleDownloadConflict() {
+      props.extraConfig.table?.downloadErrorFetch?.({
+        tableConfig: tableConfig.value,
+        columns: validColumns.value,
+        codeField: "promptCode",
+        data: conflictStore.data
+      });
+    }
     return (_ctx, _cache) => {
+      const _component_a_button = vue.resolveComponent("a-button");
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$5, [
         vue.createElementVNode("div", _hoisted_2$5, [
           vue.createTextVNode(vue.toDisplayString(__props.rule.title.title) + " ", 1),
@@ -27858,7 +27915,52 @@ const _sfc_main$7 = vue.defineComponent({
             ]),
             _: 1
           })
-        ])
+        ]),
+        vue.createVNode(vue.unref(antDesignVue.Modal), {
+          visible: conflictStore.visible,
+          title: null,
+          centered: "",
+          "wrap-class-name": "bm-confirm-modal bm-confirm-modal-warning bm-confirm-modal-conflict",
+          onCancel: _cache[2] || (_cache[2] = ($event) => conflictStore.close("cancel"))
+        }, {
+          footer: vue.withCtx(() => [
+            vue.createVNode(_component_a_button, {
+              onClick: _cache[0] || (_cache[0] = ($event) => conflictStore.close("cancel"))
+            }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode("\u53D6\u6D88")
+              ]),
+              _: 1
+            }),
+            vue.createVNode(_component_a_button, { onClick: handleDownloadConflict }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode("\u4E0B\u8F7D\u51B2\u7A81\u6570\u636E")
+              ]),
+              _: 1
+            }),
+            vue.createVNode(_component_a_button, {
+              type: "primary",
+              onClick: _cache[1] || (_cache[1] = ($event) => conflictStore.close("ok"))
+            }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode("\u786E\u5B9A")
+              ]),
+              _: 1
+            })
+          ]),
+          default: vue.withCtx(() => [
+            vue.createElementVNode("div", _hoisted_8$2, [
+              vue.createElementVNode("div", _hoisted_9$2, [
+                vue.createVNode(vue.unref(iconsVue.ExclamationCircleFilled))
+              ]),
+              vue.createElementVNode("div", _hoisted_10$2, [
+                _hoisted_11$3,
+                vue.createElementVNode("div", _hoisted_12$1, vue.toDisplayString(conflictStore.msg), 1)
+              ])
+            ])
+          ]),
+          _: 1
+        }, 8, ["visible"])
       ]);
     };
   }

package/lib/components/over-tooltips/index.d.ts

@@ -1,35 +1,58 @@
-declare const BmOverTooltips: import("bm-admin-ui/es/utils/with-install").SFCWithInstall<{
-    name: string;
-    props: {
-        title: {
-            type: StringConstructor;
-            default: undefined;
-        };
-        labelTitle: {
-            type: StringConstructor;
-            default: undefined;
-        };
-        line: {
-            type: NumberConstructor;
-            default: number;
-        };
-        width: {
-            type: (StringConstructor | NumberConstructor)[];
-            default: number;
-        };
-        showAlways: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-    };
-    setup(props: any, context: any): {
-        mySelf: import("vue").Ref<any>;
-        handleVisibleChange: (val: any) => void;
-        getPopupContainer: () => HTMLElement;
-        mSlots: import("vue").Ref<{}>;
-        isShow: import("vue").Ref<boolean>;
-        openShow: import("vue").Ref<boolean>;
-    };
-}>;
+declare const BmOverTooltips: import("bm-admin-ui/es/utils/with-install").SFCWithInstall<import("vue").DefineComponent<{
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    labelTitle: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    line: {
+        type: NumberConstructor;
+        default: number;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: number;
+    };
+    showAlways: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, {
+    mySelf: import("vue").Ref<any>;
+    handleVisibleChange: (val: any) => void;
+    getPopupContainer: () => HTMLElement;
+    mSlots: import("vue").Ref<{}>;
+    isShow: import("vue").Ref<boolean>;
+    openShow: import("vue").Ref<boolean>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    labelTitle: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    line: {
+        type: NumberConstructor;
+        default: number;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: number;
+    };
+    showAlways: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}>>, {
+    title: string;
+    width: string | number;
+    labelTitle: string;
+    line: number;
+    showAlways: boolean;
+}>>;
 export { BmOverTooltips };
 export default BmOverTooltips;

package/lib/components/over-tooltips/index.js

@@ -13,7 +13,7 @@ var _export_sfc = (sfc, props) => {
   return target;
 };
 
-const _sfc_main = {
+const _sfc_main = vue.defineComponent({
   name: "BmOverTooltips",
   props: {
     title: {
@@ -98,15 +98,15 @@ const _sfc_main = {
       getPopupContainer
     };
   }
-};
+});
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_tooltip = vue.resolveComponent("a-tooltip");
   return vue.openBlock(), vue.createBlock(_component_a_tooltip, {
     visible: _ctx.isShow,
     "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => _ctx.isShow = $event),
-    title: $props.labelTitle || $props.title,
-    "get-popup-container": $setup.getPopupContainer,
-    onVisibleChange: $setup.handleVisibleChange
+    title: _ctx.labelTitle || _ctx.title,
+    "get-popup-container": _ctx.getPopupContainer,
+    onVisibleChange: _ctx.handleVisibleChange
   }, {
     title: vue.withCtx(() => [
       vue.renderSlot(_ctx.$slots, "title")
@@ -115,14 +115,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.createElementVNode("div", {
         ref: "mySelf",
         style: vue.normalizeStyle({
-          width: $props.width ? $props.width + "px" : "100%",
-          WebkitLineClamp: $props.line
+          width: _ctx.width ? _ctx.width + "px" : "100%",
+          WebkitLineClamp: _ctx.line
         }),
-        class: vue.normalizeClass($props.line === 1 ? `bm-over-tooltip` : `bm-over-tooltip-multi`)
+        class: vue.normalizeClass(_ctx.line === 1 ? `bm-over-tooltip` : `bm-over-tooltip-multi`)
       }, [
         vue.renderSlot(_ctx.$slots, "default", {}, () => [
           vue.renderSlot(_ctx.$slots, "title", {}, () => [
-            vue.createTextVNode(vue.toDisplayString($props.title), 1)
+            vue.createTextVNode(vue.toDisplayString(_ctx.title), 1)
           ])
         ])
       ], 6)

package/lib/components/over-tooltips/src/over-tooltips.vue.d.ts

@@ -1,34 +1,57 @@
-declare const _default: {
-    name: string;
-    props: {
-        title: {
-            type: StringConstructor;
-            default: undefined;
-        };
-        labelTitle: {
-            type: StringConstructor;
-            default: undefined;
-        };
-        line: {
-            type: NumberConstructor;
-            default: number;
-        };
-        width: {
-            type: (StringConstructor | NumberConstructor)[];
-            default: number;
-        };
-        showAlways: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-    };
-    setup(props: any, context: any): {
-        mySelf: import("vue").Ref<any>;
-        handleVisibleChange: (val: any) => void;
-        getPopupContainer: () => HTMLElement;
-        mSlots: import("vue").Ref<{}>;
-        isShow: import("vue").Ref<boolean>;
-        openShow: import("vue").Ref<boolean>;
-    };
-};
+declare const _default: import("vue").DefineComponent<{
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    labelTitle: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    line: {
+        type: NumberConstructor;
+        default: number;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: number;
+    };
+    showAlways: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, {
+    mySelf: import("vue").Ref<any>;
+    handleVisibleChange: (val: any) => void;
+    getPopupContainer: () => HTMLElement;
+    mSlots: import("vue").Ref<{}>;
+    isShow: import("vue").Ref<boolean>;
+    openShow: import("vue").Ref<boolean>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    labelTitle: {
+        type: StringConstructor;
+        default: undefined;
+    };
+    line: {
+        type: NumberConstructor;
+        default: number;
+    };
+    width: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: number;
+    };
+    showAlways: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}>>, {
+    title: string;
+    width: string | number;
+    labelTitle: string;
+    line: number;
+    showAlways: boolean;
+}>;
 export default _default;