@kmkf-fe-packages/basic-components 2.2.39-beta.32 → 2.2.39-beta.33

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.
Files changed (3) hide show
  1. package/dist/index.esm.js +5 -12
  2. package/dist/index.js +5 -12
  3. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -23552,14 +23552,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23552
23552
  while (1) switch (_context.prev = _context.next) {
23553
23553
  case 0:
23554
23554
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
23555
- return item.sysItemId;
23555
+ return item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23556
23556
  });
23557
23557
  _context.next = 3;
23558
23558
  return servers.KM.getSupplierSingleton(systemItemIds);
23559
23559
  case 3:
23560
23560
  supplierMap = _context.sent;
23561
23561
  dataSource === null || dataSource === void 0 ? void 0 : dataSource.forEach(function (item) {
23562
- var supplierInfo = supplierMap.get(item.sysItemId);
23562
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23563
+ var supplierInfo = supplierMap.get(key);
23563
23564
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23564
23565
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
23565
23566
  });
@@ -26818,7 +26819,8 @@ var CommonGoods = function CommonGoods(props) {
26818
26819
  if (compType.indexOf('KM') > -1) {
26819
26820
  var _value$kmGoods;
26820
26821
  value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : _value$kmGoods.forEach(function (item) {
26821
- map[item.sysItemId] = item;
26822
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26823
+ map[key] = item;
26822
26824
  });
26823
26825
  }
26824
26826
  return map;
@@ -27033,15 +27035,6 @@ var CommonGoods = function CommonGoods(props) {
27033
27035
  return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
27034
27036
  }) : goodDetails;
27035
27037
  };
27036
- // const getKmSupplier = async (list: any[]) => {
27037
- // const systemItemIds = list?.map((item) => item.sysItemId);
27038
- // const supplierMap = await servers.KM.getSupplierSingleton(systemItemIds);
27039
- // list?.forEach((item) => {
27040
- // const supplierInfo = supplierMap.get(item.sysItemId);
27041
- // item.supplierCode = supplierInfo?.supplierCode;
27042
- // item.supplierName = supplierInfo?.supplierName;
27043
- // });
27044
- // };
27045
27038
  // 找到该订单号下所有商品
27046
27039
  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
27047
27040
  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
package/dist/index.js CHANGED
@@ -23567,14 +23567,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23567
23567
  while (1) switch (_context.prev = _context.next) {
23568
23568
  case 0:
23569
23569
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
23570
- return item.sysItemId;
23570
+ return item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23571
23571
  });
23572
23572
  _context.next = 3;
23573
23573
  return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
23574
23574
  case 3:
23575
23575
  supplierMap = _context.sent;
23576
23576
  dataSource === null || dataSource === void 0 ? void 0 : dataSource.forEach(function (item) {
23577
- var supplierInfo = supplierMap.get(item.sysItemId);
23577
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23578
+ var supplierInfo = supplierMap.get(key);
23578
23579
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23579
23580
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
23580
23581
  });
@@ -26833,7 +26834,8 @@ var CommonGoods = function CommonGoods(props) {
26833
26834
  if (compType.indexOf('KM') > -1) {
26834
26835
  var _value$kmGoods;
26835
26836
  value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : _value$kmGoods.forEach(function (item) {
26836
- map[item.sysItemId] = item;
26837
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26838
+ map[key] = item;
26837
26839
  });
26838
26840
  }
26839
26841
  return map;
@@ -27048,15 +27050,6 @@ var CommonGoods = function CommonGoods(props) {
27048
27050
  return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
27049
27051
  }) : goodDetails;
27050
27052
  };
27051
- // const getKmSupplier = async (list: any[]) => {
27052
- // const systemItemIds = list?.map((item) => item.sysItemId);
27053
- // const supplierMap = await servers.KM.getSupplierSingleton(systemItemIds);
27054
- // list?.forEach((item) => {
27055
- // const supplierInfo = supplierMap.get(item.sysItemId);
27056
- // item.supplierCode = supplierInfo?.supplierCode;
27057
- // item.supplierName = supplierInfo?.supplierName;
27058
- // });
27059
- // };
27060
27053
  // 找到该订单号下所有商品
27061
27054
  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
27062
27055
  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.39-beta.32",
3
+ "version": "2.2.39-beta.33",
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.39-beta.32",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.33",
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": "3738f693fb67a8b86de3791881cfa92a28b86987"
69
+ "gitHead": "e83b880e9aa4dd76cc307592b93711767a7ce8cd"
70
70
  }