@kmkf-fe-packages/kmkf-work-order-service-component 2.2.44-beta.12 → 2.2.44-beta.15

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

@@ -296,7 +296,7 @@ var CurrentNode = function CurrentNode(props, ref) {
               onOk: function () {
                 var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                   var _currentNodeDetail$no21;
-                  var _yield$skipNode, success;
+                  var _yield$skipNode, success, _controllerRef$curren3;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -316,15 +316,12 @@ var CurrentNode = function CurrentNode(props, ref) {
                         if (success) {
                           message.success('跳过成功');
                           queryRemarkList();
-                          setTimeout(function () {
-                            var _controllerRef$curren3;
-                            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
-                            }));
-                          }, 100);
+                          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":

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

@@ -457,7 +457,7 @@ var FormRender = function FormRender(props, ref) {
             }));
             console.log('transData', get(transData, '0', {}));
             initialValues = get(transData, '0', {});
-            newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
+            newRecord.preCreateAndNotModified && !newRecord.notAutoFillWithFirstSubmit && batchFillByMapping(initialValues);
             orderBackReplace(transData, templateDetail);
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -1362,7 +1362,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     })))
   })), /*#__PURE__*/React.createElement(Timeline, null, flowRecordList.map(function (flowRecord, index) {
     var canWithdraw = currentNodeCanWithdraw(index) && !readonly && flowStatus !== FlowStatus.FLOWING;
-    return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(NodeItem, {
+    return /*#__PURE__*/React.createElement(Timeline.Item, {
+      key: flowRecord.nodeId
+    }, /*#__PURE__*/React.createElement(NodeItem, {
       flowTemplateKey: flowTemplateKey,
       flowTemplateId: flowTemplateId,
       flowWorkOrderId: flowWorkOrderIdState,
@@ -1385,7 +1387,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       eventNodeType: flowRecord.eventNodeType,
       isSuperAdmin: isSuperAdmin
     }));
-  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
+  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
+    key: "current-node"
+  }, /*#__PURE__*/React.createElement(CurrentNode, {
     ref: currentNodeRef,
     flowTemplateId: flowTemplateId,
     flowWorkOrderId: flowWorkOrderIdState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.44-beta.12",
+  "version": "2.2.44-beta.15",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8e870a17d41d583a7d3175944ae9c76bb78f56c6",
+  "gitHead": "d845acfd9438a8cbb4c1171f6988ab378467e0f3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }