@titaui/pc 1.7.52 → 1.7.53

package/lib/components/nav-top/components/user-message/components/todos/todo-item.js

@@ -15,6 +15,8 @@ var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/toolti
 
 var _utils = require("../../utils");
 
+var _tools = require("../../../../../../utils/tools");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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; }
@@ -31,6 +33,8 @@ var TodoItem = function TodoItem(props) {
 
     if (item.objType === 7) {
       window.Talent.app.vent.trigger('global-pull-screen', item.objId, 'task');
+    } else {
+      (0, _tools.openPage)(item.objUrl);
     }
   };
 
@@ -51,8 +55,6 @@ var TodoItem = function TodoItem(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
   }, /*#__PURE__*/_react["default"].createElement("a", {
-    href: item.objUrl,
-    target: "_blank",
     onClick: function onClick() {
       return handleTodosClick(item);
     }

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

@@ -75,6 +75,9 @@
   padding: 10px 32px 8px;
   min-height: 90px;
   box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
 }
 
 .child-okrs-weight__item {

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

@@ -84,7 +84,7 @@ var _default = function _default(props) {
       _useState4 = _slicedToArray(_useState3, 1),
       user = _useState4[0];
 
-  var _useState5 = (0, _react.useState)(((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting")) === null || _getBSGlobal === void 0 ? void 0 : (_getBSGlobal$KRSettin = _getBSGlobal.KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OKrWeight) || true),
+  var _useState5 = (0, _react.useState)(((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting")) === null || _getBSGlobal === void 0 ? void 0 : (_getBSGlobal$KRSettin = _getBSGlobal.KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OKrWeight) || false),
       _useState6 = _slicedToArray(_useState5, 1),
       OKrWeightSetting = _useState6[0];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.52",
+  "version": "1.7.53",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/nav-top/components/user-message/components/todos/todo-item.tsx

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import Avatar from '../../../../../../components/avatar';
 import TooltipText from '../../../../../tooltip/tooltip-text';
 import { htmlToText, deleteText } from '../../utils';
+import { openPage } from '../../../../../../utils/tools';
 
 const preCls = 'titaui-user-message-msg-todos';
 
@@ -13,6 +14,8 @@ const TodoItem: FC<any> = (props) => {
     onItemClick && onItemClick(false);
     if (item.objType === 7) {
       window.Talent.app.vent.trigger('global-pull-screen', item.objId, 'task');
+    } else {
+      openPage(item.objUrl)
     }
   };
 
@@ -33,8 +36,6 @@ const TodoItem: FC<any> = (props) => {
       </div>
       <div className={classNames(`${preCls}__item-right`)}>
         <a
-          href={item.objUrl}
-          target="_blank"
           onClick={() => handleTodosClick(item)}
         >
           <div className={classNames(`${preCls}__item-right-header`)}>

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.js

@@ -29,7 +29,7 @@ export default (props) => {
   const { refreshAll, okrInfo } = useContext(CommonContext);
   const [user] = useState(data.principalUser);
   const [OKrWeightSetting] = useState(
-    getBSGlobal("OkrAdvancedSetting")?.KRSetting?.OKrWeight || true
+    getBSGlobal("OkrAdvancedSetting")?.KRSetting?.OKrWeight || false
   );
   const [cycleDateStr] = useState(() => {
     // 时间周期

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.scss

@@ -89,6 +89,9 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
     padding: 10px 32px 8px;
     min-height: 90px;
     box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
   }
   &__item {
     margin-bottom: 18px;