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

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

@@ -1045,7 +1045,8 @@ var FormRender = function FormRender(props, ref) {
             _context6.next = 24;
             return onBlurSkxOutboundNoticeNo({
               form: form,
-              value: value,
+              value: value === null || value === void 0 ? void 0 : value.toUpperCase(),
+              // 转大写特殊处理，其他转大写字段都走updateComponentToUpperCase，这个组件onchangValue被拦截了
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
@@ -1060,7 +1061,8 @@ var FormRender = function FormRender(props, ref) {
             _context6.next = 29;
             return onBlurSkxReturnBillNo({
               form: form,
-              value: value,
+              value: value === null || value === void 0 ? void 0 : value.toUpperCase(),
+              // 转大写特殊处理，其他转大写字段都走updateComponentToUpperCase，这个组件onchangValue被拦截了
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
@@ -1499,7 +1501,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 = {};
@@ -1521,6 +1523,7 @@ var FormRender = function FormRender(props, ref) {
       updateComponentToUpperCase({
         componentDtoList: templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList,
         allValues: allValues,
+        changedValues: changedValues,
         form: form
       });
       changeValuesCacheOrderInfo(_objectSpread(_objectSpread({}, form.getFieldsValue()), formValue), templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList);

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, changedValues, form, }: any) => void;
 export {};

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

@@ -1716,36 +1716,66 @@ export var updateComponentToUpperCase = function updateComponentToUpperCase(_ref
     componentDtoList = _ref17$componentDtoLi === void 0 ? [] : _ref17$componentDtoLi,
     _ref17$allValues = _ref17.allValues,
     allValues = _ref17$allValues === void 0 ? {} : _ref17$allValues,
+    _ref17$changedValues = _ref17.changedValues,
+    changedValues = _ref17$changedValues === void 0 ? {} : _ref17$changedValues,
     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 (changedValues) {
+      var changeComponent = componentDtoList.filter(function (item) {
+        return Object.keys(changedValues).includes(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.56",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ccd0f698d73acc414eac47a7fba6edcf197899c6",
+  "gitHead": "ee06d843a8a146c2aa3a327a288ea9a5cf7748a8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }