@titaui/pc 1.7.93 → 1.7.97

package/src/components/menus/components/drag-resize/index.tsx

@@ -1,8 +1,5 @@
 import React, { useRef, useEffect } from 'react';
 import classNames from 'classnames';
-import { getBSGlobal } from '../../../../utils/bs-global';
-const i18nInfo = getBSGlobal("I18NInfo");
-const isEn = i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "en_US";
 import './index.scss';
 
 const preCls = 'titaui-drag-resize';
@@ -18,9 +15,9 @@ interface Props {
 export default (props: Props) => {
   const {
     children,
-    defaultWidth = isEn ? 210 : 180,
+    defaultWidth = 180,
     onResize = () => {},
-    minWidth = isEn ? 210 : 180,
+    minWidth = 180,
     maxWidth = 600
   } = props;
 

package/src/components/menus/components/flip-menu-card/flip-back-header.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import classNames from "classnames";
 import preCls from "./precls";
-import { getLocale } from "../../../../utils/getLocale";
 
 import "./index.scss";
 
@@ -24,7 +23,7 @@ export default (props: Props) => {
           "tu-icon-fanhui"
         )}
       />
-      <span>{getLocale('Mod_Back')}</span>
+      <span>返回</span>
     </div>
   );
 };

package/src/components/menus/components/menu-tree/tree-node/assess-manage.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
 import preCls from '../precls';
-import { getBSGlobal } from '../../../../../utils/bs-global';
-const i18nInfo = getBSGlobal("I18NInfo");
-const isZn = !i18nInfo || i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN";
 
 import './index.scss';
 
@@ -20,6 +17,6 @@ export default props => {
     {level > 0 && <span className={classNames(`${preCls}__ass-manage-node-indent`)} />}
     {data.icon && <span className={classNames(`${preCls}__ass-manage-node-icon`, data.icon)} />}
     <span className={classNames(`${preCls}__ass-manage-node-title`, 'noselect')}>{props.title}</span>
-    {isZn && <span className={classNames(`${preCls}__ass-manage-node-suffix`)} />}
+    <span className={classNames(`${preCls}__ass-manage-node-suffix`)} />
   </div>
 }

package/src/components/menus/components/menu-tree/tree-node/assess-template.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
 import preCls from '../precls';
-import { getBSGlobal } from '../../../../../utils/bs-global';
-const i18nInfo = getBSGlobal("I18NInfo");
-const isZn = !i18nInfo || i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN";
 
 import './index.scss';
 
@@ -20,6 +17,6 @@ export default props => {
     {level > 0 && <span className={classNames(`${preCls}__ass-template-node-indent`)} />}
     {data.icon && <span className={classNames(`${preCls}__ass-template-node-icon`, data.icon)} />}
     <span className={classNames(`${preCls}__ass-template-node-title`, 'noselect')}>{props.title}</span>
-    {isZn && <span className={classNames(`${preCls}__ass-template-node-suffix`)} />}
+    <span className={classNames(`${preCls}__ass-template-node-suffix`)} />
   </div>
 }

package/src/components/menus/components/menu-tree/tree-node/index.scss

@@ -180,7 +180,6 @@
       margin-left: 8px;
       background-image: url("../images/appraisal-menu/setting.svg");
       background-size: contain;
-      background-repeat: no-repeat;
     }
   }
 
@@ -196,7 +195,6 @@
       margin-left: 8px;
       background-image: url("../images/appraisal-menu/launch.svg");
       background-size: contain;
-      background-repeat: no-repeat;
     }
   }
 

package/src/components/menus/components/menu-tree/tree-node/no-follower.tsx

@@ -6,8 +6,7 @@ import preCls from '../precls';
 import './index.scss';
 
 export default () => {
-  const noFollowerText = window['getLocale'] && window['getLocale'](locale.nofollowers) || locale.nofollowers;
   return <div className={classNames(`${preCls}__no-follower-node`)} title="">
-    <span>{noFollowerText}</span>
+    <span>{locale.nofollowers}</span>
   </div>
 }

package/src/components/menus/components/search-colleague/index.tsx

@@ -13,7 +13,7 @@ interface Props {
 
 export default (props: Props) => {
   const {
-    placeholder = window['getLocale'] && window['getLocale'](locale.input_search_user) || locale.input_search_user,
+    placeholder = locale.input_search_user,
     onSelect
   } = props;
 

package/src/components/menus/export-modules/appraisal-menus/index.tsx

@@ -8,11 +8,6 @@ import Scrollbar from '../../../scrollbar';
 import AppraisalMenuData, { AppraisalMenusInt, defaultRefObject } from "./menus";
 import MenuHighlight from './menu-highlight';
 import preCls from "../../precls";
-import { getLocale } from "../../../../utils/getLocale";
-import { getBSGlobal } from "../../../../utils/bs-global";
-
-const i18nInfo = getBSGlobal("I18NInfo");
-const isEn = i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "en_US";
 
 import "../../index.scss";
 import "./index.scss";
@@ -61,8 +56,8 @@ const AppraisalMenus = (props: Props) => {
       // @ts-ignore
       window.titaTracker('action').record({
         actionName: `绩效考核__${node.title}`,
-        actionGroup: getLocale('Menu_Title_Performance'),
-        productName: getLocale('Menu_Title_Performance'),
+        actionGroup: '绩效考核',
+        productName: '绩效考核',
       });
   };
 
@@ -92,7 +87,7 @@ const AppraisalMenus = (props: Props) => {
       ref={menuRef}
       className={classNames(preCls, `${preCls}-appraisal-menus`)}
     >
-      <FlipCard collapseMenu={collapseMenu} ref={flipRef} defaultWidth={isEn ? 210 : 180}>
+      <FlipCard collapseMenu={collapseMenu} ref={flipRef} defaultWidth={180}>
         <React.Fragment>
           <div className={classNames(`${preCls}-appraisal-menus-tree`)}>
             <Scrollbar style={{ maxHeight }}>

package/src/components/menus/export-modules/appraisal-menus/menus.ts

@@ -1,6 +1,5 @@
 import { getUserInfo, getBSGlobal } from "../../../../utils/bs-global";
 import { locale } from '../../i18n';
-import { getLocale } from "../../../../utils/getLocale";
 import {
   GROUP_NAME_NODE,
   MENU_ITEM_NOE,
@@ -121,7 +120,7 @@ export default class AppraisalMenus {
       },
       {
         icon: "",
-        label: locale.menu_basesetting,
+        label: "基础设置",
         key: "base-appraisal-group",
         type: GROUP_NAME_NODE,
         href: "",
@@ -165,7 +164,7 @@ export default class AppraisalMenus {
       if (menu.isShow) {
         treeNodes.push({
           key: `${menu.key}`,
-          title: getLocale(menu.label) ? getLocale(menu.label) : menu.label,
+          title: menu.label,
           data: menu,
           isLeaf: true,
           children: [],

package/src/components/menus/export-modules/manage-menus/index.scss

@@ -0,0 +1,13 @@
+.titaui-menus-manage-menus {
+  width: 180px;
+  position: relative;
+  box-sizing: border-box;
+  display: flex;
+  // max-height: calc(100vh - 72px - 74px);
+  flex-direction: column;
+  background: #ffffff;
+  padding: 28px 12px;
+  box-shadow: 0px 0px 16px 0px rgba(127, 145, 180, 0.1);
+  border-radius: 12px;
+  will-change: height;
+}

package/src/components/menus/export-modules/manage-menus/index.tsx

@@ -1,6 +1,5 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect } from "react";
 import { withRouter } from "react-router";
-import classNames from "classnames";
 import MenuTree from "../../components/menu-tree";
 import {
   PARENT_MENU_NODE,
@@ -8,13 +7,6 @@ import {
 } from "../../components/menu-tree/tree-node/index";
 import { menus } from "./constant";
 import { JudgeManageHighLightMenu } from "./handle-highlight";
-import { getLocale } from "../../../../utils/getLocale";
-import FlipCard, { flipRefIns } from "../../components/flip-menu-card";
-import { getBSGlobal } from "../../../../utils/bs-global";
-import Scrollbar from "../../../scrollbar";
-
-const i18nInfo = getBSGlobal("I18NInfo");
-const isEn = i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "en_US";
 import "./index.scss";
 
 interface Props {
@@ -36,17 +28,13 @@ const expandedKeys = ["okr"];
 const ManageMenus = (props: Props) => {
   const { history } = props;
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<any[]>([]);
-  const flipRef = useRef<flipRefIns>({
-    next: () => {},
-    goback: () => {},
-  });
-  const menuRef = useRef<any>();
 
   const formateToTreeNodeData = (menus, pid = 0, level = 0) => {
     const treeNodes: TreeNode[] = [];
 
     for (let i = 0; i < menus.length; i++) {
       const menu = menus[i];
+
       const hasChildren = menu.children && menu.children.length ? true : false;
       const isLeaf = menu.isLeaf !== undefined ? menu.isLeaf : !hasChildren;
 
@@ -55,7 +43,7 @@ const ManageMenus = (props: Props) => {
 
       treeNodes.push({
         key: `${menu.key}`,
-        title: getLocale(menu.label) ? getLocale(menu.label) : menu.label,
+        title: menu.label,
         data: menu.data || menu,
         isLeaf: isLeaf,
         children: formateToTreeNodeData(
@@ -69,14 +57,6 @@ const ManageMenus = (props: Props) => {
     return treeNodes;
   };
 
-  const collapseMenu = (isHide) => {
-    if (isHide) {
-      menuRef.current.style.width = "0px";
-    } else {
-      menuRef.current.style.width = "";
-    }
-  };
-
   useEffect(() => {
     const search = history.location.search;
     const activeMenu = new JudgeManageHighLightMenu(search).getHighLightMenu();
@@ -90,27 +70,13 @@ const ManageMenus = (props: Props) => {
   };
 
   return (
-    <div ref={menuRef} className={classNames(`${preCls}-manage-menus`)}>
-      <FlipCard
-        collapseMenu={collapseMenu}
-        ref={flipRef}
-        defaultWidth={isEn ? 210 : 180}
-      >
-        <React.Fragment>
-          <div className={classNames(`${preCls}-appraisal-menus-tree`)}>
-            <Scrollbar>
-              <MenuTree
-                data={formateToTreeNodeData(menus)}
-                selectedKeys={selectedMenuKeys}
-                expandedKeys={expandedKeys}
-                onSelect={onSelectHandler}
-              />
-            </Scrollbar>
-          </div>
-        </React.Fragment>
-
-        <React.Fragment></React.Fragment>
-      </FlipCard>
+    <div className={`${preCls}-manage-menus`}>
+      <MenuTree
+        data={formateToTreeNodeData(menus)}
+        selectedKeys={selectedMenuKeys}
+        expandedKeys={expandedKeys}
+        onSelect={onSelectHandler}
+      />
     </div>
   );
 };

package/src/components/menus/export-modules/okr-menus/depart-menus/index.tsx

@@ -28,20 +28,19 @@ export default () => {
   );
 
   useEffect(() => {
-    const allDepartmentText = window['getLocale'] && window['getLocale'](locale.menu_alldeparment) || locale.menu_alldeparment
     getDepsAndUsers(-1, isGetUser).then(rawTreeData => {
       const rootNode = {
         'async': true,
         'data': {
           'id': 0,
-          'name': allDepartmentText
+          'name': locale.menu_alldeparment
         },
         'pid': -1,
         'id': "0",
         'key': '0',
         'isLeaf': true,
         'nodeType': DEPART_NODE,
-        'title': allDepartmentText,
+        'title': locale.menu_alldeparment,
       };
       setRawTreeData([rootNode, ...rawTreeData]);
       setTreeData(toTree([rootNode, ...rawTreeData]));

package/src/components/menus/export-modules/okr-menus/index.tsx

@@ -8,10 +8,6 @@ import SearchColeague from "../../components/search-colleague";
 import OkrFrontMenus from './okr-front-menus';
 import { FlipContext } from '../../context';
 import preCls from "../../precls";
-import { getBSGlobal } from "../../../../utils/bs-global";
-
-const i18nInfo = getBSGlobal("I18NInfo");
-const isEn = i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "en_US";
 
 import "../../index.scss";
 import "./index.scss";
@@ -76,7 +72,7 @@ const OkrMenus = (props: Props) => {
         <FlipCard
           ref={flipRef}
           collapseMenu={collapseMenu}
-          defaultWidth={isEn ? 210 : 180}
+          defaultWidth={180}
           onChange={onFlipChangeHandler}
         >
 

package/src/components/menus/export-modules/okr-menus/menus.ts

@@ -14,7 +14,6 @@ import {
   MENU_ITEM_NOE
 } from '../../components/menu-tree/tree-node/index';
 import { isLocal } from '../../../../utils/helpers';
-import { getLocale } from "../../../../utils/getLocale";
 
 interface TreeNode {
   key: string;
@@ -312,7 +311,7 @@ export default class okrMenus {
 
       treeNodes.push({
         'key': `${menu.key}`,
-        'title': getLocale(menu.label) ? getLocale(menu.label) : menu.label,
+        'title': menu.label,
         'data': menu.data || menu,
         'isLeaf': isLeaf,
         'children': this.formateToTreeNodeData(menu.children || [], level + 1, menu.key),

package/src/components/menus/i18n.ts

@@ -1,49 +1,52 @@
+
 class I18N {
 
-  public menu_alldeparment = `OKR_Menu_Title_All`;
-  public menu_myokr = `OKR_Menu_Title_MyOKRs`;
-  public menu_responsible = `OKR_Menu_Title03_Owned`;
-  public menu_participated = `OKR_Menu_Title_Collaborator`;
-  public menu_concerned = `OKR_Menu_Title_FollowingOKRs`;
-  public menu_subordinate = `OKR_Menu_Title_DirectReports`;
-  public menu_concerned_user = `OKR_Menu_Title_FollowingOKR`;
-  public menu_other = `OKR_Menu_Title_Others`;
-  public menu_okrmap = `OKR_Menu_Title_Alignment`;
-  public menu_okrdashboard = `OKR_Menu_Title_Dashboard`;
-  public menu_okr_working_method = `OKR_Menu_Title_OKRWork`;
-  public menu_okrcases = `OKR_Menu_Title_OKRExamples`;
-
-  public menu_myass = `Per_Menu_Title_MyReviews`;
-  public menu_evaluated_ass = `Per_Menu_Title_MyEvaluation`;
-  public menu_subordinate_ass = `Per_Menu_Title_Subordinate`;
-  public menu_department_ass = `Per_Menu_Title_Department`;
-  public menu_management_ass = `Per_Menu_Title_AssessmentMana`;
-  public menu_template_ass = `Per_Menu_Title_Assessmenttempla`;
-  public menu_library_ass = `Per_Menu_Title_IndicatorDatabase`;
-  public menu_score_ass = `Per_Menu_Title_Settings`;
-  public menu_help_ass = `Per_Menu_Title_Help`;
-  public menu_statistics_ass = `Per_Menu_Title_Reports`;
-  public menu_dashboard_ass = `Per_Menu_Title_Dashboard`;
-  public menu_basesetting = `Per_Menu_Title_Label_BasicSettings`
-
-  public input_search_user = `OKR_Menu_text_SearchMembers`;
-
-  public nofollowers = `OKR_Menu_txt_NoFollowers`;
+  public menu_alldeparment = '公司全部';
+  public menu_myokr = '我的 OKR';
+  public menu_responsible = '我负责的';
+  public menu_participated = '我参与的';
+  public menu_concerned = '我关注的';
+  public menu_subordinate = '下属 OKR';
+  public menu_concerned_user = '关注的人';
+  public menu_other = '其它';
+  public menu_okrmap = 'OKR 地图';
+  public menu_okrdashboard = 'OKR 仪表盘';
+  public menu_okr_working_method = 'OKR 工作法';
+  public menu_okrcases = 'OKR 案例库';
+
+  public menu_myass = '我的考核';
+  public menu_evaluated_ass = '我评价的';
+  public menu_subordinate_ass = '下属考核';
+  public menu_department_ass = '部门考核';
+  public menu_management_ass = '考核管理';
+  public menu_template_ass = '考核模板';
+  public menu_library_ass = '考核指标库';
+  public menu_score_ass = '评价设置';
+  public menu_help_ass = '考核帮助';
+  public menu_statistics_ass = '考核报表';
+  public menu_dashboard_ass = '考核仪表盘';
+
+  public input_search_user = '搜索同事';
+
+  public nofollowers = '暂无关注的人';
   public nosubordinates = '暂无下属';
-  public alldeparment = `OKR_Menu_Title_All`;
-  public unsubscribe = `OKR_MyO_Butt_Unfollow`;
-
-  public menu_regulation_enterprise = `Per_Menu_ManRegu`
-  public menu_regulation_okr = `Regul_Menu_OKR`
-  public menu_regulation_project = `Regul_Menu_Projects`
-  public menu_regulation_plan = `Regul_Menu_Tasks`
-  public menu_regulation_daily = `Regul_Menu_DailyReport`
-  public menu_regulation_weekly = `Regul_Menu_WeeklyReport`
-  public menu_regulation_monthly = `Regul_Menu_MonthlyReport`
-
-
-  constructor() {
+  public alldeparment = '公司全部';
+  public unsubscribe = '取消关注';
+
+  public menu_regulation_enterprise = '企业管理规定'
+  public menu_regulation_okr = 'OKR规定'
+  public menu_regulation_project = '项目规定'
+  public menu_regulation_plan = '计划规定'
+  public menu_regulation_daily = '日报规定'
+  public menu_regulation_weekly = '周报规定'
+  public menu_regulation_monthly = '月报规定'
+
+
+  constructor(isEN = false) {
+    if (isEN) {
+      // 替换成英文
+    }
   }
 }
 
-export const locale = new I18N();
+export const locale = new I18N(false);

package/src/components/nav-top/components/user-message/components/inform/inform-item.tsx

@@ -49,7 +49,7 @@ const Inform = (props) => {
     }
     // 处理合并的消息
     const isMessageMerging = [
-      83, 93, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362,
+      83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362,
     ].includes(messageType);
     if (!isMessageMerging) {
       if (messageType === informType.details) {
@@ -63,7 +63,8 @@ const Inform = (props) => {
         );
         return;
 			} else if (objType === 0 && messageType === 93) {
-        openPage(`${apiServer}/u/${userId}/Home#more/messages?messageType=2&tabAppId=1&tabAppType=1&isRead=2&messageSubNav=1`)
+        openPage(`${apiServer}/u/${userId}/Home#more/messages?messageType=2&tabAppId=1&tabAppType=1&isRead=2&messageSubNav=1`);
+        return;
       } else if ( objType === 0) {        
 				let str = item.content.match(/\/\/.*?[\"|\']/gi);
 				if (!str) return;

package/src/components/nav-top/components/user-message/components/remind/remind-item.tsx

@@ -3,7 +3,6 @@ import classNames from "classnames";
 import TooltipText from "../../../../../tooltip/tooltip-text";
 import Bell from "../../images/app-tixing.svg";
 import { apiServer, userId } from "../../constant";
-import { getLocale } from "../../../../../../utils/getLocale";
 import "./index.scss";
 
 
@@ -25,7 +24,7 @@ const Remind = (props) => {
       <img src={Bell} className={classNames(`${preCls}__item-photo`)} />
       <div className={classNames(`${preCls}__item-right`)}>
         <div className={classNames(`${preCls}__item-right-name`)}>
-          <span>{getLocale('Mod_Tasks')}</span>
+          <span>任务</span>
           <span className={classNames(`${preCls}__item-right-name-status`)}>
             {item.content}
           </span>

package/src/components/nav-top/components/user-message/msg/index.tsx

@@ -7,7 +7,6 @@ import Inform from "../components/inform";
 import Remind from "../components/remind";
 import TabTitle from "../components/tab-title";
 import { getMessages } from "../../../request.apis";
-import { getLocale } from "../../../../../utils/getLocale";
 import "./index.scss";
 
 const prefixCls = "titaui-user-message-msg";
@@ -61,7 +60,7 @@ const UserMessage = (props) => {
             tab={
               <TabTitle
                 data={getData("todoIndicator")}
-                title={getLocale('Top_Message_title_Todos')}
+                title="待办"
                 tab={"todos"}
               />
             }
@@ -85,7 +84,7 @@ const UserMessage = (props) => {
             tab={
               <TabTitle
                 data={getData("mLeaveandComment")}
-                title={getLocale('Top_Message_title_@&Replies')}
+                title="@与回复"
                 tab={"replys"}
               />
             }
@@ -94,7 +93,7 @@ const UserMessage = (props) => {
             <Reply onItemClick={onItemClick} handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo}/>
           </TabPane>
           <TabPane
-            tab={<TabTitle data={remindTotal} title={getLocale('Top_Message_title_AlarmReminders')} tab={"reminds"} />}
+            tab={<TabTitle data={remindTotal} title="提醒" tab={"reminds"} />}
             key="reminds"
           >
             <Remind onItemClick={onItemClick} handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo} handleIgnoreTask={handleIgnoreTask}/>

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

@@ -1,5 +1,3 @@
-import { getLocale } from "../../../../utils/getLocale";
-
 export const htmlToText = (text) => {
 	let div = document.createElement('div');
 	div.innerHTML = text;
@@ -10,7 +8,7 @@ export const deleteText = (text) => {
 	const last = text.trim().slice(-4);
   if (last === '查看任务') {
     text = text.trim().slice(0, -4);
-  } else if (last === getLocale('Mod_Checkdetails')) {
+  } else if (last === '查看详情') {
     text = text.trim().slice(0, -4);
   } else if (last === '进入日报') {
     text = text.trim().slice(0, -4);

package/src/components/nav-top/components/user-own-menu/components/own-menu/index.scss

@@ -5,7 +5,6 @@
   box-shadow: 0px 4px 24px 0px rgba(127, 145, 180, 0.2);
   border-radius: 16px;
   padding: 16px 26px 16px 12px;
-  user-select: none;
   &__card {
     &-items {
       margin-bottom: 5px;
@@ -21,7 +20,7 @@
         left: 8px;
         display: inline-block;
         content: "";
-        width: 100%;
+        width: 100px;
         height: 1px;
         background: linear-gradient(
           297deg,
@@ -54,28 +53,9 @@
         font-weight: 400;
         color: #3f4755;
         line-height: 22px;
-        min-width: 110px;
-        display: inline-block;
         &:hover {
           color: #2879ff;
         }
-        &-suffix {
-          font-size: 14px;
-          color: #3F4755;
-          line-height: 22px;
-          display: inline-flex;
-          align-items: center;
-          &-lang {
-            &--selected {
-              color: #2879FF;
-            }
-          }
-          &-icon {
-            display: inline-block;
-            transform: rotate(90deg);
-            margin: 0 10px;
-          }
-        }
       }
     }
   }