@kmkf-fe-packages/kmkf-utils 2.2.39-beta.7 → 2.2.39
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 +1 -1
- package/dist/esm/constants/constant.js +1 -1
- package/dist/esm/constants/index.d.ts +1 -1
- package/dist/esm/constants/index.js +2 -2
- package/dist/esm/hooks/index.d.ts +0 -1
- package/dist/esm/hooks/index.js +1 -2
- package/dist/esm/request/index.js +3 -2
- package/dist/esm/servers/index.d.ts +1 -1
- package/dist/esm/servers/index.js +1 -1
- package/dist/esm/utils/dist/gyOrderBackFormValues.js +285 -0
- package/dist/esm/utils/getExpression.js +6 -6
- package/dist/esm/utils/jyOrderBackFormValues.js +0 -5
- package/dist/esm/utils/kmOrderBackFormValues.js +9 -6
- package/dist/esm/utils/orderBackFormValues.js +1 -1
- package/package.json +2 -2
- package/dist/esm/hooks/useWindowSize.d.ts +0 -4
- package/dist/esm/hooks/useWindowSize.js +0 -30
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
112311133
|
|
@@ -124,7 +124,7 @@ export var SYMBOL = {
|
|
|
124
124
|
BETWEEN: "between",
|
|
125
125
|
EQ: "eq"
|
|
126
126
|
};
|
|
127
|
-
export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "
|
|
127
|
+
export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "ERP_AFTER_SALE_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
|
|
128
128
|
export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
|
|
129
129
|
|
|
130
130
|
// 表单默认值
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
2
1
|
export { default as columnsGoodsList } from "./columnsGoodsList";
|
|
3
2
|
export { default as componentsOptionsMapping } from "./componentsOptionsMapping";
|
|
4
3
|
export * from './constant';
|
|
@@ -8,3 +7,4 @@ export declare const getMapping: (data: {
|
|
|
8
7
|
}[]) => {
|
|
9
8
|
[key: string]: string;
|
|
10
9
|
};
|
|
10
|
+
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
2
1
|
export { default as columnsGoodsList } from "./columnsGoodsList";
|
|
3
2
|
export { default as componentsOptionsMapping } from "./componentsOptionsMapping";
|
|
4
3
|
export * from "./constant";
|
|
@@ -8,4 +7,5 @@ export var getMapping = function getMapping(data) {
|
|
|
8
7
|
mapping[item.dataIndex] = item.title;
|
|
9
8
|
});
|
|
10
9
|
return mapping;
|
|
11
|
-
};
|
|
10
|
+
};
|
|
11
|
+
export { default as msgTypeCh } from "./msgTypeMapping";
|
package/dist/esm/hooks/index.js
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export * from "./useStatus";
|
|
2
|
-
export * from "./useWindowSize";
|
|
1
|
+
export * from "./useStatus";
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* @Author: litian
|
|
4
4
|
* @Date: 2022-09-06 09:29:34
|
|
5
5
|
* @LastEditors: flyingMonkey 760958607@qq.com
|
|
6
|
-
* @LastEditTime: 2025-09-04 18:
|
|
6
|
+
* @LastEditTime: 2025-09-04 18:49:52
|
|
7
7
|
*/
|
|
8
8
|
import { extend } from "umi-request";
|
|
9
9
|
import { message } from "antd";
|
|
@@ -27,7 +27,8 @@ var requestApi = function requestApi(_ref) {
|
|
|
27
27
|
data = _ref.data,
|
|
28
28
|
_ref$headers = _ref.headers,
|
|
29
29
|
headers = _ref$headers === void 0 ? {} : _ref$headers,
|
|
30
|
-
handleError = _ref.handleError,
|
|
30
|
+
_ref$handleError = _ref.handleError,
|
|
31
|
+
handleError = _ref$handleError === void 0 ? message.error : _ref$handleError,
|
|
31
32
|
infoLevel = _ref.infoLevel;
|
|
32
33
|
return new Promise(function (resolve, reject) {
|
|
33
34
|
var params = {
|
|
@@ -7,9 +7,9 @@ export * as GY from "./GY";
|
|
|
7
7
|
export * as JY from "./JY";
|
|
8
8
|
export * as JST from "./JST";
|
|
9
9
|
export * as WLN from "./WLN";
|
|
10
|
-
export * from "./workOrder";
|
|
11
10
|
export * as orderSubForm from "./orderSubForm";
|
|
12
11
|
export * as SKX from "./SKX";
|
|
12
|
+
export * from "./workOrder";
|
|
13
13
|
export * from "./constants";
|
|
14
14
|
export declare const queryWdtAddressData: (instance?: WdtAddressData) => Promise<void>;
|
|
15
15
|
export declare const queryGyAddressData: (instance?: GyAddressData) => Promise<void>;
|
|
@@ -17,11 +17,11 @@ import * as _JST from "./JST";
|
|
|
17
17
|
export { _JST as JST };
|
|
18
18
|
import * as _WLN from "./WLN";
|
|
19
19
|
export { _WLN as WLN };
|
|
20
|
-
export * from "./workOrder";
|
|
21
20
|
import * as _orderSubForm from "./orderSubForm";
|
|
22
21
|
export { _orderSubForm as orderSubForm };
|
|
23
22
|
import * as _SKX from "./SKX";
|
|
24
23
|
export { _SKX as SKX };
|
|
24
|
+
export * from "./workOrder";
|
|
25
25
|
export * from "./constants";
|
|
26
26
|
var transformData = function transformData(list) {
|
|
27
27
|
var map = {};
|
|
@@ -0,0 +1,285 @@
|
|
|
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
|
+
};
|
|
@@ -52,15 +52,15 @@ var getExpression = function getExpression(condition, l, r) {
|
|
|
52
52
|
var _intersection3, _intersection4;
|
|
53
53
|
return Array.isArray(l) ? ((_intersection3 = intersection(r, l)) === null || _intersection3 === void 0 ? void 0 : _intersection3.length) > 0 : ((_intersection4 = intersection(r, [l])) === null || _intersection4 === void 0 ? void 0 : _intersection4.length) > 0;
|
|
54
54
|
}
|
|
55
|
-
if (condition === 'ARRAY_OBJECT_INCLUDE') {
|
|
56
|
-
var _intersection5;
|
|
57
|
-
return ((_intersection5 = intersection(extractPrimitiveValues(l), r)) === null || _intersection5 === void 0 ? void 0 : _intersection5.length) > 0;
|
|
58
|
-
}
|
|
59
55
|
if (condition === 'NINCLUDE') {
|
|
60
|
-
var
|
|
61
|
-
var _include = Array.isArray(l) ? ((
|
|
56
|
+
var _intersection5, _intersection6;
|
|
57
|
+
var _include = Array.isArray(l) ? ((_intersection5 = intersection(r, l)) === null || _intersection5 === void 0 ? void 0 : _intersection5.length) > 0 : ((_intersection6 = intersection(r, [l])) === null || _intersection6 === void 0 ? void 0 : _intersection6.length) > 0;
|
|
62
58
|
return !_include;
|
|
63
59
|
}
|
|
60
|
+
if (condition === 'ARRAY_OBJECT_INCLUDE') {
|
|
61
|
+
var _intersection7;
|
|
62
|
+
return ((_intersection7 = intersection(extractPrimitiveValues(l), r)) === null || _intersection7 === void 0 ? void 0 : _intersection7.length) > 0;
|
|
63
|
+
}
|
|
64
64
|
return false;
|
|
65
65
|
};
|
|
66
66
|
export default getExpression;
|
|
@@ -89,11 +89,6 @@ export var updateJyGoodsHandle = function updateJyGoodsHandle() {
|
|
|
89
89
|
if (next.subOrderDetails && next.subOrderDetails.length) {
|
|
90
90
|
next.subOrderDetails.forEach(function (subItem) {
|
|
91
91
|
subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
|
|
92
|
-
subItem.divideOrderFee = Number(subItem.divideOrderFee).toFixed(2);
|
|
93
|
-
subItem.sellTotal = Number(subItem.sellTotal).toFixed(2);
|
|
94
|
-
subItem.sellPrice = Number(subItem.sellPrice).toFixed(2);
|
|
95
|
-
subItem.settlementPrice = Number(subItem.settlementPrice).toFixed(2);
|
|
96
|
-
subItem.mallSellingPrice = Number(subItem.mallSellingPrice).toFixed(2);
|
|
97
92
|
prv.push(subItem);
|
|
98
93
|
});
|
|
99
94
|
}
|
|
@@ -348,7 +348,7 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
|
|
|
348
348
|
|
|
349
349
|
//km订单信息转换
|
|
350
350
|
export var kmOrderTransform = function kmOrderTransform(detail, form) {
|
|
351
|
-
var _form$getFieldValue,
|
|
351
|
+
var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
|
|
352
352
|
var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
|
|
353
353
|
var _ref = detail || {},
|
|
354
354
|
orderNo = _ref.orderNo,
|
|
@@ -356,12 +356,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
|
|
|
356
356
|
var kmGoodsCom = (componentList || []).find(function (com) {
|
|
357
357
|
return com.workOrderComponentType === "KM_GOODS";
|
|
358
358
|
});
|
|
359
|
-
var
|
|
360
|
-
return
|
|
359
|
+
var kmReissueCom = (componentList || []).find(function (com) {
|
|
360
|
+
return com.workOrderComponentType === "KM_REISSUE_GOODS";
|
|
361
361
|
});
|
|
362
362
|
var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
363
363
|
var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
|
|
364
|
-
var isReissueDefaultSelect = !!(
|
|
364
|
+
var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
|
|
365
365
|
console.log("kmOrderTransform---", {
|
|
366
366
|
detail: detail,
|
|
367
367
|
componentList: componentList
|
|
@@ -369,14 +369,17 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
|
|
|
369
369
|
var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
|
|
370
370
|
return item.workOrderComponentType === "KM_GOODS";
|
|
371
371
|
})) === 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;
|
|
372
|
-
var
|
|
372
|
+
var kmReissueGoodsComponent = componentList.find(function (item) {
|
|
373
|
+
return item.workOrderComponentType === "KM_REISSUE_GOODS";
|
|
374
|
+
});
|
|
375
|
+
var kmReissueGoodsOrderBackGoodsLevel = kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon === void 0 ? void 0 : _kmReissueGoodsCompon.orderBackGoodsLevel;
|
|
373
376
|
var kmReturnGoodsOrderBackGoodsLevel = (_componentList$find2 = componentList.find(function (item) {
|
|
374
377
|
return item.workOrderComponentType === "KM_RETURN_GOODS";
|
|
375
378
|
})) === null || _componentList$find2 === void 0 ? void 0 : (_componentList$find2$ = _componentList$find2.componentConfig) === null || _componentList$find2$ === void 0 ? void 0 : _componentList$find2$.orderBackGoodsLevel;
|
|
376
379
|
var postingComponent = componentList.find(function (item) {
|
|
377
380
|
return item.workOrderComponentType === "POSTING";
|
|
378
381
|
});
|
|
379
|
-
var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (
|
|
382
|
+
var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
|
|
380
383
|
var kmPosting;
|
|
381
384
|
if (onlyOneSystemOrder && 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") {
|
|
382
385
|
kmPosting = handleKmAddressIdentify(trades[0]);
|
|
@@ -250,8 +250,8 @@ export default (function (_ref) {
|
|
|
250
250
|
var wdtValues = detail["wdtOrder"] ? wdtOrderBackFormValues(detail["wdtOrder"], templateDetail) : {};
|
|
251
251
|
var bsE3Values = detail["bsE3Order"] ? bsE3OrderBackFormValues(detail["bsE3Order"], templateDetail) : {};
|
|
252
252
|
var kmValues = detail["kmOrder"] ? kmOrderBackFormValues(detail["kmOrder"], templateDetail) : {};
|
|
253
|
-
var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
|
|
254
253
|
var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
|
|
254
|
+
var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
|
|
255
255
|
//不判断是否存在detail["skxOrder"],不存在直接清空所有skx相关组件值
|
|
256
256
|
var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
|
|
257
257
|
var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.2.39
|
|
3
|
+
"version": "2.2.39",
|
|
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": "
|
|
44
|
+
"gitHead": "52895fe5fa612a713b710ecc5cff271eb4b4036b",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
-
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); }
|
|
4
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
5
|
-
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
6
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
|
-
import React from 'react';
|
|
8
|
-
import { debounce } from 'lodash';
|
|
9
|
-
export var useWindowSize = function useWindowSize() {
|
|
10
|
-
var _React$useState = React.useState({
|
|
11
|
-
innerHeight: window.innerHeight,
|
|
12
|
-
innerWidth: window.innerWidth
|
|
13
|
-
}),
|
|
14
|
-
_React$useState2 = _slicedToArray(_React$useState, 2),
|
|
15
|
-
size = _React$useState2[0],
|
|
16
|
-
setSize = _React$useState2[1];
|
|
17
|
-
React.useEffect(function () {
|
|
18
|
-
var handleResize = debounce(function () {
|
|
19
|
-
setSize({
|
|
20
|
-
innerHeight: window.innerHeight,
|
|
21
|
-
innerWidth: window.innerWidth
|
|
22
|
-
});
|
|
23
|
-
}, 200);
|
|
24
|
-
window.addEventListener('resize', handleResize);
|
|
25
|
-
return function () {
|
|
26
|
-
window.removeEventListener('resize', handleResize);
|
|
27
|
-
};
|
|
28
|
-
}, []);
|
|
29
|
-
return size;
|
|
30
|
-
};
|