@kmkf-fe-packages/kmkf-work-order-service-component 0.24.2-beta.6 → 0.24.2-beta.8

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

@@ -31,7 +31,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
 INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
-import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, PlatData, getExpression, formatDisplayConfig, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -115,7 +115,6 @@ var FormRender = function FormRender(props, ref) {
   ExpressData.getInstance();
   ExpressInterceptData.getInstance();
   PlatData.getInstance();
-  LogisticsAddressData.getInstance();
   BsAddressData.getInstance();
   WdtAddressData.getInstance();
   var _Form$useForm = Form.useForm(),

package/dist/esm/FormRenderTemplateId/index.js

@@ -29,7 +29,7 @@ import 'moment/locale/zh-cn';
 import { calcWorkOrderList, submitDataTransOldFormat, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck } from "../model/servers/api";
 import { factory, ShopList } from '@kmkf-fe-packages/services-components';
-import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, formatDisplayConfig, getExpression, isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, PlatData, formatDisplayConfig, getExpression, isNull } from '@kmkf-fe-packages/kmkf-utils';
 import "./index.less";
 import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../common/constant";
 var ShopName = function ShopName(_ref) {
@@ -106,7 +106,7 @@ var FormRender = function FormRender(props, ref) {
   ExpressData.getInstance();
   ExpressInterceptData.getInstance();
   PlatData.getInstance();
-  LogisticsAddressData.getInstance();
+  // LogisticsAddressData.getInstance();
   useEffect(function () {
     setShopId(currentShopId);
   }, [currentShopId]);

package/dist/esm/WorkOrder/components/WorkOrderList/index.js

@@ -436,15 +436,15 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     dispatch(setFormModalVisible(true));
   };
   var onDealWorkOrderSuccess = function onDealWorkOrderSuccess(type) {
+    if (['submit', 'forward', 'close', 'rejected'].includes(type)) {
+      dispatch(setFormModalVisible(false));
+    }
     //除了 暂停和启动外，都需要更新列表数据
     if (!['stop', 'open'].includes(type)) {
       searchList();
     } else {
       queryPanelInfoHandle(record);
     }
-    if (['submit', 'forward', 'close', 'rejected'].includes(type)) {
-      dispatch(setFormModalVisible(false));
-    }
   };
   var onUpDateItem = function onUpDateItem(item, key, value) {
     var newList = data.list.map(function (t) {
@@ -505,7 +505,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     noMore: selfNoMore,
     height: height,
     onUpDateItem: onUpDateItem
-  })), /*#__PURE__*/React.createElement(Drawer, {
+  })), formRenderVisible && /*#__PURE__*/React.createElement(Drawer, {
     closeIcon: /*#__PURE__*/React.createElement(LeftOutlined, null),
     title: (record === null || record === void 0 ? void 0 : record.flowTemplateName) || title,
     width: '100%',

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

@@ -1152,8 +1152,9 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'FILE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_file")], [])));
       } else if (nex.workOrderComponentType === 'POSTING') {
-        var _nex$componentConfig;
-        var needTrans = ((_nex$componentConfig = nex.componentConfig) === null || _nex$componentConfig === void 0 ? void 0 : _nex$componentConfig.showField) !== 'wdt';
+        // PS: 旺店通收寄地址和其他的统一用code, 所以固定需要转，代码先保留
+        var needTrans = true;
+        // const needTrans = nex.componentConfig?.showField !== 'wdt'
         var address = [needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")], needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]];
         //兼容地址是只有省市的
         var interceptDistrict = needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")];
@@ -2424,7 +2425,8 @@ export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
               interceptReceiverName: undefined,
               interceptReceiverMobile: undefined,
               interceptStatus: undefined,
-              interceptOther: undefined
+              interceptOther: undefined,
+              interceptLogisticsSnapshot: undefined
             };
           });
         }

package/package.json

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