@kmkf-fe-packages/services-components 2.2.44-beta.53 → 2.2.44-beta.55
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.
|
@@ -26,6 +26,7 @@ import useGetRequest from "./orderQuery/useGetRequest";
|
|
|
26
26
|
* 尽量不要直接使用redux，飞鸽项目redux并不会读取最近的store数据，使用redux会有问题，暂时使用从外部传入redux数据的方式
|
|
27
27
|
* **/
|
|
28
28
|
var Global = function Global(_ref) {
|
|
29
|
+
var _userInfo$quotaInfo, _userInfo$quotaInfo2, _userInfo$quotaInfo3, _userInfo$quotaInfo4;
|
|
29
30
|
var children = _ref.children,
|
|
30
31
|
_ref$requestList = _ref.requestList,
|
|
31
32
|
requestList = _ref$requestList === void 0 ? [] : _ref$requestList,
|
|
@@ -42,20 +43,25 @@ var Global = function Global(_ref) {
|
|
|
42
43
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
43
44
|
loading = _useState4[0],
|
|
44
45
|
setLoading = _useState4[1];
|
|
46
|
+
var _useState5 = useState({}),
|
|
47
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
48
|
+
userInfo = _useState6[0],
|
|
49
|
+
setUserInfo = _useState6[1];
|
|
45
50
|
var reduxDataMap = useMemo(function () {
|
|
46
51
|
return reduxData;
|
|
47
52
|
}, [JSON.stringify(reduxData)]);
|
|
48
53
|
useEffect(function () {
|
|
49
54
|
try {
|
|
50
55
|
var _reduxData$main, _reduxData$workOrder, _reduxData$global;
|
|
51
|
-
var
|
|
52
|
-
var companyUserConfig = cloneDeep(
|
|
56
|
+
var _userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) || {};
|
|
57
|
+
var companyUserConfig = cloneDeep(_userInfo.companyUserConfig);
|
|
53
58
|
if (companyUserConfig && typeof companyUserConfig === "string") {
|
|
54
|
-
|
|
59
|
+
_userInfo = _objectSpread(_objectSpread({}, _userInfo), {}, {
|
|
55
60
|
companyUserConfig: JSON.parse(companyUserConfig)
|
|
56
61
|
});
|
|
57
62
|
}
|
|
58
|
-
|
|
63
|
+
setUserInfo(_userInfo);
|
|
64
|
+
localStorage.setItem("reduxData_userInfo", JSON.stringify(_userInfo));
|
|
59
65
|
} catch (e) {
|
|
60
66
|
console.error(e);
|
|
61
67
|
}
|
|
@@ -211,20 +217,47 @@ var Global = function Global(_ref) {
|
|
|
211
217
|
}
|
|
212
218
|
});
|
|
213
219
|
}
|
|
214
|
-
if (allState === "failed") {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
220
|
+
// if (allState === "failed") {
|
|
221
|
+
// return (
|
|
222
|
+
// <>
|
|
223
|
+
// <Alert
|
|
224
|
+
// message="数据加载异常,可能影响部分组件使用"
|
|
225
|
+
// type="warning"
|
|
226
|
+
// action={
|
|
227
|
+
// <Space>
|
|
228
|
+
// <Button
|
|
229
|
+
// loading={loading}
|
|
230
|
+
// type="primary"
|
|
231
|
+
// key="console"
|
|
232
|
+
// onClick={reloadData}
|
|
233
|
+
// size="small"
|
|
234
|
+
// >
|
|
235
|
+
// 刷新重试
|
|
236
|
+
// </Button>
|
|
237
|
+
// </Space>
|
|
238
|
+
// }
|
|
239
|
+
// closable
|
|
240
|
+
// />
|
|
241
|
+
// {children}
|
|
242
|
+
// </>
|
|
243
|
+
// );
|
|
244
|
+
// }
|
|
245
|
+
|
|
246
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, allState === "failed" && /*#__PURE__*/React.createElement(Alert, {
|
|
247
|
+
message: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u53EF\u80FD\u5F71\u54CD\u90E8\u5206\u7EC4\u4EF6\u4F7F\u7528",
|
|
248
|
+
type: "warning",
|
|
249
|
+
action: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
|
|
250
|
+
loading: loading,
|
|
251
|
+
type: "primary",
|
|
252
|
+
key: "console",
|
|
253
|
+
onClick: reloadData,
|
|
254
|
+
size: "small"
|
|
255
|
+
}, "\u5237\u65B0\u91CD\u8BD5")),
|
|
256
|
+
closable: true
|
|
257
|
+
}), (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo = userInfo.quotaInfo) === null || _userInfo$quotaInfo === void 0 ? void 0 : _userInfo$quotaInfo.workOrderRemainDay) > 0 && (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo2 = userInfo.quotaInfo) === null || _userInfo$quotaInfo2 === void 0 ? void 0 : _userInfo$quotaInfo2.workOrderRemainDay) < 15 && /*#__PURE__*/React.createElement(Alert, {
|
|
258
|
+
message: "\u5DE5\u5355\u6761\u6570\u5373\u5C06\u6D88\u8017\u5B8C\uFF0C\u5269\u4F59\u5DE5\u5355\u6761\u6570\uFF1A".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo3 = userInfo.quotaInfo) === null || _userInfo$quotaInfo3 === void 0 ? void 0 : _userInfo$quotaInfo3.workOrderRemain) || 0, "\u6761\uFF0C\u9884\u8BA1\u5269\u4F59\u4F7F\u7528").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo4 = userInfo.quotaInfo) === null || _userInfo$quotaInfo4 === void 0 ? void 0 : _userInfo$quotaInfo4.workOrderRemainDay) || 0, "\u5929\uFF0C\u6D88\u8017\u5B8C\u540E\u65E0\u6CD5\u65B0\u5EFA\u5DE5\u5355\u53CA\u6267\u884CRPA\u76F8\u5173\u4EFB\u52A1"),
|
|
259
|
+
type: "warning",
|
|
260
|
+
closable: true
|
|
261
|
+
}), children);
|
|
229
262
|
};
|
|
230
263
|
export default Global;
|
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, BasicPicturePro, 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, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicCascader | CommonMultiStatus | JstSendGood | MsgStatus | PublicGoods | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicCascader | CommonMultiStatus | JstSendGood | LogisticsMoreInterception | MsgStatus | Payment | BasicPicturePro | PublicGoods | PublicReissueGoods | ReceiverAddress | SubForm | BasicInput | BasicTypeInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.44-beta.
|
|
3
|
+
"version": "2.2.44-beta.55",
|
|
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.2.44-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.44-beta.54",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.54",
|
|
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": "511e721c05eca0d44f3569a1a21e4a60dd6fe746",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|