@kmkf-fe-packages/kmkf-work-order-service-component 2.2.43 → 2.2.44-beta.1

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

@@ -18,12 +18,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useMemo, useState, useRef, forwardRef, useImperativeHandle, useContext } from 'react';
+import { Modal } from 'antd';
 import { message } from 'antd';
 import { useMemoizedFn } from 'ahooks';
 import { get, find } from 'lodash';
 import { calcWorkOrderList, submitParams } from "../../../common/utils/tools";
 import { FlowStatus, NodeType, NodeStatus } from "../../../model/flowTemplateDetail/types";
-import { modifyWorkOrder, restartAutoTask } from "../../../model/flowTemplateDetail/api";
+import { modifyWorkOrder, restartAutoTask, skipNode } from "../../../model/flowTemplateDetail/api";
 import Header from "../Header";
 import FormRender from "../FormRender";
 import RenderDetail from "../RenderDetail";
@@ -36,12 +37,13 @@ import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/re
 import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
 import { AutoTaskDetail } from "../AutoTaskDetail";
+import { SKIP_NODE_TYPES } from "../../../common/constant";
 var formProps = {
   className: 'customizeFormModalClassName',
   layout: 'vertical'
 };
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$wo22, _currentNodeDetail$no24, _currentNodeDetail$wo23;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$fl2, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo22, _currentNodeDetail$no25, _currentNodeDetail$wo23;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -282,6 +284,67 @@ var CurrentNode = function CurrentNode(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var handleSkip = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            Modal.confirm({
+              title: '当前获取物流单号自动化任务正在执行中，确定要跳过吗？跳过后将无法获取物流信息',
+              okText: '确认',
+              cancelText: '取消',
+              onOk: function () {
+                var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                  var _currentNodeDetail$no21;
+                  var _yield$skipNode, success, _controllerRef$curren3;
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        _context3.next = 2;
+                        return skipNode({
+                          operateParams: {
+                            flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
+                            flowWorkOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowWorkOrderUpdateTime,
+                            flowTemplateId: flowTemplateId,
+                            flowWorkOrderId: flowWorkOrderId,
+                            nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
+                          }
+                        });
+                      case 2:
+                        _yield$skipNode = _context3.sent;
+                        success = _yield$skipNode.success;
+                        if (success) {
+                          message.success('跳过成功');
+                          queryRemarkList();
+                          dispatch(fetchPanelInfo({
+                            flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
+                            flowWorkOrderId: flowWorkOrderId
+                          }, {
+                            signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
+                          }));
+                        }
+                      case 5:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }));
+                function onOk() {
+                  return _onOk.apply(this, arguments);
+                }
+                return onOk;
+              }()
+            });
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function handleSkip() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var isArtificialNode = tag === 'artificial';
   var isAutoNode = tag === 'auto';
   var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER'].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType);
@@ -289,6 +352,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   // TODO: 决策节点给后端修复数据加了一个入口
   // @ts-ignore
   var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
+  var showSkipButton = SKIP_NODE_TYPES.includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl2 = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl2 === void 0 ? void 0 : _currentNodeDetail$fl2.eventType) && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
     tag: tag,
     nodeName: nodeName,
@@ -300,9 +364,11 @@ var CurrentNode = function CurrentNode(props, ref) {
     showReminder: isArtificialNode && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.flowStatus) &&
     // isCurrentNodeHandler &&
     !readonly,
+    showSkipButton: showSkipButton,
     isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : (_currentNodeDetail$wo20 = _currentNodeDetail$wo19.jsonMap) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : _currentNodeDetail$wo20.flowTags) || '[]').includes('REMINDER'),
     handleWithdraw: handleWithdraw,
     handleReminder: onReminder,
+    handleSkip: handleSkip,
     editing: editing,
     handleEdit: handleEdit,
     handleSave: handleSave,
@@ -310,18 +376,18 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleRestartAutoTask: handleRestartAutoTask,
     flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
     flowWorkOrderId: flowWorkOrderId || '',
-    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || '',
+    nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.id) || '',
     flowTemplateId: flowTemplateId
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
+  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
-    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
+    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,
@@ -338,7 +404,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleChangeTradeId: handleChangeTradeId,
     canModifyPayment: true,
     flowAllShowHideRules: allShowHideRules,
-    isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
+    isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
     autoSubmit: autoSubmit
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {

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

@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
@@ -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);
         }
       }
@@ -942,6 +981,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'JKY_SYSTEM_ORDER') {
+      jkySystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (workOrderComponentType === 'WDT_RETURN_BILL_NO') {
       wdtReturnBillNoBackValues({
         templateList: templateDetail,
@@ -1180,7 +1226,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'JKY_LOGISTICS', 'JKY_SEND_GOOD', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -1192,6 +1238,7 @@ var FormRender = function FormRender(props, ref) {
           case 'BS_E3_LOGISTICS':
           case 'GY_LOGISTICS':
           case 'JY_LOGISTICS':
+          case 'JKY_LOGISTICS':
           case 'SKX_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
@@ -1211,6 +1258,7 @@ var FormRender = function FormRender(props, ref) {
           case 'KM_SEND_GOOD':
           case 'GY_SEND_GOOD':
           case 'JY_SEND_GOOD':
+          case 'JKY_SEND_GOOD':
             prv[next.uniqueKey] = [{
               sendName: '',
               sendId: ''

package/dist/esm/FlowTemplateDetailV2/components/Header/index.d.ts

@@ -7,6 +7,7 @@ interface HeaderProps {
     showWithdraw: boolean;
     showReminder?: boolean;
     showRestartAutoTask?: boolean;
+    showSkipButton?: boolean;
     handleLook?: () => void;
     handleSave?: () => void;
     handleEdit?: () => void;
@@ -14,6 +15,7 @@ interface HeaderProps {
     handleWithdraw?: () => void;
     handleReminder?: (type: string) => void;
     handleRestartAutoTask?: () => void;
+    handleSkip?: () => void;
     loading?: boolean;
     editing?: boolean;
     opening?: boolean;

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

@@ -43,6 +43,7 @@ var Header = function Header(props) {
     handlePackUp = props.handlePackUp,
     handleWithdraw = props.handleWithdraw,
     handleReminder = props.handleReminder,
+    handleSkip = props.handleSkip,
     _props$loading = props.loading,
     loading = _props$loading === void 0 ? false : _props$loading,
     _props$editing = props.editing,
@@ -55,6 +56,8 @@ var Header = function Header(props) {
     showReminder = _props$showReminder === void 0 ? false : _props$showReminder,
     _props$showRestartAut = props.showRestartAutoTask,
     showRestartAutoTask = _props$showRestartAut === void 0 ? false : _props$showRestartAut,
+    _props$showSkipButton = props.showSkipButton,
+    showSkipButton = _props$showSkipButton === void 0 ? false : _props$showSkipButton,
     handler = props.handler,
     isReminder = props.isReminder,
     _props$handleLabel = props.handleLabel,
@@ -190,7 +193,14 @@ var Header = function Header(props) {
     },
     "data-spm-click": "\u53D6\u6D88\u50AC\u5355",
     "data-spm-param": "\u53D6\u6D88\u50AC\u5355"
-  }, "\u53D6\u6D88"))), /*#__PURE__*/React.createElement(Modal, {
+  }, "\u53D6\u6D88"))), showSkipButton && /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: function onClick() {
+      return typeof handleSkip === 'function' && handleSkip();
+    },
+    "data-spm-click": "\u8DF3\u8FC7",
+    "data-spm-param": "\u8DF3\u8FC7"
+  }, "\u8DF3\u8FC7"), /*#__PURE__*/React.createElement(Modal, {
     title: "\u5F02\u5E38\u65E5\u5FD7",
     onOk: handleCancel,
     onCancel: handleCancel,

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

@@ -274,7 +274,7 @@ var NodeItem = function NodeItem(props) {
       isAllStaff: data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$nodeInfo = _data$data11.nodeInfo) === null || _data$data11$nodeInfo === void 0 ? void 0 : (_data$data11$nodeInfo2 = _data$data11$nodeInfo.assistants) === null || _data$data11$nodeInfo2 === void 0 ? void 0 : _data$data11$nodeInfo2.isAllStaff
     });
   }, [data, plat.userKey, assistantMap]);
-  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'PLATFORM_LOGISTICS_INTERCEPT', 'LBDJ_ONE_PRICE_ORDER'].includes(eventNodeType);
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'LBDJ_ONE_PRICE_ORDER', 'PLATFORM_LOGISTICS_INTERCEPT'].includes(eventNodeType);
   // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
   var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
 

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -7,4 +7,4 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 // 切换当前店铺时，以下组件字段需要清空
-export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
+export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', 'ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];