bm-admin-ui 1.2.35-alpha → 1.2.37-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/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

@@ -4,14 +4,14 @@ import { Input, InputNumber, RadioGroup, Radio, Select, DatePicker, RangePicker,
 import dayjs from 'dayjs';
 import Picture from 'bm-admin-ui/es/components/upload';
 import BmStaffsSelector from 'bm-admin-ui/es/components/staffs-selector';
-import { BmTagsDisplay, BmFloatTable } from 'bm-admin-ui/es/components';
+import { BmTagsDisplay, BmFloatTable, BmOverTooltips } from 'bm-admin-ui/es/components';
 import { EyeOutlined, SearchOutlined, CheckCircleFilled, PlusOutlined } from '@ant-design/icons-vue';
 import { cloneDeep, floor, debounce } from 'lodash-es';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import utils from 'bm-admin-ui/es/utils/index';
 import { isNull } from 'bm-admin-ui/es/utils/isNull';
 import FC from '@form-create/ant-design-vue';
-import BmOverTooltips from 'bm-admin-ui/es/components/over-tooltips';
+import BmOverTooltips$1 from 'bm-admin-ui/es/components/over-tooltips';
 
 const fieldRatioMap = {
     '25%': 6,
@@ -382,7 +382,7 @@ var checkbox = {
             type: data.type,
             field: data.field,
             title: data.title.title,
-            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
+            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, showArrow: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
             options: data.options,
             effect: {
                 required: data.effect.required && (((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请选择'),
@@ -402,7 +402,7 @@ var checkbox = {
             type: data.type,
             field: data.field,
             title: data.title.title,
-            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
+            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, showArrow: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
             options: data.options,
             effect: {
                 required: data.effect.required && (((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请选择'),
@@ -428,6 +428,7 @@ var checkbox = {
                         options: data.options,
                         mode: 'multiple',
                         allowClear: true,
+                        showArrow: true,
                         maxTagCount: data.props.maxTagCount,
                         maxTagPlaceholder: data.props.maxTagPlaceholder,
                         getPopupContainer: getContainer,
@@ -697,7 +698,7 @@ var picture = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
+                    min: data.effect.required ? 1 : 0,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传图片',
                 },
             ],
@@ -746,7 +747,7 @@ var picture = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
+                    min: data.effect.required ? 1 : 0,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传图片',
                 },
             ],
@@ -783,6 +784,8 @@ var file = {
                 extraProps: {
                     maxSize: 20,
                     tips: '单个附件大小需≤20M',
+                    maxCount: 1,
+                    hideDisabledBtn: false,
                 },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
@@ -795,14 +798,8 @@ var file = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传附件',
                 },
-                {
-                    type: 'array',
-                    len: 1,
-                    message: '附件数量不能超过1个',
-                },
             ],
             inject: true,
             on: {
@@ -830,6 +827,8 @@ var file = {
                 extraProps: {
                     maxSize: 20,
                     tips: '单个附件大小需≤20M',
+                    maxCount: 1,
+                    hideDisabledBtn: false,
                 },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
@@ -842,14 +841,8 @@ var file = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传附件',
                 },
-                {
-                    type: 'array',
-                    len: 1,
-                    message: '附件数量不能超过1个',
-                },
             ],
             inject: true,
             on: {
@@ -18773,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",
@@ -19076,6 +19069,9 @@ const _sfc_main$7 = defineComponent({
         let baseTitle = mainName;
         if (rule.name === "product") {
           baseTitle = `\u5546\u54C1\u7F16\u7801-${mainName}`;
+          if (isProductCenter.value) {
+            baseTitle = `\u5546\u54C1\u7F16\u53F7-${mainName}`;
+          }
           if (isProductCenterSuit.value && rule.field === "productCode") {
             baseTitle = "\u5546\u54C1\u7F16\u53F7";
           }
@@ -19130,6 +19126,9 @@ const _sfc_main$7 = defineComponent({
                     ]
                   );
                 }
+                if (row[childField]) {
+                  return h(BmOverTooltips, { title: row[childField] }, []);
+                }
                 return h(
                   "div",
                   {
@@ -19137,10 +19136,10 @@ const _sfc_main$7 = defineComponent({
                       color: "#9393A3"
                     },
                     class: {
-                      "bm-fc-placeholder": !row[childField]
+                      "bm-fc-placeholder": true
                     }
                   },
-                  [row[childField] || "\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
+                  ["\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
                 );
               }
             }
@@ -19318,8 +19317,13 @@ const _sfc_main$7 = defineComponent({
         });
         result.length && validate(result).then((result2) => {
           data.splice(0, data.length, ...result2);
+          message.success("\u5BFC\u5165\u6210\u529F");
         }).catch((error) => {
-          message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          if (typeof error === "string") {
+            message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25\uFF1A" + error);
+          } else {
+            message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          }
           console.log("---------------");
           console.log(error);
           console.log("---------------");
@@ -19340,22 +19344,34 @@ const _sfc_main$7 = defineComponent({
         if (columnArr.length !== columns.filter((c) => isValidColumn(c)).length) {
           message.error("\u5BFC\u5165\u7684\u6A21\u677F\u51FA\u9519");
         } else {
-          data2 = rows.slice(1).filter((item) => item).map(
-            (item) => item.includes("	") ? item.split("	") : item.split(",")
-          );
+          data2 = rows.slice(1).filter((item) => item).map((item) => {
+            let sonList = item.includes("	") ? item.split("	") : item.split(",");
+            sonList = (sonList || []).map((sonItem) => {
+              return sonItem === "" ? void 0 : sonItem;
+            });
+            return sonList;
+          });
         }
       }
       return data2;
     }
+    const parseMap = {
+      product: "\u5546\u54C1\u7F16\u53F7",
+      customer: "\u5BA2\u6237\u7F16\u53F7",
+      shop: "\u5E97\u94FA\u7F16\u53F7",
+      materialTemp: "\u7D20\u6750\u6A21\u677F",
+      materialType: "\u7D20\u6750\u7C7B\u578B"
+    };
     async function validate(rowData) {
       let error = "";
       const validColumns2 = columns.filter((c) => isValidColumn(c));
       for (const row of rowData) {
-        for (const { field } of validColumns2) {
+        for (const curColumn of validColumns2) {
+          const field = curColumn.field;
           const rule = childRulesMap.value[`${field}`];
-          const title = rule?.title?.title;
           if (!rule)
             continue;
+          const title = rule?.title?.title || curColumn.title || parseMap[rule.name] || "";
           const fieldNames = props.extraConfig[rule.name]?.fieldNames;
           let value = row[`${field}`] || "";
           const txtFormatFn = rule.config?.txtFormatFn;
@@ -19513,6 +19529,9 @@ const _sfc_main$7 = defineComponent({
                   [fieldNames.value]: shopInfo.shopCode,
                   [fieldNames.label]: shopInfo.shopName
                 };
+                if (isProductCenter.value) {
+                  handleShopOption(shopInfo, rule, row);
+                }
               } else {
                 error = `${title}\u67E5\u8BE2\u7684\u5E97\u94FA\u4E0D\u5B58\u5728`;
                 break;
@@ -19927,8 +19946,9 @@ const _sfc_main$7 = defineComponent({
                         value: row[item.field],
                         fetch: __props.extraConfig?.shop,
                         "data-filtering": item?.config?.dataFiltering,
+                        disabled: item.disabled,
                         onChange: ($event) => handleShopOption($event, item, row)
-                      }, null, 8, ["value", "fetch", "data-filtering", "onChange"])
+                      }, null, 8, ["value", "fetch", "data-filtering", "disabled", "onChange"])
                     ])
                   };
                 }),
@@ -21783,7 +21803,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["update:value", "change"],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
-    FC.component("BmLabelTooltip", BmOverTooltips);
+    FC.component("BmLabelTooltip", BmOverTooltips$1);
     const formRuleList = computed(() => {
       if (typeof props.resolveRulesConfig === "function") {
         const rules = props.resolveRulesConfig(ruleList);

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

@@ -2842,7 +2842,7 @@ var ProductInfo = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "product-
 
 const _hoisted_1$6 = { class: "bm-associated-fields-item__content" };
 const _hoisted_2$4 = { class: "bm-associated-fields-item__content" };
-const _hoisted_3$3 = { style: { "text-align": "right", "margin": "6px 0 4px", "padding-right": "8px" } };
+const _hoisted_3$3 = { style: { "text-align": "left", "margin": "6px 0 4px", "padding-left": "12px" } };
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "pure-associated-fields",
   props: ["associatedFields", "options", "defaultOptions"],
@@ -2967,7 +2967,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
             })
           ]),
           default: withCtx(() => [
-            createVNode(unref(Button), { style: { "margin-top": "8px" } }, {
+            createVNode(unref(Button), { style: { "margin-top": "8px", "width": "224px" } }, {
               default: withCtx(() => [
                 createVNode(unref(PlusOutlined)),
                 createTextVNode("\u6DFB\u52A0\u5B50\u5B57\u6BB5")

package/lib/components/cascader/index.js

@@ -14,71 +14,71 @@ var _export_sfc = (sfc, props) => {
   return target;
 };
 
-const _sfc_main = vue.defineComponent({
-  name: 'BmCascader',
-  components: { DownOutlined: iconsVue.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 = vue.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(',');
-        }
-      },
-    };
-    vue.watch(
-      () => state.labelNameList.length,
-      (val) => {
-        if (!val) {
-          state.visible = false;
-        }
-      },
-      { deep: true }
-    );
-    vue.onMounted(() => {
-      attrs.value?.length &&
-        (state.labelNameList = nameArr(attrs.value).join(','));
-    });
-    return {
-      ...vue.toRefs(state),
-      ...methods,
-    }
-  },
-});
+const _sfc_main = vue.defineComponent({
+  name: 'BmCascader',
+  components: { DownOutlined: iconsVue.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 = vue.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(',');
+        }
+      },
+    };
+    vue.watch(
+      () => state.labelNameList.length,
+      (val) => {
+        if (!val) {
+          state.visible = false;
+        }
+      },
+      { deep: true }
+    );
+    vue.onMounted(() => {
+      attrs.value?.length &&
+        (state.labelNameList = nameArr(attrs.value).join(','));
+    });
+    return {
+      ...vue.toRefs(state),
+      ...methods,
+    }
+  },
+});
 
 const _hoisted_1 = {
   ref: "BmCascader",
@@ -99,18 +99,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ? (vue.openBlock(), vue.createBlock(_component_a_popover, {
           key: 0,
           visible: _ctx.visible,
-          "get-popup-container": 
-        (triggerNode) => {
-          return triggerNode.parentNode
-        }
+          "get-popup-container": 
+        (triggerNode) => {
+          return triggerNode.parentNode
+        }
       
         }, vue.createSlots({
           default: vue.withCtx(() => [
             vue.createVNode(_component_a_cascader, vue.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,
@@ -163,10 +163,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, vue.createSlots({
             default: vue.withCtx(() => [
               vue.createVNode(_component_a_cascader, vue.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/lib/components/edit-form/index.js

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

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

@@ -396,7 +396,7 @@ var checkbox = {
             type: data.type,
             field: data.field,
             title: data.title.title,
-            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
+            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, showArrow: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
             options: data.options,
             effect: {
                 required: data.effect.required && (((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请选择'),
@@ -416,7 +416,7 @@ var checkbox = {
             type: data.type,
             field: data.field,
             title: data.title.title,
-            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
+            props: Object.assign({ placeholder: data.props.placeholder, allowClear: true, showArrow: true, maxTagCount: data.props.maxTagCount, maxTagPlaceholder: data.props.maxTagPlaceholder }, extraProps),
             options: data.options,
             effect: {
                 required: data.effect.required && (((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请选择'),
@@ -442,6 +442,7 @@ var checkbox = {
                         options: data.options,
                         mode: 'multiple',
                         allowClear: true,
+                        showArrow: true,
                         maxTagCount: data.props.maxTagCount,
                         maxTagPlaceholder: data.props.maxTagPlaceholder,
                         getPopupContainer: getContainer,
@@ -711,7 +712,7 @@ var picture = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
+                    min: data.effect.required ? 1 : 0,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传图片',
                 },
             ],
@@ -760,7 +761,7 @@ var picture = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
+                    min: data.effect.required ? 1 : 0,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传图片',
                 },
             ],
@@ -797,6 +798,8 @@ var file = {
                 extraProps: {
                     maxSize: 20,
                     tips: '单个附件大小需≤20M',
+                    maxCount: 1,
+                    hideDisabledBtn: false,
                 },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
@@ -809,14 +812,8 @@ var file = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传附件',
                 },
-                {
-                    type: 'array',
-                    len: 1,
-                    message: '附件数量不能超过1个',
-                },
             ],
             inject: true,
             on: {
@@ -844,6 +841,8 @@ var file = {
                 extraProps: {
                     maxSize: 20,
                     tips: '单个附件大小需≤20M',
+                    maxCount: 1,
+                    hideDisabledBtn: false,
                 },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
@@ -856,14 +855,8 @@ var file = {
                 {
                     required: data.effect.required,
                     type: 'array',
-                    min: 1,
                     message: ((_a = data.effect) === null || _a === void 0 ? void 0 : _a.requiredTip) || '请上传附件',
                 },
-                {
-                    type: 'array',
-                    len: 1,
-                    message: '附件数量不能超过1个',
-                },
             ],
             inject: true,
             on: {
@@ -18787,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",
@@ -19090,6 +19083,9 @@ const _sfc_main$7 = vue.defineComponent({
         let baseTitle = mainName;
         if (rule.name === "product") {
           baseTitle = `\u5546\u54C1\u7F16\u7801-${mainName}`;
+          if (isProductCenter.value) {
+            baseTitle = `\u5546\u54C1\u7F16\u53F7-${mainName}`;
+          }
           if (isProductCenterSuit.value && rule.field === "productCode") {
             baseTitle = "\u5546\u54C1\u7F16\u53F7";
           }
@@ -19144,6 +19140,9 @@ const _sfc_main$7 = vue.defineComponent({
                     ]
                   );
                 }
+                if (row[childField]) {
+                  return vue.h(components.BmOverTooltips, { title: row[childField] }, []);
+                }
                 return vue.h(
                   "div",
                   {
@@ -19151,10 +19150,10 @@ const _sfc_main$7 = vue.defineComponent({
                       color: "#9393A3"
                     },
                     class: {
-                      "bm-fc-placeholder": !row[childField]
+                      "bm-fc-placeholder": true
                     }
                   },
-                  [row[childField] || "\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
+                  ["\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"]
                 );
               }
             }
@@ -19332,8 +19331,13 @@ const _sfc_main$7 = vue.defineComponent({
         });
         result.length && validate(result).then((result2) => {
           data.splice(0, data.length, ...result2);
+          antDesignVue.message.success("\u5BFC\u5165\u6210\u529F");
         }).catch((error) => {
-          antDesignVue.message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          if (typeof error === "string") {
+            antDesignVue.message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25\uFF1A" + error);
+          } else {
+            antDesignVue.message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          }
           console.log("---------------");
           console.log(error);
           console.log("---------------");
@@ -19354,22 +19358,34 @@ const _sfc_main$7 = vue.defineComponent({
         if (columnArr.length !== columns.filter((c) => isValidColumn(c)).length) {
           antDesignVue.message.error("\u5BFC\u5165\u7684\u6A21\u677F\u51FA\u9519");
         } else {
-          data2 = rows.slice(1).filter((item) => item).map(
-            (item) => item.includes("	") ? item.split("	") : item.split(",")
-          );
+          data2 = rows.slice(1).filter((item) => item).map((item) => {
+            let sonList = item.includes("	") ? item.split("	") : item.split(",");
+            sonList = (sonList || []).map((sonItem) => {
+              return sonItem === "" ? void 0 : sonItem;
+            });
+            return sonList;
+          });
         }
       }
       return data2;
     }
+    const parseMap = {
+      product: "\u5546\u54C1\u7F16\u53F7",
+      customer: "\u5BA2\u6237\u7F16\u53F7",
+      shop: "\u5E97\u94FA\u7F16\u53F7",
+      materialTemp: "\u7D20\u6750\u6A21\u677F",
+      materialType: "\u7D20\u6750\u7C7B\u578B"
+    };
     async function validate(rowData) {
       let error = "";
       const validColumns2 = columns.filter((c) => isValidColumn(c));
       for (const row of rowData) {
-        for (const { field } of validColumns2) {
+        for (const curColumn of validColumns2) {
+          const field = curColumn.field;
           const rule = childRulesMap.value[`${field}`];
-          const title = rule?.title?.title;
           if (!rule)
             continue;
+          const title = rule?.title?.title || curColumn.title || parseMap[rule.name] || "";
           const fieldNames = props.extraConfig[rule.name]?.fieldNames;
           let value = row[`${field}`] || "";
           const txtFormatFn = rule.config?.txtFormatFn;
@@ -19527,6 +19543,9 @@ const _sfc_main$7 = vue.defineComponent({
                   [fieldNames.value]: shopInfo.shopCode,
                   [fieldNames.label]: shopInfo.shopName
                 };
+                if (isProductCenter.value) {
+                  handleShopOption(shopInfo, rule, row);
+                }
               } else {
                 error = `${title}\u67E5\u8BE2\u7684\u5E97\u94FA\u4E0D\u5B58\u5728`;
                 break;
@@ -19941,8 +19960,9 @@ const _sfc_main$7 = vue.defineComponent({
                         value: row[item.field],
                         fetch: __props.extraConfig?.shop,
                         "data-filtering": item?.config?.dataFiltering,
+                        disabled: item.disabled,
                         onChange: ($event) => handleShopOption($event, item, row)
-                      }, null, 8, ["value", "fetch", "data-filtering", "onChange"])
+                      }, null, 8, ["value", "fetch", "data-filtering", "disabled", "onChange"])
                     ])
                   };
                 }),

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

@@ -2852,7 +2852,7 @@ var ProductInfo = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "product-
 
 const _hoisted_1$6 = { class: "bm-associated-fields-item__content" };
 const _hoisted_2$4 = { class: "bm-associated-fields-item__content" };
-const _hoisted_3$3 = { style: { "text-align": "right", "margin": "6px 0 4px", "padding-right": "8px" } };
+const _hoisted_3$3 = { style: { "text-align": "left", "margin": "6px 0 4px", "padding-left": "12px" } };
 const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
   __name: "pure-associated-fields",
   props: ["associatedFields", "options", "defaultOptions"],
@@ -2977,7 +2977,7 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
             })
           ]),
           default: vue.withCtx(() => [
-            vue.createVNode(vue.unref(antDesignVue.Button), { style: { "margin-top": "8px" } }, {
+            vue.createVNode(vue.unref(antDesignVue.Button), { style: { "margin-top": "8px", "width": "224px" } }, {
               default: vue.withCtx(() => [
                 vue.createVNode(vue.unref(iconsVue.PlusOutlined)),
                 vue.createTextVNode("\u6DFB\u52A0\u5B50\u5B57\u6BB5")

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "bm-admin-ui",
-  "version": "1.2.35-alpha",
-  "private": false,
-  "description": "An Admin Component Library for Bm",
-  "license": "UNLICENSED",
-  "repository": {
-    "type": "git",
-    "url": "http://gitlab.admin.bluemoon.com.cn/Frontend-web/bm-admin-ui"
-  },
-  "main": "lib/index.js",
-  "module": "es/index.js",
-  "unpkg": "index.js",
-  "peerDependencies": {
-    "vue": "^3.2.31"
-  },
-  "dependencies": {
-    "@form-create/ant-design-vue": "^3.1.12",
-    "@logicflow/core": "^1.1.7",
-    "@logicflow/extension": "^1.1.7",
-    "floating-vue": "2.0.0-beta.17",
-    "@ant-design/icons-vue": "^6.1.0",
-    "ant-design-vue": "^3.2.10",
-    "bm-admin-icons": "^0.2.7",
-    "vuedraggable": "^4.1.0",
-    "lodash-es": "^4.17.21",
-    "dayjs": "^1.11.4",
-    "vxe-table": "4.2.3",
-    "xe-utils": "3.5.4"
-  },
-  "sideEffects": [
-    "theme-chalk/*.css"
-  ]
-}
+{
+  "name": "bm-admin-ui",
+  "version": "1.2.37-alpha",
+  "private": false,
+  "description": "An Admin Component Library for Bm",
+  "license": "UNLICENSED",
+  "repository": {
+    "type": "git",
+    "url": "http://gitlab.admin.bluemoon.com.cn/Frontend-web/bm-admin-ui"
+  },
+  "main": "lib/index.js",
+  "module": "es/index.js",
+  "unpkg": "index.js",
+  "peerDependencies": {
+    "vue": "^3.2.31"
+  },
+  "dependencies": {
+    "@form-create/ant-design-vue": "^3.1.12",
+    "@logicflow/core": "^1.1.7",
+    "@logicflow/extension": "^1.1.7",
+    "floating-vue": "2.0.0-beta.17",
+    "@ant-design/icons-vue": "^6.1.0",
+    "ant-design-vue": "^3.2.10",
+    "bm-admin-icons": "^0.2.7",
+    "vuedraggable": "^4.1.0",
+    "lodash-es": "^4.17.21",
+    "dayjs": "^1.11.4",
+    "vxe-table": "4.2.3",
+    "xe-utils": "3.5.4"
+  },
+  "sideEffects": [
+    "theme-chalk/*.css"
+  ]
+}