@kmkf-fe-packages/services-components 2.0.19-beta.3 → 2.0.19-beta.30
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/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +7 -2
- package/dist/esm/commonComponents/GlobalContext/index.js +10 -5
- package/dist/esm/components/BS/common/SystemOrderNo.js +2 -0
- package/dist/esm/components/StatusSelect/constants.js +8 -0
- package/dist/esm/factory.d.ts +1 -1
- package/package.json +4 -4
|
@@ -18,9 +18,14 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
18
18
|
};
|
|
19
19
|
function useGetHasErpData(reduxData) {
|
|
20
20
|
var companyUserConfig = useMemo(function () {
|
|
21
|
-
var _ref, _reduxData$main$userI, _reduxData$main, _reduxData$workOrder, _userInfo$companyUser;
|
|
21
|
+
var _ref, _ref2, _reduxData$main$userI, _reduxData$main, _reduxData$workOrder, _reduxData$global, _userInfo$companyUser;
|
|
22
22
|
// console.log("companyUserConfig--reduxData", reduxData);
|
|
23
|
-
|
|
23
|
+
/**
|
|
24
|
+
* main - pc
|
|
25
|
+
* workOrder - 除千牛工作台外所有插件端
|
|
26
|
+
* global - 千牛工作台
|
|
27
|
+
* **/
|
|
28
|
+
var userInfo = (_ref = (_ref2 = (_reduxData$main$userI = reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) !== null && _reduxData$main$userI !== void 0 ? _reduxData$main$userI : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) !== null && _ref2 !== void 0 ? _ref2 : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) !== null && _ref !== void 0 ? _ref : {};
|
|
24
29
|
var companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
|
|
25
30
|
if (typeof companyUserConfig === "string") {
|
|
26
31
|
try {
|
|
@@ -41,7 +41,12 @@ var Global = function Global(_ref) {
|
|
|
41
41
|
loading = _useState4[0],
|
|
42
42
|
setLoading = _useState4[1];
|
|
43
43
|
var reduxDataMap = useMemo(function () {
|
|
44
|
-
|
|
44
|
+
try {
|
|
45
|
+
var _ref2, _ref3, _reduxData$main$userI, _reduxData$main, _reduxData$main$userI2, _reduxData$workOrder, _reduxData$workOrder$, _reduxData$global, _reduxData$global$use;
|
|
46
|
+
sessionStorage.setItem("companyKey_test", (_ref2 = (_ref3 = (_reduxData$main$userI = reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : (_reduxData$main$userI2 = _reduxData$main.userInfo) === null || _reduxData$main$userI2 === void 0 ? void 0 : _reduxData$main$userI2.companyKey) !== null && _reduxData$main$userI !== void 0 ? _reduxData$main$userI : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : (_reduxData$workOrder$ = _reduxData$workOrder.userInfo) === null || _reduxData$workOrder$ === void 0 ? void 0 : _reduxData$workOrder$.companyKey) !== null && _ref3 !== void 0 ? _ref3 : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : (_reduxData$global$use = _reduxData$global.userInfo) === null || _reduxData$global$use === void 0 ? void 0 : _reduxData$global$use.companyKey) !== null && _ref2 !== void 0 ? _ref2 : "");
|
|
47
|
+
} catch (error) {
|
|
48
|
+
console.log("companyKey_test_error", error);
|
|
49
|
+
}
|
|
45
50
|
return reduxData;
|
|
46
51
|
}, [JSON.stringify(reduxData)]);
|
|
47
52
|
useEffect(function () {
|
|
@@ -73,7 +78,7 @@ var Global = function Global(_ref) {
|
|
|
73
78
|
return "success";
|
|
74
79
|
}, [globalState, logisticsCompanyState, sendDataState, addressDataState]);
|
|
75
80
|
var reloadData = /*#__PURE__*/function () {
|
|
76
|
-
var
|
|
81
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
77
82
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
78
83
|
while (1) switch (_context.prev = _context.next) {
|
|
79
84
|
case 0:
|
|
@@ -119,11 +124,11 @@ var Global = function Global(_ref) {
|
|
|
119
124
|
}, _callee);
|
|
120
125
|
}));
|
|
121
126
|
return function reloadData() {
|
|
122
|
-
return
|
|
127
|
+
return _ref4.apply(this, arguments);
|
|
123
128
|
};
|
|
124
129
|
}();
|
|
125
130
|
var initDataSource = /*#__PURE__*/function () {
|
|
126
|
-
var
|
|
131
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
|
|
127
132
|
var mapping, mergeMapping, promises, _Object$keys, _Object$keys2, _Object$keys2$filter, _promises;
|
|
128
133
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
129
134
|
while (1) switch (_context2.prev = _context2.next) {
|
|
@@ -171,7 +176,7 @@ var Global = function Global(_ref) {
|
|
|
171
176
|
}, _callee2, null, [[4, 10]]);
|
|
172
177
|
}));
|
|
173
178
|
return function initDataSource() {
|
|
174
|
-
return
|
|
179
|
+
return _ref5.apply(this, arguments);
|
|
175
180
|
};
|
|
176
181
|
}();
|
|
177
182
|
if (allState === "loading") {
|
|
@@ -18,6 +18,7 @@ var componentType = {
|
|
|
18
18
|
WDT_REISSUE_GOODS: "wdtSystemOrderNo",
|
|
19
19
|
BS_E3_REISSUE_GOODS: "bsE3SystemOrderNo",
|
|
20
20
|
GY_REISSUE_GOODS: "gySystemOrderNo",
|
|
21
|
+
GY_RETURN_GOODS: "gySystemOrderNo",
|
|
21
22
|
JST_REISSUE_GOODS: "jstSystemOrderNo",
|
|
22
23
|
JST_RETURN_GOODS: "jstSystemOrderNo"
|
|
23
24
|
};
|
|
@@ -49,6 +50,7 @@ var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
|
|
|
49
50
|
_this$getParentId$spl2 = _slicedToArray(_this$getParentId$spl, 1),
|
|
50
51
|
key = _this$getParentId$spl2[0];
|
|
51
52
|
if (!(r !== null && r !== void 0 && r[key][componentType[_this.type]])) {
|
|
53
|
+
return /*#__PURE__*/React.createElement("span", null, "ces");
|
|
52
54
|
return null;
|
|
53
55
|
}
|
|
54
56
|
var text = r !== null && r !== void 0 && r[key] ? r === null || r === void 0 ? void 0 : (_r$key = r[key]) === null || _r$key === void 0 ? void 0 : _r$key[componentType[_this.type]] : "";
|
|
@@ -18,6 +18,14 @@ export var getSelectTypeAttribute = function getSelectTypeAttribute(_ref) {
|
|
|
18
18
|
color: "#ff4d4f"
|
|
19
19
|
}]
|
|
20
20
|
};
|
|
21
|
+
if (key === "agreeRefundStatusValue") {
|
|
22
|
+
var _dataMap$options;
|
|
23
|
+
dataMap === null || dataMap === void 0 ? void 0 : (_dataMap$options = dataMap.options) === null || _dataMap$options === void 0 ? void 0 : _dataMap$options.push({
|
|
24
|
+
value: "".concat(text, "\u62C6\u5355\u9000\u6B3E\u4E2D"),
|
|
25
|
+
label: "".concat(text, "\u62C6\u5355\u9000\u6B3E\u4E2D"),
|
|
26
|
+
color: "#1890ff"
|
|
27
|
+
});
|
|
28
|
+
}
|
|
21
29
|
dataMap["failValue"] = dataMap.options[failValueIndex].value;
|
|
22
30
|
return dataMap;
|
|
23
31
|
};
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ReissueLogistics, 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, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => GyReissue |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => GyReissue | JstSendGood | LogisticsInterception | LogisticsMoreInterception | MsgStatus | BasicSelect | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | 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 | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReturn;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.0.19-beta.
|
|
3
|
+
"version": "2.0.19-beta.30",
|
|
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": "2.0.19-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.0.19-beta.30",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.30",
|
|
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": "9a17bb9b438894b0d35456807efebdf6dd7393bc",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|