@titaui/pc 1.9.78 → 1.9.80

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/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.78",
+  "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

@@ -61,6 +61,8 @@ export const Textarea = styled.textarea`
   word-break: break-all;
   word-wrap: break-word;
   height: 160px;
+  font-size: 14px;
+  line-height: 22px;
 
   &.textarea-setheight {
     visibility: hidden;
@@ -69,7 +71,8 @@ export const Textarea = styled.textarea`
 `;
 
 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}

package/src/components/okr-flow/export-modal/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  useState, useEffect, useRef, FC,
+  useState, useEffect, useRef, Fragment,
 } from "react";
 import classNames from "classnames";
 import Html2Canvas from "html2canvas";
@@ -25,7 +25,7 @@ interface IProps {
   showkr: boolean;
 }
 
-const ExportMapModal: FC<IProps> = (props: IProps) => {
+function ExportMapModal(props: IProps) {
   const {
     visible = false,
     onCloseHandler,
@@ -39,19 +39,17 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
   const [isExport, setIsExport] = useState(false);
   const modalRef = useRef();
   useEffect(() => {
-    if (isWx() && window.WWOpenData) {
-      if (window.WWOpenData.enableCanvasSharing) {
-        window.WWOpenData.enableCanvasSharing();
-      }
-      if (window.WWOpenData.initCanvas) {
-        window.WWOpenData.initCanvas();
-      }
+    if (isWx()) {
+      window.WWOpenData
+        && window.WWOpenData.enableCanvasSharing
+        && window.WWOpenData.enableCanvasSharing();
+      window.WWOpenData
+        && window.WWOpenData.initCanvas
+        && window.WWOpenData.initCanvas();
     }
   }, []);
   useEffect(() => {
-    if (visible && mapInstance) {
-      mapInstance.fitView();
-    }
+    visible && mapInstance && mapInstance.fitView();
   }, [visible, mapInstance]);
 
   const downloadImg = async () => {
@@ -74,41 +72,34 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
       useCORS: true, // 【重要】开启跨域配置
     };
 
-    await Html2Canvas(okrMapRef, opts).then((result) => {
-      if (isWx() && window.WWOpenData) {
-        if (window.WWOpenData.enableCanvasSharing) {
-          window.WWOpenData.enableCanvasSharing();
-        }
-        if (window.WWOpenData.initCanvas) {
-          window.WWOpenData.initCanvas();
-        }
-      }
-      const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
-      getBase64DownloadUrl(imgUrl.split(",")[1]).then((url) => {
-        const image = new Image();
+    const result = await Html2Canvas(okrMapRef, opts);
+    if (isWx()) {
+      window.WWOpenData
+        && window.WWOpenData.enableCanvasSharing
+        && window.WWOpenData.enableCanvasSharing();
+      window.WWOpenData
+        && window.WWOpenData.initCanvas
+        && window.WWOpenData.initCanvas();
+    }
+    const imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+    const url = await getBase64DownloadUrl(imgUrl.split(",")[1]);
+    const image = new Image();
 
-        image.setAttribute("crossOrigin", "anonymous");
-        image.onload = () => {
-          if (!url.Data.obj) {
-            Toast.Error("导出失败，请稍后重试", { canClose: false });
-          }
-          const a = document.createElement("a"); // 生成一个a元素
-          const event = new MouseEvent("click"); // 创建一个单击事件
-          a.download = "okr地图"; // 设置图片名称
-          a.href = url.Data.obj; // 将生成的URL设置为a.href属性
-          a.dispatchEvent(event); // 触发a的单击事件
-          Toast.Success("导出成功");
-          setIsExport(false);
-          if (onCloseHandler) {
-            onCloseHandler();
-          }
-        };
-        image.src = imgUrl;
-      });
-    }).catch((err) => {
+    image.setAttribute("crossOrigin", "anonymous");
+    image.onload = () => {
+      if (!url.Data.obj) {
+        Toast.Error("导出失败，请稍后重试", { canClose: false });
+      }
+      const a = document.createElement("a"); // 生成一个a元素
+      const event = new MouseEvent("click"); // 创建一个单击事件
+      a.download = "okr地图"; // 设置图片名称
+      a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+      a.dispatchEvent(event); // 触发a的单击事件
+      Toast.Success("导出成功");
       setIsExport(false);
-      Toast.Error(err, { canClose: false });
-    });
+      onCloseHandler && onCloseHandler();
+    };
+    image.src = imgUrl;
   };
 
   const confirmHandler = () => {
@@ -187,9 +178,5 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
       </>
     </Dialog>
   );
-};
-
-ExportMapModal.defaultProps = {
-  onCloseHandler: () => {},
-};
+}
 export default ExportMapModal;

package/src/components/okr-progress-modal/helper.js

@@ -1,7 +1,7 @@
 import React, { Fragment } from "react";
 import { getLocale } from "../../utils/getLocale";
 
-export const getO_SETTING = () => ({
+export const getOSetting = () => ({
   settingTitle: getLocale("OKR_MyO_Pop_Upd_Setmatically"),
   switchLabel: getLocale("OKR_MyO_Pop_Upd_Setmatically"),
   options: [
@@ -16,31 +16,35 @@ export const getO_SETTING = () => ({
       tooltip: getLocale("OKR_MyO_Pop_Upd_SubO"),
     },
   ],
-  getRecommandText: (autoUpdate = true, updateWay = 1, recommandProgressObj) => {
+  getRecommandText: (recommandProgressObj, autoUpdate = true, updateWay = 1) => {
     if (autoUpdate) {
-      if (updateWay == 1) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_Pop_Upd_Automatic")}</span>;
-      if (updateWay == 2) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_calculationSubO")}</span>;
-    } else {
-      const { childOkrProgress, childkrProgress } = recommandProgressObj;
-      const textArr = [];
-      childkrProgress !== -1 && textArr.push(`${getLocale("OKR_MyO_Pop_Upd_KRCom")}${childkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
-      childOkrProgress !== -1 && textArr.push(`${getLocale("OKR_MyO_Ew_SubobjCom")}${childOkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
-      if (textArr.length == 0) return "";
-      return (
-        <>
-          <span className="auto-update__recommand-icon">{getLocale("Per_Ass_Pop_title_Recommend")}</span>
-          <span className="auto-update__recommand-tip">
-            （
-            {textArr.join("，")}
-            ）
-          </span>
-        </>
-      );
+      if (updateWay === 1) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_Pop_Upd_Automatic")}</span>;
+      if (updateWay === 2) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_calculationSubO")}</span>;
+      return <span />;
     }
+    const { childOkrProgress, childkrProgress } = recommandProgressObj;
+    const textArr = [];
+    if (childkrProgress !== -1) {
+      textArr.push(`${getLocale("OKR_MyO_Pop_Upd_KRCom")}${childkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
+    }
+    if (childOkrProgress !== -1) {
+      textArr.push(`${getLocale("OKR_MyO_Ew_SubobjCom")}${childOkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
+    }
+    if (textArr.length === 0) return "";
+    return (
+      <>
+        <span className="auto-update__recommand-icon">{getLocale("Per_Ass_Pop_title_Recommend")}</span>
+        <span className="auto-update__recommand-tip">
+          （
+          {textArr.join("，")}
+          ）
+        </span>
+      </>
+    );
   },
 });
 
-export const getKR_SETTING = () => ({
+export const getKrSetting = () => ({
   settingTitle: getLocale("OKR_MyO_KRCompletion"),
   switchLabel: getLocale("OKR_MyO_SetKRcompletion"),
   options: [
@@ -55,31 +59,35 @@ export const getKR_SETTING = () => ({
       tooltip: getLocale("OKR_MyO_KRcompletionde"),
     },
   ],
-  getRecommandText: (autoUpdate = true, updateWay = 1, recommandProgressObj) => {
+  getRecommandText: (recommandProgressObj, autoUpdate = true, updateWay = 1) => {
     if (autoUpdate) {
-      if (updateWay == 1) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_Automatic")}</span>;
-      if (updateWay == 2) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_calculationSubO")}</span>;
-    } else {
-      const { childOkrProgress, childEProgress } = recommandProgressObj;
-      const textArr = [];
-      childEProgress !== -1 && textArr.push(`${getLocale("OKR_MyO_Ecompletion")}${childEProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
-      childOkrProgress !== -1 && textArr.push(`${getLocale("OKR_MyO_Ew_SubobjCom")}${childOkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
-      if (textArr.length == 0) return "";
-      return (
-        <>
-          <span className="auto-update__recommand-icon">{getLocale("Per_Ass_Pop_title_Recommend")}</span>
-          <span className="auto-update__recommand-tip" style={{ marginLeft: 0 }}>
-            (
-            {textArr.join("，")}
-            )
-          </span>
-        </>
-      );
+      if (updateWay === 1) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_Automatic")}</span>;
+      if (updateWay === 2) return <span className="auto-update__recommand-tip">{getLocale("OKR_MyO_calculationSubO")}</span>;
+      return <span />;
+    }
+    const { childOkrProgress, childEProgress } = recommandProgressObj;
+    const textArr = [];
+    if (childEProgress !== -1) {
+      textArr.push(`${getLocale("OKR_MyO_Ecompletion")}${childEProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
+    }
+    if (childOkrProgress !== -1) {
+      textArr.push(`${getLocale("OKR_MyO_Ew_SubobjCom")}${childOkrProgress}${getLocale("OKR_MyO_Pop_Upd_Percentage")}`);
     }
+    if (textArr.length === 0) return "";
+    return (
+      <>
+        <span className="auto-update__recommand-icon">{getLocale("Per_Ass_Pop_title_Recommend")}</span>
+        <span className="auto-update__recommand-tip" style={{ marginLeft: 0 }}>
+          (
+          {textArr.join("，")}
+          )
+        </span>
+      </>
+    );
   },
 });
 
-export const transProgress = (progress) => (progress == -1 ? 0 : progress);
+export const transProgress = (progress) => (progress === -1 ? 0 : progress);
 
 export const getKrOptions = () => [
   {