@kmkf-fe-packages/kmkf-utils 2.10.28 → 2.10.29

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.
@@ -94,6 +94,7 @@ declare enum TComponentType {
94
94
  WDT_LOGISTICS = "WDT_LOGISTICS",
95
95
  WDT_SEND_GOOD = "WDR_SEND_GOOD",
96
96
  WDT_SYSTEM_ORDER = "WDT_SYSTEM_ORDER",
97
+ WDT_TAGS = "WDT_TAGS",
97
98
  WDT_RETURN_GOODS = "WDT_RETURN_GOODS",
98
99
  WDT_EXCHANGE_GOODS = "WDT_EXCHANGE_GOODS",
99
100
  JST_RETURN_GOODS = "JST_RETURN_GOODS",
@@ -12,5 +12,6 @@ export * from "./hooks";
12
12
  export * from "./baseAddressData";
13
13
  export * from "./utils";
14
14
  export * from "./constants";
15
+ export { isYouzanShop, normalizeYouzanStar, YOUZAN_FLAG_STAR_MAPPING, YOUZAN_SHOP_SOURCE } from "./constants/youzan";
15
16
  export { SendDataCenter } from "./utils/SendData";
16
17
  export { WdtShopDataCenter } from "./utils/WdtShopData";
package/dist/esm/index.js CHANGED
@@ -13,5 +13,8 @@ export * from "./hooks";
13
13
  export * from "./baseAddressData";
14
14
  export * from "./utils";
15
15
  export * from "./constants";
16
+ // Keep commonly consumed Youzan helpers visible to bundlers that do not resolve
17
+ // nested `export *` re-exports reliably.
18
+ export { isYouzanShop, normalizeYouzanStar, YOUZAN_FLAG_STAR_MAPPING, YOUZAN_SHOP_SOURCE } from "./constants/youzan";
16
19
  export { SendDataCenter } from "./utils/SendData";
17
20
  export { WdtShopDataCenter } from "./utils/WdtShopData";
@@ -0,0 +1,284 @@
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
+ return {
155
+ gySystemOrder: {
156
+ orderNo: orderNo,
157
+ isTest: 4,
158
+ orders: currentTrades.map(function (item) {
159
+ return __assign(__assign({}, item), {
160
+ billNo: item.code,
161
+ billType: item.orderTypeName,
162
+ billTag: item.tagName,
163
+ tradeTagName: item.tradeTagName,
164
+ deliveryState: deliveryStateMap[item.deliveryState]
165
+ });
166
+ }),
167
+ selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
168
+ return item.code;
169
+ }) : [],
170
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
171
+ return __assign(__assign({}, item), {
172
+ billNo: item.code,
173
+ billType: item.orderTypeName,
174
+ billTag: item.tagName,
175
+ tradeTagName: item.tradeTagName,
176
+ deliveryState: deliveryStateMap[item.deliveryState]
177
+ });
178
+ })
179
+ },
180
+ gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
181
+ gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
182
+ return !isStrict || !orderNo || good.platformCode === orderNo;
183
+ }) : [],
184
+ gyGoods: {
185
+ // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
186
+ orders: currentTrades,
187
+ orderNo: orderNo,
188
+ shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
189
+ return item.shopCode;
190
+ })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
191
+ vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
192
+ return item.vipCode;
193
+ })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
194
+ gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
195
+ return !isStrict || !orderNo || good.platformCode === orderNo;
196
+ })
197
+ },
198
+ // gyLogistics: updateGyItemListHandle(
199
+ // currentTrades,
200
+ // "logistics",
201
+ // componentList || [],
202
+ // form
203
+ // ),
204
+ gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
205
+ };
206
+ };
207
+ exports.gyOrderBackFormValues = function (detail, templateDetail) {
208
+ if (detail === void 0) {
209
+ detail = {};
210
+ }
211
+ if (templateDetail === void 0) {
212
+ templateDetail = {};
213
+ }
214
+ return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
215
+ var _a, _b;
216
+ var uniqueKey = next.uniqueKey;
217
+ var config = next.componentConfig;
218
+ switch (next.workOrderComponentType) {
219
+ case "GY_SYSTEM_ORDER":
220
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
221
+ break;
222
+ case "GY_GOODS":
223
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
224
+ break;
225
+ case "GY_REISSUE_GOODS":
226
+ prv[uniqueKey] = {
227
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
228
+ gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
229
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
230
+ gyReissueType: ["1"],
231
+ shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
232
+ vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
233
+ };
234
+ break;
235
+ case "GY_LOGISTICS":
236
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
237
+ break;
238
+ case "GY_SEND_GOOD":
239
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
240
+ }
241
+ return prv;
242
+ }, {});
243
+ };
244
+ var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
245
+ if (config === void 0) {
246
+ config = {};
247
+ }
248
+ var showField = config.showField,
249
+ _a = config.notOrderBack,
250
+ notOrderBack = _a === void 0 ? false : _a;
251
+ if (notOrderBack) {
252
+ return list;
253
+ }
254
+ return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
255
+ if (type === "logistics") {
256
+ if (!["logisticsCompany", ""].includes(showField || "")) {
257
+ next.logisticsCompany = undefined;
258
+ }
259
+ if (!["logisticsCode", ""].includes(showField || "")) {
260
+ next.logisticsCode = undefined;
261
+ }
262
+ } else if (type === "send") {
263
+ if (!["sendId", "all"].includes(showField || "")) {
264
+ next.sendId = undefined;
265
+ }
266
+ if (!["sendName", "all"].includes(showField || "")) {
267
+ next.sendName = undefined;
268
+ next.sendSnapshotName = undefined;
269
+ }
270
+ }
271
+ prv.push(next);
272
+ return prv;
273
+ }, []);
274
+ };
275
+ // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
276
+ exports.filterGyOrders = function (trades, order_no) {
277
+ var currentTrades = (trades || []).filter(function (item) {
278
+ return (item.platformCode || "").split(",").includes(order_no);
279
+ });
280
+ if (currentTrades.length) {
281
+ return currentTrades;
282
+ }
283
+ return [];
284
+ };
@@ -76,6 +76,8 @@ export declare const WDT_ORDER_TYPE_MAP: {
76
76
  export declare const updateWdtGoodsHandle: (orders?: any[]) => any;
77
77
  export declare const updateWdtAftersaleGoodsHandle: (orders?: any[]) => any;
78
78
  export declare const filterWdtOrders: (detail: any, order_no: string) => any;
79
+ /** Normalize flagship trade_label and enterprise tags into the form's name array. */
80
+ export declare const getWdtOrderTags: (order: any, version?: string) => string[];
79
81
  export declare const wdtOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
80
82
  export declare const wdtOrderTransform: (detail: any, form: any) => {
81
83
  wdtSystemOrder: {
@@ -112,5 +114,6 @@ export declare const wdtOrderTransform: (detail: any, form: any) => {
112
114
  };
113
115
  wdtLogistics: any;
114
116
  wdtSendGood: any;
117
+ wdtTags: unknown[];
115
118
  shopCode: any;
116
119
  };
@@ -1,6 +1,6 @@
1
- function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
1
  var _excluded = ["label"],
3
2
  _excluded2 = ["label"];
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
4
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
5
5
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
6
6
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -487,6 +487,28 @@ export var filterWdtOrders = function filterWdtOrders(detail, order_no) {
487
487
  }
488
488
  return [];
489
489
  };
490
+ var splitWdtTagValue = function splitWdtTagValue(value) {
491
+ if (value === undefined || value === null || value === "") return [];
492
+ if (Array.isArray(value)) return value.flatMap(splitWdtTagValue);
493
+ if (_typeof(value) === "object") {
494
+ var _ref4, _ref5, _ref6, _ref7, _value$tagName;
495
+ return splitWdtTagValue((_ref4 = (_ref5 = (_ref6 = (_ref7 = (_value$tagName = value.tagName) !== null && _value$tagName !== void 0 ? _value$tagName : value.name) !== null && _ref7 !== void 0 ? _ref7 : value.label) !== null && _ref6 !== void 0 ? _ref6 : value.tag_name) !== null && _ref5 !== void 0 ? _ref5 : value.id) !== null && _ref4 !== void 0 ? _ref4 : value.tagId);
496
+ }
497
+ return String(value).split(/[\u002c\uFF0C\u3001]/).map(function (item) {
498
+ return item.trim();
499
+ }).filter(Boolean);
500
+ };
501
+
502
+ /** Normalize flagship trade_label and enterprise tags into the form's name array. */
503
+ export var getWdtOrderTags = function getWdtOrderTags(order, version) {
504
+ var candidates = version === "enterprise" ? [order === null || order === void 0 ? void 0 : order.trade_label, order === null || order === void 0 ? void 0 : order.tradeLabel, order === null || order === void 0 ? void 0 : order.tagNames, order === null || order === void 0 ? void 0 : order.tagName, order === null || order === void 0 ? void 0 : order.tags] : [order === null || order === void 0 ? void 0 : order.trade_label, order === null || order === void 0 ? void 0 : order.tradeLabel, order === null || order === void 0 ? void 0 : order.tagName, order === null || order === void 0 ? void 0 : order.tagNames, order === null || order === void 0 ? void 0 : order.tags];
505
+ for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
506
+ var candidate = _candidates[_i];
507
+ var tags = splitWdtTagValue(candidate);
508
+ if (tags.length) return _toConsumableArray(new Set(tags));
509
+ }
510
+ return [];
511
+ };
490
512
  export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
491
513
  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
492
514
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -520,6 +542,9 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
520
542
  case "WDT_SEND_GOOD":
521
543
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtSendGood;
522
544
  break;
545
+ case "WDT_TAGS":
546
+ prv[uniqueKey] = (detail === null || detail === void 0 ? void 0 : detail.wdtTags) || [];
547
+ break;
523
548
  case "WDT_SHOP":
524
549
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.shopCode;
525
550
  break;
@@ -585,7 +610,9 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
585
610
  allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
586
611
  _detail$wdtReturnOrde = detail.wdtReturnOrders,
587
612
  wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
588
- matchLogisticsNo = detail.matchLogisticsNo;
613
+ matchLogisticsNo = detail.matchLogisticsNo,
614
+ version = detail.version,
615
+ explicitlySelectedRows = detail.selectedRows;
589
616
  var wdtGoodsCom = (componentList || []).find(function (com) {
590
617
  return com.workOrderComponentType === "WDT_GOODS";
591
618
  });
@@ -602,10 +629,18 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
602
629
  var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
603
630
  return item.tradeNo;
604
631
  });
605
- var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
606
- var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
632
+ var selectedSystemOrders = explicitlySelectedRows ? explicitlySelectedRows : matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
633
+ var selectedRows = explicitlySelectedRows ? explicitlySelectedRows : matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
607
634
  var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : currentTrades;
608
635
  var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.tradeNo;
636
+ var selectedSystemOrderIds = explicitlySelectedRows ? explicitlySelectedRows.map(function (item) {
637
+ return item.tradeNo;
638
+ }) : matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
639
+ return item.tradeNo;
640
+ }) : [];
641
+ var wdtTags = selectedSystemOrders.reduce(function (tags, order) {
642
+ return [].concat(_toConsumableArray(tags), _toConsumableArray(getWdtOrderTags(order, version)));
643
+ }, []);
609
644
  return {
610
645
  wdtSystemOrder: {
611
646
  //标记通过请求获取的值
@@ -615,20 +650,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
615
650
  return _objectSpread(_objectSpread({}, item), {}, {
616
651
  billNo: item.tradeNo,
617
652
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
618
- billTag: item.tagName || item.tags,
619
- // 网页版取tags,其他版本用tagName
653
+ billTag: getWdtOrderTags(item, version).join("、"),
620
654
  logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
621
655
  });
622
656
  }),
623
- selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
624
- return item.tradeNo;
625
- }) : [],
657
+ selectIds: selectedSystemOrderIds,
626
658
  selectedRows: selectedRows.map(function (item) {
627
659
  return _objectSpread(_objectSpread({}, item), {}, {
628
660
  billNo: item.tradeNo,
629
661
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
630
- billTag: item.tagName || item.tags,
631
- // 网页版取tags,其他版本用tagName
662
+ billTag: getWdtOrderTags(item, version).join("、"),
632
663
  logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
633
664
  });
634
665
  }),
@@ -636,8 +667,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
636
667
  return _objectSpread(_objectSpread({}, item), {}, {
637
668
  billNo: item.tradeNo,
638
669
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
639
- billTag: item.tagName || item.tags,
640
- // 网页版取tags,其他版本用tagName
670
+ billTag: getWdtOrderTags(item, version).join("、"),
641
671
  logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
642
672
  });
643
673
  })
@@ -681,6 +711,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
681
711
  },
682
712
  wdtLogistics: updateWdtItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
683
713
  wdtSendGood: updateWdtItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
714
+ wdtTags: _toConsumableArray(new Set(wdtTags)),
684
715
  shopCode: (_orderBackTrades$ = orderBackTrades[0]) === null || _orderBackTrades$ === void 0 ? void 0 : _orderBackTrades$.shopNo
685
716
  // wdtSingingTime: detail?.receiptDate,
686
717
  // wdtSendTime:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.10.28",
3
+ "version": "2.10.29",
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": "6214b113903df9c8f0bffb7106bd36bf39240a21",
44
+ "gitHead": "bc7629679c5254fa413acb1b6bb74c06aae65cba",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }