@kmkf-fe-packages/kmkf-work-order-service-component 2.2.39-beta.22 → 2.2.39-beta.25

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -417,7 +417,7 @@ var FormRender = function FormRender(props, ref) {
               return prv;
             }, {});
             if (!workOrderId) {
-              _context2.next = 44;
+              _context2.next = 45;
               break;
             }
             // 先初始化端上内容
@@ -450,7 +450,7 @@ var FormRender = function FormRender(props, ref) {
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
             if (!newRecord.notAutoFillWithFirstSubmit) {
-              _context2.next = 34;
+              _context2.next = 35;
               break;
             }
             currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
@@ -488,16 +488,18 @@ var FormRender = function FormRender(props, ref) {
               jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
             });
           case 32:
-            _context2.next = 42;
+            // 仅在依赖值有值且映射值为空时触发一次映射
+            batchFillByMappingWhenTargetEmpty(initialValues);
+            _context2.next = 43;
             break;
-          case 34:
+          case 35:
             if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
-              _context2.next = 41;
+              _context2.next = 42;
               break;
             }
             queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
             queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
-            _context2.next = 39;
+            _context2.next = 40;
             return orderBack({
               companyKey: companyKey,
               order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
@@ -511,16 +513,16 @@ var FormRender = function FormRender(props, ref) {
               callKey: 1,
               setLoading: setLoading
             });
-          case 39:
-            _context2.next = 42;
+          case 40:
+            _context2.next = 43;
             break;
-          case 41:
+          case 42:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 42:
-            _context2.next = 67;
+          case 43:
+            _context2.next = 68;
             break;
-          case 44:
+          case 45:
             fillByShopId(shopId);
             initFormValues = null;
             if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -539,7 +541,7 @@ var FormRender = function FormRender(props, ref) {
 
             // console.log(orderNo, initFormValues);
             if (!initFormValues) {
-              _context2.next = 55;
+              _context2.next = 56;
               break;
             }
             form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -556,9 +558,9 @@ var FormRender = function FormRender(props, ref) {
               _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
             }
             fetchRemark(_shopId, _orderNo);
-            _context2.next = 67;
+            _context2.next = 68;
             break;
-          case 55:
+          case 56:
             _transData = calcWorkOrderList([{
               jsonMap: jsonMap
             }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -570,12 +572,12 @@ var FormRender = function FormRender(props, ref) {
             batchFillByMapping(_initialValues);
             //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
             if (!(orderNo && shopId)) {
-              _context2.next = 66;
+              _context2.next = 67;
               break;
             }
             queryLabels(orderNo, shopId);
             queryMemberLevels(orderNo, shopId);
-            _context2.next = 64;
+            _context2.next = 65;
             return orderBack({
               companyKey: companyKey,
               order_no: orderNo,
@@ -590,13 +592,13 @@ var FormRender = function FormRender(props, ref) {
               callKey: 2,
               setLoading: setLoading
             });
-          case 64:
-            _context2.next = 67;
+          case 65:
+            _context2.next = 68;
             break;
-          case 66:
+          case 67:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 67:
+          case 68:
             antFormEl = document.getElementsByClassName('ant-form');
             (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
             resetMappingHideComponents();
@@ -605,7 +607,7 @@ var FormRender = function FormRender(props, ref) {
               type: 'setaAutoSubmitFlag',
               payload: true
             });
-          case 71:
+          case 72:
           case "end":
             return _context2.stop();
         }
@@ -655,6 +657,14 @@ var FormRender = function FormRender(props, ref) {
       shopUniqueKey && fillByMapping('SHOP_SELECT_MAPPING', shopUniqueKey);
     }, 0);
   };
+  var isEmptyMappingValue = function isEmptyMappingValue(value) {
+    if (isArray(value)) return value.length === 0;
+    if (value && _typeof(value) === 'object') {
+      if ('value' in value) return !value.value;
+      return isEmpty(value);
+    }
+    return value === undefined || value === null || value === '';
+  };
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
@@ -662,23 +672,52 @@ var FormRender = function FormRender(props, ref) {
       fillByMapping(_key, values[_key]);
     }
   };
+
+  // 依赖值有值且目标映射值为空时才触发映射
+  var batchFillByMappingWhenTargetEmpty = function batchFillByMappingWhenTargetEmpty(values) {
+    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
+    var _loop = function _loop(key) {
+      var _componentList$find, _mappingConfig$config;
+      var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
+        return t.uniqueKey === key;
+      })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
+      var triggerValue = getMappingTargetValue(values[key], workOrderComponentType);
+      if (isEmptyMappingValue(triggerValue)) return "continue";
+      var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[key];
+      var targetValues = mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue];
+      if (!targetValues) return "continue";
+      var patch = {};
+      for (var targetKey in targetValues) {
+        if (isEmptyMappingValue(form.getFieldValue(targetKey))) {
+          patch[targetKey] = targetValues[targetKey];
+        }
+      }
+      if (!isEmpty(patch)) {
+        form.setFieldsValue(patch);
+      }
+    };
+    for (var _key2 in values) {
+      var _ret = _loop(_key2);
+      if (_ret === "continue") continue;
+    }
+  };
   // 组件映射
   var fillByMapping = function fillByMapping(triggerUniqueKey, value) {
-    var _componentList$find, _mappingConfig$config;
+    var _componentList$find2, _mappingConfig$config2;
     var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
-    var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
+    var workOrderComponentType = (_componentList$find2 = componentList.find(function (t) {
       return t.uniqueKey === triggerUniqueKey;
-    })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
+    })) === null || _componentList$find2 === void 0 ? void 0 : _componentList$find2.workOrderComponentType;
     var triggerValue = getMappingTargetValue(value, workOrderComponentType);
 
     // 如果有映射关系，则修改对应组件的值
-    var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[triggerUniqueKey];
+    var mapping = (_mappingConfig$config2 = mappingConfig.config) === null || _mappingConfig$config2 === void 0 ? void 0 : _mappingConfig$config2[triggerUniqueKey];
     if (mapping !== null && mapping !== void 0 && mapping[triggerValue]) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }

package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts

@@ -236,7 +236,6 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
                 }[];
             } | undefined;
         } | undefined;
-        uniqueKey: string;
     } | undefined;
 } | undefined;
 export declare const selectTid: (state: FlowTemplateDetailState) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.39-beta.22",
+  "version": "2.2.39-beta.25",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.2.39-beta.21",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.19",
-    "@kmkf-fe-packages/services-components": "2.2.39-beta.21",
+    "@kmkf-fe-packages/basic-components": "2.2.39-beta.25",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.25",
+    "@kmkf-fe-packages/services-components": "2.2.39-beta.25",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c567d7a3b861051698ca7896d1056e7cdca18f2b",
+  "gitHead": "0e114e7d44d95ca335cef155e45a9da066253b1f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }