bm-admin-ui 1.2.45-alpha → 1.2.46-alpha

package/es/components/cascader/index.js

@@ -10,71 +10,71 @@ var _export_sfc = (sfc, props) => {
   return target;
 };
 
-const _sfc_main = defineComponent({
-  name: 'BmCascader',
-  components: { DownOutlined },
-  props: {
-    tipType: {
-      type: String,
-      default: () => {
-        return 'none'
-      },
-    },
-    width: {
-      type: Number,
-      default: () => {
-        return 200
-      },
-    },
-  },
-  setup(props, { emit, attrs }) {
-    const nameArr = (arr) => {
-      return arr.reduce(
-        (acc, cur) => acc.concat(Array.isArray(cur) ? nameArr(cur) : cur),
-        []
-      )
-    };
-    const state = reactive({
-      labelNameList: '',
-      visible: false,
-    });
-    const methods = {
-      onmouseover() {
-        state.labelNameList.length && (state.visible = true);
-      },
-      onmouseout() {
-        state.labelNameList.length && (state.visible = false);
-      },
-      onchange(value, selectedOptions) {
-        if (attrs.multiple === '' || attrs.multiple) {
-          let res = selectedOptions.map((v, k) => {
-            return v.map((e, i) => {
-              return e.label
-            })
-          });
-          state.labelNameList = nameArr(res).join(',');
-        }
-      },
-    };
-    watch(
-      () => state.labelNameList.length,
-      (val) => {
-        if (!val) {
-          state.visible = false;
-        }
-      },
-      { deep: true }
-    );
-    onMounted(() => {
-      attrs.value?.length &&
-        (state.labelNameList = nameArr(attrs.value).join(','));
-    });
-    return {
-      ...toRefs(state),
-      ...methods,
-    }
-  },
-});
+const _sfc_main = defineComponent({
+  name: 'BmCascader',
+  components: { DownOutlined },
+  props: {
+    tipType: {
+      type: String,
+      default: () => {
+        return 'none'
+      },
+    },
+    width: {
+      type: Number,
+      default: () => {
+        return 200
+      },
+    },
+  },
+  setup(props, { emit, attrs }) {
+    const nameArr = (arr) => {
+      return arr.reduce(
+        (acc, cur) => acc.concat(Array.isArray(cur) ? nameArr(cur) : cur),
+        []
+      )
+    };
+    const state = reactive({
+      labelNameList: '',
+      visible: false,
+    });
+    const methods = {
+      onmouseover() {
+        state.labelNameList.length && (state.visible = true);
+      },
+      onmouseout() {
+        state.labelNameList.length && (state.visible = false);
+      },
+      onchange(value, selectedOptions) {
+        if (attrs.multiple === '' || attrs.multiple) {
+          let res = selectedOptions.map((v, k) => {
+            return v.map((e, i) => {
+              return e.label
+            })
+          });
+          state.labelNameList = nameArr(res).join(',');
+        }
+      },
+    };
+    watch(
+      () => state.labelNameList.length,
+      (val) => {
+        if (!val) {
+          state.visible = false;
+        }
+      },
+      { deep: true }
+    );
+    onMounted(() => {
+      attrs.value?.length &&
+        (state.labelNameList = nameArr(attrs.value).join(','));
+    });
+    return {
+      ...toRefs(state),
+      ...methods,
+    }
+  },
+});
 
 const _hoisted_1 = {
   ref: "BmCascader",
@@ -95,18 +95,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ? (openBlock(), createBlock(_component_a_popover, {
           key: 0,
           visible: _ctx.visible,
-          "get-popup-container": 
-        (triggerNode) => {
-          return triggerNode.parentNode
-        }
+          "get-popup-container": 
+        (triggerNode) => {
+          return triggerNode.parentNode
+        }
       
         }, createSlots({
           default: withCtx(() => [
             createVNode(_component_a_cascader, mergeProps(_ctx.$attrs, {
-              style: {
-          width:
-            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
-          minWidth: _ctx.width + 'px',
+              style: {
+          width:
+            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
+          minWidth: _ctx.width + 'px',
         },
               "show-arrow": true,
               onMouseover: _ctx.onmouseover,
@@ -159,10 +159,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, createSlots({
             default: withCtx(() => [
               createVNode(_component_a_cascader, mergeProps(_ctx.$attrs, {
-                style: {
-          width:
-            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
-          minWidth: _ctx.width + 'px',
+                style: {
+          width:
+            _ctx.$attrs.multiple === '' || _ctx.$attrs.multiple ? _ctx.width + 'px' : 'auto',
+          minWidth: _ctx.width + 'px',
         },
                 "show-arrow": true,
                 onMouseover: _ctx.onmouseover,

package/es/components/edit-form/index.js

@@ -1070,7 +1070,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     createVNode(unref(BmOverTooltips), {
                                       title: unref(getShowValue)(item) || tmpForm.value[item.prop]
                                     }, null, 8, ["title"]),
-                                    createCommentVNode(' <AutoTooltip\r\n                        :tooltip="getShowValue(item) || tmpForm[item.prop]"\r\n                      /> ')
+                                    createCommentVNode(' <AutoTooltip\n                        :tooltip="getShowValue(item) || tmpForm[item.prop]"\n                      /> ')
                                   ], 6)) : createCommentVNode("v-if", true),
                                   item.type === "multiText" ? (openBlock(), createElementBlock("div", {
                                     key: 15,

package/es/components/float-table/index.d.ts

@@ -42,9 +42,9 @@ declare const BmFloatTable: import("bm-admin-ui/es/utils/with-install").SFCWithI
         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, {
+        simpleImage: import("vue").Ref<(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, {
+        }> | 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<{}>;

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

@@ -42,9 +42,9 @@ declare const _default: {
         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, {
+        simpleImage: import("vue").Ref<(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, {
+        }> | 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<{}>;

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

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

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

@@ -1,5 +1,5 @@
 import { withInstall } from 'bm-admin-ui/es/utils/with-install';
-import { h, defineComponent, computed, openBlock, createBlock, unref, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, nextTick, ref, createVNode, normalizeStyle, withModifiers, createElementVNode, createCommentVNode, normalizeClass, reactive, watch, createSlots, inject, onUnmounted, createStaticVNode, provide, resolveComponent } from 'vue';
+import { h, defineComponent, computed, openBlock, createBlock, unref, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, nextTick, ref, createVNode, normalizeStyle, withModifiers, createElementVNode, createCommentVNode, normalizeClass, reactive, watch, resolveComponent, createSlots, inject, onUnmounted, createStaticVNode, provide } from 'vue';
 import { Input, InputNumber, RadioGroup, Radio, Select, DatePicker, RangePicker, message, Modal, Layout, LayoutSider, Tree, LayoutContent, Button, Row, Col, Pagination, FormItemRest, Divider, Image, Tabs, TabPane, Cascader } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import Picture from 'bm-admin-ui/es/components/upload';
@@ -18766,7 +18766,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     debounceFetch("");
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
-        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> '),
+        createCommentVNode(' <Input\n    v-model:value="inputValue"\n    placeholder="\u8BF7\u8F93\u5165"\n    :disabled="disabled"\n    @change="debounceFn($event.target.value)"\n  ></Input> '),
         createVNode(unref(Select), {
           value: __props.value,
           placeholder: "\u8BF7\u9009\u62E9",
@@ -26568,6 +26568,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__ */ 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 = defineComponent({
   __name: "table-widget",
   props: [
@@ -26728,6 +26733,23 @@ const _sfc_main$7 = defineComponent({
         return "";
       }
     });
+    const conflictStore = 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);
     }
@@ -26910,28 +26932,44 @@ const _sfc_main$7 = defineComponent({
             width: "140px",
             slots: {
               default({ row }) {
-                if (item.value === "\u5546\u54C1\u56FE\u7247" && row[childField]) {
-                  return h(
-                    "div",
-                    {
-                      style: {
-                        color: "#9393A3"
+                if (item.value === "\u5546\u54C1\u56FE\u7247") {
+                  if (row[childField]) {
+                    return h(
+                      "div",
+                      {
+                        style: {
+                          color: "#9393A3"
+                        },
+                        class: {
+                          "bm-fc-table-img": true
+                        }
                       },
-                      class: {
-                        "bm-fc-table-img": true
-                      }
-                    },
-                    [
-                      h(Image, {
-                        src: props.extraConfig.common.previewImg(row[childField]),
+                      [
+                        h(Image, {
+                          src: props.extraConfig.common.previewImg(row[childField]),
+                          style: {
+                            width: "86px",
+                            height: "86px",
+                            padding: "8px"
+                          }
+                        })
+                      ]
+                    );
+                  } else {
+                    return 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 h(BmOverTooltips, { title: row[childField] }, []);
@@ -26943,8 +26981,7 @@ const _sfc_main$7 = defineComponent({
                       color: "#9393A3"
                     },
                     class: {
-                      "bm-fc-placeholder": true,
-                      "bm-fc-table-img-placeholder": true
+                      "bm-fc-placeholder": true
                     }
                   },
                   ["\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
@@ -27525,7 +27562,7 @@ const _sfc_main$7 = defineComponent({
           filterByShopcode: props.rule?.config?.dataFiltering,
           dataFile: e.target.files?.[0]
         }) || {};
-        if (res.promptMessage && !await utils.confirmModal(res.promptMessage)) {
+        if (res.promptMessage && !await showConflictModal(res.promptMessage, res)) {
           return;
         }
         if (res.templateDataList?.length) {
@@ -27595,7 +27632,27 @@ const _sfc_main$7 = 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 = resolveComponent("a-button");
       return openBlock(), createElementBlock("div", _hoisted_1$5, [
         createElementVNode("div", _hoisted_2$5, [
           createTextVNode(toDisplayString(__props.rule.title.title) + " ", 1),
@@ -27844,7 +27901,52 @@ const _sfc_main$7 = defineComponent({
             ]),
             _: 1
           })
-        ])
+        ]),
+        createVNode(unref(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: withCtx(() => [
+            createVNode(_component_a_button, {
+              onClick: _cache[0] || (_cache[0] = ($event) => conflictStore.close("cancel"))
+            }, {
+              default: withCtx(() => [
+                createTextVNode("\u53D6\u6D88")
+              ]),
+              _: 1
+            }),
+            createVNode(_component_a_button, { onClick: handleDownloadConflict }, {
+              default: withCtx(() => [
+                createTextVNode("\u4E0B\u8F7D\u51B2\u7A81\u6570\u636E")
+              ]),
+              _: 1
+            }),
+            createVNode(_component_a_button, {
+              type: "primary",
+              onClick: _cache[1] || (_cache[1] = ($event) => conflictStore.close("ok"))
+            }, {
+              default: withCtx(() => [
+                createTextVNode("\u786E\u5B9A")
+              ]),
+              _: 1
+            })
+          ]),
+          default: withCtx(() => [
+            createElementVNode("div", _hoisted_8$2, [
+              createElementVNode("div", _hoisted_9$2, [
+                createVNode(unref(ExclamationCircleFilled))
+              ]),
+              createElementVNode("div", _hoisted_10$2, [
+                _hoisted_11$3,
+                createElementVNode("div", _hoisted_12$1, toDisplayString(conflictStore.msg), 1)
+              ])
+            ])
+          ]),
+          _: 1
+        }, 8, ["visible"])
       ]);
     };
   }

package/es/components/staffs-selector/index.d.ts

@@ -902,9 +902,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<(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, {
+        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;
@@ -977,9 +977,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<(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, {
+        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/es/components/staffs-selector/src/departmentCmp.vue.d.ts

@@ -20,9 +20,9 @@ declare const _default: import("vue").DefineComponent<{
     searchVal: import("vue").Ref<string>;
     selectAll: import("vue").Ref<boolean>;
     indeterminate: import("vue").Ref<boolean>;
-    emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    emptyPic: import("vue").Ref<(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, {
+    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;

package/es/components/staffs-selector/src/multipleCmp.vue.d.ts

@@ -21,9 +21,9 @@ declare const _default: import("vue").DefineComponent<{
     searchVal: import("vue").Ref<string>;
     selectAll: import("vue").Ref<boolean>;
     indeterminate: import("vue").Ref<boolean>;
-    emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    emptyPic: import("vue").Ref<(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, {
+    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;

package/es/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -902,9 +902,9 @@ declare const _default: import("vue").DefineComponent<{
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<(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, {
+        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;
@@ -977,9 +977,9 @@ declare const _default: import("vue").DefineComponent<{
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<(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, {
+        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;