@titaui/pc 1.10.45 → 1.10.48

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 (38) hide show
  1. package/lib/components/checkbox/index.css +1 -0
  2. package/lib/components/dialog/index.css +4 -1
  3. package/lib/components/dialog/index.js +1 -1
  4. package/lib/components/drawer-manager/index.js +6 -1
  5. package/lib/components/dynamic/dynamic-item/dynamic-chart/index.js +10 -47
  6. package/lib/components/dynamic/dynamic-item/dynamic-chart/utils.js +61 -0
  7. package/lib/components/mblog/index.js +14 -5
  8. package/lib/components/nav-top/components/menu/index.css +4 -2
  9. package/lib/components/nav-top/components/user-message/index.css +2 -2
  10. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-project.js +8 -1
  11. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css +19 -1
  12. package/lib/components/okr-share/common-painter/openDataPainter.js +34 -27
  13. package/lib/components/open-data-painter/index.js +5 -1
  14. package/lib/components/rich-editor/plugins/block/block-quote/index.js +3 -1
  15. package/lib/components/rich-editor/plugins/block/heading/index.js +5 -3
  16. package/lib/components/rich-editor/plugins/block/lists/index.js +4 -2
  17. package/lib/components/rich-editor/plugins/extension/alignment/index.js +5 -3
  18. package/lib/components/rich-editor/plugins/inline/color/index.js +13 -5
  19. package/lib/components/rich-editor/plugins/inline/color/selector.js +4 -2
  20. package/lib/components/rich-editor/plugins/inline/color/util.js +25 -0
  21. package/lib/components/rich-editor/plugins/inline/delete-line/index.js +3 -1
  22. package/lib/components/rich-editor/plugins/inline/link/ui/linkEditor.js +7 -5
  23. package/lib/components/rich-editor/plugins/inline/link/ui/linkToolbar.js +17 -4
  24. package/lib/components/rich-editor/plugins/inline/strong/index.js +3 -1
  25. package/lib/components/rich-editor/plugins/inline/under-line/index.js +3 -1
  26. package/lib/components/rich-editor/ui/editor/index.js +6 -1
  27. package/lib/components/rich-editor/ui/normal-toolbar/index.css +7 -2
  28. package/lib/components/superset-charts/components/chart/index.js +12 -22
  29. package/lib/components/superset-charts/{init/insert-assets.js → fetch-assets-and-append/append-assets.js} +29 -24
  30. package/lib/components/superset-charts/{init/use-get-assets.js → fetch-assets-and-append/get-assets-with-cache.js} +26 -20
  31. package/lib/components/superset-charts/fetch-assets-and-append/index.js +79 -0
  32. package/lib/components/superset-charts/utils/axios.js +8 -4
  33. package/lib/components/toast/index.js +2 -10
  34. package/lib/components/weekly-report/common-painter/openDataPainter.js +5 -1
  35. package/lib/pages/new-okr-list/index.js +3 -3
  36. package/package.json +2 -1
  37. package/lib/components/superset-charts/init/index.js +0 -61
  38. package/yarn-error.log +0 -22184
@@ -23,6 +23,8 @@ require("./index.css");
23
23
 
24
24
  var _main = require("../pm-plugins/main");
25
25
 
26
+ var _getLocale = require("../../../../../../utils/getLocale");
27
+
26
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
29
 
28
30
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -111,10 +113,10 @@ function LinkEditor(_ref) {
111
113
  }
112
114
  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
113
115
  className: preCls + '__input',
114
- label: "\u6587\u672C",
116
+ label: (0, _getLocale.getLocale)('Rtx_Text'),
115
117
  name: "text",
116
118
  layout: "row",
117
- placeholder: "\u8BF7\u8F93\u5165\u6587\u672C",
119
+ placeholder: (0, _getLocale.getLocale)('Rtx_Pleaseentetext'),
118
120
  onChange: function onChange(text) {
119
121
  return setContent(_objectSpread(_objectSpread({}, content), {}, {
120
122
  text: text
@@ -123,10 +125,10 @@ function LinkEditor(_ref) {
123
125
  value: content.text
124
126
  }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
125
127
  className: preCls + '__input',
126
- label: "\u94FE\u63A5",
128
+ label: (0, _getLocale.getLocale)('Tasks_Tab_MyS_Link'),
127
129
  name: "href",
128
130
  layout: "row",
129
- placeholder: "\u6DFB\u52A0\u94FE\u63A5\u5730\u5740",
131
+ placeholder: (0, _getLocale.getLocale)('Rtx_Addlinkaddress'),
130
132
  onChange: function onChange(href) {
131
133
  return setContent(_objectSpread(_objectSpread({}, content), {}, {
132
134
  href: href
@@ -141,7 +143,7 @@ function LinkEditor(_ref) {
141
143
  width: 90
142
144
  },
143
145
  onClick: handleSubmit
144
- }, "\u5E94\u7528"))));
146
+ }, (0, _getLocale.getLocale)('Rtx_Application')))));
145
147
  }
146
148
 
147
149
  var _default = LinkEditor;
@@ -13,12 +13,16 @@ var _prosemirrorUtils = require("prosemirror-utils");
13
13
 
14
14
  var _Popup = _interopRequireDefault(require("../../../../ui/Popup"));
15
15
 
16
+ var _tooltip = _interopRequireDefault(require("../../../../../tooltip"));
17
+
16
18
  var _classnames = _interopRequireDefault(require("classnames"));
17
19
 
18
20
  require("./index.css");
19
21
 
20
22
  var _commands = require("../commands");
21
23
 
24
+ var _getLocale = require("../../../../../../utils/getLocale");
25
+
22
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
27
 
24
28
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -72,16 +76,25 @@ function LinkToolBar(_ref) {
72
76
  }
73
77
  }, /*#__PURE__*/_react["default"].createElement("div", {
74
78
  className: preCls + '__text'
75
- }, href), /*#__PURE__*/_react["default"].createElement("div", {
79
+ }, href), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
80
+ overlay: (0, _getLocale.getLocale)('Rtx_Visit'),
81
+ placement: "top"
82
+ }, /*#__PURE__*/_react["default"].createElement("div", {
76
83
  className: (0, _classnames["default"])('tu-icon-visit', preCls + '__btn'),
77
84
  onClick: handleOpenLink
78
- }), /*#__PURE__*/_react["default"].createElement("div", {
85
+ })), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
86
+ overlay: (0, _getLocale.getLocale)('Mod_Editor'),
87
+ placement: "top"
88
+ }, /*#__PURE__*/_react["default"].createElement("div", {
79
89
  className: (0, _classnames["default"])('tu-icon-bianji3', preCls + '__btn'),
80
90
  onClick: handleEdit
81
- }), /*#__PURE__*/_react["default"].createElement("div", {
91
+ })), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
92
+ overlay: (0, _getLocale.getLocale)('Tasks_Tab_MyS_Cancellink'),
93
+ placement: "top"
94
+ }, /*#__PURE__*/_react["default"].createElement("div", {
82
95
  className: (0, _classnames["default"])('tu-icon-quxiaoguanlian', preCls + '__btn'),
83
96
  onClick: handleRemoveLink
84
- })));
97
+ }))));
85
98
  }
86
99
 
87
100
  var _default = LinkToolBar;
@@ -17,6 +17,8 @@ var _plugin = _interopRequireDefault(require("../../../models/plugin"));
17
17
 
18
18
  var _schema = require("../../../models/schema");
19
19
 
20
+ var _getLocale = require("../../../../../utils/getLocale");
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
24
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -97,7 +99,7 @@ var StrongController = /*#__PURE__*/function (_BaseController) {
97
99
  }
98
100
 
99
101
  return _possibleConstructorReturn(_this2, (_this2 = _super2.call.apply(_super2, [this].concat(args)), _this2.toolbar = {
100
- title: '加粗',
102
+ title: (0, _getLocale.getLocale)('Rtx_Bold'),
101
103
  icon: 'tu-icon-text-blod',
102
104
  handler: function handler(editor) {
103
105
  (0, _prosemirrorCommands.toggleMark)(editor.state.schema.marks[PLUGIN_NAME])(editor.state, editor.view.dispatch);
@@ -17,6 +17,8 @@ var _plugin = _interopRequireDefault(require("../../../models/plugin"));
17
17
 
18
18
  var _schema = require("../../../models/schema");
19
19
 
20
+ var _getLocale = require("../../../../../utils/getLocale");
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
24
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -105,7 +107,7 @@ var UnderLineController = /*#__PURE__*/function (_BaseController) {
105
107
  }
106
108
 
107
109
  return _possibleConstructorReturn(_this2, (_this2 = _super2.call.apply(_super2, [this].concat(args)), _this2.toolbar = {
108
- title: '下划线',
110
+ title: (0, _getLocale.getLocale)('Rtx_Underline'),
109
111
  icon: 'tu-icon-text-underline',
110
112
  handler: function handler(editor) {
111
113
  (0, _prosemirrorCommands.toggleMark)(editor.state.schema.marks[PLUGIN_NAME])(editor.state, editor.view.dispatch);
@@ -48,7 +48,8 @@ function RichEditor(_ref, ref) {
48
48
  onInit = _ref.onInit,
49
49
  _ref$editable = _ref.editable,
50
50
  _editable = _ref$editable === void 0 ? true : _ref$editable,
51
- defaultState = _ref.defaultState;
51
+ defaultState = _ref.defaultState,
52
+ onChange = _ref.onChange;
52
53
 
53
54
  var container = (0, _react.useRef)();
54
55
  var dataRef = (0, _react.useRef)({});
@@ -93,6 +94,10 @@ function RichEditor(_ref, ref) {
93
94
 
94
95
  this.updateState(state);
95
96
  dispatcher.emit(_events.EDITOR_STATE_CHANGE, state);
97
+
98
+ if (tr.docChanged) {
99
+ onChange === null || onChange === void 0 ? void 0 : onChange(state);
100
+ }
96
101
  }
97
102
  });
98
103
  dataRef.current.editor = new _editor["default"]({
@@ -1,11 +1,12 @@
1
1
  .tita-rich-editor-normal-toolbar {
2
2
  display: flex;
3
3
  align-items: center;
4
+ padding: 12px 0;
4
5
  }
5
6
 
6
7
  .tita-rich-editor-normal-toolbar-item {
7
- width: 24px;
8
- height: 24px;
8
+ width: 32px;
9
+ height: 32px;
9
10
  margin: 0 2px;
10
11
  font-size: 16px;
11
12
  display: flex;
@@ -24,6 +25,10 @@
24
25
  background: #f0f4fa;
25
26
  }
26
27
 
28
+ .tita-rich-editor-normal-toolbar-item--disabled {
29
+ color: #bfc7d5;
30
+ }
31
+
27
32
  .tita-rich-editor-normal-toolbar-item--disabled:hover {
28
33
  cursor: not-allowed;
29
34
  }
@@ -9,16 +9,14 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _init = require("../../init");
12
+ var _fetchAssetsAndAppend = _interopRequireDefault(require("../../fetch-assets-and-append"));
13
13
 
14
- var _excluded = ["chartId"];
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
15
 
16
16
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
17
 
18
18
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
19
19
 
20
- function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
21
-
22
20
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
23
21
 
24
22
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -31,33 +29,25 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
31
29
 
32
30
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
33
31
 
34
- function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
35
-
36
- function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
37
-
38
- var lazyOnce = (0, _init.lazyLoad)();
32
+ var singletonFetchAssetsAndAppend = (0, _fetchAssetsAndAppend["default"])();
39
33
 
40
34
  var Chart = function Chart(props) {
41
35
  var _window, _window$SupersetChart;
42
36
 
43
- var chartId = props.chartId,
44
- restProps = _objectWithoutProperties(props, _excluded);
45
-
46
- var _useState = (0, _react.useState)(true),
37
+ var _useState = (0, _react.useState)(false),
47
38
  _useState2 = _slicedToArray(_useState, 2),
48
- loading = _useState2[0],
49
- setLoading = _useState2[1];
39
+ isInit = _useState2[0],
40
+ setIsInit = _useState2[1];
50
41
 
51
42
  (0, _react.useEffect)(function () {
52
- lazyOnce === null || lazyOnce === void 0 ? void 0 : lazyOnce.then(function () {
53
- setLoading(false);
54
- });
55
- }, []); // @ts-ignore
43
+ var _singletonFetchAssets;
56
44
 
45
+ (_singletonFetchAssets = singletonFetchAssetsAndAppend()) === null || _singletonFetchAssets === void 0 ? void 0 : _singletonFetchAssets.then(function () {
46
+ setIsInit(true);
47
+ });
48
+ }, []);
57
49
  var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
58
- return /*#__PURE__*/_react["default"].createElement("div", null, Chart && !loading && chartId && /*#__PURE__*/_react["default"].createElement(Chart, _extends({
59
- id: chartId
60
- }, restProps)));
50
+ return /*#__PURE__*/_react["default"].createElement("div", null, Chart && isInit && /*#__PURE__*/_react["default"].createElement(Chart, props));
61
51
  };
62
52
 
63
53
  var _default = Chart;
@@ -11,7 +11,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
11
11
 
12
12
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
13
13
 
14
- var generateScript = function generateScript(assets) {
14
+ var appendJs = function appendJs(assets) {
15
15
  return new Promise(function (resolve, reject) {
16
16
  var script = document.createElement("script");
17
17
  var r = false;
@@ -37,65 +37,70 @@ var generateScript = function generateScript(assets) {
37
37
  });
38
38
  };
39
39
 
40
- var generateStyle = function generateStyle(assets) {
40
+ var appendCss = function appendCss(assets) {
41
41
  var el = document.createElement("link");
42
42
  el.href = assets.uri;
43
43
  return el;
44
44
  };
45
45
 
46
- var InsertAssetsList = /*#__PURE__*/function () {
47
- function InsertAssetsList() {
46
+ var AppendAssetsList = /*#__PURE__*/function () {
47
+ function AppendAssetsList() {
48
48
  var _this = this;
49
49
 
50
- _classCallCheck(this, InsertAssetsList);
51
-
52
- this.generateAssets = function (assets) {
53
- var _this$strategy$type, _this$strategy;
50
+ _classCallCheck(this, AppendAssetsList);
54
51
 
52
+ this.appendAssets = function (assets) {
55
53
  var type = assets.type;
56
- return (_this$strategy$type = (_this$strategy = _this.strategy)[type]) === null || _this$strategy$type === void 0 ? void 0 : _this$strategy$type.call(_this$strategy, assets);
54
+ return _this.strategy[type](assets);
57
55
  };
58
56
 
59
- this.insertAssetsList = function () {
57
+ this.appendAssetsList = function () {
60
58
  if (!_this.assetsList.length) return undefined;
61
59
 
62
60
  if (!_this.init) {
63
61
  _this.init = true;
64
62
  var fragment = document.createDocumentFragment();
65
63
 
66
- _this.assetsList.filter(function (element) {
67
- return element.type === "css";
68
- }).forEach(function (element) {
69
- var el = generateStyle(element);
64
+ _this.assetsList.filter(function (assets) {
65
+ return assets.type !== "js";
66
+ }).forEach(function (assets) {
67
+ if (!assets.type || !_this.strategy[assets.type]) {
68
+ // eslint-disable-next-line no-console
69
+ console.error("assets type is not expected");
70
+ return;
71
+ }
72
+
73
+ var el = _this.appendAssets(assets);
74
+
70
75
  fragment.appendChild(el);
71
76
  });
72
77
 
73
- return Promise.all(_this.assetsList.filter(function (element) {
74
- return element.type === "js";
75
- }).map(function (element) {
76
- return generateScript(element);
78
+ return Promise.all(_this.assetsList.filter(function (assets) {
79
+ return assets.type === "js";
80
+ }).map(function (assets) {
81
+ return appendJs(assets);
77
82
  }));
78
83
  }
79
84
 
80
- return Promise.resolve(1);
85
+ return Promise.resolve();
81
86
  };
82
87
 
83
88
  this.init = false;
84
89
  this.strategy = {
85
- js: generateScript,
86
- css: generateStyle
90
+ js: appendJs,
91
+ css: appendCss
87
92
  };
88
93
  }
89
94
 
90
- _createClass(InsertAssetsList, [{
95
+ _createClass(AppendAssetsList, [{
91
96
  key: "setAssets",
92
97
  value: function setAssets(assets) {
93
98
  this.assetsList = assets;
94
99
  }
95
100
  }]);
96
101
 
97
- return InsertAssetsList;
102
+ return AppendAssetsList;
98
103
  }();
99
104
 
100
- var _default = InsertAssetsList;
105
+ var _default = AppendAssetsList;
101
106
  exports["default"] = _default;
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.transMetasToTableData = exports.getAssetsVersion = exports.getAssetsUri = exports.getAssets = exports.domain = void 0;
6
+ exports.transMetasToTableData = exports.fetchAssetsVersion = exports.fetchAssetsUri = exports.domain = exports["default"] = void 0;
7
7
 
8
8
  var _axios = _interopRequireDefault(require("../utils/axios"));
9
9
 
@@ -34,7 +34,7 @@ var transMetasToTableData = function transMetasToTableData() {
34
34
  exports.transMetasToTableData = transMetasToTableData;
35
35
  var storageKey = "DEMO_CHART_URI_";
36
36
 
37
- var getAssetsVersion = function getAssetsVersion() {
37
+ var fetchAssetsVersion = function fetchAssetsVersion() {
38
38
  return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
39
39
  filter: {
40
40
  fields: [],
@@ -50,9 +50,9 @@ var getAssetsVersion = function getAssetsVersion() {
50
50
  });
51
51
  };
52
52
 
53
- exports.getAssetsVersion = getAssetsVersion;
53
+ exports.fetchAssetsVersion = fetchAssetsVersion;
54
54
 
55
- var getAssetsUri = function getAssetsUri(version) {
55
+ var fetchAssetsUri = function fetchAssetsUri(version) {
56
56
  return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
57
57
  filter: {
58
58
  fields: [{
@@ -74,42 +74,47 @@ var getAssetsUri = function getAssetsUri(version) {
74
74
  });
75
75
  };
76
76
 
77
- exports.getAssetsUri = getAssetsUri;
77
+ exports.fetchAssetsUri = fetchAssetsUri;
78
78
 
79
- var getAssets = /*#__PURE__*/function () {
80
- var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
81
- var _JSON$parse$;
79
+ var hasCachedAssets = function hasCachedAssets(resVersion) {
80
+ var _JSON$parse$;
81
+
82
+ var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
83
+ var cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
84
+ return cacheAssets !== null && cacheVersion === resVersion;
85
+ };
82
86
 
83
- var res, cacheAssets, cacheVersion, resVersion, assetsUri;
87
+ var getAssetsWithCache = /*#__PURE__*/function () {
88
+ var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
89
+ var res, cacheAssets, resVersion, assetsUri;
84
90
  return regeneratorRuntime.wrap(function _callee$(_context) {
85
91
  while (1) {
86
92
  switch (_context.prev = _context.next) {
87
93
  case 0:
88
94
  _context.next = 2;
89
- return getAssetsVersion();
95
+ return fetchAssetsVersion();
90
96
 
91
97
  case 2:
92
98
  res = _context.sent;
93
99
  cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
94
- cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
95
100
  resVersion = res[0].version;
96
101
 
97
- if (!(cacheAssets !== null && cacheVersion === resVersion)) {
98
- _context.next = 8;
102
+ if (!hasCachedAssets(resVersion)) {
103
+ _context.next = 7;
99
104
  break;
100
105
  }
101
106
 
102
107
  return _context.abrupt("return", JSON.parse(cacheAssets));
103
108
 
104
- case 8:
105
- _context.next = 10;
106
- return getAssetsUri(resVersion);
109
+ case 7:
110
+ _context.next = 9;
111
+ return fetchAssetsUri(resVersion);
107
112
 
108
- case 10:
113
+ case 9:
109
114
  assetsUri = _context.sent;
110
115
  return _context.abrupt("return", assetsUri);
111
116
 
112
- case 12:
117
+ case 11:
113
118
  case "end":
114
119
  return _context.stop();
115
120
  }
@@ -117,9 +122,10 @@ var getAssets = /*#__PURE__*/function () {
117
122
  }, _callee);
118
123
  }));
119
124
 
120
- return function getAssets() {
125
+ return function getAssetsWithCache() {
121
126
  return _ref.apply(this, arguments);
122
127
  };
123
128
  }();
124
129
 
125
- exports.getAssets = getAssets;
130
+ var _default = getAssetsWithCache;
131
+ exports["default"] = _default;
@@ -0,0 +1,79 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = exports.SingletonFetchAssetsAndAppend = void 0;
7
+
8
+ var _appendAssets = _interopRequireDefault(require("./append-assets"));
9
+
10
+ var _getAssetsWithCache = _interopRequireDefault(require("./get-assets-with-cache"));
11
+
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
+
14
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
15
+
16
+ function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
17
+
18
+ var getAssetsAndAppend = /*#__PURE__*/function () {
19
+ var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
20
+ var assets, execute;
21
+ return regeneratorRuntime.wrap(function _callee$(_context) {
22
+ while (1) {
23
+ switch (_context.prev = _context.next) {
24
+ case 0:
25
+ _context.next = 2;
26
+ return (0, _getAssetsWithCache["default"])();
27
+
28
+ case 2:
29
+ assets = _context.sent;
30
+ execute = new _appendAssets["default"]();
31
+ execute.setAssets(assets);
32
+ return _context.abrupt("return", execute.appendAssetsList());
33
+
34
+ case 6:
35
+ case "end":
36
+ return _context.stop();
37
+ }
38
+ }
39
+ }, _callee);
40
+ }));
41
+
42
+ return function getAssetsAndAppend() {
43
+ return _ref.apply(this, arguments);
44
+ };
45
+ }();
46
+
47
+ var SingletonFetchAssetsAndAppend = function SingletonFetchAssetsAndAppend() {
48
+ var instance;
49
+ return /*#__PURE__*/function () {
50
+ var _Singlenton = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
51
+ return regeneratorRuntime.wrap(function _callee2$(_context2) {
52
+ while (1) {
53
+ switch (_context2.prev = _context2.next) {
54
+ case 0:
55
+ if (!instance) {
56
+ instance = getAssetsAndAppend();
57
+ }
58
+
59
+ return _context2.abrupt("return", instance);
60
+
61
+ case 2:
62
+ case "end":
63
+ return _context2.stop();
64
+ }
65
+ }
66
+ }, _callee2);
67
+ }));
68
+
69
+ function Singlenton() {
70
+ return _Singlenton.apply(this, arguments);
71
+ }
72
+
73
+ return Singlenton;
74
+ }();
75
+ };
76
+
77
+ exports.SingletonFetchAssetsAndAppend = SingletonFetchAssetsAndAppend;
78
+ var _default = SingletonFetchAssetsAndAppend;
79
+ exports["default"] = _default;
@@ -38,8 +38,12 @@ function setToken(token) {
38
38
 
39
39
  var getJwtToken = function getJwtToken() {
40
40
  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/const/skynetToken")).then(function (res) {
41
- setToken(JSON.parse(res.data.Data.obj).token);
42
- return JSON.parse(res.data.Data.obj).token;
41
+ if (res.data.Data) {
42
+ setToken(JSON.parse(res.data.Data.obj).token);
43
+ return JSON.parse(res.data.Data.obj).token;
44
+ }
45
+
46
+ return "";
43
47
  });
44
48
  };
45
49
 
@@ -61,8 +65,8 @@ var beforeResponse = function beforeResponse(res) {
61
65
  config.retry = 3;
62
66
  config.retryCount = config.retryCount || 0;
63
67
 
64
- if (res.data.code === 203) {
65
- // 203错误表示未登录授权或者token失效
68
+ if (res.data.code === 401) {
69
+ // 401错误表示未登录授权或者token失效
66
70
  clearToken();
67
71
 
68
72
  if (config.retryCount <= config.retry) {
@@ -132,11 +132,7 @@ var Toast = /*#__PURE__*/function () {
132
132
  while (1) {
133
133
  switch (_context2.prev = _context2.next) {
134
134
  case 0:
135
- options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {
136
- style: {
137
- position: "fixed"
138
- }
139
- };
135
+ options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
140
136
  key = (0, _uuid["default"])();
141
137
  _context2.next = 4;
142
138
  return getInstance();
@@ -177,11 +173,7 @@ var Toast = /*#__PURE__*/function () {
177
173
  while (1) {
178
174
  switch (_context3.prev = _context3.next) {
179
175
  case 0:
180
- options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {
181
- style: {
182
- position: "fixed"
183
- }
184
- };
176
+ options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
185
177
  key = (0, _uuid["default"])();
186
178
  _context3.next = 4;
187
179
  return getInstance();
@@ -89,7 +89,11 @@ var getOpenData = function getOpenData(_ref2) {
89
89
  return reject(err);
90
90
  }
91
91
 
92
- resolve(data.items[0].data);
92
+ if (data && data.items[0]) {
93
+ resolve(data.items[0].data);
94
+ } else {
95
+ resolve(name);
96
+ }
93
97
  });
94
98
  });
95
99
  };
@@ -205,8 +205,8 @@ var NewOkrList = function NewOkrList(props) {
205
205
  params.Searchpage = 2;
206
206
  }
207
207
 
208
- if (departmentId != 0) {
209
- params.keyWords = '';
208
+ if (departmentId !== 0) {
209
+ params.keyWords = "";
210
210
  }
211
211
 
212
212
  var request;
@@ -363,7 +363,7 @@ var NewOkrList = function NewOkrList(props) {
363
363
  className: "okr-list__check-filter-btn",
364
364
  onClick: triggerAnimation
365
365
  }, (0, _getLocale.getLocale)("OKR_MyO_Text_Check")), (0, _getLocale.getLocale)("OKR_MyO_Text_Topfiltercriteria")), /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
366
- zIndex: 99999,
366
+ zIndex: 1200,
367
367
  noHeadLine: true,
368
368
  visible: casesVisible,
369
369
  onClose: onCasesCloseHandler,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.10.45",
3
+ "version": "1.10.48",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -22,6 +22,7 @@
22
22
  "@babel/core": "^7.11.1",
23
23
  "@babel/plugin-proposal-class-properties": "^7.10.4",
24
24
  "@babel/plugin-proposal-decorators": "^7.10.5",
25
+ "@babel/plugin-proposal-numeric-separator": "^7.16.7",
25
26
  "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
26
27
  "@babel/plugin-transform-modules-commonjs": "^7.10.4",
27
28
  "@babel/plugin-transform-runtime": "^7.11.0",