@kmkf-fe-packages/basic-components 2.2.5-beta.2 → 2.2.5-beta.21

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
@@ -8204,6 +8204,11 @@ var CheckboxRender = function CheckboxRender(_ref4) {
8204
8204
  }
8205
8205
  return value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/');
8206
8206
  };
8207
+ var MultipleSelectRender = function MultipleSelectRender(_ref5) {
8208
+ var _ref5$value = _ref5.value,
8209
+ value = _ref5$value === void 0 ? [] : _ref5$value;
8210
+ return value === null || value === void 0 ? void 0 : value.join(',');
8211
+ };
8207
8212
  var renderMap = {
8208
8213
  PICTURE: function PICTURE() {
8209
8214
  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -8230,16 +8235,21 @@ var renderMap = {
8230
8235
  return /*#__PURE__*/React.createElement(CheckboxRender, {
8231
8236
  value: value
8232
8237
  });
8238
+ },
8239
+ BASIC_MULT_SELECT: function BASIC_MULT_SELECT(value) {
8240
+ return /*#__PURE__*/React.createElement(MultipleSelectRender, {
8241
+ value: value
8242
+ });
8233
8243
  }
8234
8244
  };
8235
- var EditPictureRender = function EditPictureRender(_ref5) {
8236
- var _ref5$val = _ref5.val,
8237
- val = _ref5$val === void 0 ? [] : _ref5$val,
8238
- index = _ref5.index,
8239
- t = _ref5.t,
8240
- updateHandle = _ref5.updateHandle,
8241
- disabled = _ref5.disabled,
8242
- hostUrl = _ref5.hostUrl;
8245
+ var EditPictureRender = function EditPictureRender(_ref6) {
8246
+ var _ref6$val = _ref6.val,
8247
+ val = _ref6$val === void 0 ? [] : _ref6$val,
8248
+ index = _ref6.index,
8249
+ t = _ref6.t,
8250
+ updateHandle = _ref6.updateHandle,
8251
+ disabled = _ref6.disabled,
8252
+ hostUrl = _ref6.hostUrl;
8243
8253
  var finalPictures = val.map(function (item) {
8244
8254
  return item.startsWith('http') ? item : "".concat(hostUrl, "/").concat(item);
8245
8255
  });
@@ -8250,7 +8260,12 @@ var EditPictureRender = function EditPictureRender(_ref5) {
8250
8260
  border: '1px solid #d9d9d9',
8251
8261
  padding: '3px'
8252
8262
  }
8253
- }, !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(Popover, {
8263
+ }, t.isEdit || disabled ? /*#__PURE__*/React.createElement(PlusSquareOutlined, {
8264
+ style: {
8265
+ fontSize: 18,
8266
+ color: '#aaa'
8267
+ }
8268
+ }) : /*#__PURE__*/React.createElement(Popover, {
8254
8269
  content: /*#__PURE__*/React.createElement(ApaasUploadAsync$1, _objectSpread2(_objectSpread2({}, t.componentConfig), {}, {
8255
8270
  value: finalPictures,
8256
8271
  onChange: function onChange(e) {
@@ -8263,25 +8278,20 @@ var EditPictureRender = function EditPictureRender(_ref5) {
8263
8278
  style: {
8264
8279
  fontSize: 18
8265
8280
  }
8266
- })) : /*#__PURE__*/React.createElement(PlusSquareOutlined, {
8267
- style: {
8268
- fontSize: 18,
8269
- color: '#333'
8270
- }
8271
- }), /*#__PURE__*/React.createElement(PictureRender, {
8281
+ })), /*#__PURE__*/React.createElement(PictureRender, {
8272
8282
  value: finalPictures,
8273
8283
  width: 24,
8274
8284
  hostUrl: hostUrl
8275
8285
  }));
8276
8286
  };
8277
- var EditFileRender = function EditFileRender(_ref6) {
8278
- var _ref6$val = _ref6.val,
8279
- val = _ref6$val === void 0 ? [] : _ref6$val,
8280
- index = _ref6.index,
8281
- t = _ref6.t,
8282
- updateHandle = _ref6.updateHandle,
8283
- disabled = _ref6.disabled,
8284
- hostUrl = _ref6.hostUrl;
8287
+ var EditFileRender = function EditFileRender(_ref7) {
8288
+ var _ref7$val = _ref7.val,
8289
+ val = _ref7$val === void 0 ? [] : _ref7$val,
8290
+ index = _ref7.index,
8291
+ t = _ref7.t,
8292
+ updateHandle = _ref7.updateHandle,
8293
+ disabled = _ref7.disabled,
8294
+ hostUrl = _ref7.hostUrl;
8285
8295
  return /*#__PURE__*/React.createElement("div", {
8286
8296
  style: {
8287
8297
  display: 'flex',
@@ -8289,7 +8299,12 @@ var EditFileRender = function EditFileRender(_ref6) {
8289
8299
  border: '1px solid #d9d9d9',
8290
8300
  padding: '3px'
8291
8301
  }
8292
- }, !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(Popover, {
8302
+ }, t.isEdit || disabled ? /*#__PURE__*/React.createElement(PlusSquareOutlined, {
8303
+ style: {
8304
+ fontSize: 18,
8305
+ color: '#aaa'
8306
+ }
8307
+ }) : /*#__PURE__*/React.createElement(Popover, {
8293
8308
  content: /*#__PURE__*/React.createElement(ApaasUploadFile, _objectSpread2(_objectSpread2({}, t.componentConfig), {}, {
8294
8309
  value: val,
8295
8310
  onChange: function onChange(e) {
@@ -8302,24 +8317,19 @@ var EditFileRender = function EditFileRender(_ref6) {
8302
8317
  style: {
8303
8318
  fontSize: 18
8304
8319
  }
8305
- })) : /*#__PURE__*/React.createElement(PlusSquareOutlined, {
8306
- style: {
8307
- fontSize: 18,
8308
- color: '#333'
8309
- }
8310
- }), /*#__PURE__*/React.createElement(FileRender, {
8320
+ })), /*#__PURE__*/React.createElement(FileRender, {
8311
8321
  fileList: val,
8312
8322
  canDownload: true
8313
8323
  }));
8314
8324
  };
8315
8325
  var EditRenderMap = {
8316
- INPUT: function INPUT(_ref7) {
8317
- var val = _ref7.val,
8318
- record = _ref7.record,
8319
- index = _ref7.index,
8320
- t = _ref7.t,
8321
- updateHandle = _ref7.updateHandle,
8322
- disabled = _ref7.disabled;
8326
+ INPUT: function INPUT(_ref8) {
8327
+ var val = _ref8.val,
8328
+ record = _ref8.record,
8329
+ index = _ref8.index,
8330
+ t = _ref8.t,
8331
+ updateHandle = _ref8.updateHandle,
8332
+ disabled = _ref8.disabled;
8323
8333
  var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
8324
8334
  return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
8325
8335
  style: {
@@ -8342,13 +8352,13 @@ var EditRenderMap = {
8342
8352
  }
8343
8353
  }) : /*#__PURE__*/React.createElement("div", null, val);
8344
8354
  },
8345
- TEXTAREA: function TEXTAREA(_ref8) {
8346
- var val = _ref8.val,
8347
- record = _ref8.record,
8348
- index = _ref8.index,
8349
- t = _ref8.t,
8350
- updateHandle = _ref8.updateHandle,
8351
- disabled = _ref8.disabled;
8355
+ TEXTAREA: function TEXTAREA(_ref9) {
8356
+ var val = _ref9.val,
8357
+ record = _ref9.record,
8358
+ index = _ref9.index,
8359
+ t = _ref9.t,
8360
+ updateHandle = _ref9.updateHandle,
8361
+ disabled = _ref9.disabled;
8352
8362
  var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
8353
8363
  return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
8354
8364
  style: {
@@ -8371,62 +8381,39 @@ var EditRenderMap = {
8371
8381
  }
8372
8382
  }) : /*#__PURE__*/React.createElement("div", null, val);
8373
8383
  },
8374
- PICTURE: function PICTURE(_ref9) {
8375
- var val = _ref9.val,
8376
- record = _ref9.record,
8377
- index = _ref9.index,
8378
- t = _ref9.t,
8379
- updateHandle = _ref9.updateHandle,
8380
- disabled = _ref9.disabled;
8381
- return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(EditPictureRender, {
8382
- val: val,
8383
- t: t,
8384
- disabled: disabled,
8385
- index: index,
8386
- updateHandle: updateHandle,
8387
- hostUrl: hostUrl
8388
- }) : /*#__PURE__*/React.createElement(PictureRender, {
8389
- value: val,
8390
- width: 20,
8391
- hostUrl: hostUrl
8392
- });
8393
- },
8394
- FILE: function FILE(_ref10) {
8384
+ PICTURE: function PICTURE(_ref10) {
8395
8385
  var val = _ref10.val,
8396
8386
  record = _ref10.record,
8397
8387
  index = _ref10.index,
8398
8388
  t = _ref10.t,
8399
8389
  updateHandle = _ref10.updateHandle,
8400
8390
  disabled = _ref10.disabled;
8401
- return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(EditFileRender, {
8391
+ return /*#__PURE__*/React.createElement(EditPictureRender, {
8402
8392
  val: val,
8403
8393
  t: t,
8404
8394
  disabled: disabled,
8405
8395
  index: index,
8406
8396
  updateHandle: updateHandle,
8407
8397
  hostUrl: hostUrl
8408
- }) : /*#__PURE__*/React.createElement(FileRender, {
8409
- fileList: val,
8410
- canDownload: true
8411
8398
  });
8412
8399
  },
8413
- RADIO: function RADIO(_ref11) {
8400
+ FILE: function FILE(_ref11) {
8414
8401
  var val = _ref11.val,
8415
8402
  record = _ref11.record,
8416
8403
  index = _ref11.index,
8417
8404
  t = _ref11.t,
8418
8405
  updateHandle = _ref11.updateHandle,
8419
- disabled = _ref11.disabled,
8420
- componentDto = _ref11.componentDto;
8421
- return /*#__PURE__*/React.createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8422
- value: val,
8423
- disabled: t.isEdit || disabled,
8424
- onChange: function onChange(e) {
8425
- return updateHandle(e, index, t.key);
8426
- }
8427
- }));
8406
+ disabled = _ref11.disabled;
8407
+ return /*#__PURE__*/React.createElement(EditFileRender, {
8408
+ val: val,
8409
+ t: t,
8410
+ disabled: disabled,
8411
+ index: index,
8412
+ updateHandle: updateHandle,
8413
+ hostUrl: hostUrl
8414
+ });
8428
8415
  },
8429
- SELECT: function SELECT(_ref12) {
8416
+ RADIO: function RADIO(_ref12) {
8430
8417
  var val = _ref12.val,
8431
8418
  record = _ref12.record,
8432
8419
  index = _ref12.index,
@@ -8434,7 +8421,7 @@ var EditRenderMap = {
8434
8421
  updateHandle = _ref12.updateHandle,
8435
8422
  disabled = _ref12.disabled,
8436
8423
  componentDto = _ref12.componentDto;
8437
- return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8424
+ return /*#__PURE__*/React.createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8438
8425
  value: val,
8439
8426
  disabled: t.isEdit || disabled,
8440
8427
  onChange: function onChange(e) {
@@ -8442,7 +8429,7 @@ var EditRenderMap = {
8442
8429
  }
8443
8430
  }));
8444
8431
  },
8445
- CHECKBOX: function CHECKBOX(_ref13) {
8432
+ SELECT: function SELECT(_ref13) {
8446
8433
  var val = _ref13.val,
8447
8434
  record = _ref13.record,
8448
8435
  index = _ref13.index,
@@ -8450,7 +8437,7 @@ var EditRenderMap = {
8450
8437
  updateHandle = _ref13.updateHandle,
8451
8438
  disabled = _ref13.disabled,
8452
8439
  componentDto = _ref13.componentDto;
8453
- return /*#__PURE__*/React.createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8440
+ return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8454
8441
  value: val,
8455
8442
  disabled: t.isEdit || disabled,
8456
8443
  onChange: function onChange(e) {
@@ -8458,7 +8445,7 @@ var EditRenderMap = {
8458
8445
  }
8459
8446
  }));
8460
8447
  },
8461
- BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref14) {
8448
+ CHECKBOX: function CHECKBOX(_ref14) {
8462
8449
  var val = _ref14.val,
8463
8450
  record = _ref14.record,
8464
8451
  index = _ref14.index,
@@ -8466,6 +8453,22 @@ var EditRenderMap = {
8466
8453
  updateHandle = _ref14.updateHandle,
8467
8454
  disabled = _ref14.disabled,
8468
8455
  componentDto = _ref14.componentDto;
8456
+ return /*#__PURE__*/React.createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8457
+ value: val,
8458
+ disabled: t.isEdit || disabled,
8459
+ onChange: function onChange(e) {
8460
+ return updateHandle(e, index, t.key);
8461
+ }
8462
+ }));
8463
+ },
8464
+ BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
8465
+ var val = _ref15.val,
8466
+ record = _ref15.record,
8467
+ index = _ref15.index,
8468
+ t = _ref15.t,
8469
+ updateHandle = _ref15.updateHandle,
8470
+ disabled = _ref15.disabled,
8471
+ componentDto = _ref15.componentDto;
8469
8472
  return /*#__PURE__*/React.createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8470
8473
  value: val,
8471
8474
  disabled: t.isEdit || disabled,
@@ -8595,7 +8598,7 @@ var SubForm = function SubForm(props) {
8595
8598
  title: '序号',
8596
8599
  width: 50,
8597
8600
  render: function render(val, record, index) {
8598
- return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
8601
+ return disabled ? /*#__PURE__*/React.createElement("div", null, index + 1) : /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
8599
8602
  index: index,
8600
8603
  hoveredRowIndex: hoveredRowIndex,
8601
8604
  handleClick: function handleClick() {
@@ -8704,9 +8707,6 @@ var SubForm = function SubForm(props) {
8704
8707
  other: ''
8705
8708
  };
8706
8709
  }
8707
- if (['SELECT'].includes(next.workOrderComponentType)) {
8708
- item.defaultValue = '';
8709
- }
8710
8710
  prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
8711
8711
  return prv;
8712
8712
  }, {});
@@ -8745,7 +8745,6 @@ var SubForm = function SubForm(props) {
8745
8745
  newValue.splice(index, 0, _objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
8746
8746
  uuid: uuid()
8747
8747
  }));
8748
- console.log('newValue', newValue);
8749
8748
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
8750
8749
  };
8751
8750
  var onScrollCapture = function onScrollCapture(e) {
@@ -8831,7 +8830,7 @@ var SubForm = function SubForm(props) {
8831
8830
  data = res.data, success = res.success;
8832
8831
  if (success) {
8833
8832
  transDataSourceItem = transformWorkOrderData(templateDetail.componentDtoList, 'init');
8834
- headerKeys = tableHeader.map(function (t) {
8833
+ headerKeys = correlationList.map(function (t) {
8835
8834
  return t.key;
8836
8835
  });
8837
8836
  newList = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (item) {
@@ -12296,6 +12295,7 @@ var jstGoods = function jstGoods(props) {
12296
12295
  var _props$value = props.value,
12297
12296
  value = _props$value === void 0 ? [] : _props$value,
12298
12297
  onChange = props.onChange,
12298
+ _onBlur = props.onBlur,
12299
12299
  disabled = props.disabled,
12300
12300
  _props$type = props.type,
12301
12301
  type = _props$type === void 0 ? 1 : _props$type,
@@ -12310,7 +12310,7 @@ var jstGoods = function jstGoods(props) {
12310
12310
  changeIndex = _useState2[0],
12311
12311
  setChangeIndex = _useState2[1]; //选中的包裹
12312
12312
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
12313
- var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
12313
+ var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
12314
12314
  var expressDateInstance = ExpressData.getInstance(platformType);
12315
12315
  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
12316
12316
  useEffect(function () {
@@ -12425,6 +12425,9 @@ var jstGoods = function jstGoods(props) {
12425
12425
  onChange: function onChange(e) {
12426
12426
  return changeInputHandle(e.target.value, 'logisticsCode');
12427
12427
  },
12428
+ onBlur: function onBlur(e) {
12429
+ return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value);
12430
+ },
12428
12431
  value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.logisticsCode
12429
12432
  }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
12430
12433
  disabled: disabled,
@@ -22291,6 +22294,7 @@ var OrderSubForm = function OrderSubForm(props) {
22291
22294
  manual = props.manual,
22292
22295
  correlationList = props.subConfig.correlationList,
22293
22296
  effects = props.effects;
22297
+ console.log('effects', effects);
22294
22298
  var valueRef = useRef(value);
22295
22299
  useEffect(function () {
22296
22300
  valueRef.current = value;
@@ -22352,7 +22356,7 @@ var OrderSubForm = function OrderSubForm(props) {
22352
22356
  width: 80,
22353
22357
  ellipsis: true,
22354
22358
  render: function render(val, record, index) {
22355
- return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
22359
+ return disabled ? /*#__PURE__*/React.createElement("div", null, index + 1) : /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
22356
22360
  index: index,
22357
22361
  hoveredRowIndex: hoveredRowIndex,
22358
22362
  handleClick: function handleClick() {
@@ -22415,8 +22419,7 @@ var OrderSubForm = function OrderSubForm(props) {
22415
22419
  });
22416
22420
  }
22417
22421
  return list;
22418
- }, [newTableHeader, disabled, updateHandle]);
22419
- console.log('column', column);
22422
+ }, [newTableHeader, disabled, updateHandle, hoveredRowIndex]);
22420
22423
  var orderModalColumns = useMemo(function () {
22421
22424
  return [{
22422
22425
  dataIndex: '',
@@ -22471,11 +22474,16 @@ var OrderSubForm = function OrderSubForm(props) {
22471
22474
  }));
22472
22475
  };
22473
22476
  var getDataSourceAsync = function getDataSourceAsync() {
22474
- var _effects$form;
22475
- var _ref = (effects === null || effects === void 0 ? void 0 : (_effects$form = effects.form) === null || _effects$form === void 0 ? void 0 : _effects$form.getFieldsValue()) || {},
22476
- _ref$shopId = _ref.shopId,
22477
- shopId = _ref$shopId === void 0 ? '' : _ref$shopId;
22478
- return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId ? getOrderListSingleton$4({
22477
+ var _ref = effects || {},
22478
+ shopList = _ref.shopList,
22479
+ form = _ref.form;
22480
+ var _ref2 = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {},
22481
+ _ref2$shopId = _ref2.shopId,
22482
+ shopId = _ref2$shopId === void 0 ? '' : _ref2$shopId;
22483
+ var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
22484
+ return !item.notJoin && item.shopId == shopId;
22485
+ });
22486
+ return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$4({
22479
22487
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
22480
22488
  shopId: shopId
22481
22489
  }).then(function (data) {
@@ -22483,7 +22491,7 @@ var OrderSubForm = function OrderSubForm(props) {
22483
22491
  onChange(_objectSpread2(_objectSpread2({}, value), {}, {
22484
22492
  allOrders: allOrders
22485
22493
  }));
22486
- }) : Promise.resolve();
22494
+ }).catch(console.debug) : Promise.resolve();
22487
22495
  };
22488
22496
  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
22489
22497
  var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
@@ -25920,13 +25928,11 @@ var typeMap$6 = {
25920
25928
  }
25921
25929
  },
25922
25930
  asyncGetData: function () {
25923
- var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(tradeId) {
25931
+ var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
25924
25932
  return _regeneratorRuntime().wrap(function _callee$(_context) {
25925
25933
  while (1) switch (_context.prev = _context.next) {
25926
25934
  case 0:
25927
- return _context.abrupt("return", servers.SKX.querySkxOrderDetailSingleton({
25928
- tid: tradeId
25929
- }).then(function (res) {
25935
+ return _context.abrupt("return", servers.SKX.querySkxOrderDetailSingleton(params).then(function (res) {
25930
25936
  var orderDetailInfoList = res.data.orderDetailInfoList || [];
25931
25937
  return orderDetailInfoList;
25932
25938
  }));
@@ -25961,13 +25967,11 @@ var typeMap$6 = {
25961
25967
  }
25962
25968
  },
25963
25969
  asyncGetData: function () {
25964
- var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tradeId) {
25970
+ var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
25965
25971
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
25966
25972
  while (1) switch (_context2.prev = _context2.next) {
25967
25973
  case 0:
25968
- return _context2.abrupt("return", servers.SKX.queryReturnOrderDetailSingleton({
25969
- tid: tradeId
25970
- }).then(function (res) {
25974
+ return _context2.abrupt("return", servers.SKX.queryReturnOrderDetailSingleton(params).then(function (res) {
25971
25975
  var skqReturnOrderDetailInfoDtos = res.data.skqReturnOrderDetailInfoDtos || [];
25972
25976
  return skqReturnOrderDetailInfoDtos;
25973
25977
  }));
@@ -26032,32 +26036,42 @@ var IdInputSelect = function IdInputSelect(props) {
26032
26036
  }, [value]);
26033
26037
  var asyncQueryData = /*#__PURE__*/function () {
26034
26038
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
26035
- var tradeId;
26039
+ var _form$getFieldValue, _form$getFieldValue$;
26040
+ var tradeId, skxReturnExpressCode, blurFrom;
26036
26041
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
26037
26042
  while (1) switch (_context3.prev = _context3.next) {
26038
26043
  case 0:
26039
26044
  tradeId = form.getFieldValue('m3ap1EvEyd');
26045
+ skxReturnExpressCode = (_form$getFieldValue = form.getFieldValue('4487c6516b')) === null || _form$getFieldValue === void 0 ? void 0 : (_form$getFieldValue$ = _form$getFieldValue[0]) === null || _form$getFieldValue$ === void 0 ? void 0 : _form$getFieldValue$.logisticsCode;
26046
+ blurFrom = form.getFieldValue('skx_return_billNo_blur_from');
26040
26047
  console.log('asyncQueryData---', {
26048
+ skxReturnExpressCode: skxReturnExpressCode,
26049
+ blurFrom: blurFrom,
26041
26050
  tradeId: tradeId,
26042
26051
  tradeIdRef: tradeIdRef.current,
26043
26052
  form: form
26044
26053
  });
26045
- if (tradeId) {
26046
- _context3.next = 5;
26054
+ if (!(type === 'SKX_OUTBOUND_NOTICE_NO' && !tradeId || type === 'SKX_RETURN_BILL_NO' && !tradeId && !skxReturnExpressCode)) {
26055
+ _context3.next = 7;
26047
26056
  break;
26048
26057
  }
26049
26058
  setDataSource([]);
26050
26059
  return _context3.abrupt("return");
26051
- case 5:
26060
+ case 7:
26052
26061
  setSpinning(true);
26053
- typeMap$6[type].asyncGetData(tradeId).then(function (data) {
26062
+ // 判断是从哪个组件失焦,若是从[SKX]退换物流信息(TH)失焦,则根据物流单号查询,若是从订单号组件失焦,则根据订单号查询
26063
+ typeMap$6[type].asyncGetData(type === 'SKX_RETURN_BILL_NO' && blurFrom === '4487c6516b' ? {
26064
+ expressCode: skxReturnExpressCode
26065
+ } : {
26066
+ tid: tradeId
26067
+ }).then(function (data) {
26054
26068
  setDataSource(data);
26055
26069
  }).catch(function () {
26056
26070
  setDataSource([]);
26057
26071
  }).finally(function () {
26058
26072
  setSpinning(false);
26059
26073
  });
26060
- case 7:
26074
+ case 9:
26061
26075
  case "end":
26062
26076
  return _context3.stop();
26063
26077
  }
@@ -26154,7 +26168,14 @@ var IdInputSelect = function IdInputSelect(props) {
26154
26168
  value: value,
26155
26169
  isInput: isInput
26156
26170
  });
26157
- onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && !!isInput);
26171
+ var isReturnBillNoChange = type === 'SKX_RETURN_BILL_NO' && form.getFieldValue('skx_return_billNo_blur_from') === '4487c6516b';
26172
+ onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && (!!isInput || isReturnBillNoChange));
26173
+ // 如果类型是[SKX]退换货单号,则根据blurFrom判断是从[SKX]退换物流信息(TH)失焦,则调用onBlur
26174
+ isReturnBillNoChange && (_onBlur === null || _onBlur === void 0 ? void 0 : _onBlur({
26175
+ target: {
26176
+ value: val
26177
+ }
26178
+ }));
26158
26179
  // 关闭浮窗
26159
26180
  setPopoverVisible(false);
26160
26181
  };
package/dist/index.js CHANGED
@@ -8217,6 +8217,11 @@ var CheckboxRender = function CheckboxRender(_ref4) {
8217
8217
  }
8218
8218
  return value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/');
8219
8219
  };
8220
+ var MultipleSelectRender = function MultipleSelectRender(_ref5) {
8221
+ var _ref5$value = _ref5.value,
8222
+ value = _ref5$value === void 0 ? [] : _ref5$value;
8223
+ return value === null || value === void 0 ? void 0 : value.join(',');
8224
+ };
8220
8225
  var renderMap = {
8221
8226
  PICTURE: function PICTURE() {
8222
8227
  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -8243,16 +8248,21 @@ var renderMap = {
8243
8248
  return /*#__PURE__*/React__default['default'].createElement(CheckboxRender, {
8244
8249
  value: value
8245
8250
  });
8251
+ },
8252
+ BASIC_MULT_SELECT: function BASIC_MULT_SELECT(value) {
8253
+ return /*#__PURE__*/React__default['default'].createElement(MultipleSelectRender, {
8254
+ value: value
8255
+ });
8246
8256
  }
8247
8257
  };
8248
- var EditPictureRender = function EditPictureRender(_ref5) {
8249
- var _ref5$val = _ref5.val,
8250
- val = _ref5$val === void 0 ? [] : _ref5$val,
8251
- index = _ref5.index,
8252
- t = _ref5.t,
8253
- updateHandle = _ref5.updateHandle,
8254
- disabled = _ref5.disabled,
8255
- hostUrl = _ref5.hostUrl;
8258
+ var EditPictureRender = function EditPictureRender(_ref6) {
8259
+ var _ref6$val = _ref6.val,
8260
+ val = _ref6$val === void 0 ? [] : _ref6$val,
8261
+ index = _ref6.index,
8262
+ t = _ref6.t,
8263
+ updateHandle = _ref6.updateHandle,
8264
+ disabled = _ref6.disabled,
8265
+ hostUrl = _ref6.hostUrl;
8256
8266
  var finalPictures = val.map(function (item) {
8257
8267
  return item.startsWith('http') ? item : "".concat(hostUrl, "/").concat(item);
8258
8268
  });
@@ -8263,7 +8273,12 @@ var EditPictureRender = function EditPictureRender(_ref5) {
8263
8273
  border: '1px solid #d9d9d9',
8264
8274
  padding: '3px'
8265
8275
  }
8266
- }, !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
8276
+ }, t.isEdit || disabled ? /*#__PURE__*/React__default['default'].createElement(icons.PlusSquareOutlined, {
8277
+ style: {
8278
+ fontSize: 18,
8279
+ color: '#aaa'
8280
+ }
8281
+ }) : /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
8267
8282
  content: /*#__PURE__*/React__default['default'].createElement(ApaasUploadAsync$1, _objectSpread2(_objectSpread2({}, t.componentConfig), {}, {
8268
8283
  value: finalPictures,
8269
8284
  onChange: function onChange(e) {
@@ -8276,25 +8291,20 @@ var EditPictureRender = function EditPictureRender(_ref5) {
8276
8291
  style: {
8277
8292
  fontSize: 18
8278
8293
  }
8279
- })) : /*#__PURE__*/React__default['default'].createElement(icons.PlusSquareOutlined, {
8280
- style: {
8281
- fontSize: 18,
8282
- color: '#333'
8283
- }
8284
- }), /*#__PURE__*/React__default['default'].createElement(PictureRender, {
8294
+ })), /*#__PURE__*/React__default['default'].createElement(PictureRender, {
8285
8295
  value: finalPictures,
8286
8296
  width: 24,
8287
8297
  hostUrl: hostUrl
8288
8298
  }));
8289
8299
  };
8290
- var EditFileRender = function EditFileRender(_ref6) {
8291
- var _ref6$val = _ref6.val,
8292
- val = _ref6$val === void 0 ? [] : _ref6$val,
8293
- index = _ref6.index,
8294
- t = _ref6.t,
8295
- updateHandle = _ref6.updateHandle,
8296
- disabled = _ref6.disabled,
8297
- hostUrl = _ref6.hostUrl;
8300
+ var EditFileRender = function EditFileRender(_ref7) {
8301
+ var _ref7$val = _ref7.val,
8302
+ val = _ref7$val === void 0 ? [] : _ref7$val,
8303
+ index = _ref7.index,
8304
+ t = _ref7.t,
8305
+ updateHandle = _ref7.updateHandle,
8306
+ disabled = _ref7.disabled,
8307
+ hostUrl = _ref7.hostUrl;
8298
8308
  return /*#__PURE__*/React__default['default'].createElement("div", {
8299
8309
  style: {
8300
8310
  display: 'flex',
@@ -8302,7 +8312,12 @@ var EditFileRender = function EditFileRender(_ref6) {
8302
8312
  border: '1px solid #d9d9d9',
8303
8313
  padding: '3px'
8304
8314
  }
8305
- }, !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
8315
+ }, t.isEdit || disabled ? /*#__PURE__*/React__default['default'].createElement(icons.PlusSquareOutlined, {
8316
+ style: {
8317
+ fontSize: 18,
8318
+ color: '#aaa'
8319
+ }
8320
+ }) : /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
8306
8321
  content: /*#__PURE__*/React__default['default'].createElement(ApaasUploadFile, _objectSpread2(_objectSpread2({}, t.componentConfig), {}, {
8307
8322
  value: val,
8308
8323
  onChange: function onChange(e) {
@@ -8315,24 +8330,19 @@ var EditFileRender = function EditFileRender(_ref6) {
8315
8330
  style: {
8316
8331
  fontSize: 18
8317
8332
  }
8318
- })) : /*#__PURE__*/React__default['default'].createElement(icons.PlusSquareOutlined, {
8319
- style: {
8320
- fontSize: 18,
8321
- color: '#333'
8322
- }
8323
- }), /*#__PURE__*/React__default['default'].createElement(FileRender, {
8333
+ })), /*#__PURE__*/React__default['default'].createElement(FileRender, {
8324
8334
  fileList: val,
8325
8335
  canDownload: true
8326
8336
  }));
8327
8337
  };
8328
8338
  var EditRenderMap = {
8329
- INPUT: function INPUT(_ref7) {
8330
- var val = _ref7.val,
8331
- record = _ref7.record,
8332
- index = _ref7.index,
8333
- t = _ref7.t,
8334
- updateHandle = _ref7.updateHandle,
8335
- disabled = _ref7.disabled;
8339
+ INPUT: function INPUT(_ref8) {
8340
+ var val = _ref8.val,
8341
+ record = _ref8.record,
8342
+ index = _ref8.index,
8343
+ t = _ref8.t,
8344
+ updateHandle = _ref8.updateHandle,
8345
+ disabled = _ref8.disabled;
8336
8346
  var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
8337
8347
  return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
8338
8348
  style: {
@@ -8355,13 +8365,13 @@ var EditRenderMap = {
8355
8365
  }
8356
8366
  }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
8357
8367
  },
8358
- TEXTAREA: function TEXTAREA(_ref8) {
8359
- var val = _ref8.val,
8360
- record = _ref8.record,
8361
- index = _ref8.index,
8362
- t = _ref8.t,
8363
- updateHandle = _ref8.updateHandle,
8364
- disabled = _ref8.disabled;
8368
+ TEXTAREA: function TEXTAREA(_ref9) {
8369
+ var val = _ref9.val,
8370
+ record = _ref9.record,
8371
+ index = _ref9.index,
8372
+ t = _ref9.t,
8373
+ updateHandle = _ref9.updateHandle,
8374
+ disabled = _ref9.disabled;
8365
8375
  var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
8366
8376
  return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
8367
8377
  style: {
@@ -8384,62 +8394,39 @@ var EditRenderMap = {
8384
8394
  }
8385
8395
  }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
8386
8396
  },
8387
- PICTURE: function PICTURE(_ref9) {
8388
- var val = _ref9.val,
8389
- record = _ref9.record,
8390
- index = _ref9.index,
8391
- t = _ref9.t,
8392
- updateHandle = _ref9.updateHandle,
8393
- disabled = _ref9.disabled;
8394
- return !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(EditPictureRender, {
8395
- val: val,
8396
- t: t,
8397
- disabled: disabled,
8398
- index: index,
8399
- updateHandle: updateHandle,
8400
- hostUrl: hostUrl
8401
- }) : /*#__PURE__*/React__default['default'].createElement(PictureRender, {
8402
- value: val,
8403
- width: 20,
8404
- hostUrl: hostUrl
8405
- });
8406
- },
8407
- FILE: function FILE(_ref10) {
8397
+ PICTURE: function PICTURE(_ref10) {
8408
8398
  var val = _ref10.val,
8409
8399
  record = _ref10.record,
8410
8400
  index = _ref10.index,
8411
8401
  t = _ref10.t,
8412
8402
  updateHandle = _ref10.updateHandle,
8413
8403
  disabled = _ref10.disabled;
8414
- return !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(EditFileRender, {
8404
+ return /*#__PURE__*/React__default['default'].createElement(EditPictureRender, {
8415
8405
  val: val,
8416
8406
  t: t,
8417
8407
  disabled: disabled,
8418
8408
  index: index,
8419
8409
  updateHandle: updateHandle,
8420
8410
  hostUrl: hostUrl
8421
- }) : /*#__PURE__*/React__default['default'].createElement(FileRender, {
8422
- fileList: val,
8423
- canDownload: true
8424
8411
  });
8425
8412
  },
8426
- RADIO: function RADIO(_ref11) {
8413
+ FILE: function FILE(_ref11) {
8427
8414
  var val = _ref11.val,
8428
8415
  record = _ref11.record,
8429
8416
  index = _ref11.index,
8430
8417
  t = _ref11.t,
8431
8418
  updateHandle = _ref11.updateHandle,
8432
- disabled = _ref11.disabled,
8433
- componentDto = _ref11.componentDto;
8434
- return /*#__PURE__*/React__default['default'].createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8435
- value: val,
8436
- disabled: t.isEdit || disabled,
8437
- onChange: function onChange(e) {
8438
- return updateHandle(e, index, t.key);
8439
- }
8440
- }));
8419
+ disabled = _ref11.disabled;
8420
+ return /*#__PURE__*/React__default['default'].createElement(EditFileRender, {
8421
+ val: val,
8422
+ t: t,
8423
+ disabled: disabled,
8424
+ index: index,
8425
+ updateHandle: updateHandle,
8426
+ hostUrl: hostUrl
8427
+ });
8441
8428
  },
8442
- SELECT: function SELECT(_ref12) {
8429
+ RADIO: function RADIO(_ref12) {
8443
8430
  var val = _ref12.val,
8444
8431
  record = _ref12.record,
8445
8432
  index = _ref12.index,
@@ -8447,7 +8434,7 @@ var EditRenderMap = {
8447
8434
  updateHandle = _ref12.updateHandle,
8448
8435
  disabled = _ref12.disabled,
8449
8436
  componentDto = _ref12.componentDto;
8450
- return /*#__PURE__*/React__default['default'].createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8437
+ return /*#__PURE__*/React__default['default'].createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8451
8438
  value: val,
8452
8439
  disabled: t.isEdit || disabled,
8453
8440
  onChange: function onChange(e) {
@@ -8455,7 +8442,7 @@ var EditRenderMap = {
8455
8442
  }
8456
8443
  }));
8457
8444
  },
8458
- CHECKBOX: function CHECKBOX(_ref13) {
8445
+ SELECT: function SELECT(_ref13) {
8459
8446
  var val = _ref13.val,
8460
8447
  record = _ref13.record,
8461
8448
  index = _ref13.index,
@@ -8463,7 +8450,7 @@ var EditRenderMap = {
8463
8450
  updateHandle = _ref13.updateHandle,
8464
8451
  disabled = _ref13.disabled,
8465
8452
  componentDto = _ref13.componentDto;
8466
- return /*#__PURE__*/React__default['default'].createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8453
+ return /*#__PURE__*/React__default['default'].createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8467
8454
  value: val,
8468
8455
  disabled: t.isEdit || disabled,
8469
8456
  onChange: function onChange(e) {
@@ -8471,7 +8458,7 @@ var EditRenderMap = {
8471
8458
  }
8472
8459
  }));
8473
8460
  },
8474
- BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref14) {
8461
+ CHECKBOX: function CHECKBOX(_ref14) {
8475
8462
  var val = _ref14.val,
8476
8463
  record = _ref14.record,
8477
8464
  index = _ref14.index,
@@ -8479,6 +8466,22 @@ var EditRenderMap = {
8479
8466
  updateHandle = _ref14.updateHandle,
8480
8467
  disabled = _ref14.disabled,
8481
8468
  componentDto = _ref14.componentDto;
8469
+ return /*#__PURE__*/React__default['default'].createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8470
+ value: val,
8471
+ disabled: t.isEdit || disabled,
8472
+ onChange: function onChange(e) {
8473
+ return updateHandle(e, index, t.key);
8474
+ }
8475
+ }));
8476
+ },
8477
+ BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
8478
+ var val = _ref15.val,
8479
+ record = _ref15.record,
8480
+ index = _ref15.index,
8481
+ t = _ref15.t,
8482
+ updateHandle = _ref15.updateHandle,
8483
+ disabled = _ref15.disabled,
8484
+ componentDto = _ref15.componentDto;
8482
8485
  return /*#__PURE__*/React__default['default'].createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
8483
8486
  value: val,
8484
8487
  disabled: t.isEdit || disabled,
@@ -8608,7 +8611,7 @@ var SubForm = function SubForm(props) {
8608
8611
  title: '序号',
8609
8612
  width: 50,
8610
8613
  render: function render(val, record, index) {
8611
- return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
8614
+ return disabled ? /*#__PURE__*/React__default['default'].createElement("div", null, index + 1) : /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
8612
8615
  index: index,
8613
8616
  hoveredRowIndex: hoveredRowIndex,
8614
8617
  handleClick: function handleClick() {
@@ -8717,9 +8720,6 @@ var SubForm = function SubForm(props) {
8717
8720
  other: ''
8718
8721
  };
8719
8722
  }
8720
- if (['SELECT'].includes(next.workOrderComponentType)) {
8721
- item.defaultValue = '';
8722
- }
8723
8723
  prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
8724
8724
  return prv;
8725
8725
  }, {});
@@ -8758,7 +8758,6 @@ var SubForm = function SubForm(props) {
8758
8758
  newValue.splice(index, 0, _objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
8759
8759
  uuid: kmkfUtils.uuid()
8760
8760
  }));
8761
- console.log('newValue', newValue);
8762
8761
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
8763
8762
  };
8764
8763
  var onScrollCapture = function onScrollCapture(e) {
@@ -8844,7 +8843,7 @@ var SubForm = function SubForm(props) {
8844
8843
  data = res.data, success = res.success;
8845
8844
  if (success) {
8846
8845
  transDataSourceItem = kmkfUtils.transformWorkOrderData(templateDetail.componentDtoList, 'init');
8847
- headerKeys = tableHeader.map(function (t) {
8846
+ headerKeys = correlationList.map(function (t) {
8848
8847
  return t.key;
8849
8848
  });
8850
8849
  newList = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (item) {
@@ -12309,6 +12308,7 @@ var jstGoods = function jstGoods(props) {
12309
12308
  var _props$value = props.value,
12310
12309
  value = _props$value === void 0 ? [] : _props$value,
12311
12310
  onChange = props.onChange,
12311
+ _onBlur = props.onBlur,
12312
12312
  disabled = props.disabled,
12313
12313
  _props$type = props.type,
12314
12314
  type = _props$type === void 0 ? 1 : _props$type,
@@ -12323,7 +12323,7 @@ var jstGoods = function jstGoods(props) {
12323
12323
  changeIndex = _useState2[0],
12324
12324
  setChangeIndex = _useState2[1]; //选中的包裹
12325
12325
  var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
12326
- var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
12326
+ var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
12327
12327
  var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
12328
12328
  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
12329
12329
  React.useEffect(function () {
@@ -12438,6 +12438,9 @@ var jstGoods = function jstGoods(props) {
12438
12438
  onChange: function onChange(e) {
12439
12439
  return changeInputHandle(e.target.value, 'logisticsCode');
12440
12440
  },
12441
+ onBlur: function onBlur(e) {
12442
+ return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value);
12443
+ },
12441
12444
  value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.logisticsCode
12442
12445
  }) : null) : null, type === 2 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
12443
12446
  disabled: disabled,
@@ -22304,6 +22307,7 @@ var OrderSubForm = function OrderSubForm(props) {
22304
22307
  manual = props.manual,
22305
22308
  correlationList = props.subConfig.correlationList,
22306
22309
  effects = props.effects;
22310
+ console.log('effects', effects);
22307
22311
  var valueRef = React.useRef(value);
22308
22312
  React.useEffect(function () {
22309
22313
  valueRef.current = value;
@@ -22365,7 +22369,7 @@ var OrderSubForm = function OrderSubForm(props) {
22365
22369
  width: 80,
22366
22370
  ellipsis: true,
22367
22371
  render: function render(val, record, index) {
22368
- return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
22372
+ return disabled ? /*#__PURE__*/React__default['default'].createElement("div", null, index + 1) : /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
22369
22373
  index: index,
22370
22374
  hoveredRowIndex: hoveredRowIndex,
22371
22375
  handleClick: function handleClick() {
@@ -22428,8 +22432,7 @@ var OrderSubForm = function OrderSubForm(props) {
22428
22432
  });
22429
22433
  }
22430
22434
  return list;
22431
- }, [newTableHeader, disabled, updateHandle]);
22432
- console.log('column', column);
22435
+ }, [newTableHeader, disabled, updateHandle, hoveredRowIndex]);
22433
22436
  var orderModalColumns = React.useMemo(function () {
22434
22437
  return [{
22435
22438
  dataIndex: '',
@@ -22484,11 +22487,16 @@ var OrderSubForm = function OrderSubForm(props) {
22484
22487
  }));
22485
22488
  };
22486
22489
  var getDataSourceAsync = function getDataSourceAsync() {
22487
- var _effects$form;
22488
- var _ref = (effects === null || effects === void 0 ? void 0 : (_effects$form = effects.form) === null || _effects$form === void 0 ? void 0 : _effects$form.getFieldsValue()) || {},
22489
- _ref$shopId = _ref.shopId,
22490
- shopId = _ref$shopId === void 0 ? '' : _ref$shopId;
22491
- return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId ? getOrderListSingleton$4({
22490
+ var _ref = effects || {},
22491
+ shopList = _ref.shopList,
22492
+ form = _ref.form;
22493
+ var _ref2 = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {},
22494
+ _ref2$shopId = _ref2.shopId,
22495
+ shopId = _ref2$shopId === void 0 ? '' : _ref2$shopId;
22496
+ var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
22497
+ return !item.notJoin && item.shopId == shopId;
22498
+ });
22499
+ return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$4({
22492
22500
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
22493
22501
  shopId: shopId
22494
22502
  }).then(function (data) {
@@ -22496,7 +22504,7 @@ var OrderSubForm = function OrderSubForm(props) {
22496
22504
  onChange(_objectSpread2(_objectSpread2({}, value), {}, {
22497
22505
  allOrders: allOrders
22498
22506
  }));
22499
- }) : Promise.resolve();
22507
+ }).catch(console.debug) : Promise.resolve();
22500
22508
  };
22501
22509
  var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
22502
22510
  var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
@@ -25933,13 +25941,11 @@ var typeMap$6 = {
25933
25941
  }
25934
25942
  },
25935
25943
  asyncGetData: function () {
25936
- var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(tradeId) {
25944
+ var _asyncGetData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
25937
25945
  return _regeneratorRuntime().wrap(function _callee$(_context) {
25938
25946
  while (1) switch (_context.prev = _context.next) {
25939
25947
  case 0:
25940
- return _context.abrupt("return", kmkfUtils.servers.SKX.querySkxOrderDetailSingleton({
25941
- tid: tradeId
25942
- }).then(function (res) {
25948
+ return _context.abrupt("return", kmkfUtils.servers.SKX.querySkxOrderDetailSingleton(params).then(function (res) {
25943
25949
  var orderDetailInfoList = res.data.orderDetailInfoList || [];
25944
25950
  return orderDetailInfoList;
25945
25951
  }));
@@ -25974,13 +25980,11 @@ var typeMap$6 = {
25974
25980
  }
25975
25981
  },
25976
25982
  asyncGetData: function () {
25977
- var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tradeId) {
25983
+ var _asyncGetData2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
25978
25984
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
25979
25985
  while (1) switch (_context2.prev = _context2.next) {
25980
25986
  case 0:
25981
- return _context2.abrupt("return", kmkfUtils.servers.SKX.queryReturnOrderDetailSingleton({
25982
- tid: tradeId
25983
- }).then(function (res) {
25987
+ return _context2.abrupt("return", kmkfUtils.servers.SKX.queryReturnOrderDetailSingleton(params).then(function (res) {
25984
25988
  var skqReturnOrderDetailInfoDtos = res.data.skqReturnOrderDetailInfoDtos || [];
25985
25989
  return skqReturnOrderDetailInfoDtos;
25986
25990
  }));
@@ -26045,32 +26049,42 @@ var IdInputSelect = function IdInputSelect(props) {
26045
26049
  }, [value]);
26046
26050
  var asyncQueryData = /*#__PURE__*/function () {
26047
26051
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
26048
- var tradeId;
26052
+ var _form$getFieldValue, _form$getFieldValue$;
26053
+ var tradeId, skxReturnExpressCode, blurFrom;
26049
26054
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
26050
26055
  while (1) switch (_context3.prev = _context3.next) {
26051
26056
  case 0:
26052
26057
  tradeId = form.getFieldValue('m3ap1EvEyd');
26058
+ skxReturnExpressCode = (_form$getFieldValue = form.getFieldValue('4487c6516b')) === null || _form$getFieldValue === void 0 ? void 0 : (_form$getFieldValue$ = _form$getFieldValue[0]) === null || _form$getFieldValue$ === void 0 ? void 0 : _form$getFieldValue$.logisticsCode;
26059
+ blurFrom = form.getFieldValue('skx_return_billNo_blur_from');
26053
26060
  console.log('asyncQueryData---', {
26061
+ skxReturnExpressCode: skxReturnExpressCode,
26062
+ blurFrom: blurFrom,
26054
26063
  tradeId: tradeId,
26055
26064
  tradeIdRef: tradeIdRef.current,
26056
26065
  form: form
26057
26066
  });
26058
- if (tradeId) {
26059
- _context3.next = 5;
26067
+ if (!(type === 'SKX_OUTBOUND_NOTICE_NO' && !tradeId || type === 'SKX_RETURN_BILL_NO' && !tradeId && !skxReturnExpressCode)) {
26068
+ _context3.next = 7;
26060
26069
  break;
26061
26070
  }
26062
26071
  setDataSource([]);
26063
26072
  return _context3.abrupt("return");
26064
- case 5:
26073
+ case 7:
26065
26074
  setSpinning(true);
26066
- typeMap$6[type].asyncGetData(tradeId).then(function (data) {
26075
+ // 判断是从哪个组件失焦,若是从[SKX]退换物流信息(TH)失焦,则根据物流单号查询,若是从订单号组件失焦,则根据订单号查询
26076
+ typeMap$6[type].asyncGetData(type === 'SKX_RETURN_BILL_NO' && blurFrom === '4487c6516b' ? {
26077
+ expressCode: skxReturnExpressCode
26078
+ } : {
26079
+ tid: tradeId
26080
+ }).then(function (data) {
26067
26081
  setDataSource(data);
26068
26082
  }).catch(function () {
26069
26083
  setDataSource([]);
26070
26084
  }).finally(function () {
26071
26085
  setSpinning(false);
26072
26086
  });
26073
- case 7:
26087
+ case 9:
26074
26088
  case "end":
26075
26089
  return _context3.stop();
26076
26090
  }
@@ -26167,7 +26181,14 @@ var IdInputSelect = function IdInputSelect(props) {
26167
26181
  value: value,
26168
26182
  isInput: isInput
26169
26183
  });
26170
- onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && !!isInput);
26184
+ var isReturnBillNoChange = type === 'SKX_RETURN_BILL_NO' && form.getFieldValue('skx_return_billNo_blur_from') === '4487c6516b';
26185
+ onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && (!!isInput || isReturnBillNoChange));
26186
+ // 如果类型是[SKX]退换货单号,则根据blurFrom判断是从[SKX]退换物流信息(TH)失焦,则调用onBlur
26187
+ isReturnBillNoChange && (_onBlur === null || _onBlur === void 0 ? void 0 : _onBlur({
26188
+ target: {
26189
+ value: val
26190
+ }
26191
+ }));
26171
26192
  // 关闭浮窗
26172
26193
  setPopoverVisible(false);
26173
26194
  };
@@ -12,6 +12,9 @@ export declare const RadioRender: ({ value }: {
12
12
  export declare const CheckboxRender: ({ value }: {
13
13
  value: any;
14
14
  }) => any;
15
+ export declare const MultipleSelectRender: ({ value }: {
16
+ value: any;
17
+ }) => any;
15
18
  export declare const renderMap: Record<string, (props: any) => React.ReactNode>;
16
19
  export declare const EditPictureRender: ({ val, index, t, updateHandle, disabled, hostUrl, }: any) => React.JSX.Element;
17
20
  export declare const EditFileRender: ({ val, index, t, updateHandle, disabled, hostUrl, }: any) => React.JSX.Element;
@@ -6,6 +6,7 @@ interface JstGoodsProps {
6
6
  options: any[];
7
7
  disabled: boolean;
8
8
  onChange: (val: any[]) => void;
9
+ onBlur?: (val: any) => void;
9
10
  showField: string;
10
11
  platformType?: string;
11
12
  onlyShowFieldSelect: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.5-beta.2",
3
+ "version": "2.2.5-beta.21",
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.2.5-beta.2",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.5-beta.18",
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": "25af86e0250188e7f3985986c8851bf486913647"
69
+ "gitHead": "52e09d850c3d64732636822d50585dc02cfd234f"
70
70
  }