@titaui/pc 1.9.75 → 1.9.80

package/lib/components-v1/userSelector/components/MultiMode/CommonList.js

@@ -35,7 +35,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/MultiMode/DepartmentList.js

@@ -49,7 +49,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/MultiMode/DepartmentTree.js

@@ -33,7 +33,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/MultiMode/SubsList.js

@@ -35,7 +35,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/MultiMode/index.js

@@ -41,7 +41,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/SearchBar.js

@@ -25,7 +25,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/SingleMode.js

@@ -33,7 +33,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/components/UserItem.js

@@ -27,7 +27,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/components-v1/userSelector/index.js

@@ -43,7 +43,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/pages/appointment-demo/input/index.js

@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/pages/group-management/components/input-form/index.js

@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/lib/pages/okr-map/export-modules/okr-map/header/index.css

@@ -3,7 +3,7 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px #e9eef3;
   position: relative;
-  border-bottom: 1px solid #E9ECF0;
+  border-bottom: 1px solid #e9ecf0;
 }
 
 .titapage-okr-map__header__folded {
@@ -68,7 +68,7 @@
 }
 
 .titapage-okr-map__header-theme:hover {
-  color: #2879FF;
+  color: #2879ff;
 }
 
 .titapage-okr-map__header-theme:hover:before {
@@ -113,7 +113,7 @@
 }
 
 .titapage-okr-map__header-action-showkr:hover, .titapage-okr-map__header-action-level:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .titapage-okr-map__header-action--show-more {
@@ -125,7 +125,7 @@
   height: 30px;
   line-height: 30px;
   cursor: pointer;
-  color: #3F4755;
+  color: #3f4755;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   font-size: 12px;
 }
@@ -134,7 +134,7 @@
   position: absolute;
   display: inline-block;
   background: url("../../../images/line-down-arrow.svg") transparent no-repeat 50% 50%;
-  content: "";
+  content: '';
   height: 6px;
   width: 10px;
   right: 0;
@@ -151,9 +151,9 @@
 
 .titapage-okr-map__show-more-popup {
   padding: 11px 0;
-  background: #FFFFFF;
+  background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
-  border: 1px solid #E9ECF0;
+  border: 1px solid #e9ecf0;
   border-radius: 2px;
 }
 
@@ -226,7 +226,7 @@
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-period-selector button:hover {
-  background: #5c8EFF;
+  background: #5c8eff;
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-period-selector .titaui-period-selector__down-arrow {
@@ -262,7 +262,7 @@
 }
 
 .titapage-okr-map__dark .titapage-okr-map__header .titaui-icon-button-list__btn:hover {
-  background-color: #515A69;
+  background-color: #515a69;
 }
 
 .titapage-okr-map__dark .rc-select-selection-item {
@@ -286,7 +286,7 @@
   content: 'i';
   width: 16px;
   height: 16px;
-  background-color: #FFBC00;
+  background-color: #ffbc00;
   color: #fff;
   text-align: center;
   line-height: 16px;
@@ -299,7 +299,8 @@
 .titapage-okr-map--kr-dialog--content {
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #6F7886;
+  color: #6f7886;
   line-height: 20px;
   padding: 0 32px;
+  display: block;
 }

package/lib/utils/auth.js

@@ -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"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); 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); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.75",
+  "version": "1.9.80",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",
@@ -116,6 +116,7 @@
     "react-content-loader": "^6.0.3",
     "react-cropper": "^2.1.8",
     "react-custom-scrollbars": "^4.2.1",
+    "react-dom": "^17.0.2",
     "react-grid-layout": "^1.2.5",
     "react-perfect-scrollbar": "^1.5.8",
     "react-sizeme": "^3.0.1",

package/src/components/change-okr-modal/Item.tsx

@@ -4,7 +4,6 @@ import {
 } from "./styledComponents";
 import { OkrData } from "./types";
 import { OpenUserName } from "../../utils/open-data";
-import drawerManager from "../../components/drawer-manager";
 import { getTypeMap } from "./constant";
 import { getMonth } from "../../utils/constant";
 import Tooltip from "../tooltip";
@@ -28,6 +27,9 @@ const colorMap = {
 };
 
 export default class Item extends PureComponent<Props, State> {
+  // @ts-ignore
+  isObjectiveRelevanceKr: boolean = window.BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
+
   constructor(props: Props) {
     super(props);
     this.state = {
@@ -35,9 +37,6 @@ export default class Item extends PureComponent<Props, State> {
     };
   }
 
-  // @ts-ignore
-  isObjectiveRelevanceKr: boolean = BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
-
   componentDidMount() {
     this.isExtend();
   }
@@ -66,7 +65,7 @@ export default class Item extends PureComponent<Props, State> {
     const { data, active } = this.props;
     const { isExpand } = this.state;
     if (data.Krs.length > 0) {
-      const isRelatedKr = data.Krs.some((item) => item.mileStoneId == (active.workId || active.mileStoneId));
+      const isRelatedKr = data.Krs.some((item) => item.mileStoneId === (active.workId || active.mileStoneId));
       this.setState({
         isExpand: isRelatedKr ? true : isExpand || data.isOpen,
       });
@@ -76,8 +75,8 @@ export default class Item extends PureComponent<Props, State> {
   htmlToText = (text) => {
     const div = document.createElement("div");
     div.innerHTML = text;
-    text = div.innerText || div.textContent;
-    return text;
+    const newtext = div.innerText || div.textContent;
+    return newtext;
   };
 
   getCycleText = () => {
@@ -93,7 +92,7 @@ export default class Item extends PureComponent<Props, State> {
       case 2: return hzNum[data.yqmnum - 1];
       case 3: return getMonth()[data.yqmnum - 1];
       case 4: return `${getMonth()[data.yqmnum - 1]}-${getMonth()[((data.yqmnum + 1) % 12 || 12) - 1]}月`;
-      case 5: return data.yqmnum == 1 ? getLocale("OKR_MyO_Pop_Firsthalf") : getLocale("OKR_MyO_Pop_Secondhalf");
+      case 5: return data.yqmnum === 1 ? getLocale("OKR_MyO_Pop_Firsthalf") : getLocale("OKR_MyO_Pop_Secondhalf");
       default: return getLocale("Mod_Customization");
     }
   };
@@ -111,17 +110,18 @@ export default class Item extends PureComponent<Props, State> {
     return newstr;
   };
 
-  _dealOkrData = (data: OkrData, keyWords: string) => {
+  dealOkrData = (data: OkrData, keyWords: string) => {
+    const newData = data;
     if (keyWords) {
-      data.workName = this.formatKeywordsFunc(data.workName, keyWords);
-      data.Krs.forEach((item) => {
+      newData.workName = this.formatKeywordsFunc(data.workName, keyWords);
+      newData.Krs.forEach((item) => {
         item.mileStoneName = this.formatKeywordsFunc(item.mileStoneName, keyWords);
       });
     }
     return data;
   };
 
-  okrData: any = this._dealOkrData(this.props.data, this.props.keywords);
+  okrData: any = this.dealOkrData(this.props.data, this.props.keywords);
 
   render() {
     const { data, active, isShowKr } = this.props;
@@ -130,12 +130,12 @@ export default class Item extends PureComponent<Props, State> {
       <ItemWrapper>
         <ItemObjectiveContainer onClick={() => this.setState({ isExpand: !isExpand })}>
           <ItemTop>
-            <Radio onClick={(e: any) => this.onSelect(e, data)} active={active && data.workId == active.workId} />
+            <Radio onClick={(e: any) => this.onSelect(e, data)} active={active && data.workId === active.workId} />
             <Tag color={colorMap[data.cycleType] || colorMap[4]}>{this.getCycleText()}</Tag>
             <WorkNameWrapper isShowKr={isShowKr}>
-              <Tooltip.Text isPercent overlayText={this.htmlToText(this.okrData.workName)}>
+              <Tooltip placement="top" overlay={this.htmlToText(this.okrData.workName)}>
                 <OkrName isKr={false} isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: this.okrData.workName }} />
-              </Tooltip.Text>
+              </Tooltip>
             </WorkNameWrapper>
             {this.isObjectiveRelevanceKr && isShowKr && data.Krs.length > 0 && <span className={`${this.state.isExpand ? "tu-icon-arrow-up" : "tu-icon-arrow-down"}`} />}
           </ItemTop>
@@ -167,20 +167,20 @@ export default class Item extends PureComponent<Props, State> {
               {
                 this.okrData.Krs.length > 0 && this.okrData.Krs.map((item: any, index: number) => (this.isObjectiveRelevanceKr ? (
                   <ItemTop key={item.mileStoneId}>
-                    <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId == (active.workId || active.mileStoneId)} />
+                    <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
                     <WorkNameWrapper isShowKr={isShowKr}>
-                      <Tooltip.Text isPercent overlayText={this.htmlToText(item.mileStoneName)}>
+                      <Tooltip placement="top" overlay={this.htmlToText(item.mileStoneName)}>
                         <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
-                      </Tooltip.Text>
+                      </Tooltip>
                     </WorkNameWrapper>
                   </ItemTop>
-                ) : active && item.mileStoneId == (active.workId || active.mileStoneId) ? (
+                ) : active && item.mileStoneId === (active.workId || active.mileStoneId) ? (
                   <ItemTop key={item.mileStoneId}>
-                    <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId == (active.workId || active.mileStoneId)} />
+                    <Radio onClick={(e: any) => this.onSelect(e, data.Krs[index])} active={active && item.mileStoneId === (active.workId || active.mileStoneId)} />
                     <WorkNameWrapper isShowKr={isShowKr}>
-                      <Tooltip.Text isPercent overlayText={this.htmlToText(item.mileStoneName)}>
+                      <Tooltip placement="top" overlay={this.htmlToText(item.mileStoneName)}>
                         <OkrName isKr isShowKr={isShowKr} dangerouslySetInnerHTML={{ __html: `KR${index + 1}：${item.mileStoneName}` }} />
-                      </Tooltip.Text>
+                      </Tooltip>
                     </WorkNameWrapper>
                   </ItemTop>
                 ) : ""))

package/src/components/change-okr-modal/styledComponents.ts

@@ -3,7 +3,7 @@ import styled from "styled-components";
 export const Wrapper = styled.div`
   width: 589px;
   height: 488px;
-  margin-top: ${(p: any) => (p.okrPopType == 1 ? 0 : "32px")};
+  margin-top: ${(p: any) => (p.okrPopType === 1 ? 0 : "32px")};
   background: #ffffff;
   box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.2);
   border-radius: 4px;
@@ -230,11 +230,17 @@ export const Tag = styled.div`
   margin: 0 12px 0 9px;
 `;
 export const OkrName = styled.span`
+  display: inline-block
   flex: 1;
-  width: 0;
+  max-width: 400px;
   font-size: 13px;
   font-weight: ${(p: any) => (p.isShowKr ? "normal" : "600")};
   color: #33383d;
+  white-space: nowrap;
+  overflow: hidden;
+  word-break: keep-all;
+  text-overflow: ellipsis;
+  line-height: 1;
 `;
 export const ItemBottom = styled.div`
   padding-left: 102px;
@@ -274,14 +280,14 @@ export const Button = styled.a`
   padding: 0 15px;
   box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.21);
   border-radius: 2px;
-  background-color: ${(p: any) => (p.type != "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF")};
-  color: ${(p: any) => (p.type != "confirm" ? "#565E66" : "#FFF")};
+  background-color: ${(p: any) => (p.type !== "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF")};
+  color: ${(p: any) => (p.type !== "confirm" ? "#565E66" : "#FFF")};
   cursor: pointer;
   text-align: center;
   white-space: nowrap;
   line-height: 27px;
   &:hover {
-    color: ${(p: any) => (p.type != "confirm" ? "#565E66" : "#FFF")};
+    color: ${(p: any) => (p.type !== "confirm" ? "#565E66" : "#FFF")};
   }
 `;
 export const KrItemWrapper = styled.div`

package/src/components/mblog/style.ts

@@ -26,7 +26,7 @@ export const DivMblogContent = styled.div`
   background-color: #fff;
   position: relative;
   transition: all .2s ease-in-out;
-  height: 124px;
+  height: 200px;
   box-sizing: border-box;
 
   &.input_default-active {
@@ -60,20 +60,19 @@ export const Textarea = styled.textarea`
   resize: none;
   word-break: break-all;
   word-wrap: break-word;
-  height: 86px;
+  height: 160px;
+  font-size: 14px;
+  line-height: 22px;
 
   &.textarea-setheight {
     visibility: hidden;
     position: absolute;
   }
-/* 
-  &.private__bg {
-    background: url(${require("./assets/lock-radius.png")}) no-repeat right top;
-  } */
 `;
 
 export const Tips = styled.div`
-  line-height: 18px;
+  font-size: 14px;
+  line-height: 22px;
   color: ${(p: any) => p.color};
   text-align: right;
 `;

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

@@ -18,7 +18,7 @@ function OkrDetailHeaderConfirm({ onConfirm, title = "", content = "" }: Props):
   }, []);
 
   return (
-    <Confirm visible={visible} type="warning">
+    <Confirm visible={visible} type="warning" zIndex={2400}>
       {
         // @ts-ignore
         <span type="title">{title}</span>

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

@@ -71,13 +71,15 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       visibility: context.generalVisibility.visibility,
       detailInfo,
       openShareModal: async () => {
-        const krs = await getKrs({ okrId: detailInfo.workId });
-        setKrs(krs);
+        const krss = await getKrs({ okrId: detailInfo.workId });
+        setKrs(krss);
         setShareVisible(true);
       },
       changeVisiblilty: (visibility) => {
-        if (visibility == 4) {
-          userSelectRef.current && userSelectRef.current.open();
+        if (visibility === 4) {
+          if (userSelectRef.current) {
+            userSelectRef.current.open();
+          }
           return;
         }
         changVisiblity(detailInfo.workId, visibility);
@@ -100,10 +102,11 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
             : getLocale("OKR_MyO_Err_Progress"),
         );
         if (res) {
-          follow
-            // @ts-ignore
-            ? await addUser(loginUserId, detailInfo.workId, 3)
-            : await deleteUser(loginUserId, detailInfo.workId, 3);
+          if (follow) {
+            await addUser(loginUserId, detailInfo.workId, 3);
+          } else {
+            await deleteUser(loginUserId, detailInfo.workId, 3);
+          }
           context.setGeneralRoleType(follow ? 3 : 0);
           // 关注
           Toast.Success(getLocale("Mod_Successfuloperat"));
@@ -117,9 +120,11 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
           isFinish ? getLocale("OKR_MyO_Areycloseobjective") : getLocale("OKR_MyO_Err_Restart"),
         );
         if (res) {
-          isFinish
-            ? await close(detailInfo.workId)
-            : await start(detailInfo.workId);
+          if (isFinish) {
+            await close(detailInfo.workId);
+          } else {
+            await start(detailInfo.workId);
+          }
           commonContext.refreshAll();
           // 刷新
           Toast.Success(getLocale("Mod_Successfuloperat"));
@@ -172,7 +177,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
             <span className="okr-detail-head-parent">
               <i className="tu-icon-liebiao-duiqinubiao" />
               <span
-                onClick={() => (parent.type == "okr"
+                onClick={() => (parent.type === "okr"
                   ? drawerManager.open("okrDetail", {
                     okrId: parent.id,
                   })
@@ -180,7 +185,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
                     krId: parent.id,
                   }))}
               >
-                <span>{parent.type == "okr" ? "O " : "KR "}</span>
+                <span>{parent.type === "okr" ? "O " : "KR "}</span>
                 {parent.name}
               </span>
             </span>
@@ -202,6 +207,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
             },
           },
         }}
+        zIndex={2400}
       />
       <PopConfirm
         ref={popRef}