@kmkf-fe-packages/services-components 1.17.8-beta.0 → 1.17.8-beta.2
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.
|
@@ -1065,7 +1065,7 @@ export var MsgContent = function MsgContent(_ref14) {
|
|
|
1065
1065
|
var getColorByStatus = function getColorByStatus(value) {
|
|
1066
1066
|
var _options$find2;
|
|
1067
1067
|
return ((_options$find2 = options.find(function (innerItem) {
|
|
1068
|
-
return value === innerItem.label;
|
|
1068
|
+
return value === innerItem.label || value === innerItem.oldValue;
|
|
1069
1069
|
})) === null || _options$find2 === void 0 ? void 0 : _options$find2.color) || '#000';
|
|
1070
1070
|
};
|
|
1071
1071
|
var detailContent = function detailContent(item) {
|
|
@@ -1106,7 +1106,7 @@ export var MsgContent = function MsgContent(_ref14) {
|
|
|
1106
1106
|
cursor: "pointer"
|
|
1107
1107
|
}
|
|
1108
1108
|
}, (_item$msgReceivers2 = item.msgReceivers) !== null && _item$msgReceivers2 !== void 0 && _item$msgReceivers2.some(function (msgItem) {
|
|
1109
|
-
return (msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) === failValue;
|
|
1109
|
+
return Array.isArray(failValue) ? failValue.includes(msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) : (msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) === failValue;
|
|
1110
1110
|
}) || item.failReason ? /*#__PURE__*/React.createElement(Popover, {
|
|
1111
1111
|
content: detailContent(item),
|
|
1112
1112
|
overlayStyle: {
|
|
@@ -19,22 +19,27 @@ import { SYMBOL } from "../../constant";
|
|
|
19
19
|
var typeMap = {
|
|
20
20
|
MSG_STATUS: {
|
|
21
21
|
options: [{
|
|
22
|
+
oldValue: '发送成功',
|
|
22
23
|
value: '执行成功',
|
|
23
24
|
label: '执行成功',
|
|
24
25
|
color: '#52c41a'
|
|
25
26
|
}, {
|
|
27
|
+
oldValue: '已发送',
|
|
26
28
|
value: '执行中',
|
|
27
29
|
label: '执行中',
|
|
28
30
|
color: '#52c41a'
|
|
29
31
|
}, {
|
|
32
|
+
oldValue: '发送失败',
|
|
30
33
|
value: '执行失败',
|
|
31
34
|
label: '执行失败',
|
|
32
35
|
color: '#ff4d4f'
|
|
33
36
|
}, {
|
|
37
|
+
oldValue: '等待发送',
|
|
34
38
|
value: '等待执行',
|
|
35
39
|
label: '等待执行',
|
|
36
40
|
color: '#e7780f'
|
|
37
41
|
}, {
|
|
42
|
+
oldValue: '等待发送',
|
|
38
43
|
value: '不满足条件，无需执行',
|
|
39
44
|
label: '不满足条件，无需执行',
|
|
40
45
|
color: '#8A8A8A'
|
|
@@ -45,7 +50,8 @@ var typeMap = {
|
|
|
45
50
|
type: 1,
|
|
46
51
|
valueKey: 'status',
|
|
47
52
|
idKey: 'systemOrderId',
|
|
48
|
-
|
|
53
|
+
// 添加 发送失败 是为了兼容老数据
|
|
54
|
+
failValue: ['执行失败', '发送失败']
|
|
49
55
|
}
|
|
50
56
|
};
|
|
51
57
|
var msgTypeCh = {
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BasicCascader | StatusSelect | TradeId | BasicInput | BasicAddress |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BasicCascader | BasicCheckbox | FlowWorkOrderId | JstSendGood | JstSupply | LogisticsInterception | LogisticsMoreInterception | MsgStatus | PaymentVoucherCode | StatusSelect | SubForm | TradeId | BasicInput | BasicAddress | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | Label | KmErpSendGood | AfterSalesOrderId;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "1.17.8-beta.
|
|
3
|
+
"version": "1.17.8-beta.2",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
]
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@kmkf-fe-packages/basic-components": "1.17.8-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "1.17.8-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "1.17.8-beta.2",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "1.17.8-beta.2",
|
|
26
26
|
"b64-to-blob": "^1.2.19",
|
|
27
27
|
"html2canvas": "^1.4.1",
|
|
28
28
|
"react-pdf-js": "^5.1.0"
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "a8415fd4609d1d3b97f31bf548cf96983afe44e1",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|