@kmkf-fe-packages/kmkf-utils 2.2.31-beta.17 → 2.2.32
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/index.d.ts +1 -1
- package/dist/esm/constants/index.js +2 -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/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/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
112311133
|
|
@@ -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";
|
|
@@ -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 = {};
|
|
@@ -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.
|
|
3
|
+
"version": "2.2.32",
|
|
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": "7f51024d94cfdccb5e1d8fe2b1e6fb02c8ad9a00",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|