@kmkf-fe-packages/kmkf-work-order-service-component 0.26.1-beta.0 → 0.26.1-beta.2

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

@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
 import V from 'voca';
 import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
 import { cloneDeep, isEqual, set } from 'lodash';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
@@ -1298,7 +1298,7 @@ var transDataSource = function transDataSource(templateColumns) {
           interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
         }));
       } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [])));
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [{}])));
       } else if (nex.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           trajectoryCompany: item.jsonMap["".concat(nex.uniqueKey, "_trajectoryCompany")],
@@ -2406,21 +2406,45 @@ export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
           });
         }
       } else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
+        var expressInterceptData = ExpressInterceptData.getInstance().getExpressData();
         if (companyType === 'INPUT') {
+          var interceptCompany = expressInterceptData.find(function (item) {
+            return item.value === value;
+          });
+          var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
+            var _item$config;
+            return item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.isDefault;
+          });
           prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
-            interceptCompany: ExpressData.getInstance().getExpressCodeByName(value, false)
+            interceptCompany: ExpressData.getInstance().getExpressCodeByName(value, false),
+            interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value
           })];
         } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
+          var _interceptCompany = expressInterceptData.find(function (item) {
+            return item.value === value;
+          });
+          var _returnValue = ((_interceptCompany === null || _interceptCompany === void 0 ? void 0 : _interceptCompany.interceptionTypeList) || []).find(function (item) {
+            var _item$config2;
+            return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
+          });
           prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
             interceptCompany: value.company,
-            interceptCode: value.order
+            interceptCode: value.order,
+            interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value
           })];
         } else if (companyType === 'BS_LOGISTICS') {
           prv[next.uniqueKey] = value.map(function (item) {
+            var interceptCompany = expressInterceptData.find(function (t) {
+              return item.logisticsCompany === t.value;
+            });
+            var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (t) {
+              var _t$config;
+              return t === null || t === void 0 ? void 0 : (_t$config = t.config) === null || _t$config === void 0 ? void 0 : _t$config.isDefault;
+            });
             return {
               interceptCompany: item.logisticsCompany,
               interceptCode: item.logisticsCode,
-              interceptType: undefined,
+              interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
               interceptSenderMobile: undefined,
               interceptAddress: [],
               interceptDetail: undefined,

package/package.json

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