@kmkf-fe-packages/kmkf-work-order-service-component 2.2.31-beta.55 → 2.2.31-beta.57

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

@@ -962,31 +962,40 @@ var FormRender = function FormRender(props, ref) {
 
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type, uniqueKey) {
       var promises;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
+            setTimeout(function () {
+              var allValue = form.getFieldsValue();
+              updateComponentToUpperCase({
+                componentDtoList: templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList,
+                allValues: allValue,
+                uniqueKey: uniqueKey,
+                form: form
+              });
+            }, 0);
             if (!(type === 'erpAfterSaleTradeId')) {
-              _context6.next = 5;
+              _context6.next = 6;
               break;
             }
-            _context6.next = 3;
+            _context6.next = 4;
             return onBlurErpAfterSaleTradeId({
               form: form,
               value: value,
               templateDetail: templateDetail,
               setKmLoading: setKmLoading
             });
-          case 3:
-            _context6.next = 48;
+          case 4:
+            _context6.next = 49;
             break;
-          case 5:
+          case 6:
             if (!(type === 'expressLogisticsCode')) {
-              _context6.next = 15;
+              _context6.next = 16;
               break;
             }
-            _context6.next = 8;
+            _context6.next = 9;
             return onBlurExpressLogisticsCode({
               form: form,
               value: value,
@@ -994,21 +1003,21 @@ var FormRender = function FormRender(props, ref) {
               setKmLoading: setKmLoading,
               componentOnBlur: componentOnBlur
             });
-          case 8:
+          case 9:
             if (!['TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
             ].includes(companyKey)) {
-              _context6.next = 11;
+              _context6.next = 12;
               break;
             }
-            _context6.next = 11;
+            _context6.next = 12;
             return onBlurSkxLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 11:
-            _context6.next = 13;
+          case 12:
+            _context6.next = 14;
             return onBlurReturnLogisticsCode({
               form: form,
               value: value,
@@ -1016,15 +1025,15 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               orderBackRule: 'outSid'
             });
-          case 13:
-            _context6.next = 48;
+          case 14:
+            _context6.next = 49;
             break;
-          case 15:
+          case 16:
             if (!(type === 'returnLogisticsCode')) {
-              _context6.next = 20;
+              _context6.next = 21;
               break;
             }
-            _context6.next = 18;
+            _context6.next = 19;
             return onBlurReturnLogisticsCode({
               form: form,
               value: value,
@@ -1032,57 +1041,57 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               orderBackRule: 'logisticsCode'
             });
-          case 18:
-            _context6.next = 48;
+          case 19:
+            _context6.next = 49;
             break;
-          case 20:
+          case 21:
             if (!(type === 'skxOutboundNoticeNo')) {
-              _context6.next = 26;
+              _context6.next = 27;
               break;
             }
             //[SKX]ON出库通知单号  返填
             console.log('skxOutboundNoticeNo', value);
-            _context6.next = 24;
+            _context6.next = 25;
             return onBlurSkxOutboundNoticeNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 24:
-            _context6.next = 48;
+          case 25:
+            _context6.next = 49;
             break;
-          case 26:
+          case 27:
             if (!(type === 'skxReturnBillNo')) {
-              _context6.next = 31;
+              _context6.next = 32;
               break;
             }
-            _context6.next = 29;
+            _context6.next = 30;
             return onBlurSkxReturnBillNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 29:
-            _context6.next = 48;
+          case 30:
+            _context6.next = 49;
             break;
-          case 31:
+          case 32:
             if (!(type === 'skxReturnTHLogisticsCode')) {
-              _context6.next = 36;
+              _context6.next = 37;
               break;
             }
-            _context6.next = 34;
+            _context6.next = 35;
             return onBlurSkxReturnTHLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 34:
-            _context6.next = 48;
+          case 35:
+            _context6.next = 49;
             break;
-          case 36:
+          case 37:
             // 收集所有需要执行的异步操作
             promises = [];
             if (type === 'tradeId') {
@@ -1094,7 +1103,7 @@ var FormRender = function FormRender(props, ref) {
               promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context6.next = 43;
+              _context6.next = 44;
               break;
             }
             setReplaceValue(function (prev) {
@@ -1105,24 +1114,24 @@ var FormRender = function FormRender(props, ref) {
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
             return _context6.abrupt("return");
-          case 43:
+          case 44:
             promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
               promises.push(changeHandle(value));
             }
             // 等待所有异步操作完成
-            _context6.next = 47;
+            _context6.next = 48;
             return Promise.all(promises);
-          case 47:
-            return _context6.abrupt("return", Promise.resolve());
           case 48:
+            return _context6.abrupt("return", Promise.resolve());
+          case 49:
           case "end":
             return _context6.stop();
         }
       }, _callee6);
     }));
-    return function componentOnBlur(_x10, _x11) {
+    return function componentOnBlur(_x10, _x11, _x12) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -1431,7 +1440,9 @@ var FormRender = function FormRender(props, ref) {
           currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
           checkFillMapping(show, uniqueKey, workOrderComponentType);
           return instance.editRender({
-            onBlur: componentOnBlur,
+            onBlur: function onBlur(value, type) {
+              return componentOnBlur(value, type, uniqueKey);
+            },
             onChange: function onChange(value, type) {
               return componentOnValueChange(uniqueKey, value, workOrderComponentType, type);
             },
@@ -1443,7 +1454,9 @@ var FormRender = function FormRender(props, ref) {
         });
       }
       return instance.editRender({
-        onBlur: componentOnBlur,
+        onBlur: function onBlur(value, type) {
+          return componentOnBlur(value, type, uniqueKey);
+        },
         onChange: function onChange(value, type) {
           return componentOnValueChange(uniqueKey, value, workOrderComponentType, type);
         },
@@ -1499,7 +1512,7 @@ var FormRender = function FormRender(props, ref) {
       return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
     });
   }, [templateDetail]);
-  var handleWatchFormValueChange = function handleWatchFormValueChange() {
+  var handleWatchFormValueChange = function handleWatchFormValueChange(changedValues) {
     var componentShowMap = currentTemplateAllComponentsDisplay.current;
     var allValues = form.getFieldsValue(true);
     var formValue = {};
@@ -1518,11 +1531,12 @@ var FormRender = function FormRender(props, ref) {
     //缓存防止bs商品组件联动返填获取不到值
     setTimeout(function () {
       //部分组件小写改成大写
-      updateComponentToUpperCase({
-        componentDtoList: templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList,
-        allValues: allValues,
-        form: form
-      });
+      // updateComponentToUpperCase({
+      //   componentDtoList: templateDetail?.componentDtoList,
+      //   allValues,
+      //   changedValues,
+      //   form,
+      // });
       changeValuesCacheOrderInfo(_objectSpread(_objectSpread({}, form.getFieldsValue()), formValue), templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList);
     });
   };

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

@@ -294,7 +294,7 @@ export var onBlurSkxOutboundNoticeNo = /*#__PURE__*/function () {
                     });
                     form.setFieldsValue(_objectSpread(_objectSpread({}, values || {}), {}, {
                       m3ap1EvEyd: tradeId,
-                      '78CADF2951': value
+                      '78CADF2951': value.toUpperCase()
                     }));
                     return _context5.abrupt("return", res.data);
                   case 11:

package/dist/esm/common/utils/tools.d.ts

@@ -132,5 +132,5 @@ export declare const getHashParams: (key?: string) => {};
 /**
  * 修改部分组件小写改成大写
  */
-export declare const updateComponentToUpperCase: ({ componentDtoList, allValues, form, }: any) => void;
+export declare const updateComponentToUpperCase: ({ componentDtoList, allValues, uniqueKey, form, }: any) => void;
 export {};

package/dist/esm/common/utils/tools.js

@@ -1716,36 +1716,65 @@ export var updateComponentToUpperCase = function updateComponentToUpperCase(_ref
     componentDtoList = _ref17$componentDtoLi === void 0 ? [] : _ref17$componentDtoLi,
     _ref17$allValues = _ref17.allValues,
     allValues = _ref17$allValues === void 0 ? {} : _ref17$allValues,
+    uniqueKey = _ref17.uniqueKey,
     form = _ref17.form;
-  console.log('修改部分组件小写改成大写');
-  var value = cloneDeep(allValues);
   //固定组件自动转换
   var FIXED_COMPONENTS = ['SKX_OUTBOUND_NOTICE_NO', 'SKX_LOGISTICS', 'SKX_RETURN_BILL_NO', 'SKX_RETURN_LOGISTICS'];
   var updateComponent = componentDtoList.filter(function (item) {
     var _item$componentConfig;
     return FIXED_COMPONENTS.includes(item.workOrderComponentType) || ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.toUpperCase);
   });
+  //是否有转换组件
   if (updateComponent.length) {
-    updateComponent.forEach(function (item) {
-      if (value[item.uniqueKey]) {
-        if (['EXPRESS_LOGISTICS_SELECT', 'RETURN_LOGISTICS_SELECT'].includes(item.workOrderComponentType)) {
-          var _value$item$uniqueKey, _value$item$uniqueKey2;
-          value[item.uniqueKey] = _objectSpread(_objectSpread({}, value[item.uniqueKey]), {}, {
-            order: (_value$item$uniqueKey = value[item.uniqueKey]) === null || _value$item$uniqueKey === void 0 ? void 0 : (_value$item$uniqueKey2 = _value$item$uniqueKey.order) === null || _value$item$uniqueKey2 === void 0 ? void 0 : _value$item$uniqueKey2.toUpperCase()
-          });
-        } else if (['SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType)) {
-          value[item.uniqueKey] = cloneDeep(value[item.uniqueKey]).map(function (t) {
-            var _t$logisticsCode;
-            return _objectSpread(_objectSpread({}, t), {}, {
-              logisticsCode: (_t$logisticsCode = t.logisticsCode) === null || _t$logisticsCode === void 0 ? void 0 : _t$logisticsCode.toUpperCase()
+    //只修改需要转换的值
+    var value = {};
+    //判断是否是值变化
+    if (uniqueKey) {
+      var changeComponent = componentDtoList.filter(function (item) {
+        return uniqueKey === item.uniqueKey;
+      });
+      changeComponent.forEach(function (item) {
+        if (allValues[item.uniqueKey]) {
+          if (['EXPRESS_LOGISTICS_SELECT', 'RETURN_LOGISTICS_SELECT'].includes(item.workOrderComponentType)) {
+            var _allValues$item$uniqu, _allValues$item$uniqu2;
+            value[item.uniqueKey] = _objectSpread(_objectSpread({}, allValues[item.uniqueKey]), {}, {
+              order: (_allValues$item$uniqu = allValues[item.uniqueKey]) === null || _allValues$item$uniqu === void 0 ? void 0 : (_allValues$item$uniqu2 = _allValues$item$uniqu.order) === null || _allValues$item$uniqu2 === void 0 ? void 0 : _allValues$item$uniqu2.toUpperCase()
             });
-          });
-        } else {
-          var _value$item$uniqueKey3;
-          value[item.uniqueKey] = (_value$item$uniqueKey3 = value[item.uniqueKey]) === null || _value$item$uniqueKey3 === void 0 ? void 0 : _value$item$uniqueKey3.toUpperCase();
+          } else if (['SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType)) {
+            value[item.uniqueKey] = cloneDeep(allValues[item.uniqueKey]).map(function (t) {
+              var _t$logisticsCode;
+              return _objectSpread(_objectSpread({}, t), {}, {
+                logisticsCode: (_t$logisticsCode = t.logisticsCode) === null || _t$logisticsCode === void 0 ? void 0 : _t$logisticsCode.toUpperCase()
+              });
+            });
+          } else {
+            var _allValues$item$uniqu3;
+            value[item.uniqueKey] = (_allValues$item$uniqu3 = allValues[item.uniqueKey]) === null || _allValues$item$uniqu3 === void 0 ? void 0 : _allValues$item$uniqu3.toUpperCase();
+          }
         }
-      }
-    });
+      });
+    } else {
+      updateComponent.forEach(function (item) {
+        if (allValues[item.uniqueKey]) {
+          if (['EXPRESS_LOGISTICS_SELECT', 'RETURN_LOGISTICS_SELECT'].includes(item.workOrderComponentType)) {
+            var _allValues$item$uniqu4, _allValues$item$uniqu5;
+            value[item.uniqueKey] = _objectSpread(_objectSpread({}, allValues[item.uniqueKey]), {}, {
+              order: (_allValues$item$uniqu4 = allValues[item.uniqueKey]) === null || _allValues$item$uniqu4 === void 0 ? void 0 : (_allValues$item$uniqu5 = _allValues$item$uniqu4.order) === null || _allValues$item$uniqu5 === void 0 ? void 0 : _allValues$item$uniqu5.toUpperCase()
+            });
+          } else if (['SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType)) {
+            value[item.uniqueKey] = cloneDeep(allValues[item.uniqueKey]).map(function (t) {
+              var _t$logisticsCode2;
+              return _objectSpread(_objectSpread({}, t), {}, {
+                logisticsCode: (_t$logisticsCode2 = t.logisticsCode) === null || _t$logisticsCode2 === void 0 ? void 0 : _t$logisticsCode2.toUpperCase()
+              });
+            });
+          } else {
+            var _allValues$item$uniqu6;
+            value[item.uniqueKey] = (_allValues$item$uniqu6 = allValues[item.uniqueKey]) === null || _allValues$item$uniqu6 === void 0 ? void 0 : _allValues$item$uniqu6.toUpperCase();
+          }
+        }
+      });
+    }
+    form.setFieldsValue(_objectSpread({}, value));
   }
-  form.setFieldsValue(_objectSpread({}, value));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.31-beta.55",
+  "version": "2.2.31-beta.57",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -34,7 +34,7 @@
     "@ant-design/icons": "^4.7.0",
     "@kmkf-fe-packages/basic-components": "2.2.31-beta.53",
     "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.53",
-    "@kmkf-fe-packages/services-components": "2.2.31-beta.54",
+    "@kmkf-fe-packages/services-components": "2.2.31-beta.57",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ccd0f698d73acc414eac47a7fba6edcf197899c6",
+  "gitHead": "a70cd51a0127966607a31d3572f1285ae8dc15a4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }