@titaui/pc 1.9.38 → 1.9.42

package/lib/pages/personal-info/components/person-photo/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-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); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true

package/lib/utils/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 
-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); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,7 +9,7 @@ exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.D
 
 var _bsGlobal = require("./bs-global");
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -27,7 +27,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var BaseAuth = /*#__PURE__*/function () {
   function BaseAuth() {

package/lib/utils/local-storage.js

@@ -11,7 +11,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var localStorage = /*#__PURE__*/function () {
   function localStorage() {

package/lib/utils/open-data.js

@@ -1,6 +1,6 @@
 "use strict";
 
-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); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,9 +15,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/utils/request-v1.js

@@ -10,9 +10,9 @@ exports.taker = taker;
 
 var _bsGlobal = require("./bs-global");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/utils/roundWeight.js

@@ -8,9 +8,9 @@ exports.AccMul = AccMul;
 exports.ReCalibratePrecision = ReCalibratePrecision;
 exports.RoundWeight = RoundWeight;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/package.json

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

package/src/components/communication/ConvertUserName.tsx

@@ -1,36 +1,33 @@
-import React, { PureComponent } from 'react'
-import { getBSGlobal, getUserInfo } from '../../utils/bs-global'
-import { OpenUserName } from '../../utils/open-data'
-import styled from 'styled-components'
-
+import classNames from "classnames";
+import React, { PureComponent } from "react";
+import { OpenUserName } from "../../utils/open-data";
+import "./index.scss";
 interface Props {
-  className?: string
-  userName: string
-  userId?: number
+  className?: string;
+  userName: string;
+  userId?: number;
 }
 
-const UserLink = styled.a`
-  font-size: 14px;
-  font-weight: 600;
-  color: #3F4755;
-  line-height: 22px;
-
-  &:hover {
-    color: #2879ff;
-  }
-`
-
 export default class ConvertUserName extends PureComponent<Props> {
   render() {
-    const { userName, userId, className } = this.props
+    const { userName, userId, className } = this.props;
     if (userId) {
-      const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
+      // const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
       return (
-        <UserLink className={className} target="_blank" href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}>
-          <span><OpenUserName name={userName} id={userId} /></span>
-        </UserLink>
-      )
+        <a
+          className={classNames(
+            className,
+            "titaui-communication__communication-content__user-link"
+          )}
+          target="_blank"
+          // href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}
+        >
+          <span>
+            <OpenUserName name={userName} id={userId} />
+          </span>
+        </a>
+      );
     }
-    return <span className={className}>{userName}</span>
+    return <span className={className}>{userName}</span>;
   }
 }

package/src/components/communication/index.scss

@@ -22,6 +22,16 @@
       img {
         vertical-align: text-bottom;
       }
+      &__user-link {
+        font-size: 14px;
+        font-weight: 600;
+        color: #3F4755;
+        line-height: 22px;
+      
+        &:hover {
+          color: #2879ff;
+        }
+      }
       a {
         color: #2879ff;
         &:hover {

package/src/components/create-okr-modal/img/check-right.svg

@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>对号</title>
-    <g id="创建OKR" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="目标实时校验" transform="translate(-1015.000000, -384.000000)" fill-rule="nonzero">
-            <g id="单行" transform="translate(976.000000, 129.000000)">
-                <g id="编组-12" transform="translate(23.000000, 225.000000)">
-                    <g id="对号" transform="translate(16.000000, 30.000000)">
-                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="10" height="10"></rect>
-                        <path d="M0.633865976,4.59654663 L3.04772746,6.45071008 C3.04772746,6.45071008 3.18087497,6.51691307 3.34730936,6.45071008 L9.29070556,1.51474948 C9.29070556,1.51474948 10.1376717,1.33516988 9.98056404,2.22923006 C9.40729003,2.80858618 3.56375447,8.40433792 3.56375447,8.40433792 C3.56375447,8.40433792 3.18087497,8.6195776 2.8145585,8.40433792 C2.44856365,8.04006157 0.00173690497,5.37467163 0.00173690497,5.37467163 C0.00173690497,5.37467163 -0.0653192697,4.72911252 0.633865976,4.59654663 Z" id="路径" fill="#5AD8A6"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path d="M4.634 8.597l2.414 1.854s.133.066.3 0l5.943-4.936s.847-.18.69.714c-.574.58-6.417 6.175-6.417 6.175s-.383.216-.75 0c-.365-.364-2.812-3.03-2.812-3.03s-.067-.645.632-.777z" fill="#5AD8A6" fill-rule="nonzero"/></svg>

package/src/components/create-okr-modal/img/check-wrong.svg

@@ -1,29 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>不建议</title>
-    <defs>
-        <circle id="path-1" cx="8" cy="8" r="4"></circle>
-        <filter x="-78.1%" y="-78.1%" width="256.2%" height="256.2%" filterUnits="objectBoundingBox" id="filter-2">
-            <feMorphology radius="0.25" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
-            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0.964705882   0 0 0 0 0.741176471   0 0 0 0 0.0862745098  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="创建OKR" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="激活-关键成果" transform="translate(-1011.000000, -466.000000)">
-            <g id="单行" transform="translate(976.000000, 129.000000)">
-                <g id="编组-12" transform="translate(23.000000, 267.000000)">
-                    <g id="不建议" transform="translate(13.000000, 71.000000)">
-                        <circle id="椭圆形" fill="#F6BD16" opacity="0.08" cx="8" cy="8" r="8"></circle>
-                        <g id="椭圆形">
-                            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-                            <use stroke="#FFFFFF" stroke-width="0.5" fill="#F6BD16" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path d="M9 8.317l3.246-3.246a.242.242 0 0 1 .342 0l.341.341a.242.242 0 0 1 0 .342L9.683 9l3.246 3.246a.242.242 0 0 1 0 .342l-.341.341a.242.242 0 0 1-.342 0L9 9.683 5.754 12.93a.242.242 0 0 1-.342 0l-.341-.341a.242.242 0 0 1 0-.342L8.317 9 5.07 5.754a.242.242 0 0 1 0-.342l.341-.341a.242.242 0 0 1 .342 0L9 8.317z" fill="#F05E5E" fill-rule="nonzero"/></svg>

package/src/components/dialog/index.scss

@@ -15,11 +15,11 @@ Microsoft YaHei;
   display: flex;
   justify-content: center;
   align-items: center;
-  z-index: 1299 !important;
+  z-index: 1299;
 }
 
 .rc-dialog-mask {
-  z-index: 1299 !important;
+  z-index: 1299;
   background: rgba(20, 28, 40, 0.7) !important;
 }
 

package/src/components/dynamic/online-broadcast/data.ts

@@ -14,18 +14,32 @@ if (source === 860) {
 }
 
 export const onlineBroadcastData = [
+  {
+    hasOnline: true,
+    preContent: '「OKR」支持手动进行目标打分',
+    preHref: 'https://wiki.tita.com/x/GYCeAQ',
+    isNew: true,
+    date: '1/12',
+  },
+  {
+    hasOnline: true,
+    preContent: '「考核」支持批量公布考核结果 ',
+    preHref: 'https://wiki.tita.com/x/L4CeAQ',
+    isNew: true,
+    date: '1/11',
+  },
   {
     hasOnline: true,
     preContent: 'Tita「Learning」 全新上线',
     preHref: 'https://wiki.tita.com/x/doNrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/26',
   },
   {
     hasOnline: true,
     preContent: '「OKR」支持设置子目标权重',
     preHref: 'https://wiki.tita.com/x/mIFrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/18',
   },
   {

package/src/components/hr-header/index.tsx

@@ -79,7 +79,7 @@ function HrHeader({}: Props): ReactElement {
             popupPlacement="bottom"
             popup={
                   <div className='tencent-hr-header-popup'>
-                    {menus.slice(6).map((menu) => (
+                    {menus.slice(5).map((menu) => (
                       <a className='tencent-hr-header-popup__item' href={menu.appUrl}>{menu.appName}</a>
                     ))}
                   </div>

package/src/components/keyword-search/index.tsx

@@ -12,13 +12,12 @@ interface IProps {
 
 const KeywordSearch = (props: IProps) => {;
   const { onSearch } = props;
-  const inputRef = useRef();
+  const inputRef = useRef<any>();
   const [active, setActive] = useState(false);
   const [keyword, setKeyword] = useState('');
   const handleSearchClick = () => {
     if(!active) {
       setActive(true);
-      //@ts-ignore
       inputRef?.current?.focus();
     } else {
       handleSearch()
@@ -40,7 +39,9 @@ const KeywordSearch = (props: IProps) => {;
     }
   }
   const clearKeyword = (e) =>{
-    setKeyword('')
+    setKeyword('');
+    inputRef?.current?.focus();
+    onSearch && onSearch({keyWords: ''});
   };
 
   return <div className={classnames(precls, {[`${precls}--active`]: active})}>

package/src/components/menus/components/flip-menu-card/index.tsx

@@ -154,9 +154,9 @@ export default forwardRef((props: Props, ref) => {
       const el = scrollArea?.getScrollElement();
       if (el && el.scrollHeight > el.offsetHeight) {
         if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
-          setShowFrontMore(false);
+          setShowMore(false);
         } else {
-          setShowFrontMore(true);
+          setShowMore(true);
         }
       } else {
         setShowMore(false);
@@ -294,7 +294,7 @@ export default forwardRef((props: Props, ref) => {
                 <div
                   className={`${preCls}__has-more`}
                   onClick={onClickShowMore}
-                ></div>
+                />
               )}
             </div>
           </div>

package/src/components/menus/export-modules/appraisal-menus/index.tsx

@@ -23,7 +23,7 @@ const AppraisalMenus = (props: Props) => {
   const { onSelect = () => { }, history } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - 170;
+    return document.body.offsetHeight - 150;
   });
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
 
@@ -75,7 +75,7 @@ const AppraisalMenus = (props: Props) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - 170);
+        setMaxHeight(cr.height - 150);
       }
     })
     obs.observe(document.body);

package/src/components/menus/export-modules/okr-menus/depart-menus/index.tsx

@@ -53,7 +53,7 @@ export default () => {
 
   // 因为要实现虚拟列表的功能，所有要动态的计算出一个菜单的高度
   useEffect(() => {
-    setHeight(document.body.offsetHeight - 210);
+    setHeight(document.body.offsetHeight - 164);
   }, [])
 
   useEffect(() => {
@@ -93,7 +93,7 @@ export default () => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setHeight(cr.height - 210);
+        setHeight(cr.height - 164);
       }
     })
     obs.observe(document.body);

package/src/components/menus/export-modules/okr-menus/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useRef } from "react";
+import React, { useState, useRef, useEffect } from "react";
 import classNames from "classnames";
 import { withRouter } from "react-router";
 import DepartMenus from "./depart-menus";

package/src/components/menus/export-modules/okr-menus/menu-highlight.ts

@@ -24,6 +24,8 @@ export default class {
         cb(PAGE_MY_PART_OKR);
       } else if (this.isMyTargetOkr()) {
         cb(PAGE_MY_TARGET_OKR);
+      } else {
+        cb(PAGE_MY_OWNER_OKR);
       }
     } else if (this.isOkrMap()) {
       cb(PAGE_OKR_MAP);

package/src/components/menus/export-modules/okr-menus/okr-front-menus.tsx

@@ -32,7 +32,7 @@ export default forwardRef((props: Props, ref) => {
   } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - 210;
+    return document.body.offsetHeight - 198;
   });
   const [expandedKeys, setExpandedKeys] = useState(['myokr']);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
@@ -159,7 +159,7 @@ export default forwardRef((props: Props, ref) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - 210);
+        setMaxHeight(cr.height - 198);
       }
     })
     obs.observe(document.body);

package/src/components/okr-detail/components/header/o-score.tsx

@@ -91,8 +91,10 @@ const OScore = (props: IOScoreProps) => {
         onClose={handleCancel}
         onOk={handleOk}
         onCancel={handleCancel}
+        getContainer={() => document.body}
         noHeadLine
         noFooterLine
+        zIndex={1310}
       >
         <div ref={formContainerRef} className={`${preCls}__form`}>
           <Form

package/src/components/okr-detail/detail-header/index.tsx

@@ -96,7 +96,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
         const res = await openOkrHeaderConfirm(
           follow ? getLocale('OKR_MyO_Err_Focuson') : getLocale('OKR_MyO_Err_Unfollow'),
           follow
-            ? "关注后进展信息将推送到 “动态” 下"
+            ? getLocale('OKR_MyO_Err_Payatten')
             : getLocale('OKR_MyO_Err_Progress')
         );
         if (res) {

package/src/components/toast/index.tsx

@@ -16,6 +16,7 @@ async function getInstance() {
           'left': '50%',
           'position': 'absolute',
           // 'transform': 'translate(-50%, 0)'
+          'borderRadius': 12
         },
         'maxCount': 1,
         'className': 'document-mouse-event-ignore',

package/src/pages/aha2021/index.tsx

@@ -41,7 +41,7 @@ const PageLayout = (props) => {
   const { children } = props;
 
   const isTrial =
-    window.BSGlobal.tenantAuthentication.Version !== 1 && isOfficialSite();
+    window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
   const isTencentHr = window.BSGlobal.tenantInfo.Source == 964;
 
   const onClickKefu = () => {

package/src/pages/like-ranking/index.tsx

@@ -144,10 +144,10 @@ const LikeRanking: FC = () => {
   };
 
   const handleLinkToPraiseRaking = () => {
-    window.history.go(-1)
-    // let href = window.location.href;
-    // let url = `${href.split("#")[0]}#dynamic`;
-    // window.open(url, "self");
+    // window.history.go(-1)
+    let href = window.location.href;
+    let url = `${href.split("#")[0]}#dynamic`;
+    window.open(url, "self");
   };
 
   return (

package/src/pages/okr-map/share-dialog/index.js

@@ -5,7 +5,7 @@ import Dialog from '../../../components/dialog';
 import preCls from '../precls';
 import { getShareUrl } from '../request-apis';
 import { getLocale } from '../../../utils/getLocale';
-import Toast from '@titaui/toast';
+import Toast from '../../../components/toast';
 
 import './index.scss';