@titaui/pc 1.10.79 → 1.10.83

package/lib/components/menus/export-modules/okr-menus/menu-highlight.js

@@ -31,6 +31,8 @@ var _default = /*#__PURE__*/function () {
           cb(_menus.PAGE_MY_PART_OKR);
         } else if (this.isMyTargetOkr()) {
           cb(_menus.PAGE_MY_TARGET_OKR);
+        } else if (this.isTargetUser()) {
+          return null;
         } else {
           cb(_menus.PAGE_MY_OWNER_OKR);
         }
@@ -43,6 +45,8 @@ var _default = /*#__PURE__*/function () {
       } else if (this.isOkrCases()) {
         cb(_menus.PAGE_OKR_CASES);
       }
+
+      return null;
     }
   }, {
     key: "isMyOkr",
@@ -62,6 +66,12 @@ var _default = /*#__PURE__*/function () {
       var search = this.history.location.search;
       return !!search.match(/relation[\s]*?=[\s]*?3/);
     }
+  }, {
+    key: "isTargetUser",
+    value: function isTargetUser() {
+      var search = this.history.location.search;
+      return !!search.match(/toUserId[\s]*?=[\d]+/);
+    }
   }, {
     key: "isOkr",
     value: function isOkr() {

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

@@ -97,9 +97,13 @@ function _default(props) {
     }, {
       disabledDottedSubordinatesDig: true
     }).then(function (users) {
-      var rawTreeData = (0, _helper.transToTreeNode)(users);
-      setRawTreeData(rawTreeData);
-      setTreeData((0, _utils.toTree)(rawTreeData));
+      var rawTreeData = (0, _helper.transToTreeNode)(users); // 要过滤掉那些既是登录者的虚线下级，又是登录者下属的下级，让他默认展开的时候重新获取
+
+      var newRawTreeData = rawTreeData.filter(function (item) {
+        return item.pid === loginUserId;
+      });
+      setRawTreeData(newRawTreeData);
+      setTreeData((0, _utils.toTree)(newRawTreeData));
       setLoading(false);
     });
   }, []);
@@ -112,14 +116,15 @@ function _default(props) {
     });
   };
 
-  var filterData = function filterData(childNode, grandNode) {
+  var filterData = function filterData(newNode, oldNode) {
     var mark = {};
-    childNode.forEach(function (item) {
-      mark[item.id] = true;
+    newNode.forEach(function (item) {
+      mark[item.userId] = true;
     });
-    return grandNode.filter(function (item) {
-      !mark[item.userId];
+    var newArry = oldNode.filter(function (item) {
+      return !mark[item.id];
     });
+    return newArry;
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -130,16 +135,18 @@ function _default(props) {
       promise.then(function (nodes) {
         var _treeNode$children;
 
+        if (!nodes.length) return null;
+        var oldRawTreeData = rawTreeData;
+
         if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
-          nodes = filterData(treeNode.children, nodes);
+          oldRawTreeData = filterData(nodes, oldRawTreeData);
         }
 
-        if (!nodes.length) return null;
         (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
-          return rawTreeData.push(it);
+          return oldRawTreeData.push(it);
         });
-        setRawTreeData(rawTreeData);
-        setTreeData((0, _utils.toTree)(rawTreeData));
+        setRawTreeData(oldRawTreeData);
+        setTreeData((0, _utils.toTree)(oldRawTreeData));
         return true;
       });
       resolve(true);

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.css

@@ -54,7 +54,7 @@
 }
 
 .tita-okrdt-tree__o-child-node-prefix::before {
-  content: "";
+  content: '';
   width: 9px;
   height: 12px;
   background: url(../../images/O.svg) transparent no-repeat 50% 50%;
@@ -73,7 +73,9 @@
 
 .child-okrs-weight__content {
   padding: 10px 32px 8px;
+  max-height: 300px;
   min-height: 90px;
+  overflow: auto;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -105,7 +107,7 @@
 }
 
 .child-okrs-weight__item-precls:before {
-  content: "";
+  content: '';
   width: 10px;
   height: 8px;
   border-radius: 50%;

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

@@ -47,6 +47,10 @@ var fetchAssetsVersion = function fetchAssetsVersion() {
     },
     objectName: "superset_assets_version"
   }).then(function (res) {
+    if (!res.data) {
+      return [];
+    }
+
     return transMetasToTableData(res.data.list);
   });
 };
@@ -70,6 +74,10 @@ var fetchAssetsUri = function fetchAssetsUri(version) {
     },
     objectName: "superset_assets"
   }).then(function (res) {
+    if (!res.data) {
+      return [];
+    }
+
     sessionStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
     return transMetasToTableData(res.data.list);
   });

package/lib/pages/group-management/tree/group-form/index.js

@@ -183,7 +183,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }), /*#__PURE__*/_react["default"].createElement("label", {
     htmlFor: "total",
     className: "text"
-  }, (0, _getLocale.getLocale)("Pro_page_Plan_Allpersonnel"))), /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_titaUi.Radio, {
+  }, (0, _getLocale.getLocale)("Backst_Visibletoall"))), /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_titaUi.Radio, {
     id: "scope",
     checked: scopeChecked == 1,
     onChange: function onChange() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.79",
+  "version": "1.10.83",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -77,6 +77,7 @@
     "@titaui/rc-tree2": "4.1.23",
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
+    "@titaui/request": "^1.0.1",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",