@kmkf-fe-packages/kmkf-work-order-service-component 2.0.46 → 2.0.47

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

@@ -162,7 +162,7 @@ var FormRender = function FormRender(props, ref) {
       });
       var transData = calcWorkOrderList([record], preNodeComponentDtoList);
       preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
-      fillByShopId(get(transData, '0', {}).shopId);
+      record.preCreateAndNotModified && fillByShopId(get(transData, '0', {}).shopId);
     }
   }, [record]);
   // 过滤打款组件订单与支付宝账号重复校验结果
@@ -396,6 +396,7 @@ var FormRender = function FormRender(props, ref) {
       var transData = calcWorkOrderList([newRecord], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), newRecord.preCreateAndNotModified ? 'init' : 'edit' // TODO: 修复非首节点录入时丢失初始值问题
       );
       // console.log(newRecord.jsonMap, newFormValues, transData);
+
       form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
         shopId: shopId,
         shopName: newRecord.shopName,
@@ -427,6 +428,7 @@ var FormRender = function FormRender(props, ref) {
         fetchRemark(shopId, currentNodeTid);
       }
     } else {
+      fillByShopId(shopId);
       var initFormValues = null;
       if (plat !== null && plat !== void 0 && plat.subOrderNo) {
         var _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
@@ -530,6 +532,7 @@ var FormRender = function FormRender(props, ref) {
   // 商品组件映射
   var fillByShopId = function fillByShopId(shopId) {
     // PS: 增加setTimeout 为了让后续的items渲染，然后触发对应的映射
+    console.log('fillByShopId', shopId);
     setTimeout(function () {
       var shopUniqueKey = shopId ? shopIdToUniqueKeyMap[shopId] : '';
       shopUniqueKey && fillByMapping('SHOP_SELECT_MAPPING', shopUniqueKey);
@@ -586,9 +589,11 @@ var FormRender = function FormRender(props, ref) {
       }
     }
   };
-  useEffect(function () {
-    fillByShopId(shopId);
-  }, [shopId]);
+
+  // useEffect(() => {
+  //   console.log('店铺变化');
+  //   fillByShopId(shopId);
+  // }, [shopId]);
 
   // 查询标签
   var queryLabels = /*#__PURE__*/function () {
@@ -705,6 +710,7 @@ var FormRender = function FormRender(props, ref) {
         setIsOrderBackShopId(true);
         setTimeout(function () {
           setShopId(id);
+          fillByShopId(id);
         }, 0);
       }
     });
@@ -817,6 +823,7 @@ var FormRender = function FormRender(props, ref) {
   // 切换店铺
   var handleChangeShopId = function handleChangeShopId(val) {
     setShopId(val);
+    fillByShopId(val || '');
     setIsOrderBackShopId(true);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
@@ -916,6 +923,7 @@ var FormRender = function FormRender(props, ref) {
             setIsOrderBackShopId(true);
             setTimeout(function () {
               setShopId(id);
+              fillByShopId(id);
             }, 0);
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.46",
+  "version": "2.0.47",
   "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.0.46",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.46",
-    "@kmkf-fe-packages/services-components": "2.0.46",
+    "@kmkf-fe-packages/basic-components": "2.0.47",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.47",
+    "@kmkf-fe-packages/services-components": "2.0.47",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5d0f5367848cbd3220631cb3590baa34ff497297",
+  "gitHead": "a680d7d4952b6e9ac0d19f567b827244f8e6b9fd",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }