@kmkf-fe-packages/basic-components 1.22.1-beta.64 → 1.22.1-beta.69

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } 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, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterKmOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterKmOrders, 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, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -8127,11 +8127,6 @@ function ApaasAddress(props) {
     };
     var addressData = type === 'bs' ? BsAddressData.getInstance() : AddressData.getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      // params.address = [
-      //   addressData.getProCodeByName(val?.province),
-      //   addressData.getProCodeByName(val?.city),
-      //   addressData.getProCodeByName(val?.district),
-      // ];
       params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
@@ -15707,7 +15702,7 @@ var index$1 = (function (props) {
           case 0:
             gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
               var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return (item.platformCode || '').split(',').includes(orderNo);
+                return getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
@@ -17631,7 +17626,7 @@ var GyReissue = function GyReissue(props) {
     other = _objectWithoutProperties(props, _excluded$l);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
     var _order$platformCode;
-    return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(',');
+    return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(';');
   });
   var getOrderFlag = useRef(false);
   var _useState = useState(false),
@@ -17727,7 +17722,7 @@ var GyReissue = function GyReissue(props) {
     var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? updateGyGoodsHandle([order]) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
-      return !orderNo || goodItem.platformCode === orderNo;
+      return !orderNo || (orderNo || '').includes(goodItem.oid);
     }) : goodDetails;
   };
   var changeGoodHandle = function changeGoodHandle(val) {

package/dist/index.js

@@ -8139,11 +8139,6 @@ function ApaasAddress(props) {
     };
     var addressData = type === 'bs' ? kmkfUtils.BsAddressData.getInstance() : kmkfUtils.AddressData.getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      // params.address = [
-      //   addressData.getProCodeByName(val?.province),
-      //   addressData.getProCodeByName(val?.city),
-      //   addressData.getProCodeByName(val?.district),
-      // ];
       params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
@@ -15719,7 +15714,7 @@ var index$1 = (function (props) {
           case 0:
             gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
               var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return (item.platformCode || '').split(',').includes(orderNo);
+                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
@@ -17643,7 +17638,7 @@ var GyReissue = function GyReissue(props) {
     other = _objectWithoutProperties(props, _excluded$l);
   var showModeBtn = ((value === null || value === void 0 ? void 0 : (_value$gySystemOrder = value.gySystemOrder) === null || _value$gySystemOrder === void 0 ? void 0 : _value$gySystemOrder.orders) || []).some(function (order) {
     var _order$platformCode;
-    return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(',');
+    return order === null || order === void 0 ? void 0 : (_order$platformCode = order.platformCode) === null || _order$platformCode === void 0 ? void 0 : _order$platformCode.includes(';');
   });
   var getOrderFlag = React.useRef(false);
   var _useState = React.useState(false),
@@ -17739,7 +17734,7 @@ var GyReissue = function GyReissue(props) {
     var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? kmkfUtils.updateGyGoodsHandle([order]) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
-      return !orderNo || goodItem.platformCode === orderNo;
+      return !orderNo || (orderNo || '').includes(goodItem.oid);
     }) : goodDetails;
   };
   var changeGoodHandle = function changeGoodHandle(val) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.64",
+  "version": "1.22.1-beta.69",
   "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": "1.22.1-beta.64",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.69",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "20bdc2ce7a3e649c528f994109d8241230b10e83"
+  "gitHead": "333ee887aa703e7cb48f448b1d3a943140c1777f"
 }