@kmkf-fe-packages/services-components 2.4.2-rc.0 → 2.4.3

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.
Files changed (2) hide show
  1. package/dist/esm/commonComponents/GlobalContext/index.js +19 -52
  2. package/package.json +4 -4
package/dist/esm/commonComponents/GlobalContext/index.js CHANGED
@@ -26,7 +26,6 @@ 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;
30
29
  var children = _ref.children,
31
30
  _ref$requestList = _ref.requestList,
32
31
  requestList = _ref$requestList === void 0 ? [] : _ref$requestList,
@@ -43,25 +42,20 @@ var Global = function Global(_ref) {
43
42
  _useState4 = _slicedToArray(_useState3, 2),
44
43
  loading = _useState4[0],
45
44
  setLoading = _useState4[1];
46
- var _useState5 = useState({}),
47
- _useState6 = _slicedToArray(_useState5, 2),
48
- userInfo = _useState6[0],
49
- setUserInfo = _useState6[1];
50
45
  var reduxDataMap = useMemo(function () {
51
46
  return reduxData;
52
47
  }, [JSON.stringify(reduxData)]);
53
48
  useEffect(function () {
54
49
  try {
55
50
  var _reduxData$main, _reduxData$workOrder, _reduxData$global;
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);
51
+ 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) || {};
52
+ var companyUserConfig = cloneDeep(userInfo.companyUserConfig);
58
53
  if (companyUserConfig && typeof companyUserConfig === "string") {
59
- _userInfo = _objectSpread(_objectSpread({}, _userInfo), {}, {
54
+ userInfo = _objectSpread(_objectSpread({}, userInfo), {}, {
60
55
  companyUserConfig: JSON.parse(companyUserConfig)
61
56
  });
62
57
  }
63
- setUserInfo(_userInfo);
64
- localStorage.setItem("reduxData_userInfo", JSON.stringify(_userInfo));
58
+ localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
65
59
  } catch (e) {
66
60
  console.error(e);
67
61
  }
@@ -217,47 +211,20 @@ var Global = function Global(_ref) {
217
211
  }
218
212
  });
219
213
  }
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.workOrderRemainDays) > 0 && (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo2 = userInfo.quotaInfo) === null || _userInfo$quotaInfo2 === void 0 ? void 0 : _userInfo$quotaInfo2.workOrderRemainDays) < 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.workOrderRemainDays) || 0, "\u5929\uFF0C\u6D88\u8017\u5B8C\u540E\u65E0\u6CD5\u65B0\u5EFA\u5DE5\u5355"),
259
- type: "warning",
260
- closable: true
261
- }), children);
214
+ if (allState === "failed") {
215
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
216
+ message: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u53EF\u80FD\u5F71\u54CD\u90E8\u5206\u7EC4\u4EF6\u4F7F\u7528",
217
+ type: "warning",
218
+ action: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
219
+ loading: loading,
220
+ type: "primary",
221
+ key: "console",
222
+ onClick: reloadData,
223
+ size: "small"
224
+ }, "\u5237\u65B0\u91CD\u8BD5")),
225
+ closable: true
226
+ }), children);
227
+ }
228
+ return /*#__PURE__*/React.createElement(React.Fragment, null, children);
262
229
  };
263
230
  export default Global;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.4.2-rc.0",
3
+ "version": "2.4.3",
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.4.2-rc.0",
25
- "@kmkf-fe-packages/kmkf-utils": "2.4.2-rc.0",
24
+ "@kmkf-fe-packages/basic-components": "2.4.3",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.4.3",
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": "82881c023de5aac81f4789b1e114999c699762f7",
44
+ "gitHead": "2e557538d263287d1cb6c050d3a87b79fa30f1c0",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }