@kmkf-fe-packages/kmkf-utils 2.8.4 → 2.9.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/README.md CHANGED
@@ -1 +1 @@
1
- 112311111
1
+ 112311111
@@ -53,7 +53,6 @@ _defineProperty(GyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#__
53
53
  instance = GyAddressData.getInstance();
54
54
  if (!GyAddressData.initSingleton) {
55
55
  GyAddressData.initSingleton = queryGyAddressData().catch(function (e) {
56
- console.warn("init gy data e", e);
57
56
  GyAddressData.initSingleton = null;
58
57
  });
59
58
  }
@@ -53,7 +53,6 @@ _defineProperty(JkyAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = JkyAddressData.getInstance();
54
54
  if (!JkyAddressData.initSingleton) {
55
55
  JkyAddressData.initSingleton = queryJkyAddressData().catch(function (e) {
56
- console.warn("init jst data e", e);
57
56
  JkyAddressData.initSingleton = null;
58
57
  });
59
58
  }
@@ -53,7 +53,6 @@ _defineProperty(JstAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = JstAddressData.getInstance();
54
54
  if (!JstAddressData.initSingleton) {
55
55
  JstAddressData.initSingleton = queryJstAddressData().catch(function (e) {
56
- console.warn("init jst data e", e);
57
56
  JstAddressData.initSingleton = null;
58
57
  });
59
58
  }
@@ -53,7 +53,6 @@ _defineProperty(WdtAddressData, "initData", /*#__PURE__*/_asyncToGenerator( /*#_
53
53
  instance = WdtAddressData.getInstance();
54
54
  if (!WdtAddressData.initSingleton) {
55
55
  WdtAddressData.initSingleton = queryWdtAddressData().catch(function (e) {
56
- console.warn("init wdt data e", e);
57
56
  WdtAddressData.initSingleton = null;
58
57
  });
59
58
  }
@@ -20,9 +20,7 @@ var logisticsAddressData = /*#__PURE__*/function () {
20
20
  }).then(function (res) {
21
21
  var data = res.data;
22
22
  _this.addressData = data;
23
- }).catch(function (e) {
24
- console.log(e);
25
- });
23
+ }).catch(function (e) {});
26
24
  });
27
25
  _defineProperty(this, "getAddressData", function () {
28
26
  var _this$addressData;
@@ -17,9 +17,7 @@ var showErrorMessage = function showErrorMessage(res, options) {
17
17
  message.warning(msg);
18
18
  } else if (infoLevel === "error") {
19
19
  message.error(msg);
20
- } else {
21
- console.error(msg, res, options);
22
- }
20
+ } else {}
23
21
  };
24
22
  var requestApi = function requestApi(_ref) {
25
23
  var url = _ref.url,
@@ -70,9 +70,7 @@ export var getSupplierSingleton = /*#__PURE__*/function () {
70
70
  });
71
71
  });
72
72
  }
73
- }).catch(function (err) {
74
- console.error(err);
75
- });
73
+ }).catch(function (err) {});
76
74
  }));
77
75
  case 8:
78
76
  return _context.abrupt("return", supplierMap);
@@ -51,14 +51,13 @@ export var getOrderSubFormDataAsync = /*#__PURE__*/function () {
51
51
  return _regeneratorRuntime().wrap(function _callee$(_context) {
52
52
  while (1) switch (_context.prev = _context.next) {
53
53
  case 0:
54
- console.log("params", params);
55
- _context.next = 3;
54
+ _context.next = 2;
56
55
  return queryOrderSubFormList(params);
57
- case 3:
56
+ case 2:
58
57
  result = _context.sent;
59
58
  orderSubFormList = (result === null || result === void 0 ? void 0 : result.data) || [];
60
59
  return _context.abrupt("return", orderSubFormList);
61
- case 6:
60
+ case 5:
62
61
  case "end":
63
62
  return _context.stop();
64
63
  }
@@ -22,7 +22,6 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
22
22
  case 0:
23
23
  _context.next = 2;
24
24
  return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
25
- console.log("发货仓数据---", _this.platform, list);
26
25
  _this.sendData = list;
27
26
  });
28
27
  case 2:
@@ -281,7 +281,6 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
281
281
  logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
282
282
  logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
283
283
  }];
284
- console.log("packageDetailList", next, next.logisticCode, packageDetailList);
285
284
  var packageDetails = (packageDetailList || []).map(function (t) {
286
285
  return {
287
286
  items: items,
@@ -290,7 +289,6 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
290
289
  logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
291
290
  };
292
291
  });
293
- console.log("packageDetails", packageDetails);
294
292
  prv.push.apply(prv, _toConsumableArray(packageDetails));
295
293
  } else if (type === "send") {
296
294
  var params = {
@@ -416,10 +416,6 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
416
416
  var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
417
417
  var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
418
418
  var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
419
- console.log("kmOrderTransform---", {
420
- detail: detail,
421
- componentList: componentList
422
- });
423
419
  var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
424
420
  return item.workOrderComponentType === "KM_GOODS";
425
421
  })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
@@ -449,7 +445,6 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
449
445
  var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
450
446
  if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
451
447
  kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
452
- console.log("kmPosting", kmPosting);
453
448
  }
454
449
  return {
455
450
  kmSystemOrderNo: selectedSystemOrderNo,
@@ -259,7 +259,6 @@ export default (function (_ref) {
259
259
  var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
260
260
  var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
261
261
  var jkyValues = detail["jkyOrder"] ? jkyOrderBackFormValues(detail["jkyOrder"], templateDetail) : {};
262
- console.log("jkyValues", detail, jkyValues);
263
262
  //不判断是否存在detail["skxOrder"],不存在直接清空所有skx相关组件值
264
263
  var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
265
264
  var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
@@ -473,7 +473,6 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
473
473
  case "WDT_RETURN_BILL_NO":
474
474
  {
475
475
  if (config.orderBackRule === "platformOrderNumber") {
476
- console.log("4343434");
477
476
  prv[uniqueKey] = (detail === null || detail === void 0 ? void 0 : detail.wdtReturnSystemOrder) || [];
478
477
  }
479
478
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.8.4",
3
+ "version": "2.9.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -41,7 +41,7 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "fd1f245d2d1a35fea163de0b8b118f83ebe3aed4",
44
+ "gitHead": "50a9ed976dfe5d2718b966cbd974a3d69c0bc1fd",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }
@@ -1,285 +0,0 @@
1
- "use strict";
2
-
3
- var __assign = this && this.__assign || function () {
4
- __assign = Object.assign || function (t) {
5
- for (var s, i = 1, n = arguments.length; i < n; i++) {
6
- s = arguments[i];
7
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
8
- }
9
- return t;
10
- };
11
- return __assign.apply(this, arguments);
12
- };
13
- exports.__esModule = true;
14
- exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
15
- var getUUid_1 = require("./getUUid");
16
- var deliveryStateMap = {
17
- 0: "未发货",
18
- 2: "全部发货"
19
- };
20
- exports.GY_SYSTEM_ORDER_CONFIG = {
21
- key: "gySystemShowOrder",
22
- name: "管易",
23
- selectId: "gySystemSelectIds",
24
- columns: [{
25
- dataIndex: "billType",
26
- title: "订单类型",
27
- width: 150
28
- }, {
29
- dataIndex: "billNo",
30
- title: "系统订单号",
31
- width: 160
32
- }, {
33
- dataIndex: "tradeTagName",
34
- title: "订单标记名称",
35
- width: 150
36
- }, {
37
- dataIndex: "billTag",
38
- title: "订单标签",
39
- width: 150
40
- }, {
41
- dataIndex: "deliveryState",
42
- title: "发货状态",
43
- width: 150
44
- }]
45
- };
46
- exports.updateGyGoodsHandle = function (orders) {
47
- if (orders === void 0) {
48
- orders = [];
49
- }
50
- return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
51
- if (Array.isArray(cur.details)) {
52
- acc.push.apply(acc, cur.details.map(function (item) {
53
- var _a;
54
- item.goodName = item.itemName;
55
- item.goodShortName = item.itemSimpleName;
56
- item.goodNo = item.itemCode;
57
- item.specNo = item.skuCode;
58
- item.specName = item.skuName;
59
- item.canDelete = true;
60
- item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
61
- return item;
62
- }));
63
- }
64
- return acc;
65
- }, []);
66
- };
67
- var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
68
- var _a, _b;
69
- if (type === "logistics") {
70
- //管易物流信息组件先不做
71
- // const currentCom = comList?.find?.(
72
- // (item) => item.workOrderComponentType === "GY_LOGISTICS"
73
- // );
74
- // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
75
- // if (notOrderBack) {
76
- // let currentValue = form.getFieldValue(currentCom.uniqueKey);
77
- // currentValue = currentValue?.length
78
- // ? currentValue
79
- // : [{ logisticsCode: "", logisticsCompany: "" }];
80
- // return currentValue;
81
- // }
82
- } else if (type === "send") {
83
- var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
84
- return item.workOrderComponentType === "GY_SEND_GOOD";
85
- });
86
- var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
87
- if (notOrderBack) {
88
- var currentValue = form.getFieldValue(currentCom.uniqueKey);
89
- currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
90
- sendId: "",
91
- sendName: ""
92
- }];
93
- return currentValue;
94
- }
95
- }
96
- var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
97
- var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
98
- return {
99
- title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
100
- picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
101
- platform: "gy",
102
- skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
103
- };
104
- });
105
- var params = {
106
- items: items
107
- };
108
- if (type === "logistics") {
109
- // params.logisticsCompany = next?.shippingCode;
110
- // params.logisticsCode = next?.shippingSn;
111
- } else if (type === "send") {
112
- params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
113
- //下拉框,取id
114
- params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
115
- params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
116
- }
117
- prv.push(params);
118
- return prv;
119
- }, []);
120
- if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
121
- switch (type) {
122
- case "logistics":
123
- newList = [{
124
- logisticsCode: ""
125
- }];
126
- break;
127
- case "supply":
128
- newList = [{
129
- supplyId: ""
130
- }];
131
- break;
132
- case "send":
133
- newList = [{
134
- sendId: "",
135
- sendName: ""
136
- }];
137
- break;
138
- }
139
- }
140
- return newList;
141
- };
142
- //管易订单信息转换
143
- exports.gyOrderTransform = function (detail, form) {
144
- var _a, _b, _c, _d, _e, _f;
145
- var orderNo = detail.orderNo,
146
- _g = detail.trades,
147
- currentTrades = _g === void 0 ? [] : _g,
148
- componentList = detail.componentList;
149
- var gyGoodsCom = (componentList || []).find(function (com) {
150
- return com.workOrderComponentType === "GY_GOODS";
151
- });
152
- var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
153
- var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
- console.log("触发---getGyOrderList--4");
155
- return {
156
- gySystemOrder: {
157
- orderNo: orderNo,
158
- isTest: 4,
159
- orders: currentTrades.map(function (item) {
160
- return __assign(__assign({}, item), {
161
- billNo: item.code,
162
- billType: item.orderTypeName,
163
- billTag: item.tagName,
164
- tradeTagName: item.tradeTagName,
165
- deliveryState: deliveryStateMap[item.deliveryState]
166
- });
167
- }),
168
- selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
169
- return item.code;
170
- }) : [],
171
- showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
172
- return __assign(__assign({}, item), {
173
- billNo: item.code,
174
- billType: item.orderTypeName,
175
- billTag: item.tagName,
176
- tradeTagName: item.tradeTagName,
177
- deliveryState: deliveryStateMap[item.deliveryState]
178
- });
179
- })
180
- },
181
- gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
182
- gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
183
- return !isStrict || !orderNo || good.platformCode === orderNo;
184
- }) : [],
185
- gyGoods: {
186
- // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
187
- orders: currentTrades,
188
- orderNo: orderNo,
189
- shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
190
- return item.shopCode;
191
- })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
192
- vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
193
- return item.vipCode;
194
- })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
195
- gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
196
- return !isStrict || !orderNo || good.platformCode === orderNo;
197
- })
198
- },
199
- // gyLogistics: updateGyItemListHandle(
200
- // currentTrades,
201
- // "logistics",
202
- // componentList || [],
203
- // form
204
- // ),
205
- gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
206
- };
207
- };
208
- exports.gyOrderBackFormValues = function (detail, templateDetail) {
209
- if (detail === void 0) {
210
- detail = {};
211
- }
212
- if (templateDetail === void 0) {
213
- templateDetail = {};
214
- }
215
- return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
216
- var _a, _b;
217
- var uniqueKey = next.uniqueKey;
218
- var config = next.componentConfig;
219
- switch (next.workOrderComponentType) {
220
- case "GY_SYSTEM_ORDER":
221
- prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
222
- break;
223
- case "GY_GOODS":
224
- prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
225
- break;
226
- case "GY_REISSUE_GOODS":
227
- prv[uniqueKey] = {
228
- gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
229
- gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
230
- gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
231
- gyReissueType: ["1"],
232
- shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
233
- vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
234
- };
235
- break;
236
- case "GY_LOGISTICS":
237
- prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
238
- break;
239
- case "GY_SEND_GOOD":
240
- prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
241
- }
242
- return prv;
243
- }, {});
244
- };
245
- var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
246
- if (config === void 0) {
247
- config = {};
248
- }
249
- var showField = config.showField,
250
- _a = config.notOrderBack,
251
- notOrderBack = _a === void 0 ? false : _a;
252
- if (notOrderBack) {
253
- return list;
254
- }
255
- return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
256
- if (type === "logistics") {
257
- if (!["logisticsCompany", ""].includes(showField || "")) {
258
- next.logisticsCompany = undefined;
259
- }
260
- if (!["logisticsCode", ""].includes(showField || "")) {
261
- next.logisticsCode = undefined;
262
- }
263
- } else if (type === "send") {
264
- if (!["sendId", "all"].includes(showField || "")) {
265
- next.sendId = undefined;
266
- }
267
- if (!["sendName", "all"].includes(showField || "")) {
268
- next.sendName = undefined;
269
- next.sendSnapshotName = undefined;
270
- }
271
- }
272
- prv.push(next);
273
- return prv;
274
- }, []);
275
- };
276
- // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
277
- exports.filterGyOrders = function (trades, order_no) {
278
- var currentTrades = (trades || []).filter(function (item) {
279
- return (item.platformCode || "").split(",").includes(order_no);
280
- });
281
- if (currentTrades.length) {
282
- return currentTrades;
283
- }
284
- return [];
285
- };