@kmkf-fe-packages/basic-components 1.22.1-beta.63 → 1.22.1-beta.67

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, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, 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';
@@ -15476,128 +15476,11 @@ var kmUtils = {
 };
 
 var columnsMap = {
-  BS_SYSTEM_ORDER: [{
-    title: '单据类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '标签',
-    dataIndex: 'billTag',
-    width: 150
-  }, {
-    title: '主播名称',
-    dataIndex: 'authorName',
-    width: 150
-  }, {
-    title: '主播ID',
-    dataIndex: 'authorId',
-    width: 150
-  }
-  // {
-  //   title: '直播活动',
-  //   dataIndex: 'liveActivites',
-  //   width: 150,
-  // },
-  ],
-
+  BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
-  WLN_SYSTEM_ORDER: [{
-    title: '订单类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '标记',
-    dataIndex: 'billTag',
-    width: 150
-  }],
-  WDT_SYSTEM_ORDER: [{
-    title: '订单类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '订单标签',
-    dataIndex: 'billTag',
-    width: 150
-  }],
-  BS_E3_SYSTEM_ORDER: [{
-    title: '系统订单号',
-    dataIndex: 'orderSn',
-    width: 150,
-    ellipsis: true
-  }, {
-    title: '订单状态',
-    dataIndex: 'orderStatus',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_ORDER_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否被拆分',
-    dataIndex: 'isSplit',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否拆分子单',
-    dataIndex: 'isSplitNew',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否被合并',
-    dataIndex: 'isCombine',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否合并新单',
-    dataIndex: 'isCombineNew',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否复制单',
-    dataIndex: 'isCopy',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否换货单',
-    dataIndex: 'isExchangeOrder',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '订单备注',
-    dataIndex: 'orderMsg',
-    width: 150,
-    ellipsis: true
-  }],
+  WLN_SYSTEM_ORDER: WLN_SYSTEM_ORDER_CONFIG.columns,
+  WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
+  BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
   GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
@@ -15824,7 +15707,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,
@@ -17748,7 +17631,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),
@@ -17844,7 +17727,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

@@ -15488,128 +15488,11 @@ var kmUtils = {
 };
 
 var columnsMap = {
-  BS_SYSTEM_ORDER: [{
-    title: '单据类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '标签',
-    dataIndex: 'billTag',
-    width: 150
-  }, {
-    title: '主播名称',
-    dataIndex: 'authorName',
-    width: 150
-  }, {
-    title: '主播ID',
-    dataIndex: 'authorId',
-    width: 150
-  }
-  // {
-  //   title: '直播活动',
-  //   dataIndex: 'liveActivites',
-  //   width: 150,
-  // },
-  ],
-
+  BS_SYSTEM_ORDER: kmkfUtils.BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
-  WLN_SYSTEM_ORDER: [{
-    title: '订单类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '标记',
-    dataIndex: 'billTag',
-    width: 150
-  }],
-  WDT_SYSTEM_ORDER: [{
-    title: '订单类型',
-    dataIndex: 'billType',
-    width: 150
-  }, {
-    title: '系统订单号',
-    dataIndex: 'billNo',
-    width: 150
-  }, {
-    title: '订单标签',
-    dataIndex: 'billTag',
-    width: 150
-  }],
-  BS_E3_SYSTEM_ORDER: [{
-    title: '系统订单号',
-    dataIndex: 'orderSn',
-    width: 150,
-    ellipsis: true
-  }, {
-    title: '订单状态',
-    dataIndex: 'orderStatus',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_ORDER_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否被拆分',
-    dataIndex: 'isSplit',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否拆分子单',
-    dataIndex: 'isSplitNew',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否被合并',
-    dataIndex: 'isCombine',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否合并新单',
-    dataIndex: 'isCombineNew',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否复制单',
-    dataIndex: 'isCopy',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '是否换货单',
-    dataIndex: 'isExchangeOrder',
-    width: 100,
-    ellipsis: true,
-    render: function render(val) {
-      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-    }
-  }, {
-    title: '订单备注',
-    dataIndex: 'orderMsg',
-    width: 150,
-    ellipsis: true
-  }],
+  WLN_SYSTEM_ORDER: kmkfUtils.WLN_SYSTEM_ORDER_CONFIG.columns,
+  WDT_SYSTEM_ORDER: kmkfUtils.WDT_SYSTEM_ORDER_CONFIG.columns,
+  BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
@@ -15836,7 +15719,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,
@@ -17760,7 +17643,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),
@@ -17856,7 +17739,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.63",
+  "version": "1.22.1-beta.67",
   "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.63",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.67",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4c783993a72f38c9257aca814a872b144abce3a"
+  "gitHead": "e3deb6bd08addd3f8b1d2a5bd1e73814fb720b9f"
 }