@titaui/pc 1.10.76 → 1.10.79

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.
@@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
13
13
 
14
14
  function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
15
15
 
16
- var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n background-color: #fff;\n padding-top: 21px;\n padding: 32px 32px 0 32px;\n max-height: 600px;\n overflow-y: scroll;\n"])));
16
+ var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n background-color: #fff;\n padding-top: 21px;\n padding: 32px 32px 0 32px;\n max-height: 300px;\n overflow-y: scroll;\n"])));
17
17
 
18
18
  exports.EditWightContent = EditWightContent;
19
19
 
@@ -105,12 +105,21 @@ function _default(props) {
105
105
  }, []);
106
106
 
107
107
  var loadNodes = function loadNodes(nodeId) {
108
- return (// 钻去隔级的直接下级
109
- (0, _requestApis.getSubordinates)({
110
- toUserId: nodeId,
111
- relationIds: "1"
112
- })
113
- );
108
+ // 钻去隔级的直接下级
109
+ return (0, _requestApis.getSubordinates)({
110
+ toUserId: nodeId,
111
+ relationIds: "1"
112
+ });
113
+ };
114
+
115
+ var filterData = function filterData(childNode, grandNode) {
116
+ var mark = {};
117
+ childNode.forEach(function (item) {
118
+ mark[item.id] = true;
119
+ });
120
+ return grandNode.filter(function (item) {
121
+ !mark[item.userId];
122
+ });
114
123
  };
115
124
 
116
125
  var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -119,6 +128,12 @@ function _default(props) {
119
128
  var promise = loadNodes(treeNode.id);
120
129
  if (!promise) return resolve(true);
121
130
  promise.then(function (nodes) {
131
+ var _treeNode$children;
132
+
133
+ if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
134
+ nodes = filterData(treeNode.children, nodes);
135
+ }
136
+
122
137
  if (!nodes.length) return null;
123
138
  (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
124
139
  return rawTreeData.push(it);
@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
12
  var _getLocale = require("../../../../utils/getLocale");
13
13
 
14
+ var _tools = require("../../../../utils/tools");
15
+
14
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
17
 
16
18
  function OName(props) {
@@ -19,16 +21,21 @@ function OName(props) {
19
21
  setIsEdit = props.setIsEdit,
20
22
  okrStatus = props.okrStatus,
21
23
  children = props.children;
24
+
25
+ var handleEditClick = function handleEditClick() {
26
+ if (editable) {
27
+ setIsEdit(true);
28
+ }
29
+ };
30
+
22
31
  return /*#__PURE__*/_react["default"].createElement("div", {
23
32
  className: (0, _classnames["default"])("okr-drawer-header__title", {
24
33
  "okr-drawer-header__title--editable": editable
25
34
  })
26
35
  }, /*#__PURE__*/_react["default"].createElement("span", {
27
36
  className: "okr-drawer-header__name",
28
- onClick: function onClick() {
29
- editable && setIsEdit(true);
30
- }
31
- }, okrName), children, okrStatus == 2 && /*#__PURE__*/_react["default"].createElement("span", {
37
+ onClick: handleEditClick
38
+ }, (0, _tools.htmlDecodeByRegExp)(okrName)), children, Number(okrStatus) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
32
39
  className: "okr-drawer-header__over-tag"
33
40
  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")));
34
41
  }
@@ -414,7 +414,9 @@ function OkrDetailHeader(_ref) {
414
414
  case 2:
415
415
  _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
416
416
 
417
- commonContext.refreshAll();
417
+ setTimeout(function () {
418
+ commonContext.refreshAll();
419
+ }, 500);
418
420
 
419
421
  case 4:
420
422
  case "end":
@@ -1,39 +1,97 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
- exports["default"] = _default;
8
+ exports["default"] = void 0;
7
9
 
8
- var _react = _interopRequireDefault(require("react"));
10
+ var _react = _interopRequireWildcard(require("react"));
9
11
 
10
12
  var _classnames = _interopRequireDefault(require("classnames"));
11
13
 
12
14
  var _simplebarReact = _interopRequireDefault(require("./simplebar-react"));
13
15
 
16
+ var _scrollMask = _interopRequireDefault(require("./scroll-mask"));
17
+
14
18
  require("./index.css");
15
19
 
16
20
  var _excluded = ["children", "style"];
17
21
 
18
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
19
23
 
24
+ 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); }
25
+
26
+ 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; }
27
+
20
28
  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
29
 
30
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
31
+
32
+ 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."); }
33
+
34
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
35
+
36
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
37
+
38
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
39
+
40
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
41
+
22
42
  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; }
23
43
 
24
44
  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; }
25
45
 
26
46
  var preCls = "titaui-scrollbar";
27
-
28
- function _default(props) {
47
+ var ScrollBar = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
29
48
  var children = props.children,
30
- style = props.style,
31
- restProps = _objectWithoutProperties(props, _excluded); // @ts-ignore
49
+ _props$style = props.style,
50
+ style = _props$style === void 0 ? {
51
+ height: "100%"
52
+ } : _props$style,
53
+ restProps = _objectWithoutProperties(props, _excluded);
54
+
55
+ var _useState = (0, _react.useState)(),
56
+ _useState2 = _slicedToArray(_useState, 2),
57
+ scrollElement = _useState2[0],
58
+ setScrollElement = _useState2[1];
32
59
 
60
+ var _useState3 = (0, _react.useState)(),
61
+ _useState4 = _slicedToArray(_useState3, 2),
62
+ contentElement = _useState4[0],
63
+ setContentElement = _useState4[1];
33
64
 
34
- return /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], _extends({
65
+ var simpleBarRef = (0, _react.useRef)();
66
+ (0, _react.useImperativeHandle)(ref, function () {
67
+ return {
68
+ scrollElement: scrollElement,
69
+ contentElement: contentElement
70
+ };
71
+ });
72
+ (0, _react.useEffect)(function () {
73
+ // @ts-ignore
74
+ setScrollElement(simpleBarRef === null || simpleBarRef === void 0 ? void 0 : simpleBarRef.current.getScrollElement()); // @ts-ignore
75
+
76
+ setContentElement(simpleBarRef === null || simpleBarRef === void 0 ? void 0 : simpleBarRef.current.getContentElement());
77
+ }, []);
78
+ return /*#__PURE__*/_react["default"].createElement("div", {
79
+ style: {
80
+ height: "100%"
81
+ }
82
+ }, /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], _extends({
83
+ ref: simpleBarRef,
35
84
  className: (0, _classnames["default"])(preCls),
36
85
  timeout: 800,
37
86
  style: style
38
- }, restProps), children);
39
- }
87
+ }, restProps), children));
88
+ });
89
+ ScrollBar.defaultProps = {
90
+ style: {
91
+ height: "100%"
92
+ }
93
+ }; // @ts-ignore
94
+
95
+ ScrollBar.Mask = _scrollMask["default"];
96
+ var _default = ScrollBar;
97
+ exports["default"] = _default;
@@ -0,0 +1,29 @@
1
+ .titaui-scroll-mask {
2
+ width: 100%;
3
+ height: calc(100% - 16px);
4
+ position: relative;
5
+ }
6
+
7
+ .titaui-scroll-mask__top {
8
+ position: absolute;
9
+ top: 0;
10
+ width: 100%;
11
+ pointer-events: none;
12
+ background: linear-gradient(180deg, #ffffff 0%, rgba(255, 255, 255, 0) 100%);
13
+ }
14
+
15
+ .titaui-scroll-mask__top--hide {
16
+ display: none;
17
+ }
18
+
19
+ .titaui-scroll-mask__bottom {
20
+ position: absolute;
21
+ bottom: 0;
22
+ width: 100%;
23
+ pointer-events: none;
24
+ background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
25
+ }
26
+
27
+ .titaui-scroll-mask__bottom--hide {
28
+ display: none;
29
+ }
@@ -0,0 +1,152 @@
1
+ "use strict";
2
+
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports["default"] = void 0;
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _classnames = _interopRequireDefault(require("classnames"));
13
+
14
+ var _scrollbar = _interopRequireDefault(require("../../scrollbar"));
15
+
16
+ require("./index.css");
17
+
18
+ var _excluded = ["children", "maskHeight", "style"];
19
+
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
+
22
+ 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); }
23
+
24
+ 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; }
25
+
26
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
27
+
28
+ 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); }
29
+
30
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
31
+
32
+ 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."); }
33
+
34
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
35
+
36
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
37
+
38
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
39
+
40
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
41
+
42
+ 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; }
43
+
44
+ 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; }
45
+
46
+ var preCls = "titaui-scroll-mask";
47
+
48
+ var ScrollBarMask = function ScrollBarMask(_ref) {
49
+ var _scrollRef$current, _scrollRef$current2;
50
+
51
+ var children = _ref.children,
52
+ maskHeight = _ref.maskHeight,
53
+ _ref$style = _ref.style,
54
+ style = _ref$style === void 0 ? {
55
+ height: "100%"
56
+ } : _ref$style,
57
+ restProps = _objectWithoutProperties(_ref, _excluded);
58
+
59
+ var _useState = (0, _react.useState)(true),
60
+ _useState2 = _slicedToArray(_useState, 2),
61
+ isScrollToTop = _useState2[0],
62
+ setIsScrollToTop = _useState2[1];
63
+
64
+ var _useState3 = (0, _react.useState)(false),
65
+ _useState4 = _slicedToArray(_useState3, 2),
66
+ isScrollToBottom = _useState4[0],
67
+ setIsScrollToBottom = _useState4[1];
68
+
69
+ var _useState5 = (0, _react.useState)(false),
70
+ _useState6 = _slicedToArray(_useState5, 2),
71
+ isOverFlow = _useState6[0],
72
+ setIsOverFlow = _useState6[1];
73
+
74
+ var scrollRef = (0, _react.useRef)(); // @ts-ignore
75
+
76
+ var scrollElement = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollElement; // @ts-ignore
77
+
78
+ var contentElement = (_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.contentElement;
79
+
80
+ var handleScroll = function handleScroll() {
81
+ // 判断是否滚动到顶部
82
+ if (!(scrollElement !== null && scrollElement !== void 0 && scrollElement.scrollTop)) {
83
+ setIsScrollToTop(true);
84
+ } else {
85
+ setIsScrollToTop(false);
86
+ } // 判断是否滚动到底部
87
+
88
+
89
+ if (scrollElement.scrollTop + scrollElement.offsetHeight === scrollElement.scrollHeight) {
90
+ setIsScrollToBottom(true);
91
+ } else {
92
+ setIsScrollToBottom(false);
93
+ }
94
+ };
95
+
96
+ (0, _react.useEffect)(function () {
97
+ // 判断是否出现滚动条
98
+ if ((scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.offsetHeight) < (scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.scrollHeight)) {
99
+ setIsOverFlow(true);
100
+ }
101
+ }, [scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.scrollHeight]);
102
+ (0, _react.useEffect)(function () {
103
+ var mutation;
104
+
105
+ if (contentElement) {
106
+ var config = {
107
+ characterData: true,
108
+ // 监听元素内的数据变动
109
+ childList: true,
110
+ // 监听子元素数量变动(子元素的属性变化不会触发事件)(只针对一级子元素,孙子元素的数量变化不会触发事件)
111
+ subtree: true // 将observer事件下发到目标元素的所有子元素,相当于对子元素也进行了observer
112
+
113
+ };
114
+
115
+ var recalculate = function recalculate() {
116
+ if (contentElement.scrollHeight > scrollElement.offsetHeight) {
117
+ setIsOverFlow(true);
118
+ } else {
119
+ setIsOverFlow(false);
120
+ }
121
+ };
122
+
123
+ mutation = new MutationObserver(recalculate);
124
+ mutation.observe(contentElement, config);
125
+ }
126
+ }, [contentElement]);
127
+ return /*#__PURE__*/_react["default"].createElement("div", {
128
+ className: preCls,
129
+ onScroll: handleScroll
130
+ }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], _extends({
131
+ ref: scrollRef,
132
+ style: style
133
+ }, restProps), children), isOverFlow && /*#__PURE__*/_react["default"].createElement("div", {
134
+ className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "__top--hide"), isScrollToTop), _defineProperty({}, "".concat(preCls, "__top"), !isScrollToTop)),
135
+ style: {
136
+ height: "".concat(maskHeight, "px")
137
+ }
138
+ }), isOverFlow && /*#__PURE__*/_react["default"].createElement("div", {
139
+ className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "__bottom--hide"), isScrollToBottom), _defineProperty({}, "".concat(preCls, "__bottom"), !isScrollToBottom)),
140
+ style: {
141
+ height: "".concat(maskHeight, "px")
142
+ }
143
+ }));
144
+ };
145
+
146
+ ScrollBarMask.defaultProps = {
147
+ style: {
148
+ height: "100%"
149
+ }
150
+ };
151
+ var _default = ScrollBarMask;
152
+ exports["default"] = _default;
@@ -70,7 +70,7 @@ var fetchAssetsUri = function fetchAssetsUri(version) {
70
70
  },
71
71
  objectName: "superset_assets"
72
72
  }).then(function (res) {
73
- localStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
73
+ sessionStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
74
74
  return transMetasToTableData(res.data.list);
75
75
  });
76
76
  };
@@ -80,13 +80,15 @@ exports.fetchAssetsUri = fetchAssetsUri;
80
80
  var hasCachedAssets = function hasCachedAssets(resVersion) {
81
81
  var _JSON$parse$;
82
82
 
83
- var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
83
+ var cacheAssets = sessionStorage.getItem("".concat(storageKey, "version"));
84
84
  var cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
85
85
  return cacheAssets !== null && cacheVersion === resVersion;
86
86
  };
87
87
 
88
88
  var getAssetsWithCache = /*#__PURE__*/function () {
89
89
  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
90
+ var _res$;
91
+
90
92
  var res, cacheAssets, resVersion, assetsUri;
91
93
  return regeneratorRuntime.wrap(function _callee$(_context) {
92
94
  while (1) {
@@ -97,25 +99,33 @@ var getAssetsWithCache = /*#__PURE__*/function () {
97
99
 
98
100
  case 2:
99
101
  res = _context.sent;
100
- cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
101
- resVersion = res[0].version;
102
+ cacheAssets = sessionStorage.getItem("".concat(storageKey, "version"));
103
+ resVersion = res === null || res === void 0 ? void 0 : (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.version;
102
104
 
103
- if (!hasCachedAssets(resVersion)) {
105
+ if (resVersion) {
104
106
  _context.next = 7;
105
107
  break;
106
108
  }
107
109
 
108
- return _context.abrupt("return", JSON.parse(cacheAssets));
110
+ return _context.abrupt("return", []);
109
111
 
110
112
  case 7:
111
- _context.next = 9;
112
- return fetchAssetsUri(resVersion);
113
+ if (!hasCachedAssets(resVersion)) {
114
+ _context.next = 9;
115
+ break;
116
+ }
117
+
118
+ return _context.abrupt("return", JSON.parse(cacheAssets));
113
119
 
114
120
  case 9:
121
+ _context.next = 11;
122
+ return fetchAssetsUri(resVersion);
123
+
124
+ case 11:
115
125
  assetsUri = _context.sent;
116
126
  return _context.abrupt("return", assetsUri);
117
127
 
118
- case 11:
128
+ case 13:
119
129
  case "end":
120
130
  return _context.stop();
121
131
  }
@@ -25,15 +25,15 @@ var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0;
25
25
  var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
26
26
 
27
27
  function getToken() {
28
- return localStorage.getItem("DEMOFREE_TOKEN") || "";
28
+ return sessionStorage.getItem("DEMOFREE_TOKEN") || "";
29
29
  }
30
30
 
31
31
  function clearToken() {
32
- localStorage.removeItem("DEMOFREE_TOKEN");
32
+ sessionStorage.removeItem("DEMOFREE_TOKEN");
33
33
  }
34
34
 
35
35
  function setToken(token) {
36
- localStorage.setItem("DEMOFREE_TOKEN", token);
36
+ sessionStorage.setItem("DEMOFREE_TOKEN", token);
37
37
  }
38
38
 
39
39
  var getJwtToken = function getJwtToken() {
@@ -178,7 +178,12 @@ var NewOkrList = function NewOkrList(props) {
178
178
 
179
179
  (0, _react.useEffect)(function () {
180
180
  setPageNum(1);
181
- }, [relation, toUserId, departmentId, query]); // 记录访问者数据
181
+ }, [relation, toUserId, departmentId, query]);
182
+ (0, _react.useEffect)(function () {
183
+ handleOnSearch({
184
+ keyWords: ""
185
+ });
186
+ }, [relation, toUserId, departmentId]); // 记录访问者数据
182
187
 
183
188
  var recordVisitUser = function recordVisitUser() {
184
189
  if (toUserId) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.10.76",
3
+ "version": "1.10.79",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",