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

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 +12 -12
  2. package/dist/index.js +12 -12
  3. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -15806,6 +15806,13 @@ var transformFormData = function transformFormData(formData) {
15806
15806
  if (formData[key]) {
15807
15807
  var _formData$key, _formData$key2, _formData$key3, _formData$key4;
15808
15808
  var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
15809
+ // 如果 value 是字符串且包含中英文逗号或空格，则拆分成数组
15810
+ if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
15811
+ var _value, _value$replace, _value$replace$split;
15812
+ value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,， ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
15813
+ return v;
15814
+ });
15815
+ }
15809
15816
  var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
15810
15817
  conditionList.push({
15811
15818
  leftValue: key,
@@ -23552,14 +23559,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23552
23559
  while (1) switch (_context.prev = _context.next) {
23553
23560
  case 0:
23554
23561
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
23555
- return item.sysItemId;
23562
+ return item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23556
23563
  });
23557
23564
  _context.next = 3;
23558
23565
  return servers.KM.getSupplierSingleton(systemItemIds);
23559
23566
  case 3:
23560
23567
  supplierMap = _context.sent;
23561
23568
  dataSource === null || dataSource === void 0 ? void 0 : dataSource.forEach(function (item) {
23562
- var supplierInfo = supplierMap.get(item.sysItemId);
23569
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23570
+ var supplierInfo = supplierMap.get(key);
23563
23571
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23564
23572
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
23565
23573
  });
@@ -26818,7 +26826,8 @@ var CommonGoods = function CommonGoods(props) {
26818
26826
  if (compType.indexOf('KM') > -1) {
26819
26827
  var _value$kmGoods;
26820
26828
  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;
26829
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26830
+ map[key] = item;
26822
26831
  });
26823
26832
  }
26824
26833
  return map;
@@ -27033,15 +27042,6 @@ var CommonGoods = function CommonGoods(props) {
27033
27042
  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
27043
  }) : goodDetails;
27035
27044
  };
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
27045
  // 找到该订单号下所有商品
27046
27046
  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
27047
27047
  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
package/dist/index.js CHANGED
@@ -15821,6 +15821,13 @@ var transformFormData = function transformFormData(formData) {
15821
15821
  if (formData[key]) {
15822
15822
  var _formData$key, _formData$key2, _formData$key3, _formData$key4;
15823
15823
  var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
15824
+ // 如果 value 是字符串且包含中英文逗号或空格，则拆分成数组
15825
+ if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
15826
+ var _value, _value$replace, _value$replace$split;
15827
+ value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,， ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
15828
+ return v;
15829
+ });
15830
+ }
15824
15831
  var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
15825
15832
  conditionList.push({
15826
15833
  leftValue: key,
@@ -23567,14 +23574,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
23567
23574
  while (1) switch (_context.prev = _context.next) {
23568
23575
  case 0:
23569
23576
  systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
23570
- return item.sysItemId;
23577
+ return item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23571
23578
  });
23572
23579
  _context.next = 3;
23573
23580
  return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
23574
23581
  case 3:
23575
23582
  supplierMap = _context.sent;
23576
23583
  dataSource === null || dataSource === void 0 ? void 0 : dataSource.forEach(function (item) {
23577
- var supplierInfo = supplierMap.get(item.sysItemId);
23584
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
23585
+ var supplierInfo = supplierMap.get(key);
23578
23586
  item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
23579
23587
  item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
23580
23588
  });
@@ -26833,7 +26841,8 @@ var CommonGoods = function CommonGoods(props) {
26833
26841
  if (compType.indexOf('KM') > -1) {
26834
26842
  var _value$kmGoods;
26835
26843
  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;
26844
+ var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
26845
+ map[key] = item;
26837
26846
  });
26838
26847
  }
26839
26848
  return map;
@@ -27048,15 +27057,6 @@ var CommonGoods = function CommonGoods(props) {
27048
27057
  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
27058
  }) : goodDetails;
27050
27059
  };
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
27060
  // 找到该订单号下所有商品
27061
27061
  var getAllTradeGoodsDetails = /*#__PURE__*/function () {
27062
27062
  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.34",
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": "0f519f6986de7916c7d1121f5e30698be610ba91"
70
70
  }