@titaui/pc 1.9.78 → 1.9.83

package/src/components/okr-progress-modal/index.tsx

@@ -1,11 +1,11 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, FC } from "react";
 import { Input, Modal, Tooltip } from "tita-ui";
 import classNames from "classnames";
 import { getKrRecommandProgress, getORecommandProgress } from "./request-apis";
 import Switch from "../switch";
 import Textarea from "./textarea";
 import {
-  getO_SETTING, getKR_SETTING, transProgress, getKrOptions, getOptions,
+  getOSetting, getKrSetting, transProgress, getKrOptions, getOptions,
 } from "./helper";
 import {
   ErrorTip, List, Item, Icon, Options, OptionsWrapper,
@@ -15,12 +15,12 @@ import { getLocale } from "../../utils/getLocale";
 import { inputWordTrans } from "../../utils/i18n-front-translate";
 import "./index.scss";
 
-const ProgressModal: React.FC<IProgressModalProps> = (props) => {
+const ProgressModal: FC<IProgressModalProps> = (props:IProgressModalProps) => {
   const {
     maxLength, okrInfo, onClose, onOk, title = window.getLocale("OKR_MyO_Prog_Butt_Update"), visible, isKr,
   } = props;
 
-  const configure = isKr ? getKR_SETTING() : getO_SETTING();
+  const configure = isKr ? getKrSetting() : getOSetting();
 
   const reg = /^[0-9]*[1-9][0-9]*$/;
   const [errorProgress, setErrorProgress] = useState(false);
@@ -34,10 +34,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   const [selected, setSelected] = useState<number>(
     isKr ? okrInfo.riskLevel : okrInfo.manualRiskLevel,
   );
-  const [ShowKrProgress] = useState(() =>
-    // @ts-ignore
-    window.BSGlobal.OkrAdvancedSetting.KRSetting.ShowKrProgress);
-
+  const [ShowKrProgress] = useState(window?.BSGlobal?.OkrAdvancedSetting?.KRSetting?.ShowKrProgress);
   const [autoUpdate, setUpdate] = useState(true); // 设置自动更新
   const [updateWay, setUpdateWay] = useState(0); // 自动更新方式 0: 关闭， 1: 根据关见成果， 2: 子目标
   const [settingFolded, setSettingFold] = useState(false);
@@ -46,11 +43,11 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   const getRecommendProgress = async () => {
     const getRecommandHandler = isKr ? getKrRecommandProgress : getORecommandProgress;
     const data = await getRecommandHandler(isKr ? okrInfo.mileStoneId : okrInfo.workId);
-    if (data.Code == 1) {
+    if (data.Code === 1) {
       const { UpdateProgressWay, Progress } = data.Data;
       setRecommandProgressObj(data.Data);
-      setUpdate(UpdateProgressWay != 0);
-      setUpdateWay(UpdateProgressWay == 0 ? 1 : UpdateProgressWay);
+      setUpdate(UpdateProgressWay !== 0);
+      setUpdateWay(UpdateProgressWay === 0 ? 1 : UpdateProgressWay);
       setProgress(Progress);
     }
   };
@@ -66,9 +63,12 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   useEffect(() => {
     if (!autoUpdate) return;
     const { childOkrProgress, childkrProgress, childEProgress } = recommandProgressObj;
-    updateWay == 1
-      && setProgress(isKr ? transProgress(childEProgress) : transProgress(childkrProgress));
-    updateWay == 2 && setProgress(transProgress(childOkrProgress));
+    if (updateWay === 1) {
+      setProgress(isKr ? transProgress(childEProgress) : transProgress(childkrProgress));
+    }
+    if (updateWay === 2) {
+      setProgress(transProgress(childOkrProgress));
+    }
   }, [updateWay, autoUpdate, recommandProgressObj]);
 
   let descriptionText = (
@@ -131,6 +131,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
       title={title}
       visible={visible}
       width={600}
+      zIndex={2400}
     >
       <List>
         <Item>
@@ -165,7 +166,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
                 <Icon
                   color={option.color}
                   className={
-                    selected == option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
+                    selected === option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
                   }
                 />
                 <p>{option.text}</p>
@@ -195,7 +196,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
                       <span
                         className={classNames(
                           "auto-update-setting__radio",
-                          `auto-update-setting__radio${updateWay == option.key ? "--selected" : ""
+                          `auto-update-setting__radio${updateWay === option.key ? "--selected" : ""
                           }`,
                         )}
                       />

package/src/components/okr-share/index.tsx

@@ -11,7 +11,7 @@ interface Props {
   data: any;
 }
 
-const ShareContent = function ({ closeModal, getModalRef, data }: Props) {
+const ShareContent = ({ closeModal, getModalRef, data }: Props) => {
   const [shareImg, setShareImg] = useState<string>();
   const [showPublish, setShowPublish] = useState(false);
   return (
@@ -43,12 +43,14 @@ const ShareContent = function ({ closeModal, getModalRef, data }: Props) {
 };
 
 interface ShareProps {
-  shareComponent
   data: any;
   visible:boolean;
+  zIndex?: number;
   onClose: () => void
 }
-const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
+const OkrShare: React.FC<ShareProps> = ({
+  data, visible, onClose, zIndex,
+}) => {
   const modalRef = useRef<any>();
 
   return (
@@ -60,6 +62,7 @@ const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
         // maskClosable
       onCancel={() => onClose()}
       ref={modalRef}
+      zIndex={zIndex}
     >
       {visible ? (
         <ShareContent
@@ -71,5 +74,7 @@ const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
     </Modal>
   );
 };
-
+OkrShare.defaultProps = {
+  zIndex: 1300,
+};
 export default OkrShare;

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -7,16 +7,18 @@ import Toast from "../../toast";
 import Dialog from "../../dialog";
 import Form from "../../form";
 import { getLocale } from "../../../utils/getLocale";
+import img from "../image/payBackgroundImg.png";
+import submitImg from "../image/submitLogo.svg";
 
 const { Fields } = Form;
 
 interface Props1 {
   handleShowSubmitOkrWindow: Function;
   isShowSubmitOkrWindow: boolean;
-  allViewAreaRef: any;
+  // allViewAreaRef: any;
 }
 export function SubmitDialog(props: Props1) {
-  const { handleShowSubmitOkrWindow, isShowSubmitOkrWindow, allViewAreaRef } = props;
+  const { handleShowSubmitOkrWindow, isShowSubmitOkrWindow } = props;
   const [type, setType] = useState("");
   const [job, setJob] = useState("");
   const [scene, setScene] = useState("");
@@ -31,10 +33,8 @@ export function SubmitDialog(props: Props1) {
     };
     // 校验
     const err = formRef.current.verifing({ truonlyFirstErrore: false });
-    if (err.length) {
-      console.log(err);
-    } else {
-      postSurvey(body).then((res) => {
+    if (!err.length) {
+      postSurvey(body).then(() => {
         Toast.Success("发送成功");
         handleShowSubmitOkrWindow(false);
       }).catch(() => {
@@ -46,7 +46,7 @@ export function SubmitDialog(props: Props1) {
   return (
     <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body} zIndex={1200}>
       <div className="okr-cases-library__submitWindow">
-        <img src={require("../image/submit小驴.svg")} />
+        <img src={submitImg} alt="submit小驴" />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />
         <Form ref={formRef}>
           <Fields.Input
@@ -110,7 +110,7 @@ export function PayDialog(props: Props2) {
     // @ts-ignore
     const { tenantType } = window.BSGlobal.tenantInfo;
     // 外部注冊賬號使用的產品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";
   });
   const [orderId, setOrderId] = useState("");
@@ -134,30 +134,30 @@ export function PayDialog(props: Props2) {
           Total: 1,
         }],
       }).then((orderInfo) => {
-        const { Id: orderId, AliModel } = orderInfo;
+        const { Id, AliModel } = orderInfo;
         const { PayCode, PayName } = AliModel;
         setPayCode(PayCode);
-        setOrderId(orderId);
+        setOrderId(Id);
         setPayName(PayName);
       });
     });
   }, []);
 
   // 点击立即支付后，2分钟内，每个10s，循环获取订单信息
-  const loopOrderInfo = (orderId) => {
+  const loopOrderInfo = (id) => {
     if (getOrderInfoTimers.current === 12) {
       getOrderInfoTimers.current = 1;
     }
     setTimeout(() => {
       // 循环获取订单信息 2 分钟
       if (getOrderInfoTimers.current < 12) {
-        getOkrOrderInfo(orderId).then((res) => {
+        getOkrOrderInfo(id).then((res) => {
           getOrderInfoTimers.current += 1;
           // @ts-ignore
           const { OrderStatus } = res;
           // 未支付成功重新获取订单
-          if (OrderStatus != 2) {
-            loopOrderInfo(orderId);
+          if (OrderStatus !== 2) {
+            loopOrderInfo(id);
           } else {
             // 订单已支付
             Modal.success({
@@ -178,7 +178,7 @@ export function PayDialog(props: Props2) {
   return (
     <Dialog visible={isShowPayWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => allViewAreaRef.current}>
       <div className="okr-cases-library__payWindow">
-        <img src={require("../image/支付背景浮出.png")} />
+        <img src={img} alt="支付背景浮出" />
         <div className="tu-icon-canceled" onClick={() => handleShowPayWindow(false)} style={{ width: "18px", height: "18px" }} />
         <p className="okr-cases-library__payWindow__head">
           {price}
@@ -192,7 +192,7 @@ export function PayDialog(props: Props2) {
         <div className="okr-cases-library__payWindow__amount">
           应付金额：
           <b>
-            <span style={{ fontSize: "32px" }}>19.8</span>
+            <span style={{ fontSize: "32px" }}>29.8</span>
             元/年
           </b>
         </div>

package/src/pages/personal-info/components/base-info/index.tsx

@@ -25,14 +25,19 @@ const BaseInfo: FC = () => {
     setVisible(false);
   };
 
-  const handleSuccessEditBaseInfo = (userInfo) => {
-    setUserInfo({ ...userInfo });
+  const handleSuccessEditBaseInfo = (data) => {
+    setUserInfo({ ...data });
   };
 
   useEffect(() => {
     getUserInfoFun().then((resp) => {
       if (resp.Code === 1 && resp.Data) {
-        setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
+        setUserInfo({
+          ...resp.Data,
+          position: resp.Data.positionCode,
+          deparmentId: resp.Data.departmentId,
+          deparmentName: resp.Data.departmentName,
+        });
       }
     });
   }, []);

package/src/pages/personal-info/components/edit-base-info/index.tsx

@@ -1,17 +1,26 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, {
+  useState, useRef, useEffect, FC,
+} from "react";
 import Form from "../../../../components/form";
-import { getUserInfoFun, saveUserInfo } from "../../request-api";
+import { saveUserInfo } from "../../request-api";
 import Toast from "../../../../components/toast";
 import Dialog from "../../../../components/dialog";
 import { getLocale } from "../../../../utils/getLocale";
 import { i18nLimitCharacters } from "../../../../utils/i18n-front-translate";
 import "./index.scss";
 
+interface IEditbaseInfoProps {
+  visible: boolean;
+  onCancel: Function;
+  handleSuccessEditBaseInfo: Function;
+  info: any
+}
+
 const { Fields } = Form;
 
 const prefix = "titaui-edit-personal-info";
 
-function EditBaseInfo(props) {
+const EditBaseInfo: FC<IEditbaseInfoProps> = (props) => {
   const {
     visible, onCancel, handleSuccessEditBaseInfo, info,
   } = props;
@@ -21,8 +30,8 @@ function EditBaseInfo(props) {
   const formRef = useRef<any>();
 
   const [isDisable, setIsDisable] = useState(false);
-  const [isEdit, setIsEdit] = useState(false);
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "" });
+  // const [isEdit, setIsEdit] = useState(false);
+  const [userInfo, setUserInfo] = useState(info);
 
   const handleNameChange = (value) => {
     setUserInfo({
@@ -34,7 +43,7 @@ function EditBaseInfo(props) {
     } else {
       setIsDisable(false);
     }
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handlePhoneChange = (value) => {
@@ -47,7 +56,7 @@ function EditBaseInfo(props) {
     } else {
       setIsDisable(false);
     }
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handleEmailChange = (value) => {
@@ -55,7 +64,7 @@ function EditBaseInfo(props) {
       ...userInfo,
       email: value || "",
     });
-    setIsEdit(true);
+    // setIsEdit(true);
   };
 
   const handleSaveUserInfo = () => {
@@ -75,12 +84,8 @@ function EditBaseInfo(props) {
   };
 
   useEffect(() => {
-    getUserInfoFun().then((resp) => {
-      if (resp.Code === 1 && resp.Data) {
-        setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
-      }
-    });
-  }, []);
+    setUserInfo(info);
+  }, [info]);
 
   return (
     <Dialog
@@ -178,6 +183,6 @@ function EditBaseInfo(props) {
       </div>
     </Dialog>
   );
-}
+};
 
 export default EditBaseInfo;