@titaui/pc 1.9.49 → 1.9.50

package/src/components/nav-top/index.tsx

@@ -1,6 +1,4 @@
-import React, {
-  FC, useState, useEffect, useCallback,
-} from "react";
+import React, { FC, useState, useEffect, useCallback } from "react";
 import classNames from "classnames";
 import { getTenantInfo, getBSGlobal } from "../../utils/bs-global";
 import UserOwnMenu from "./components/user-own-menu";
@@ -12,11 +10,10 @@ import { getLogo, getMenus } from "./utils";
 import "./index.scss";
 import { rpost } from "../../utils/request";
 import Toast from "../toast";
-
 const Logo = getLogo();
-const newNavigation = getBSGlobal("newNavigation") || [];
+const newNavigation = getBSGlobal("newNavigation")||[]
 const hasOKRApp = newNavigation.find(
-  (item) => item.appId === 113,
+  (item) => item.appId === 113
 );
 const preCls = "titaui-nav-top";
 
@@ -25,12 +22,13 @@ const NavTop: FC = () => {
   const versionInfo = getBSGlobal("tenantAuthentication");
   const [activeMenuId, setActiveMenuId] = useState(-1);
   const ua = navigator.userAgent.toLowerCase();
-  const showWxInvite = getTenantInfo().mainCorpId && ua.indexOf("micromessenger") != -1;
+  const showWxInvite =
+    getTenantInfo().mainCorpId && ua.indexOf("micromessenger") != -1;
   const openWxInvite = useCallback(() => {
-    // @ts-ignore
-    WeixinJSBridge
-      // @ts-ignore
-      && WeixinJSBridge.invoke(
+    //@ts-ignore
+    WeixinJSBridge &&
+      //@ts-ignore
+      WeixinJSBridge.invoke(
         "selectPrivilegedContact",
         {
           fromDepartmentId: -1, // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
@@ -39,15 +37,15 @@ const NavTop: FC = () => {
           // "selectedOpenUserIds"["xxx","yyy"], // 非必填，已选用户OpenID列表。single模式忽略该参数。
           // "selectedTickets"["ticket1","ticket2"] // 非必填，已选ticket列表。single模式忽略该参数
         },
-        (res) => {
+        function (res) {
           if (res.err_msg == "selectPrivilegedContact:ok") {
             // var selectedUserList = res.result.userList; // 已选的成员列表
             // for (var i = 0; i < selectedUserList.length; i++) {
             //   var openUserId = selectedUserList[i].openUserId; //成员openUserId
             // }
-            const selectedTicket = res.result.selectedTicket.replace(/['"]/g, ""); // 已选的集合Ticket
+            var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ""); // 已选的集合Ticket
             rpost("v1")(
-              `wx/send/templateMessage?selectedTickets=${selectedTicket}`,
+              "wx/send/templateMessage?selectedTickets=" + selectedTicket
             )
               .then(() => {
                 Toast.Success("邀请成功");
@@ -58,15 +56,17 @@ const NavTop: FC = () => {
           } else {
             // console.log(res);
           }
-        },
+        }
       );
   }, []);
 
   const handleHashChange = () => {
-    const hash = location.hash.split("?")[0] || "";
+    const hash = location.hash.split('?')[0] || "";
     if (hash) {
-      const activeMenu = menu.find((item) => hash.includes(item.href.split("#")?.[1]?.split("?")[0]));
-      if (hash.includes("homepage")) {
+      const activeMenu = menu.find((item) =>
+        hash.includes(item.href.split("#")?.[1]?.split('?')[0])
+      );
+      if (hash.includes('homepage')) {
         setActiveMenuId(99999);
         return;
       }
@@ -81,7 +81,7 @@ const NavTop: FC = () => {
   useEffect(() => {
     handleHashChange();
     window.addEventListener("hashchange", handleHashChange);
-
+    
     return () => {
       window.removeEventListener("hashchange", handleHashChange);
     };
@@ -91,7 +91,7 @@ const NavTop: FC = () => {
     <div className={classNames(`${preCls}`)}>
       <a
         className={classNames(`${preCls}__left`)}
-        href={hasOKRApp ? "#homepage" : ""}
+        href={hasOKRApp ? `#homepage` : ""}
       >
         <img
           src={Logo}
@@ -113,7 +113,7 @@ const NavTop: FC = () => {
           </span>
         )}
       </a>
-      <div className={classNames(`${preCls}__line`)} />
+      <div className={classNames(`${preCls}__line`)}></div>
       <div className={classNames(`${preCls}__middle`)}>
         <Menu menus={menu} activeMenuId={activeMenuId} />
       </div>
@@ -122,7 +122,7 @@ const NavTop: FC = () => {
           <i
             className={classNames(
               "tu-icon-add-people",
-              `${preCls}__invite-icon`,
+              `${preCls}__invite-icon`
             )}
           />
         </div>

package/src/components/nav-top/request.apis.ts

@@ -11,26 +11,40 @@ const requestDomain = () => {
   return `${location.protocol}//www.tita.gift`;
 };
 
-export const getTodos = (pageNum) => rget("v1")(
-  `todo/Get?app_type=-1&app_id=-1&page_num=${pageNum}&page_size=10&status=1`,
-);
-export const getData = (url, saveData) => rget("v1")(url).then((res) => {
-  saveData(res.Data);
-});
+export const getTodos = (pageNum) => {
+  return rget("v1")(
+    `todo/Get?app_type=-1&app_id=-1&page_num=${pageNum}&page_size=10&status=1`
+  );
+};
+export const getData = (url, saveData) => {
+  return rget("v1")(url).then((res) => {
+    saveData(res.Data);
+  });
+};
 
-export const getReplys = (pageNum) => rget("v1")(`comment/messages?page_num=${pageNum}&page_size=10&status=1`);
+export const getReplys = (pageNum) => {
+  return rget("v1")(`comment/messages?page_num=${pageNum}&page_size=10&status=1`);
+}
 
-export const getReminds = () => rget("v2")("remind/get");
+export const getReminds = () => {
+  return rget("v2")("remind/get");
+};
 
-export const getInforms = (pageNum) => rget("v1")(
-  `messages/Get?page_size=10&page_num=${pageNum}&status=1&app_type=-1&app_id=-1`,
-);
+export const getInforms = (pageNum) => {
+  return rget("v1")(
+    `messages/Get?page_size=10&page_num=${pageNum}&status=1&app_type=-1&app_id=-1`
+  );
+};
 
-export const clearInforms = () => rdelete("v1")(
-  "Indicator/Clear?message_type=1&indicator_type=undefined",
-);
+export const clearInforms = () => {
+  return rdelete("v1")(
+    "Indicator/Clear?message_type=1&indicator_type=undefined"
+  );
+};
 
-export const clearReplys = () => rdelete("v1")("Indicator/Clear?message_type=0&indicator_type=mLeaveandComment");
+export const clearReplys = () => {
+  return rdelete("v1")("Indicator/Clear?message_type=0&indicator_type=mLeaveandComment");
+}
 
 export const getMessages = () => {
   const nowTime = new Date();
@@ -39,11 +53,11 @@ export const getMessages = () => {
   const date = nowTime.getDate();
   return axios
     .get(
-      `${requestDomain()}/api/v1/${tenantId}/${userId}/RemindV2/Get?dateTime=${year}/${month}/${date}`,
+      `${requestDomain()}/api/v1/${tenantId}/${userId}/RemindV2/Get?dateTime=${year}/${month}/${date}`
     )
     .then((resp: any) => {
       if (resp.code === 401) {
-        location.href = "/Account/Logout";
+        location.href = '/Account/Logout';
         return;
       }
       return resp.data;
@@ -51,4 +65,6 @@ export const getMessages = () => {
     .then((data) => data);
 };
 
-export const changeLang = (lang) => rget("v1")(`multiLange/change?lang=${lang}`);
+export const changeLang = (lang) => {
+  return rget('v1')(`multiLange/change?lang=${lang}`)
+}

package/src/components/nav-top/utils.ts

@@ -1,16 +1,19 @@
 import { getTenantInfo } from "../../utils/bs-global";
-import { INavType } from "./interface";
+import {  INavType } from "./interface";
 import defaultLogo from "./images/logo-white.png";
 
+
 export const getMenus = () => {
   // @ts-ignore
   const navs: INavType[] = BSGlobal.newNavigation;
-  navs.sort((pre, next) => pre.orderId - next.orderId);
+  navs.sort((pre, next) => {
+    return pre.orderId - next.orderId;
+  })
   return navs;
-};
+}
 
 export const getLogo = () => {
   // 232637ab8a674427a1d6489329035d86_n 是老logo的路径，没法判断是否用户自定义过，所以只能这么硬核
   const tenantInfo = getTenantInfo();
-  return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) || !tenantInfo.Logo ? defaultLogo : tenantInfo.Logo;
-};
+  return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) || !tenantInfo.Logo ? defaultLogo : tenantInfo.Logo
+}

package/src/components/okr-detail/auth.js

@@ -1,101 +1,99 @@
-import { getBSGlobal, getUserInfo } from "../../utils/bs-global";
+import { getBSGlobal, getUserInfo } from '../../utils/bs-global'
 
 export class BaseAuth {
   constructor() {
-    this.loginUserInfor = getBSGlobal("loginUserInfo");
+    this.loginUserInfor = getBSGlobal('loginUserInfo');
   }
-
   // 老板
-  isBoss() {
+  isBoss () {
     // console.log('isboss', this.loginUserInfor.IsBoss)
     return this.loginUserInfor.IsBoss;
   }
-
   // 超管、助理、目标管理员
-  isManager() {
+  isManager () {
     // console.log('ismanager', this.loginUserInfor.IsOkrManager)
     return this.loginUserInfor.IsOkrManager;
   }
 }
 
 export const OAuth = class extends BaseAuth {
+
   constructor(props) {
     super(props);
-    const { principalUser, createUserId } = props;
+    let { principalUser, createUserId } = props;
     this.userId = this.loginUserInfor.Id;
     this.principalUser = principalUser;
     this.createUserId = createUserId;
   }
 
   // 創建人、發起人
-  isCreater() {
+  isCreater () {
     // console.log('o iscreater', this.userId, this.createUserId)
     return this.userId == this.createUserId;
   }
-
   // 負責人
-  isPrincipalUser() {
+  isPrincipalUser () {
     // console.log('o isp', this.userId, this.principalUser.userId)
     return this.userId == this.principalUser.userId;
   }
 
   // 有操作OKR的權限
-  hasAuth() {
+  hasAuth () {
     return (this.isBoss() || this.isManager() || this.isCreater() || this.isPrincipalUser());
   }
-};
+}
 
 export const KRAuth = class extends BaseAuth {
+
   constructor(props) {
     super(props);
-    const { user, createUserId } = props;
-    this.loginUserInfor = getBSGlobal("loginUserInfo");
+    let { user, createUserId } = props;
+    this.loginUserInfor = getBSGlobal('loginUserInfo');
     this.userId = this.loginUserInfor.Id;
     this.user = user;
     this.createUserId = createUserId;
   }
 
   // 創建人、發起人
-  isCreater() {
+  isCreater () {
     // console.log('kr iscreater', this.userId, this.createUserId)
     return this.userId == this.createUserId;
   }
-
   // 負責人
-  isPrincipalUser() {
+  isPrincipalUser () {
     // console.log('kr isp', this.userId, this.user.userId)
     return this.userId == this.user.userId;
   }
 
   // 有操作KR的權限
-  hasAuth() {
+  hasAuth () {
     return (this.isBoss() || this.isManager() || this.isCreater() || this.isPrincipalUser());
   }
-};
+}
 
 export const EAuth = class extends BaseAuth {
+
   constructor(props) {
     super(props);
-    const { principalUser, user } = props;
+    let { principalUser, user } = props;
     this.userId = this.loginUserInfor.Id;
     this.principalUser = principalUser;
     this.user = user;
   }
 
   // 創建人、發起人
-  isCreater() {
+  isCreater () {
     // console.log('e iscreater', this.userId, this.user.userId)
     return this.userId == this.user.userId;
   }
-
   // 負責人
-  isPrincipalUser() {
+  isPrincipalUser () {
     // console.log('e isp', this.userId, this.principalUser.userId)
     return this.userId == this.principalUser.userId;
   }
 
   // 有操作KR的權限
-  hasAuth() {
+  hasAuth () {
     return (this.isBoss() || this.isManager() || this.isCreater() || this.isPrincipalUser());
   }
-};
+}

package/src/components/okr-detail/base-info/base-info.tsx

@@ -58,9 +58,10 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
 
   const { okrInfo, setOkrInfo } = useContext(CommonContext);
 
-  const originDesc = decodeURI(encodeURI(okrInfo.description)) === "null"
-    ? ""
-    : decodeURI(encodeURI(okrInfo.description));
+  const originDesc =
+    decodeURI(encodeURI(okrInfo.description)) === "null"
+      ? ""
+      : decodeURI(encodeURI(okrInfo.description));
   const [originalDesc, setOriginalDesc] = useState(originDesc || "");
   const [participant, setParticipant] = useState<IUser[]>([]);
   const [followers, setFollowers] = useState<IUser[]>([]);
@@ -68,14 +69,14 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
     new OAuth({
       principalUser: okrInfo.principalUser,
       createUserId: okrInfo.createUserId,
-    }).hasAuth() && okrInfo.status === 1,
+    }).hasAuth() && okrInfo.status === 1
   );
   const [canEditPerson, setCanEditPerson] = useState(false);
   const [canEditFocusPerson, setCanEditFocusPerson] = useState(
     new OAuth({
       principalUser: okrInfo.principalUser,
       createUserId: okrInfo.createUserId,
-    }).hasAuth(),
+    }).hasAuth()
   );
   const [showDialogConfirm, setShowDialogConfirm] = useState(false);
   const [delUserType, setDelUserType] = useState(0); // 1: 参与人 2: 关注人
@@ -102,7 +103,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         }
       });
     },
-    [okrInfo.workId],
+    [okrInfo.workId]
   );
 
   const handleChangePrincipalUser = useCallback(
@@ -110,7 +111,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
       transferPrincipal(okrInfo.workId, user.email, user.id).then((resp) => {
         if (resp.Code === 1) {
           Toast.Success(getLocale("Mod_Successfuloperat"), { canClose: false });
-          const tempParticipant = [...participant];
+          let tempParticipant = [...participant];
           // 当前登录的是有权限的人，将负责人转为参与人或者关注人中的一个
           const isParticipantIndex = findUserIndex(tempParticipant, user.id);
           const isFollowerIndex = findUserIndex(followers, user.id);
@@ -118,8 +119,8 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
             tempParticipant.splice(isParticipantIndex, 1);
           }
           // 当前负责人，转交了负责人自动转为参与人
-          isParticipantIndex === -1
-            && tempParticipant.push({
+          isParticipantIndex === -1 &&
+            tempParticipant.push({
               ...generalPrincipalUser,
               id: generalPrincipalUser.userId,
             });
@@ -131,8 +132,8 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
           setGeneralPrincipalUser({ ...user, id: user.userId });
           isChangePrincipalRef.current = true;
           if (
-            generalPrincipalUser.userId === loginUser.Id
-            && loginUser.Id !== user.id
+            generalPrincipalUser.userId === loginUser.Id &&
+            loginUser.Id !== user.id
           ) {
             setGeneralRoleType(user.id === loginUser.Id ? 1 : 0);
           }
@@ -141,7 +142,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         }
       });
     },
-    [participant, followers, generalPrincipalUser],
+    [participant, followers, generalPrincipalUser]
   );
 
   const handleChangeClassify = useCallback((classify) => {
@@ -157,17 +158,20 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
 
   const handleVisiableLimitChanged = useCallback(
     (visiableValue, data) => {
-      const areaUserIds = data && data.users && data.users.map((user) => user.userId);
-      const areaOrgIds = data
-        && data.departments
-        && data.departments.map((department) => department.id);
-      const areaGroupIds = data && data.groups && data.groups.map((group) => group.id);
+      const areaUserIds =
+        data && data.users && data.users.map((user) => user.userId);
+      const areaOrgIds =
+        data &&
+        data.departments &&
+        data.departments.map((department) => department.id);
+      const areaGroupIds =
+        data && data.groups && data.groups.map((group) => group.id);
       updateVisibility(
         okrInfo.workId,
         visiableValue,
         areaUserIds,
         areaOrgIds,
-        areaGroupIds,
+        areaGroupIds
       ).then((resp) => {
         if (resp.Code === 1) {
           Toast.Success(getLocale("Mod_Successfuloperat"), { canClose: false });
@@ -178,7 +182,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         }
       });
     },
-    [okrInfo],
+    [okrInfo]
   );
 
   const handleAddUser = useCallback(
@@ -255,7 +259,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
           Toast.Error("网络异常", { canClose: false });
         });
     },
-    [participant, followers, canEditPerson],
+    [participant, followers, canEditPerson]
   );
 
   const handleDelParticipantUser = (data) => {
@@ -282,7 +286,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
     }
     const userIndex = findUserIndex(
       delUserType === 1 ? participant : followers,
-      delUser.id || delUser.userId,
+      delUser.id || delUser.userId
     );
     deleteUser(delUser.id, okrInfo.workId, delUserType === 1 ? 2 : 3)
       .then((resp) => {
@@ -313,7 +317,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         const data = resp.Data;
         setGeneralPrincipalUser(formatAvatarInfo(data[0].users)[0]);
         setParticipant(formatAvatarInfo(data[1].users));
-        setFollowers(formatAvatarInfo(data[2].users));
+        setFollowers(formatAvatarInfo(data[2]?.users || []));
       }
     });
   }, []);
@@ -323,7 +327,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
       new OAuth({
         principalUser: generalPrincipalUser,
         createUserId: okrInfo.createUserId,
-      }).hasAuth() && okrInfo.status === 1,
+      }).hasAuth() && okrInfo.status === 1
     );
   }, [generalPrincipalUser, okrInfo]);
   // 判断是否有权限和是否上面可编辑
@@ -335,8 +339,8 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
 
   useEffect(() => {
     if (
-      isChangePrincipalRef.current
-      || oldGeneralRoleTypeRef.current === generalRoleType
+      isChangePrincipalRef.current ||
+      oldGeneralRoleTypeRef.current === generalRoleType
     ) {
       isChangePrincipalRef.current = false;
       oldGeneralRoleTypeRef.current = generalRoleType;
@@ -368,23 +372,25 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
     }
   }, [generalRoleType, participant, followers]);
 
-  const renderDialogConfirm = useMemo(() => (
-    <DialogConfirm zIndex={1200} visible={showDialogConfirm} type="warning">
-      {/* @ts-ignore */}
-      <span type="title">
-        {delUserType === 1
-          ? getLocale("OKR_MyO_Err_Delepar")
-          : getLocale("OKR_MyO_Err_Delefol")}
-        ？
-      </span>
-      <CancelButton type="button" onClick={cancelDelPerson}>
-        {getLocale("Mod_Cancel")}
-      </CancelButton>
-      <WarningButton type="button" onClick={ensureDelPerson}>
-        {getLocale("Mod_Delete")}
-      </WarningButton>
-    </DialogConfirm>
-  ), [showDialogConfirm, delUserType]);
+  const renderDialogConfirm = useMemo(() => {
+    return (
+      <DialogConfirm zIndex={1200} visible={showDialogConfirm} type="warning">
+        {/* @ts-ignore */}
+        <span type="title">
+          {delUserType === 1
+            ? getLocale("OKR_MyO_Err_Delepar")
+            : getLocale("OKR_MyO_Err_Delefol")}
+          ？
+        </span>
+        <CancelButton type="button" onClick={cancelDelPerson}>
+          {getLocale("Mod_Cancel")}
+        </CancelButton>
+        <WarningButton type="button" onClick={ensureDelPerson}>
+          {getLocale("Mod_Delete")}
+        </WarningButton>
+      </DialogConfirm>
+    );
+  }, [showDialogConfirm, delUserType]);
 
   return (
     <div>
@@ -409,17 +415,17 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
           okrId={okrId}
         />
       </div>
-      {!canEditPerson
-      && !canEditAllInfo
-      && participant.length === 0
-      && followers.length === 0 ? null : (
-        <div className="base-info__divider" />
-        )}
+      {!canEditPerson &&
+      !canEditAllInfo &&
+      participant.length === 0 &&
+      followers.length === 0 ? null : (
+        <div className="base-info__divider"></div>
+      )}
       <div className="base-info__participant-followers-wrapper">
         <div className="base-info__person-block">
-          {!canEditPerson
-          && !canEditAllInfo
-          && participant.length === 0 ? null : (
+          {!canEditPerson &&
+          !canEditAllInfo &&
+          participant.length === 0 ? null : (
             <>
               <span className="base-info__person-block-title">
                 {getLocale("Mod_Participants")}
@@ -431,13 +437,13 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
                 onDelUser={handleDelParticipantUser}
               />
             </>
-            )}
+          )}
         </div>
         {setting.TargetFollowers && (
           <div className="base-info__person-block">
-            {!canEditFocusPerson
-            && !canEditAllInfo
-            && followers.length === 0 ? null : (
+            {!canEditFocusPerson &&
+            !canEditAllInfo &&
+            followers.length === 0 ? null : (
               <>
                 <span className="base-info__person-block-title">
                   {getLocale("Mod_Followers")}
@@ -450,7 +456,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
                   onDelUser={handleDelFollower}
                 />
               </>
-              )}
+            )}
           </div>
         )}
       </div>

package/src/components/okr-detail/base-info/index.tsx

@@ -1,3 +1,3 @@
-import BaseInfo from "./base-info";
+import BaseInfo from './base-info';
 
-export default BaseInfo;
+export default BaseInfo;