bm-admin-ui 1.2.37-alpha → 1.2.39-alpha

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

@@ -75,7 +75,7 @@ var input = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Input, {
@@ -151,7 +151,7 @@ var textarea = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Input, {
@@ -216,7 +216,7 @@ var numInput = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(InputNumber, {
@@ -353,7 +353,7 @@ var radio = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Select, {
@@ -419,7 +419,7 @@ var checkbox = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Select, {
@@ -508,7 +508,7 @@ var date = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(DatePicker, {
@@ -593,7 +593,7 @@ var dateRange = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(RangePicker, {
@@ -1028,7 +1028,7 @@ var people = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     var _a;
@@ -1056,7 +1056,7 @@ var people = {
 
 const _hoisted_1$7 = ["onClick"];
 const _hoisted_2$7 = ["onClick"];
-const _hoisted_3$6 = { class: "box" };
+const _hoisted_3$5 = { class: "box" };
 const _sfc_main$c = /* @__PURE__ */ defineComponent({
   __name: "temp-content",
   props: ["content", "preview"],
@@ -1115,7 +1115,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
           class: "bm-fc-rect-wrapper",
           onClick: withModifiers(triggerPreview, ["self"])
         }, [
-          createElementVNode("div", _hoisted_3$6, [
+          createElementVNode("div", _hoisted_3$5, [
             createElementVNode("div", {
               class: "bm-fc-rect-outer",
               style: normalizeStyle(
@@ -1140,7 +1140,7 @@ var TempContent = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__file", "temp-con
 
 const _hoisted_1$6 = { class: "bm-fc-select-material-temp__content__item-info" };
 const _hoisted_2$6 = { class: "bm-fc-select-material-temp__content__item-info__cover" };
-const _hoisted_3$5 = ["src"];
+const _hoisted_3$4 = ["src"];
 const _hoisted_4$4 = ["onClick"];
 const _hoisted_5$4 = {
   key: 1,
@@ -1346,7 +1346,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
                                   class: "bm-fc-select-material-temp__content__item-info__cover__img",
                                   src: item.coverPlanUrl,
                                   alt: ""
-                                }, null, 8, _hoisted_3$5)) : (openBlock(), createBlock(TempContent, {
+                                }, null, 8, _hoisted_3$4)) : (openBlock(), createBlock(TempContent, {
                                   key: 1,
                                   content: item.htmlContent
                                 }, null, 8, ["content"]))
@@ -18790,7 +18790,7 @@ var ShopInput = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "shop-input
 
 const _hoisted_1$5 = { class: "bm-dc-table-widget" };
 const _hoisted_2$5 = { class: "bm-dc-table-widget__title" };
-const _hoisted_3$4 = { class: "bm-dc-table-widget__title-samll" };
+const _hoisted_3$3 = { class: "bm-dc-table-widget__title-samll" };
 const _hoisted_4$3 = {
   key: 0,
   class: "bm-dc-table-widget__top-bar"
@@ -18902,10 +18902,17 @@ const _sfc_main$7 = defineComponent({
       });
       data.forEach((row) => {
         Object.keys(cache).forEach((key) => {
-          if (!isNaN(row[key]))
-            cache[key].count += row[key];
+          let tempValue = row[key];
+          if (![null, void 0, ""].includes(tempValue)) {
+            tempValue = Number(tempValue);
+            if (!isNaN(tempValue))
+              cache[key].count += tempValue;
+          }
         });
       });
+      Object.keys(cache).forEach((key) => {
+        cache[key].count = Number(cache[key].count.toFixed(4));
+      });
       if (props.rule.config.showTotal) {
         cache = {
           _total: { title: "\u884C\u6570", count: data?.length || 0 },
@@ -18975,7 +18982,7 @@ const _sfc_main$7 = defineComponent({
               pre.push({
                 field: childField,
                 title,
-                minWidth: "140px",
+                width: "140px",
                 slots: {
                   default({ row }) {
                     if (row?.[childField]) {
@@ -19022,11 +19029,19 @@ const _sfc_main$7 = defineComponent({
           return pre;
         }, [])
       );
+      columns.push({
+        field: "_empty",
+        title: " ",
+        showOverflow: false,
+        showHeaderOverflow: false,
+        minWidth: 1,
+        resizable: false
+      });
       if (!props.hidden)
         columns.push({
           field: oper,
           title: "\u64CD\u4F5C",
-          minWidth: isProductCenter.value ? "110px" : "140px",
+          width: isProductCenter.value ? "110px" : "140px",
           fixed: "right",
           slots: {
             default: "floatHandle"
@@ -19088,7 +19103,7 @@ const _sfc_main$7 = defineComponent({
           field,
           title: getBaseTitle(),
           headerClassName: rule.effect.required ? "is-required" : "",
-          minWidth: "140px",
+          width: "140px",
           slots: {
             default: rule.field
           }
@@ -19100,7 +19115,7 @@ const _sfc_main$7 = defineComponent({
           columns2.push({
             field: childField,
             title: `${item.label}-${mainName}`,
-            minWidth: "140px",
+            width: "140px",
             slots: {
               default({ row }) {
                 if (item.value === "\u5546\u54C1\u56FE\u7247" && row[childField]) {
@@ -19228,11 +19243,45 @@ const _sfc_main$7 = defineComponent({
       }
     }
     function handleExport() {
+      let data2 = xGrid.value.data;
+      let res = [];
+      data2?.forEach((row, i) => {
+        const obj = {};
+        for (let item of Object.entries(row)) {
+          if (Object.prototype.toString.call(item[1]) === "[object Array]") {
+            let temp = item[1]?.map((x) => x.name || x.categoryName || x)?.filter((x) => x)?.join(",");
+            obj[item?.[0]] = temp;
+          } else if (Object.prototype.toString.call(item[1]) === "[object Object]") {
+            obj[item[0]] = item[1]?.name;
+          } else {
+            obj[item[0]] = item[1];
+          }
+        }
+        res[i] = { ...res[i], ...obj };
+      });
+      buttonLoading.value.export = true;
       xGrid.value.exportData({
         mode: "all",
         columnFilterMethod({ column }) {
           return isValidColumn(column);
-        }
+        },
+        beforeExportMethod({ options }) {
+          const headRow = {};
+          const col = options?.columns?.map((col2) => ({
+            [col2.field]: col2.title
+          }));
+          col.forEach((x) => {
+            Object.assign(headRow, x);
+          });
+          res.unshift(headRow);
+          console.log("data", res);
+        },
+        original: true,
+        isHeader: false,
+        data: res,
+        filename: `${dayjs().format("YYYYMMDD")}`
+      }).finally(() => {
+        buttonLoading.value.export = false;
       });
     }
     function emitChange() {
@@ -19333,7 +19382,7 @@ const _sfc_main$7 = defineComponent({
       file && reader.readAsText(file, "GB2312");
     }
     function isValidColumn(c) {
-      return c.type !== "checkbox" && c.type !== "seq" && c.field !== oper;
+      return c.type !== "checkbox" && c.type !== "seq" && c.field !== oper && c.field !== "_empty";
     }
     function parseCsv(result) {
       let data2 = [];
@@ -19614,6 +19663,9 @@ const _sfc_main$7 = defineComponent({
         deep: true
       }
     );
+    const buttonLoading = ref({
+      export: false
+    });
     const buttonLoadingForProductCenter = ref({
       export: false,
       download: false,
@@ -19747,7 +19799,7 @@ const _sfc_main$7 = defineComponent({
       return openBlock(), createElementBlock("div", _hoisted_1$5, [
         createElementVNode("div", _hoisted_2$5, [
           createTextVNode(toDisplayString(__props.rule.title.title) + " ", 1),
-          createElementVNode("span", _hoisted_3$4, toDisplayString(unref(countText)), 1),
+          createElementVNode("span", _hoisted_3$3, toDisplayString(unref(countText)), 1),
           createCommentVNode(" \u5546\u54C1\u4E2D\u5FC3\u5B9A\u5236 \u6309\u94AE "),
           unref(isProductCenter) ? (openBlock(), createElementBlock("div", _hoisted_4$3, [
             !__props.hidden ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
@@ -19822,13 +19874,14 @@ const _sfc_main$7 = defineComponent({
               unref(exportFeature) ? (openBlock(), createBlock(unref(Button), {
                 key: 0,
                 disabled: __props.disabled,
+                loading: buttonLoading.value.export,
                 onClick: handleExport
               }, {
                 default: withCtx(() => [
                   createTextVNode("\u5BFC\u51FA")
                 ]),
                 _: 1
-              }, 8, ["disabled"])) : createCommentVNode("v-if", true),
+              }, 8, ["disabled", "loading"])) : createCommentVNode("v-if", true),
               createTextVNode("\xA0 "),
               unref(importFeature) ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                 createElementVNode("input", {
@@ -19880,6 +19933,18 @@ const _sfc_main$7 = defineComponent({
                 ]),
                 _: 1
               }, 8, ["disabled"])
+            ], 64)) : unref(tableConfig).isActivityCheckFlag ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+              createCommentVNode(" \u6D3B\u52A8\u5BA1\u6838\u9875 \u53EA\u5C55\u793A\u5BFC\u51FA\u6309\u94AE "),
+              unref(exportFeature) ? (openBlock(), createBlock(unref(Button), {
+                key: 0,
+                loading: buttonLoading.value.export,
+                onClick: handleExport
+              }, {
+                default: withCtx(() => [
+                  createTextVNode("\u5BFC\u51FA")
+                ]),
+                _: 1
+              }, 8, ["loading"])) : createCommentVNode("v-if", true)
             ], 64)) : createCommentVNode("v-if", true)
           ]))
         ]),
@@ -19980,7 +20045,7 @@ var TableWidget = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__file", "table-wi
 
 const _hoisted_1$4 = /* @__PURE__ */ createElementVNode("span", { class: "bm-fc-form-item-label is-required" }, "\u7D20\u6750\u6A21\u677F\uFF1A", -1);
 const _hoisted_2$4 = { key: 0 };
-const _hoisted_3$3 = /* @__PURE__ */ createElementVNode("span", { class: "bm-fc-form-item-label" }, "\u7D20\u6750\u7C7B\u578B\uFF1A", -1);
+const _hoisted_3$2 = /* @__PURE__ */ createElementVNode("span", { class: "bm-fc-form-item-label" }, "\u7D20\u6750\u7C7B\u578B\uFF1A", -1);
 const _hoisted_4$2 = {
   key: 1,
   class: "bm-fc-placeholder"
@@ -20372,7 +20437,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                                 default: withCtx(() => [
                                   createVNode(unref(Col), null, {
                                     default: withCtx(() => [
-                                      _hoisted_3$3
+                                      _hoisted_3$2
                                     ]),
                                     _: 1
                                   }),
@@ -20633,8 +20698,7 @@ var materialTemp = {
 };
 
 const _hoisted_1$3 = { class: "bm-fc-form-item-label" };
-const _hoisted_2$3 = ["src"];
-const _hoisted_3$2 = {
+const _hoisted_2$3 = {
   key: 1,
   class: "bm-fc-placeholder"
 };
@@ -20808,16 +20872,16 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         getValue(field.value) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                          field.value === "\u5546\u54C1\u56FE\u7247" ? (openBlock(), createElementBlock("img", {
+                          field.value === "\u5546\u54C1\u56FE\u7247" ? (openBlock(), createBlock(unref(Image), {
                             key: 0,
                             class: "bm-fc-form-item__img",
                             src: __props.extraConfig.common.previewImg(getValue(field.value))
-                          }, null, 8, _hoisted_2$3)) : field.value === "\u5546\u54C1\u5355\u4F4D" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                          }, null, 8, ["src"])) : field.value === "\u5546\u54C1\u5355\u4F4D" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                             createTextVNode(toDisplayString(unitMap[getValue(field.value)] || getValue(field.value)), 1)
                           ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                             createTextVNode(toDisplayString(getValue(field.value)), 1)
                           ], 64))
-                        ], 64)) : (openBlock(), createElementBlock("span", _hoisted_3$2, "\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"))
+                        ], 64)) : (openBlock(), createElementBlock("span", _hoisted_2$3, "\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6"))
                       ]),
                       _: 2
                     }, 1024)
@@ -21063,7 +21127,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                         value: __props.formCreateInject?.rule?.value?.value || __props.value?.value || null,
                         placeholder: "\u8BF7\u9009\u62E9",
                         "show-search": "",
-                        "show-arrow": false,
+                        "show-arrow": true,
                         "default-active-first-option": false,
                         "filter-option": false,
                         "not-found-content": null,
@@ -21197,7 +21261,7 @@ var shop = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: '138px',
+            width: '138px',
             slots: {
                 default({ row }) {
                     var _a;
@@ -21375,7 +21439,7 @@ var materialType = {
             field,
             title: '素材类型',
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: '138px',
+            width: '138px',
             slots: {
                 default({ row }) {
                     return h(materialType$1, {
@@ -21527,7 +21591,7 @@ var department = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            minWidth: data.config.fieldRatio,
+            width: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     var _a;

package/es/components/input-tags-display/index.js

@@ -3,7 +3,7 @@ import { defineComponent, ref, watch, resolveComponent, openBlock, createElement
 import ToolTip from 'ant-design-vue/lib/tooltip';
 import Button from 'ant-design-vue/lib/button';
 import Tag from 'ant-design-vue/lib/tag';
-import { CloseCircleFilled } from '@ant-design/icons-vue';
+import { CloseCircleFilled, DownOutlined } from '@ant-design/icons-vue';
 
 var _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
@@ -14,7 +14,7 @@ var _export_sfc = (sfc, props) => {
 };
 
 const _sfc_main = defineComponent({
-  components: { ToolTip, CloseCircleFilled, Button, Tag },
+  components: { ToolTip, CloseCircleFilled, DownOutlined, Button, Tag },
   props: {
     disabled: {
       type: Boolean,
@@ -130,12 +130,14 @@ const _hoisted_3 = { class: "pop-seleted" };
 const _hoisted_4 = { class: "pop-seleted-title" };
 const _hoisted_5 = { key: 1 };
 const _hoisted_6 = { key: 2 };
-const _hoisted_7 = /* @__PURE__ */ createElementVNode("div", null, null, -1);
+const _hoisted_7 = { class: "selector-input-arrow" };
+const _hoisted_8 = /* @__PURE__ */ createElementVNode("div", null, null, -1);
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Tag = resolveComponent("Tag");
   const _component_CloseCircleFilled = resolveComponent("CloseCircleFilled");
   const _component_ToolTip = resolveComponent("ToolTip");
   const _component_Button = resolveComponent("Button");
+  const _component_DownOutlined = resolveComponent("DownOutlined");
   return openBlock(), createElementBlock("div", _hoisted_1, [
     _ctx.list && _ctx.list.length ? (openBlock(), createElementBlock("div", {
       key: 0,
@@ -214,9 +216,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       createElementVNode("div", {
         class: normalizeClass(["selector-empty-input", { "empty-disabled": _ctx.disabled }]),
         onClick: _cache[5] || (_cache[5] = withModifiers((...args) => _ctx.toAddTags && _ctx.toAddTags(...args), ["stop"]))
-      }, " \xA0\xA0" + toDisplayString(_ctx.placeholder), 3)
+      }, " \xA0\xA0" + toDisplayString(_ctx.placeholder), 3),
+      createElementVNode("div", _hoisted_7, [
+        createVNode(_component_DownOutlined)
+      ])
     ])) : createCommentVNode("v-if", true),
-    _hoisted_7
+    _hoisted_8
   ]);
 }
 var InputTagsDisplay = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "input-tags-display.vue"]]);