bm-admin-ui 1.1.7-alpha → 1.1.8-alpha

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

@@ -10,6 +10,8 @@ import { cloneDeep, floor, debounce } from 'lodash-es';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import utils from 'bm-admin-ui/es/utils';
 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';
 
 const fieldRatioMap = {
     '25%': 6,
@@ -18919,6 +18921,11 @@ const _sfc_main$7 = defineComponent({
           }
         }
       ];
+      if (tableConfig.value?.system === "productCenter" && ["F2CTemplate", "B2CTemplate", "DistributeTemp", "FreshTemplate"].includes(
+        tableConfig.value.template
+      ) && rule.name === "product") {
+        columns2.title = "\u5546\u54C1\u7F16\u53F7";
+      }
       if (associatedFields.length) {
         associatedFields.forEach((item) => {
           const childField = productPicName(item.value, field);
@@ -19002,6 +19009,7 @@ const _sfc_main$7 = defineComponent({
     async function queryProductInfo(rule, row) {
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
+      const otherAssociatedFields = rule?.config?.otherAssociatedFields;
       let result = void 0;
       try {
         if (row[field]) {
@@ -19014,10 +19022,12 @@ const _sfc_main$7 = defineComponent({
           }
         }
         processAssociatedFields(field, associatedFields, row, result);
+        processOtherAssociatedFields(field, otherAssociatedFields, row, result);
         return result;
       } catch (e) {
         row[field] = "";
         processAssociatedFields(field, associatedFields, row, result);
+        processOtherAssociatedFields(field, otherAssociatedFields, row, result);
         return Promise.resolve(result);
       }
     }
@@ -19027,6 +19037,15 @@ const _sfc_main$7 = defineComponent({
           row[productPicName(item.value, field)] = result ? result[accosiationParseKeyMap[item.value]] : void 0;
         });
     }
+    function processOtherAssociatedFields(field, fields, row, result) {
+      if (tableConfig.value?.system === "productCenter" && ["F2CTemplate", "B2CTemplate", "DistributeTemp", "FreshTemplate"].includes(
+        tableConfig.value.template
+      )) {
+        fields?.forEach?.((item) => {
+          row[item] = result ? result[item] : void 0;
+        });
+      }
+    }
     function handleChange(e) {
       const file = e.target.files[0];
       const reader = new FileReader();
@@ -21340,6 +21359,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["update:value", "change"],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
+    FC.component("BmLabelTooltip", BmOverTooltips);
     const formRuleList = computed(() => {
       if (typeof props.resolveRulesConfig === "function") {
         const rules = props.resolveRulesConfig(ruleList);
@@ -21359,6 +21379,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           span: 24
         }
       },
+      form: {
+        title: "\u81EA\u5B9A\u4E49\u8868\u5355\u6D4B\u8BD5"
+      },
       submitBtn: false,
       global: {
         ShopWidget: {

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

@@ -14,6 +14,8 @@ var lodashEs = require('lodash-es');
 var customParseFormat = require('dayjs/plugin/customParseFormat');
 var utils = require('bm-admin-ui/lib/utils');
 var isNull = require('bm-admin-ui/lib/utils/isNull');
+var FC = require('@form-create/ant-design-vue');
+var BmOverTooltips = require('bm-admin-ui/lib/components/over-tooltips');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,6 +24,8 @@ var Picture__default = /*#__PURE__*/_interopDefaultLegacy(Picture);
 var BmStaffsSelector__default = /*#__PURE__*/_interopDefaultLegacy(BmStaffsSelector);
 var customParseFormat__default = /*#__PURE__*/_interopDefaultLegacy(customParseFormat);
 var utils__default = /*#__PURE__*/_interopDefaultLegacy(utils);
+var FC__default = /*#__PURE__*/_interopDefaultLegacy(FC);
+var BmOverTooltips__default = /*#__PURE__*/_interopDefaultLegacy(BmOverTooltips);
 
 const fieldRatioMap = {
     '25%': 6,
@@ -18931,6 +18935,11 @@ const _sfc_main$7 = vue.defineComponent({
           }
         }
       ];
+      if (tableConfig.value?.system === "productCenter" && ["F2CTemplate", "B2CTemplate", "DistributeTemp", "FreshTemplate"].includes(
+        tableConfig.value.template
+      ) && rule.name === "product") {
+        columns2.title = "\u5546\u54C1\u7F16\u53F7";
+      }
       if (associatedFields.length) {
         associatedFields.forEach((item) => {
           const childField = productPicName(item.value, field);
@@ -19014,6 +19023,7 @@ const _sfc_main$7 = vue.defineComponent({
     async function queryProductInfo(rule, row) {
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
+      const otherAssociatedFields = rule?.config?.otherAssociatedFields;
       let result = void 0;
       try {
         if (row[field]) {
@@ -19026,10 +19036,12 @@ const _sfc_main$7 = vue.defineComponent({
           }
         }
         processAssociatedFields(field, associatedFields, row, result);
+        processOtherAssociatedFields(field, otherAssociatedFields, row, result);
         return result;
       } catch (e) {
         row[field] = "";
         processAssociatedFields(field, associatedFields, row, result);
+        processOtherAssociatedFields(field, otherAssociatedFields, row, result);
         return Promise.resolve(result);
       }
     }
@@ -19039,6 +19051,15 @@ const _sfc_main$7 = vue.defineComponent({
           row[productPicName(item.value, field)] = result ? result[accosiationParseKeyMap[item.value]] : void 0;
         });
     }
+    function processOtherAssociatedFields(field, fields, row, result) {
+      if (tableConfig.value?.system === "productCenter" && ["F2CTemplate", "B2CTemplate", "DistributeTemp", "FreshTemplate"].includes(
+        tableConfig.value.template
+      )) {
+        fields?.forEach?.((item) => {
+          row[item] = result ? result[item] : void 0;
+        });
+      }
+    }
     function handleChange(e) {
       const file = e.target.files[0];
       const reader = new FileReader();
@@ -21352,6 +21373,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   emits: ["update:value", "change"],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
+    FC__default["default"].component("BmLabelTooltip", BmOverTooltips__default["default"]);
     const formRuleList = vue.computed(() => {
       if (typeof props.resolveRulesConfig === "function") {
         const rules = props.resolveRulesConfig(ruleList);
@@ -21371,6 +21393,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           span: 24
         }
       },
+      form: {
+        title: "\u81EA\u5B9A\u4E49\u8868\u5355\u6D4B\u8BD5"
+      },
       submitBtn: false,
       global: {
         ShopWidget: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.1.7-alpha",
+  "version": "1.1.8-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",