@titaui/pc 1.10.77 → 1.10.78

package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js

@@ -105,12 +105,21 @@ function _default(props) {
   }, []);
 
   var loadNodes = function loadNodes(nodeId) {
-    return (// 钻去隔级的直接下级
-      (0, _requestApis.getSubordinates)({
-        toUserId: nodeId,
-        relationIds: "1"
-      })
-    );
+    // 钻去隔级的直接下级
+    return (0, _requestApis.getSubordinates)({
+      toUserId: nodeId,
+      relationIds: "1"
+    });
+  };
+
+  var filterData = function filterData(childNode, grandNode) {
+    var mark = {};
+    childNode.forEach(function (item) {
+      mark[item.id] = true;
+    });
+    return grandNode.filter(function (item) {
+      !mark[item.userId];
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -119,6 +128,12 @@ function _default(props) {
       var promise = loadNodes(treeNode.id);
       if (!promise) return resolve(true);
       promise.then(function (nodes) {
+        var _treeNode$children;
+
+        if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
+          nodes = filterData(treeNode.children, nodes);
+        }
+
         if (!nodes.length) return null;
         (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
           return rawTreeData.push(it);

package/lib/components/superset-charts/fetch-assets-and-append/get-assets-with-cache.js

@@ -70,7 +70,7 @@ var fetchAssetsUri = function fetchAssetsUri(version) {
     },
     objectName: "superset_assets"
   }).then(function (res) {
-    localStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
+    sessionStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
     return transMetasToTableData(res.data.list);
   });
 };
@@ -80,13 +80,15 @@ exports.fetchAssetsUri = fetchAssetsUri;
 var hasCachedAssets = function hasCachedAssets(resVersion) {
   var _JSON$parse$;
 
-  var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
+  var cacheAssets = sessionStorage.getItem("".concat(storageKey, "version"));
   var cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
   return cacheAssets !== null && cacheVersion === resVersion;
 };
 
 var getAssetsWithCache = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _res$;
+
     var res, cacheAssets, resVersion, assetsUri;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -97,25 +99,33 @@ var getAssetsWithCache = /*#__PURE__*/function () {
 
           case 2:
             res = _context.sent;
-            cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
-            resVersion = res[0].version;
+            cacheAssets = sessionStorage.getItem("".concat(storageKey, "version"));
+            resVersion = res === null || res === void 0 ? void 0 : (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.version;
 
-            if (!hasCachedAssets(resVersion)) {
+            if (resVersion) {
               _context.next = 7;
               break;
             }
 
-            return _context.abrupt("return", JSON.parse(cacheAssets));
+            return _context.abrupt("return", []);
 
           case 7:
-            _context.next = 9;
-            return fetchAssetsUri(resVersion);
+            if (!hasCachedAssets(resVersion)) {
+              _context.next = 9;
+              break;
+            }
+
+            return _context.abrupt("return", JSON.parse(cacheAssets));
 
           case 9:
+            _context.next = 11;
+            return fetchAssetsUri(resVersion);
+
+          case 11:
             assetsUri = _context.sent;
             return _context.abrupt("return", assetsUri);
 
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }

package/lib/components/superset-charts/utils/axios.js

@@ -25,15 +25,15 @@ var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0;
 var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
 
 function getToken() {
-  return localStorage.getItem("DEMOFREE_TOKEN") || "";
+  return sessionStorage.getItem("DEMOFREE_TOKEN") || "";
 }
 
 function clearToken() {
-  localStorage.removeItem("DEMOFREE_TOKEN");
+  sessionStorage.removeItem("DEMOFREE_TOKEN");
 }
 
 function setToken(token) {
-  localStorage.setItem("DEMOFREE_TOKEN", token);
+  sessionStorage.setItem("DEMOFREE_TOKEN", token);
 }
 
 var getJwtToken = function getJwtToken() {

package/lib/pages/new-okr-list/index.js

@@ -178,7 +178,12 @@ var NewOkrList = function NewOkrList(props) {
 
   (0, _react.useEffect)(function () {
     setPageNum(1);
-  }, [relation, toUserId, departmentId, query]); // 记录访问者数据
+  }, [relation, toUserId, departmentId, query]);
+  (0, _react.useEffect)(function () {
+    handleOnSearch({
+      keyWords: ""
+    });
+  }, [relation, toUserId, departmentId]); // 记录访问者数据
 
   var recordVisitUser = function recordVisitUser() {
     if (toUserId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.77",
+  "version": "1.10.78",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",