@kmkf-fe-packages/basic-components 2.6.1-beta.5 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- 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, PLATFORM_AFTER_SALES_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, 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';
6
+ 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, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, 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';
7
7
  import every from 'lodash/every';
8
8
  import maxBy from 'lodash/maxBy';
9
9
  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';
@@ -9033,12 +9033,6 @@ var processBsReturnGoods = function processBsReturnGoods(getValue) {
9033
9033
  var processErpSystemOrder = function processErpSystemOrder(getValue) {
9034
9034
  return function (nex, config) {
9035
9035
  var systemOrderMap = {
9036
- PLATFORM_AFTER_SALES_ORDER: {
9037
- no: 'platformAfaterSalesOrderNo',
9038
- ids: 'platformAfaterSalesSelectIds',
9039
- order: 'platformAfaterSalesShowOrder',
9040
- shopId: 'platformAfaterSalesShopId'
9041
- },
9042
9036
  BS_SYSTEM_ORDER: {
9043
9037
  no: 'bsSystemOrderNo',
9044
9038
  ids: 'bsSystemSelectIds',
@@ -9085,14 +9079,12 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9085
9079
  order: 'wdtReturnBillShowOrder'
9086
9080
  }
9087
9081
  };
9088
- return _defineProperty({}, nex.uniqueKey, _objectSpread2({
9082
+ return _defineProperty({}, nex.uniqueKey, {
9089
9083
  orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
9090
9084
  orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
9091
9085
  selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
9092
9086
  showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
9093
- }, systemOrderMap[nex.workOrderComponentType].shopId ? {
9094
- shopId: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].shopId))
9095
- } : {}));
9087
+ });
9096
9088
  };
9097
9089
  };
9098
9090
  var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
@@ -9140,10 +9132,6 @@ var processErpTradeId = function processErpTradeId(getValue) {
9140
9132
  EXCHANGE_TRADE_ID: {
9141
9133
  key: 'tradeItemList',
9142
9134
  defaultValue: []
9143
- },
9144
- SWAP_OUT_TRADE_ID: {
9145
- key: 'tradeItemList',
9146
- defaultValue: []
9147
9135
  }
9148
9136
  };
9149
9137
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9496,7 +9484,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9496
9484
  BS_RETURN_GOODS: processBsReturnGoods,
9497
9485
  WDT_RETURN_GOODS: processWdtReturnGoods(),
9498
9486
  JST_RETURN_GOODS: processJstReturnGoods(templateColumns),
9499
- PLATFORM_AFTER_SALES_ORDER: processErpSystemOrder,
9500
9487
  BS_SYSTEM_ORDER: processErpSystemOrder,
9501
9488
  KM_SYSTEM_ORDER: processErpSystemOrder,
9502
9489
  WLN_SYSTEM_ORDER: processErpSystemOrder,
@@ -9512,7 +9499,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9512
9499
  RETURN_GOODS_TRADE_ID: processErpTradeId,
9513
9500
  BS_DELIVERY_NO: processErpTradeId,
9514
9501
  REISSUE_TRADE_ID: processErpTradeId,
9515
- SWAP_OUT_TRADE_ID: processErpTradeId,
9516
9502
  ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
9517
9503
  EXCHANGE_TRADE_ID: processErpTradeId,
9518
9504
  WLN_GOODS: processWlnGoods(templateColumns),
@@ -11643,7 +11629,7 @@ var GoodsModal = function GoodsModal(props) {
11643
11629
  key: item.value
11644
11630
  }, item.label);
11645
11631
  })), /*#__PURE__*/React.createElement(Search, {
11646
- placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
11632
+ placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接,标题' : '商品ID' : '宝贝标题',
11647
11633
  // enterButton="搜索"
11648
11634
  className: "search",
11649
11635
  value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -16153,33 +16139,30 @@ var GoodList = function GoodList(props, ref) {
16153
16139
  selectedRowKeys: selectIds,
16154
16140
  fixed: true,
16155
16141
  onSelect: function onSelect(record, selected) {
16156
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16157
16142
  if (selected) {
16158
- setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
16143
+ setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
16159
16144
  setSelect([].concat(_toConsumableArray(selectList), [record]));
16160
16145
  } else {
16161
16146
  setSelectIds(selectIds.filter(function (t) {
16162
- return t !== uniqueKey;
16147
+ return t !== record.specNo;
16163
16148
  }));
16164
16149
  setSelect(selectList.filter(function (t) {
16165
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16150
+ return t.specNo !== record.specNo;
16166
16151
  }));
16167
16152
  }
16168
16153
  },
16169
16154
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
16170
16155
  if (selected) {
16171
- var changeKeys = changeRows.map(function (t) {
16172
- return "".concat(t.goodNo, "-").concat(t.specNo);
16173
- });
16174
- setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
16156
+ setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
16157
+ return t.specNo;
16158
+ }))));
16175
16159
  setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
16176
16160
  } else {
16177
- var _changeKeys = changeRows.map(function (t) {
16178
- return "".concat(t.goodNo, "-").concat(t.specNo);
16179
- });
16180
- setSelectIds(difference(selectIds, _changeKeys));
16161
+ setSelectIds(difference(selectIds, changeRows.map(function (t) {
16162
+ return t.specNo;
16163
+ })));
16181
16164
  var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
16182
- return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
16165
+ return arrVal.specNo !== othVal.specNo;
16183
16166
  });
16184
16167
  setSelect(list);
16185
16168
  }
@@ -16187,12 +16170,11 @@ var GoodList = function GoodList(props, ref) {
16187
16170
  };
16188
16171
  var showTable = function showTable() {
16189
16172
  var handleDelete = function handleDelete(record) {
16190
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16191
16173
  setSelectIds(selectIds.filter(function (t) {
16192
- return t !== uniqueKey;
16174
+ return t !== record.specNo;
16193
16175
  }));
16194
16176
  setSelect(selectList.filter(function (t) {
16195
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16177
+ return t.specNo !== record.specNo;
16196
16178
  }));
16197
16179
  };
16198
16180
  var showColumns = [{
@@ -16216,9 +16198,7 @@ var GoodList = function GoodList(props, ref) {
16216
16198
  }
16217
16199
  }, /*#__PURE__*/React.createElement(Table, {
16218
16200
  columns: showColumns,
16219
- rowKey: function rowKey(record) {
16220
- return "".concat(record.goodNo, "-").concat(record.specNo);
16221
- },
16201
+ rowKey: 'specNo',
16222
16202
  dataSource: selectList,
16223
16203
  scroll: {
16224
16204
  x: '100%',
@@ -16248,9 +16228,7 @@ var GoodList = function GoodList(props, ref) {
16248
16228
  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
16249
16229
  className: "GoodModalColumns",
16250
16230
  rowSelection: rowSelection,
16251
- rowKey: function rowKey(record) {
16252
- return "".concat(record.goodNo, "-").concat(record.specNo);
16253
- },
16231
+ rowKey: "specNo",
16254
16232
  columns: columns,
16255
16233
  scroll: {
16256
16234
  x: '100%',
@@ -16359,6 +16337,10 @@ var searchFormData = [{
16359
16337
  label: '款式编码',
16360
16338
  name: 'styleCode',
16361
16339
  type: 'optionalInput'
16340
+ }, {
16341
+ label: '规格值',
16342
+ name: 'propertiesValue',
16343
+ type: 'optionalInput'
16362
16344
  }, {
16363
16345
  label: '商品类型',
16364
16346
  name: 'skuType',
@@ -25825,45 +25807,12 @@ var jkyUtils = {
25825
25807
  };
25826
25808
 
25827
25809
  var singletonMap$8 = new Map();
25828
- var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
25829
- var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
25830
- if (!singletonMap$8.has(cacheKey)) {
25831
- var p = new Promise(function (resolve, reject) {
25832
- var doReject = function doReject(err) {
25833
- // 清空掉错误的请求记录
25834
- singletonMap$8.delete(cacheKey);
25835
- reject(err);
25836
- };
25837
- extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
25838
- method: 'post',
25839
- data: params
25840
- }).then(function (res) {
25841
- if (res === null || res === void 0 ? void 0 : res.success) {
25842
- resolve(res.data || []);
25843
- // 延迟10秒清除,保证订单的时效性
25844
- setTimeout(function () {
25845
- singletonMap$8.delete(cacheKey);
25846
- }, 1000 * 10);
25847
- } else {
25848
- doReject(res);
25849
- }
25850
- }).catch(doReject);
25851
- });
25852
- singletonMap$8.set(cacheKey, p);
25853
- }
25854
- return singletonMap$8.get(cacheKey);
25855
- };
25856
- var platformUtils = {
25857
- getAfterSalesOrderList: getAfterSalesOrderList
25858
- };
25859
-
25860
- var singletonMap$9 = new Map();
25861
25810
  var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
25862
- if (!singletonMap$9.has(orderNo)) {
25811
+ if (!singletonMap$8.has(orderNo)) {
25863
25812
  var p = new Promise(function (resolve, reject) {
25864
25813
  var doReject = function doReject(err) {
25865
25814
  // 清空掉错误的请求记录
25866
- singletonMap$9.delete(orderNo);
25815
+ singletonMap$8.delete(orderNo);
25867
25816
  reject(err);
25868
25817
  };
25869
25818
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -25889,16 +25838,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
25889
25838
  }
25890
25839
  // 延迟10秒清除,保证订单的时效性
25891
25840
  setTimeout(function () {
25892
- singletonMap$9.delete(orderNo);
25841
+ singletonMap$8.delete(orderNo);
25893
25842
  }, 1000 * 10);
25894
25843
  } else {
25895
25844
  doReject(data);
25896
25845
  }
25897
25846
  }).catch(doReject);
25898
25847
  });
25899
- singletonMap$9.set(orderNo, p);
25848
+ singletonMap$8.set(orderNo, p);
25900
25849
  }
25901
- return singletonMap$9.get(orderNo);
25850
+ return singletonMap$8.get(orderNo);
25902
25851
  };
25903
25852
  var kmUtils = {
25904
25853
  getOrderListSingleton: getOrderListSingleton$2
@@ -25916,8 +25865,7 @@ var columnsMap = {
25916
25865
  JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
25917
25866
  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
25918
25867
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
25919
- WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
25920
- PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
25868
+ WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
25921
25869
  };
25922
25870
  var rowKeyMap = {
25923
25871
  BS_SYSTEM_ORDER: 'billNo',
@@ -25929,10 +25877,8 @@ var rowKeyMap = {
25929
25877
  JST_SYSTEM_ORDER: 'oId',
25930
25878
  JY_SYSTEM_ORDER: 'tradeNo',
25931
25879
  JKY_SYSTEM_ORDER: 'tradeNo',
25932
- WDT_RETURN_BILL_NO: 'refundNo',
25933
- PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
25880
+ WDT_RETURN_BILL_NO: 'refundNo'
25934
25881
  };
25935
- var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
25936
25882
  var index$2 = (function (props) {
25937
25883
  var value = props.value,
25938
25884
  _onChange = props.onChange,
@@ -25942,7 +25888,6 @@ var index$2 = (function (props) {
25942
25888
  showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
25943
25889
  var onceRef = useRef(false);
25944
25890
  var valueRef = useRef(null);
25945
- var isRadio = RADIO_TABLE_KEYS.includes(type);
25946
25891
  // 字段筛选状态 - 用户选择要筛选的字段(单选)
25947
25892
  var _useState = useState(''),
25948
25893
  _useState2 = _slicedToArray(_useState, 2),
@@ -25994,8 +25939,6 @@ var index$2 = (function (props) {
25994
25939
  getJyOrderList(value.orderNo);
25995
25940
  } else if (type === 'JKY_SYSTEM_ORDER') {
25996
25941
  getJkyOrderList(value.orderNo);
25997
- } else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
25998
- value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
25999
25942
  }
26000
25943
  }
26001
25944
  }, [value, type]);
@@ -26370,71 +26313,10 @@ var index$2 = (function (props) {
26370
26313
  return _ref12.apply(this, arguments);
26371
26314
  };
26372
26315
  }();
26373
- var getPlatformAfterSalesOrderList = /*#__PURE__*/function () {
26374
- var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderNo, shopId) {
26375
- return _regeneratorRuntime().wrap(function _callee10$(_context10) {
26376
- while (1) switch (_context10.prev = _context10.next) {
26377
- case 0:
26378
- platformUtils.getAfterSalesOrderList({
26379
- orderNo: orderNo,
26380
- shopId: shopId
26381
- }).then(function (data) {
26382
- _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
26383
- orders: data || [],
26384
- showOrderInfo: data || []
26385
- }));
26386
- });
26387
- onceRef.current = false;
26388
- case 2:
26389
- case "end":
26390
- return _context10.stop();
26391
- }
26392
- }, _callee10);
26393
- }));
26394
- return function getPlatformAfterSalesOrderList(_x10, _x11) {
26395
- return _ref13.apply(this, arguments);
26396
- };
26397
- }();
26398
- var rowKey = rowKeyMap[type] || 'billNo';
26399
- var handleRadioChange = function handleRadioChange(record) {
26400
- var _value$selectIds;
26401
- if (disabled) return;
26402
- var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
26403
- var rowKeyVal = String(record[rowKey]);
26404
- if (currentKey && currentKey === rowKeyVal) {
26405
- _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26406
- selectIds: [],
26407
- selectedRows: []
26408
- }));
26409
- } else {
26410
- _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26411
- selectIds: [rowKeyVal],
26412
- selectedRows: [record]
26413
- }));
26414
- }
26415
- };
26416
- var radioColumn = isRadio ? {
26417
- width: 50,
26418
- fixed: true,
26419
- render: function render(_, record) {
26420
- var _value$selectIds2;
26421
- var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
26422
- return /*#__PURE__*/React.createElement(Radio, {
26423
- checked: checked,
26424
- onClick: function onClick(e) {
26425
- e.preventDefault();
26426
- handleRadioChange(record);
26427
- },
26428
- disabled: disabled
26429
- });
26430
- }
26431
- } : null;
26432
- var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
26433
- var rowSelection = isRadio ? undefined : {
26434
- type: 'checkbox',
26316
+ var rowSelection = {
26435
26317
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
26436
26318
  fixed: true,
26437
- onChange: function onChange(selectedRowKeys, selectedRows) {
26319
+ onChange: function onChange(selectedRowKeys, selectedRows, info) {
26438
26320
  _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26439
26321
  selectIds: selectedRowKeys,
26440
26322
  selectedRows: selectedRows
@@ -26480,9 +26362,9 @@ var index$2 = (function (props) {
26480
26362
  allowClear: true
26481
26363
  })), /*#__PURE__*/React.createElement(Table, {
26482
26364
  dataSource: filteredData,
26483
- columns: displayColumns,
26365
+ columns: columns,
26484
26366
  rowSelection: rowSelection,
26485
- rowKey: rowKey,
26367
+ rowKey: rowKeyMap[type] || 'billNo',
26486
26368
  size: "small",
26487
26369
  pagination: false,
26488
26370
  scroll: {
@@ -26869,16 +26751,16 @@ var orderSubFormConstants = {
26869
26751
  };
26870
26752
 
26871
26753
  var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
26872
- var singletonMap$a = new Map();
26754
+ var singletonMap$9 = new Map();
26873
26755
  var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
26874
26756
  var orderNo = parmas.orderNo,
26875
26757
  shopId = parmas.shopId;
26876
26758
  var key = "".concat(orderNo, "-").concat(shopId);
26877
- if (!singletonMap$a.has(key)) {
26759
+ if (!singletonMap$9.has(key)) {
26878
26760
  var p = new Promise(function (resolve, reject) {
26879
26761
  var doReject = function doReject(err) {
26880
26762
  // 清空掉错误的请求记录
26881
- singletonMap$a.delete(key);
26763
+ singletonMap$9.delete(key);
26882
26764
  reject(err);
26883
26765
  };
26884
26766
  extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -26894,16 +26776,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
26894
26776
  }
26895
26777
  // 延迟10秒清除,保证订单的时效性
26896
26778
  setTimeout(function () {
26897
- singletonMap$a.delete(key);
26779
+ singletonMap$9.delete(key);
26898
26780
  }, 1000 * 10);
26899
26781
  } else {
26900
26782
  doReject(data);
26901
26783
  }
26902
26784
  }).catch(doReject);
26903
26785
  });
26904
- singletonMap$a.set(key, p);
26786
+ singletonMap$9.set(key, p);
26905
26787
  }
26906
- return singletonMap$a.get(key);
26788
+ return singletonMap$9.get(key);
26907
26789
  };
26908
26790
  var renderEditItem = function renderEditItem(_ref) {
26909
26791
  var item = _ref.item,
@@ -29599,7 +29481,7 @@ var GoodsModal$5 = function GoodsModal(props) {
29599
29481
  key: item.value
29600
29482
  }, item.label);
29601
29483
  })), /*#__PURE__*/React.createElement(Search$1, {
29602
- placeholder: "\u5B9D\u8D1D\u6807\u9898",
29484
+ placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
29603
29485
  allowClear: true,
29604
29486
  enterButton: "\u641C\u7D22",
29605
29487
  style: {
@@ -31532,8 +31414,5 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
31532
31414
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
31533
31415
  WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
31534
31416
  };
31535
- var FIELD_COLUMNS_MAP = {
31536
- PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
31537
- };
31538
31417
 
31539
- export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
31418
+ export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
package/dist/index.js CHANGED
@@ -9048,12 +9048,6 @@ var processBsReturnGoods = function processBsReturnGoods(getValue) {
9048
9048
  var processErpSystemOrder = function processErpSystemOrder(getValue) {
9049
9049
  return function (nex, config) {
9050
9050
  var systemOrderMap = {
9051
- PLATFORM_AFTER_SALES_ORDER: {
9052
- no: 'platformAfaterSalesOrderNo',
9053
- ids: 'platformAfaterSalesSelectIds',
9054
- order: 'platformAfaterSalesShowOrder',
9055
- shopId: 'platformAfaterSalesShopId'
9056
- },
9057
9051
  BS_SYSTEM_ORDER: {
9058
9052
  no: 'bsSystemOrderNo',
9059
9053
  ids: 'bsSystemSelectIds',
@@ -9100,14 +9094,12 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9100
9094
  order: 'wdtReturnBillShowOrder'
9101
9095
  }
9102
9096
  };
9103
- return _defineProperty({}, nex.uniqueKey, _objectSpread2({
9097
+ return _defineProperty({}, nex.uniqueKey, {
9104
9098
  orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
9105
9099
  orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
9106
9100
  selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
9107
9101
  showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
9108
- }, systemOrderMap[nex.workOrderComponentType].shopId ? {
9109
- shopId: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].shopId))
9110
- } : {}));
9102
+ });
9111
9103
  };
9112
9104
  };
9113
9105
  var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
@@ -9155,10 +9147,6 @@ var processErpTradeId = function processErpTradeId(getValue) {
9155
9147
  EXCHANGE_TRADE_ID: {
9156
9148
  key: 'tradeItemList',
9157
9149
  defaultValue: []
9158
- },
9159
- SWAP_OUT_TRADE_ID: {
9160
- key: 'tradeItemList',
9161
- defaultValue: []
9162
9150
  }
9163
9151
  };
9164
9152
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9511,7 +9499,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9511
9499
  BS_RETURN_GOODS: processBsReturnGoods,
9512
9500
  WDT_RETURN_GOODS: processWdtReturnGoods(),
9513
9501
  JST_RETURN_GOODS: processJstReturnGoods(templateColumns),
9514
- PLATFORM_AFTER_SALES_ORDER: processErpSystemOrder,
9515
9502
  BS_SYSTEM_ORDER: processErpSystemOrder,
9516
9503
  KM_SYSTEM_ORDER: processErpSystemOrder,
9517
9504
  WLN_SYSTEM_ORDER: processErpSystemOrder,
@@ -9527,7 +9514,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9527
9514
  RETURN_GOODS_TRADE_ID: processErpTradeId,
9528
9515
  BS_DELIVERY_NO: processErpTradeId,
9529
9516
  REISSUE_TRADE_ID: processErpTradeId,
9530
- SWAP_OUT_TRADE_ID: processErpTradeId,
9531
9517
  ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
9532
9518
  EXCHANGE_TRADE_ID: processErpTradeId,
9533
9519
  WLN_GOODS: processWlnGoods(templateColumns),
@@ -11658,7 +11644,7 @@ var GoodsModal = function GoodsModal(props) {
11658
11644
  key: item.value
11659
11645
  }, item.label);
11660
11646
  })), /*#__PURE__*/React__default['default'].createElement(Search, {
11661
- placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
11647
+ placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接,标题' : '商品ID' : '宝贝标题',
11662
11648
  // enterButton="搜索"
11663
11649
  className: "search",
11664
11650
  value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -16168,33 +16154,30 @@ var GoodList = function GoodList(props, ref) {
16168
16154
  selectedRowKeys: selectIds,
16169
16155
  fixed: true,
16170
16156
  onSelect: function onSelect(record, selected) {
16171
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16172
16157
  if (selected) {
16173
- setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
16158
+ setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
16174
16159
  setSelect([].concat(_toConsumableArray(selectList), [record]));
16175
16160
  } else {
16176
16161
  setSelectIds(selectIds.filter(function (t) {
16177
- return t !== uniqueKey;
16162
+ return t !== record.specNo;
16178
16163
  }));
16179
16164
  setSelect(selectList.filter(function (t) {
16180
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16165
+ return t.specNo !== record.specNo;
16181
16166
  }));
16182
16167
  }
16183
16168
  },
16184
16169
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
16185
16170
  if (selected) {
16186
- var changeKeys = changeRows.map(function (t) {
16187
- return "".concat(t.goodNo, "-").concat(t.specNo);
16188
- });
16189
- setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
16171
+ setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
16172
+ return t.specNo;
16173
+ }))));
16190
16174
  setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
16191
16175
  } else {
16192
- var _changeKeys = changeRows.map(function (t) {
16193
- return "".concat(t.goodNo, "-").concat(t.specNo);
16194
- });
16195
- setSelectIds(lodash.difference(selectIds, _changeKeys));
16176
+ setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
16177
+ return t.specNo;
16178
+ })));
16196
16179
  var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
16197
- return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
16180
+ return arrVal.specNo !== othVal.specNo;
16198
16181
  });
16199
16182
  setSelect(list);
16200
16183
  }
@@ -16202,12 +16185,11 @@ var GoodList = function GoodList(props, ref) {
16202
16185
  };
16203
16186
  var showTable = function showTable() {
16204
16187
  var handleDelete = function handleDelete(record) {
16205
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16206
16188
  setSelectIds(selectIds.filter(function (t) {
16207
- return t !== uniqueKey;
16189
+ return t !== record.specNo;
16208
16190
  }));
16209
16191
  setSelect(selectList.filter(function (t) {
16210
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16192
+ return t.specNo !== record.specNo;
16211
16193
  }));
16212
16194
  };
16213
16195
  var showColumns = [{
@@ -16231,9 +16213,7 @@ var GoodList = function GoodList(props, ref) {
16231
16213
  }
16232
16214
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
16233
16215
  columns: showColumns,
16234
- rowKey: function rowKey(record) {
16235
- return "".concat(record.goodNo, "-").concat(record.specNo);
16236
- },
16216
+ rowKey: 'specNo',
16237
16217
  dataSource: selectList,
16238
16218
  scroll: {
16239
16219
  x: '100%',
@@ -16263,9 +16243,7 @@ var GoodList = function GoodList(props, ref) {
16263
16243
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
16264
16244
  className: "GoodModalColumns",
16265
16245
  rowSelection: rowSelection,
16266
- rowKey: function rowKey(record) {
16267
- return "".concat(record.goodNo, "-").concat(record.specNo);
16268
- },
16246
+ rowKey: "specNo",
16269
16247
  columns: columns,
16270
16248
  scroll: {
16271
16249
  x: '100%',
@@ -16374,6 +16352,10 @@ var searchFormData = [{
16374
16352
  label: '款式编码',
16375
16353
  name: 'styleCode',
16376
16354
  type: 'optionalInput'
16355
+ }, {
16356
+ label: '规格值',
16357
+ name: 'propertiesValue',
16358
+ type: 'optionalInput'
16377
16359
  }, {
16378
16360
  label: '商品类型',
16379
16361
  name: 'skuType',
@@ -25840,45 +25822,12 @@ var jkyUtils = {
25840
25822
  };
25841
25823
 
25842
25824
  var singletonMap$8 = new Map();
25843
- var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
25844
- var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
25845
- if (!singletonMap$8.has(cacheKey)) {
25846
- var p = new Promise(function (resolve, reject) {
25847
- var doReject = function doReject(err) {
25848
- // 清空掉错误的请求记录
25849
- singletonMap$8.delete(cacheKey);
25850
- reject(err);
25851
- };
25852
- extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
25853
- method: 'post',
25854
- data: params
25855
- }).then(function (res) {
25856
- if (res === null || res === void 0 ? void 0 : res.success) {
25857
- resolve(res.data || []);
25858
- // 延迟10秒清除,保证订单的时效性
25859
- setTimeout(function () {
25860
- singletonMap$8.delete(cacheKey);
25861
- }, 1000 * 10);
25862
- } else {
25863
- doReject(res);
25864
- }
25865
- }).catch(doReject);
25866
- });
25867
- singletonMap$8.set(cacheKey, p);
25868
- }
25869
- return singletonMap$8.get(cacheKey);
25870
- };
25871
- var platformUtils = {
25872
- getAfterSalesOrderList: getAfterSalesOrderList
25873
- };
25874
-
25875
- var singletonMap$9 = new Map();
25876
25825
  var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
25877
- if (!singletonMap$9.has(orderNo)) {
25826
+ if (!singletonMap$8.has(orderNo)) {
25878
25827
  var p = new Promise(function (resolve, reject) {
25879
25828
  var doReject = function doReject(err) {
25880
25829
  // 清空掉错误的请求记录
25881
- singletonMap$9.delete(orderNo);
25830
+ singletonMap$8.delete(orderNo);
25882
25831
  reject(err);
25883
25832
  };
25884
25833
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -25904,16 +25853,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
25904
25853
  }
25905
25854
  // 延迟10秒清除,保证订单的时效性
25906
25855
  setTimeout(function () {
25907
- singletonMap$9.delete(orderNo);
25856
+ singletonMap$8.delete(orderNo);
25908
25857
  }, 1000 * 10);
25909
25858
  } else {
25910
25859
  doReject(data);
25911
25860
  }
25912
25861
  }).catch(doReject);
25913
25862
  });
25914
- singletonMap$9.set(orderNo, p);
25863
+ singletonMap$8.set(orderNo, p);
25915
25864
  }
25916
- return singletonMap$9.get(orderNo);
25865
+ return singletonMap$8.get(orderNo);
25917
25866
  };
25918
25867
  var kmUtils = {
25919
25868
  getOrderListSingleton: getOrderListSingleton$2
@@ -25931,8 +25880,7 @@ var columnsMap = {
25931
25880
  JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
25932
25881
  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
25933
25882
  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
25934
- WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns,
25935
- PLATFORM_AFTER_SALES_ORDER: kmkfUtils.PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
25883
+ WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
25936
25884
  };
25937
25885
  var rowKeyMap = {
25938
25886
  BS_SYSTEM_ORDER: 'billNo',
@@ -25944,10 +25892,8 @@ var rowKeyMap = {
25944
25892
  JST_SYSTEM_ORDER: 'oId',
25945
25893
  JY_SYSTEM_ORDER: 'tradeNo',
25946
25894
  JKY_SYSTEM_ORDER: 'tradeNo',
25947
- WDT_RETURN_BILL_NO: 'refundNo',
25948
- PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
25895
+ WDT_RETURN_BILL_NO: 'refundNo'
25949
25896
  };
25950
- var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
25951
25897
  var index$2 = (function (props) {
25952
25898
  var value = props.value,
25953
25899
  _onChange = props.onChange,
@@ -25957,7 +25903,6 @@ var index$2 = (function (props) {
25957
25903
  showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
25958
25904
  var onceRef = React.useRef(false);
25959
25905
  var valueRef = React.useRef(null);
25960
- var isRadio = RADIO_TABLE_KEYS.includes(type);
25961
25906
  // 字段筛选状态 - 用户选择要筛选的字段(单选)
25962
25907
  var _useState = React.useState(''),
25963
25908
  _useState2 = _slicedToArray(_useState, 2),
@@ -26009,8 +25954,6 @@ var index$2 = (function (props) {
26009
25954
  getJyOrderList(value.orderNo);
26010
25955
  } else if (type === 'JKY_SYSTEM_ORDER') {
26011
25956
  getJkyOrderList(value.orderNo);
26012
- } else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
26013
- value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
26014
25957
  }
26015
25958
  }
26016
25959
  }, [value, type]);
@@ -26385,71 +26328,10 @@ var index$2 = (function (props) {
26385
26328
  return _ref12.apply(this, arguments);
26386
26329
  };
26387
26330
  }();
26388
- var getPlatformAfterSalesOrderList = /*#__PURE__*/function () {
26389
- var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderNo, shopId) {
26390
- return _regeneratorRuntime().wrap(function _callee10$(_context10) {
26391
- while (1) switch (_context10.prev = _context10.next) {
26392
- case 0:
26393
- platformUtils.getAfterSalesOrderList({
26394
- orderNo: orderNo,
26395
- shopId: shopId
26396
- }).then(function (data) {
26397
- _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
26398
- orders: data || [],
26399
- showOrderInfo: data || []
26400
- }));
26401
- });
26402
- onceRef.current = false;
26403
- case 2:
26404
- case "end":
26405
- return _context10.stop();
26406
- }
26407
- }, _callee10);
26408
- }));
26409
- return function getPlatformAfterSalesOrderList(_x10, _x11) {
26410
- return _ref13.apply(this, arguments);
26411
- };
26412
- }();
26413
- var rowKey = rowKeyMap[type] || 'billNo';
26414
- var handleRadioChange = function handleRadioChange(record) {
26415
- var _value$selectIds;
26416
- if (disabled) return;
26417
- var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
26418
- var rowKeyVal = String(record[rowKey]);
26419
- if (currentKey && currentKey === rowKeyVal) {
26420
- _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26421
- selectIds: [],
26422
- selectedRows: []
26423
- }));
26424
- } else {
26425
- _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26426
- selectIds: [rowKeyVal],
26427
- selectedRows: [record]
26428
- }));
26429
- }
26430
- };
26431
- var radioColumn = isRadio ? {
26432
- width: 50,
26433
- fixed: true,
26434
- render: function render(_, record) {
26435
- var _value$selectIds2;
26436
- var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
26437
- return /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
26438
- checked: checked,
26439
- onClick: function onClick(e) {
26440
- e.preventDefault();
26441
- handleRadioChange(record);
26442
- },
26443
- disabled: disabled
26444
- });
26445
- }
26446
- } : null;
26447
- var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
26448
- var rowSelection = isRadio ? undefined : {
26449
- type: 'checkbox',
26331
+ var rowSelection = {
26450
26332
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
26451
26333
  fixed: true,
26452
- onChange: function onChange(selectedRowKeys, selectedRows) {
26334
+ onChange: function onChange(selectedRowKeys, selectedRows, info) {
26453
26335
  _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
26454
26336
  selectIds: selectedRowKeys,
26455
26337
  selectedRows: selectedRows
@@ -26495,9 +26377,9 @@ var index$2 = (function (props) {
26495
26377
  allowClear: true
26496
26378
  })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
26497
26379
  dataSource: filteredData,
26498
- columns: displayColumns,
26380
+ columns: columns,
26499
26381
  rowSelection: rowSelection,
26500
- rowKey: rowKey,
26382
+ rowKey: rowKeyMap[type] || 'billNo',
26501
26383
  size: "small",
26502
26384
  pagination: false,
26503
26385
  scroll: {
@@ -26884,16 +26766,16 @@ var orderSubFormConstants = {
26884
26766
  };
26885
26767
 
26886
26768
  var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
26887
- var singletonMap$a = new Map();
26769
+ var singletonMap$9 = new Map();
26888
26770
  var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
26889
26771
  var orderNo = parmas.orderNo,
26890
26772
  shopId = parmas.shopId;
26891
26773
  var key = "".concat(orderNo, "-").concat(shopId);
26892
- if (!singletonMap$a.has(key)) {
26774
+ if (!singletonMap$9.has(key)) {
26893
26775
  var p = new Promise(function (resolve, reject) {
26894
26776
  var doReject = function doReject(err) {
26895
26777
  // 清空掉错误的请求记录
26896
- singletonMap$a.delete(key);
26778
+ singletonMap$9.delete(key);
26897
26779
  reject(err);
26898
26780
  };
26899
26781
  extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -26909,16 +26791,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
26909
26791
  }
26910
26792
  // 延迟10秒清除,保证订单的时效性
26911
26793
  setTimeout(function () {
26912
- singletonMap$a.delete(key);
26794
+ singletonMap$9.delete(key);
26913
26795
  }, 1000 * 10);
26914
26796
  } else {
26915
26797
  doReject(data);
26916
26798
  }
26917
26799
  }).catch(doReject);
26918
26800
  });
26919
- singletonMap$a.set(key, p);
26801
+ singletonMap$9.set(key, p);
26920
26802
  }
26921
- return singletonMap$a.get(key);
26803
+ return singletonMap$9.get(key);
26922
26804
  };
26923
26805
  var renderEditItem = function renderEditItem(_ref) {
26924
26806
  var item = _ref.item,
@@ -29614,7 +29496,7 @@ var GoodsModal$5 = function GoodsModal(props) {
29614
29496
  key: item.value
29615
29497
  }, item.label);
29616
29498
  })), /*#__PURE__*/React__default['default'].createElement(Search$1, {
29617
- placeholder: "\u5B9D\u8D1D\u6807\u9898",
29499
+ placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
29618
29500
  allowClear: true,
29619
29501
  enterButton: "\u641C\u7D22",
29620
29502
  style: {
@@ -31547,9 +31429,6 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
31547
31429
  JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
31548
31430
  WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
31549
31431
  };
31550
- var FIELD_COLUMNS_MAP = {
31551
- PLATFORM_AFTER_SALES_ORDER: kmkfUtils.PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
31552
- };
31553
31432
 
31554
31433
  exports.Address = ApaasAddress;
31555
31434
  exports.AliPay = AliPay;
@@ -31591,7 +31470,6 @@ exports.CommonStatus = CommonStatus;
31591
31470
  exports.CommonSystemOrder = CommonSystemOrder;
31592
31471
  exports.CopyTextIcon = CopyTextIcon;
31593
31472
  exports.ExpressLogistics = ExpressLogistics;
31594
- exports.FIELD_COLUMNS_MAP = FIELD_COLUMNS_MAP;
31595
31473
  exports.Goods = Goods;
31596
31474
  exports.GoodsTable = index$3;
31597
31475
  exports.GyReissue = GyReissue;
@@ -1,7 +1,6 @@
1
1
  import React from 'react';
2
2
  interface BsSystemOrderProps {
3
3
  value: {
4
- shopId?: string;
5
4
  orderNo: string;
6
5
  orders: any[];
7
6
  selectIds: string[];
@@ -91,7 +91,4 @@ declare const SYSTEM_ORDER_COLUMNS_MAP: {
91
91
  disabled: boolean;
92
92
  })[];
93
93
  };
94
- export declare const FIELD_COLUMNS_MAP: {
95
- PLATFORM_AFTER_SALES_ORDER: any[];
96
- };
97
94
  export default SYSTEM_ORDER_COLUMNS_MAP;
@@ -74,5 +74,5 @@ export { default as OrderSubFormUtils } from './apaas/OrderSubForm/utils';
74
74
  export { default as SkxIdInputSelect } from './skx/IdInputSelect';
75
75
  export { default as SkxGoods } from './skx/Goods';
76
76
  export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
77
- export { default as SYSTEM_ORDER_COLUMNS_MAP, FIELD_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
77
+ export { default as SYSTEM_ORDER_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
78
78
  export { default as erpModalColumnsMap } from './bs/component/model/Columns';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.6.1-beta.5",
3
+ "version": "2.7.0",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "2.6.1-beta.5",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.6.0",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "4b651e9288dade56d396b99a37f94011cf80779b"
69
+ "gitHead": "d54565625fe23336f505c9312cea19b57e653149"
70
70
  }
@@ -1,6 +0,0 @@
1
- export declare const platformUtils: {
2
- getAfterSalesOrderList: (params: {
3
- orderNo: string;
4
- shopId: string;
5
- }) => Promise<any>;
6
- };