@kmkf-fe-packages/basic-components 2.2.44-beta.30 → 2.2.44-beta.32

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -25179,12 +25179,12 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
             var _filterJkyOrders;
             res.data.trades = (_filterJkyOrders = filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                goodsDetail: (item.goodsDetail || []).map(function (goodsItem) {
-                  return _objectSpread2({}, goodsItem);
-                }),
                 tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
-                tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus]
+                tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus],
+                logisticName: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticName'),
+                logisticCode: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticCode'),
+                logisticNo: getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticNo')
               });
             });
           }

package/dist/index.js

@@ -25194,12 +25194,12 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
             var _filterJkyOrders;
             res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                goodsDetail: (item.goodsDetail || []).map(function (goodsItem) {
-                  return _objectSpread2({}, goodsItem);
-                }),
                 tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
-                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
+                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus],
+                logisticName: kmkfUtils.getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticName'),
+                logisticCode: kmkfUtils.getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticCode'),
+                logisticNo: kmkfUtils.getJkyLogisticInfo(item === null || item === void 0 ? void 0 : item.packageDetail, 'logisticNo')
               });
             });
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.44-beta.30",
+  "version": "2.2.44-beta.32",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.30",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.32",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "03fafd04703ba41a459dcab586efa0fbb4e27af5"
+  "gitHead": "22fe8812740ec9104f16deed222a404065771081"
 }