@titaui/pc 1.9.78 → 1.9.83

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -22,6 +22,10 @@ var _form = _interopRequireDefault(require("../../form"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _payBackgroundImg = _interopRequireDefault(require("../image/payBackgroundImg.png"));
+
+var _submitLogo = _interopRequireDefault(require("../image/submitLogo.svg"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -48,8 +52,7 @@ var Fields = _form["default"].Fields;
 
 function SubmitDialog(props) {
   var handleShowSubmitOkrWindow = props.handleShowSubmitOkrWindow,
-      isShowSubmitOkrWindow = props.isShowSubmitOkrWindow,
-      allViewAreaRef = props.allViewAreaRef;
+      isShowSubmitOkrWindow = props.isShowSubmitOkrWindow;
 
   var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
@@ -79,10 +82,8 @@ function SubmitDialog(props) {
       truonlyFirstErrore: false
     });
 
-    if (err.length) {
-      console.log(err);
-    } else {
-      (0, _network.postSurvey)(body).then(function (res) {
+    if (!err.length) {
+      (0, _network.postSurvey)(body).then(function () {
         _toast["default"].Success("发送成功");
 
         handleShowSubmitOkrWindow(false);
@@ -105,7 +106,8 @@ function SubmitDialog(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__submitWindow"
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/submit\u5C0F\u9A74.svg")
+    src: _submitLogo["default"],
+    alt: "submit\u5C0F\u9A74"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tu-icon-canceled",
     onClick: function onClick() {
@@ -166,7 +168,7 @@ function PayDialog(props) {
     var tenantType = window.BSGlobal.tenantInfo.tenantType; // 外部注冊賬號使用的產品ID不同
 
     // 外部注冊賬號使用的產品ID不同
-    if (Version == 1 && tenantType == 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
+    if (Version === 1 && tenantType === 3) return "D9E059E4-4303-4EE2-9275-AE2FA74BBAA6";
     return "60AFAD35-5273-4A06-B2F4-9A3193096BE7";
   }),
       _useState10 = _slicedToArray(_useState9, 1),
@@ -205,18 +207,18 @@ function PayDialog(props) {
           Total: 1
         }]
       }).then(function (orderInfo) {
-        var orderId = orderInfo.Id,
+        var Id = orderInfo.Id,
             AliModel = orderInfo.AliModel;
         var PayCode = AliModel.PayCode,
             PayName = AliModel.PayName;
         setPayCode(PayCode);
-        setOrderId(orderId);
+        setOrderId(Id);
         setPayName(PayName);
       });
     });
   }, []); // 点击立即支付后，2分钟内，每个10s，循环获取订单信息
 
-  var loopOrderInfo = function loopOrderInfo(orderId) {
+  var loopOrderInfo = function loopOrderInfo(id) {
     if (getOrderInfoTimers.current === 12) {
       getOrderInfoTimers.current = 1;
     }
@@ -224,13 +226,13 @@ function PayDialog(props) {
     setTimeout(function () {
       // 循环获取订单信息 2 分钟
       if (getOrderInfoTimers.current < 12) {
-        (0, _network.getOkrOrderInfo)(orderId).then(function (res) {
+        (0, _network.getOkrOrderInfo)(id).then(function (res) {
           getOrderInfoTimers.current += 1; // @ts-ignore
 
           var OrderStatus = res.OrderStatus; // 未支付成功重新获取订单
 
-          if (OrderStatus != 2) {
-            loopOrderInfo(orderId);
+          if (OrderStatus !== 2) {
+            loopOrderInfo(id);
           } else {
             // 订单已支付
             _titaUi.Modal.success({
@@ -279,7 +281,8 @@ function PayDialog(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__payWindow"
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA.png")
+    src: _payBackgroundImg["default"],
+    alt: "\u652F\u4ED8\u80CC\u666F\u6D6E\u51FA"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "tu-icon-canceled",
     onClick: function onClick() {
@@ -303,7 +306,7 @@ function PayDialog(props) {
     style: {
       fontSize: "32px"
     }
-  }, "19.8"), "\u5143/\u5E74")), /*#__PURE__*/_react["default"].createElement("a", {
+  }, "29.8"), "\u5143/\u5E74")), /*#__PURE__*/_react["default"].createElement("a", {
     className: "okr-cases-library__payWindow__payButton",
     onClick: function onClick() {
       return loopOrderInfo(orderId);

package/lib/pages/personal-info/components/base-info/index.js

@@ -71,15 +71,17 @@ var BaseInfo = function BaseInfo() {
     setVisible(false);
   };
 
-  var handleSuccessEditBaseInfo = function handleSuccessEditBaseInfo(userInfo) {
-    setUserInfo(_objectSpread({}, userInfo));
+  var handleSuccessEditBaseInfo = function handleSuccessEditBaseInfo(data) {
+    setUserInfo(_objectSpread({}, data));
   };
 
   (0, _react.useEffect)(function () {
     (0, _requestApi.getUserInfoFun)().then(function (resp) {
       if (resp.Code === 1 && resp.Data) {
         setUserInfo(_objectSpread(_objectSpread({}, resp.Data), {}, {
-          position: resp.Data.positionCode
+          position: resp.Data.positionCode,
+          deparmentId: resp.Data.departmentId,
+          deparmentName: resp.Data.departmentName
         }));
       }
     });

package/lib/pages/personal-info/components/edit-base-info/index.js

@@ -50,7 +50,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var Fields = _form["default"].Fields;
 var prefix = "titaui-edit-personal-info";
 
-function EditBaseInfo(props) {
+var EditBaseInfo = function EditBaseInfo(props) {
   var visible = props.visible,
       _onCancel = props.onCancel,
       handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo,
@@ -62,21 +62,13 @@ function EditBaseInfo(props) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       isDisable = _useState2[0],
-      setIsDisable = _useState2[1];
+      setIsDisable = _useState2[1]; // const [isEdit, setIsEdit] = useState(false);
 
-  var _useState3 = (0, _react.useState)(false),
+
+  var _useState3 = (0, _react.useState)(info),
       _useState4 = _slicedToArray(_useState3, 2),
-      isEdit = _useState4[0],
-      setIsEdit = _useState4[1];
-
-  var _useState5 = (0, _react.useState)({
-    name: "",
-    email: "",
-    mobile: ""
-  }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      userInfo = _useState6[0],
-      setUserInfo = _useState6[1];
+      userInfo = _useState4[0],
+      setUserInfo = _useState4[1];
 
   var handleNameChange = function handleNameChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
@@ -87,9 +79,8 @@ function EditBaseInfo(props) {
       setIsDisable(true);
     } else {
       setIsDisable(false);
-    }
+    } // setIsEdit(true);
 
-    setIsEdit(true);
   };
 
   var handlePhoneChange = function handlePhoneChange(value) {
@@ -101,16 +92,14 @@ function EditBaseInfo(props) {
       setIsDisable(true);
     } else {
       setIsDisable(false);
-    }
+    } // setIsEdit(true);
 
-    setIsEdit(true);
   };
 
   var handleEmailChange = function handleEmailChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
       email: value || ""
-    }));
-    setIsEdit(true);
+    })); // setIsEdit(true);
   };
 
   var handleSaveUserInfo = function handleSaveUserInfo() {
@@ -138,14 +127,8 @@ function EditBaseInfo(props) {
   };
 
   (0, _react.useEffect)(function () {
-    (0, _requestApi.getUserInfoFun)().then(function (resp) {
-      if (resp.Code === 1 && resp.Data) {
-        setUserInfo(_objectSpread(_objectSpread({}, resp.Data), {}, {
-          position: resp.Data.positionCode
-        }));
-      }
-    });
-  }, []);
+    setUserInfo(info);
+  }, [info]);
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
     visible: visible,
     ref: modalRef,
@@ -233,7 +216,7 @@ function EditBaseInfo(props) {
     }],
     onChange: handleEmailChange
   }))));
-}
+};
 
 var _default = EditBaseInfo;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.78",
+  "version": "1.9.83",
   "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

@@ -59,7 +59,7 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
     const width = okrMapRef.clientWidth; // 获取dom 宽度
     const height = okrMapRef.clientHeight; // 获取dom 高度
     const canvas = document.createElement("canvas"); // 创建一个canvas节点
-    const scale = 20; // 定义任意放大倍数 支持小数
+    const scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
     canvas.width = width * scale; // 定义canvas 宽度 * 缩放
     canvas.height = height * scale; // 定义canvas高度 *缩放
     canvas.style.width = `${width}px`;
@@ -116,7 +116,7 @@ const ExportMapModal: FC<IProps> = (props: IProps) => {
       Toast.Warning("正在导出中", { canClose: true });
       return;
     }
-    setIsExport(true);
+    // setIsExport(true);
     downloadImg();
   };
   const fitViewHandler = (instance) => {

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 = () => [
   {