@titaui/pc 1.9.27 → 1.9.31

package/src/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/kr-push-score.tsx

@@ -18,6 +18,7 @@ import {
   IconEdit
 } from './style';
 import { getLocale, isEn } from "../../../../../../../utils/getLocale";
+import { inputWordTrans } from '../../../../../../../utils/i18n-front-translate';
 
 interface Props {
   setRefInParent: Function
@@ -218,7 +219,7 @@ export default class Score extends PureComponent<Props, State> {
        */
       information: (this.state.showScoreInfoError ?
 
-        <ScoreInfoWrapperError data-length={`已输入 ${this.state.areaLength} 个字，最多可输入 1000 个字`}>
+        <ScoreInfoWrapperError data-length={inputWordTrans(this.state.areaLength, 1000)}>
           <ScoreInfoSpanText style={{minWidth: isEn ? '75px' : '30px'}}>{getLocale('OKR_MyO_Description')}</ScoreInfoSpanText>
           <ScoreInfoSpanTextareaError
             ref={this.state.scoreInfoErrorRef}

package/src/components/okr-detail/okr-list/create-kr-item/heart.js

@@ -11,7 +11,7 @@ export default ({ heartOnActive, setHeartOnActive, confidenceIndex, editAble })
       onClick={() => setHeartOnActive(true)}
     >
       <Image className='kr-heart-icon' src={ImageHeart} />
-      <span className='kr-heart-middle'>{confidenceIndex} 分</span>
+      <span className='kr-heart-middle'>{confidenceIndex} {getLocale('Per_Set_Form_Quantifier_Points')}</span>
     </div>
   );
 };

package/src/components/okr-detail/okr-list/create-kr-item/index.tsx

@@ -184,7 +184,7 @@ function CreateKr({
           </div>
         </p>
         <span className={classNames(`${preCls}__heart`)}>
-          <Tooltip content='修改信心指数1'>
+          <Tooltip content='修改1'>
             <span style={{ display: 'inline-flex' }}>
               <Confidence
                 editable

package/src/components/okr-detail/schedule/components/o-progress/index.tsx

@@ -16,6 +16,7 @@ import { OAuth, hasSuperior } from '../../../../../utils/auth';
 import { GeneralDataContext, CommonContext } from '../../../context';
 import { remindAction } from '../../../request-apis';
 import { getLocale } from "../../../../../utils/getLocale";
+import { inputWordTrans } from '../../../../../utils/i18n-front-translate';
 import './index.scss';
 
 interface IOProgressProps {
@@ -267,7 +268,7 @@ const OProgress: FC<IOProgressProps> = ({listData, okrInfo, setUpdateProgress, h
         </div>
         {hasError ? (
           <div className={'o-progress__error-text'}>
-            已输入 {editOProgressContent.trim().length} 个字，最多可输入 500 个字
+            {inputWordTrans(editOProgressContent.trim().length, 500)}
           </div>
         ) : null}
       </Modal>

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

@@ -15,6 +15,7 @@ import EmptyPng from '../../img/schedule-empty.png';
 import { OAuth, hasSuperior } from '../../../../utils/auth';
 import { IOProgressProps } from '../../interface';
 import { getLocale } from '../../../../utils/getLocale';
+import { inputWordTrans } from '../../../../utils/i18n-front-translate';
 import './index.scss';
 
 const OProgress: FC<IOProgressProps> = ({listData, okrInfo, setUpdateProgress, hasOtherProgress, getOProgressData}) => {
@@ -244,7 +245,7 @@ const OProgress: FC<IOProgressProps> = ({listData, okrInfo, setUpdateProgress, h
         </div>
         {hasError ? (
           <div className={'o-progress__error-text'}>
-            已输入 {editOProgressContent.trim().length} 个字，最多可输入 500 个字
+            {inputWordTrans(editOProgressContent.trim().length, 500)}
           </div>
         ) : null}
       </Modal>

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

@@ -8,6 +8,7 @@ import { getO_SETTING, getKR_SETTING, transProgress, getKrOptions, getOptions }
 import { ErrorTip, List, Item, Icon, Options, OptionsWrapper } from './style';
 import { IRecommandProgressObj, OptionsObj, IProgressModalProps } from './interface';
 import { getLocale } from '../../utils/getLocale';
+import { inputWordTrans } from '../../utils/i18n-front-translate';
 import './index.scss';
 
 const ProgressModal: React.FC<IProgressModalProps> = props => {
@@ -85,7 +86,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
         }}
       />
       <ErrorTip className={errorRemark ? 'slideIn' : ''}>
-        已输入 {progressDescription.trim().length} 个字，最多可输入 {maxLength} 个字
+        {inputWordTrans(progressDescription.trim().length, maxLength)}
       </ErrorTip>
     </Item>
   );

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

@@ -166,9 +166,9 @@
 .okr-share-mblog {
   &__container {
     width: 480px;
-    height: 420px;
+    min-height: 420px;
     background-color: #fff;
-    border-radius: 6px;
+    border-radius: 12px;
   }
   &__header {
     height: 58px;

package/src/components/scrollbar/simplebar/simplebar.js

@@ -1,7 +1,8 @@
 import throttle from 'lodash.throttle';
 import debounce from 'lodash.debounce';
 import memoize from 'lodash.memoize';
-import { ResizeObserver } from '@juggle/resize-observer';
+// import { ResizeObserver } from '@juggle/resize-observer';
+import ResizeObserver from 'resize-observer-polyfill';
 import canUseDOM from 'can-use-dom';
 import scrollbarWidth from './scrollbar-width';
 import { getElementWindow, getElementDocument } from './helpers';

package/src/components/search-dropdown/index.scss

@@ -71,6 +71,7 @@
   background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #f0f2f5;
+  border-radius: 12px;
 
   .tui-select {
     &-item-option {

package/src/components/user-selector/export-modules/duties-selector/index.tsx

@@ -118,7 +118,8 @@ export default forwardRef((props: Props, ref) => {
               asyncData={false}
               onSelect={onSelectHandler}
               virtual={true}
-              height={height-44}
+              height={height}
+              switcherIcon=""
             />
           </TreeNodeContext.Provider>
           </div>
@@ -131,8 +132,9 @@ export default forwardRef((props: Props, ref) => {
               multiple={false}
               getTreeData={onGetTreeData}
               itemHeight={itemHeight}
-              height={height-44}
+              height={height}
               virtual={true}
+              switcherIcon=""
             />
           </TreeNodeContext.Provider>
         )}

package/src/components/user-selector/select-tree/choose-tree/index.tsx

@@ -24,7 +24,8 @@ export default props => {
     height,
     virtual,
     isGetRoot,
-    renderEmpty = () => <Empty />
+    renderEmpty = () => <Empty />,
+    ...restProps
   } = props;
 
   const loadedNode = useRef([]);
@@ -118,6 +119,7 @@ export default props => {
   return (
     <div className="perspm-tree">
       <Tree
+        {...restProps}
         multiple={multiple}
         selectNodeHighlight={false}
         defaultExpandedKeys={getDefaultExpandedKeys()}

package/src/components-v1/textarea/index.tsx

@@ -1,4 +1,5 @@
 import React, { PureComponent } from 'react'
+import { inputWordTrans } from '../../utils/i18n-front-translate'
 import { TextareaWrapper, Textarea, TextareaPlaceholder, TextareaWarning } from './style'
 
 interface Props {
@@ -115,7 +116,7 @@ export default class TextareaView extends PureComponent<Props, State> {
         </Textarea>
         {valueLen > (maxLength as number) && (
           <TextareaWarning>
-            <p>已输入{valueLen}  个字，最多可输入 {maxLength} 个字</p>
+            <p>{inputWordTrans(valueLen, maxLength)}</p>
           </TextareaWarning>
         )}
       </TextareaWrapper>

package/src/pages/aha2021/index.scss

@@ -17,17 +17,27 @@
     z-index: 3;
   }
 
-  &__invite {
+  &__invite,&__kefu {
     position: absolute;
     bottom: 74px;
-    left: 24px;
+    right: 24px;
     z-index: 2;
   }
 
+  &__kefu {
+    width: 42px;
+    height: 42px;
+    background: url('./kefu.svg') no-repeat;
+    background-size: 42px;
+    box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
+    cursor: pointer;
+    border-radius: 50%;
+  }
+
   &__help {
     position: absolute;
     bottom: 20px;
-    left: 24px;
+    right: 24px;
     z-index: 2;
   }
 

package/src/pages/aha2021/index.tsx

@@ -1,20 +1,21 @@
-import React, { Children, useState, useEffect } from 'react';
-import classNames from 'classnames';
-import NavTop from '../../components/nav-top';
-import FollowerVisitor from '../../components/follower-visitor';
-import InvitePeople from '../../components/invite-people';
-import HelpCard from '../../components/help-card';
-import PointDemo from '../../components/point-demo/point-demo';
-import { isOfficialSite } from '../../utils/platform';
-import './index.scss';
+import React, { Children, useEffect } from "react";
+import classNames from "classnames";
+import Tooltip from "../../components/tooltip";
+import NavTop from "../../components/nav-top";
+import FollowerVisitor from "../../components/follower-visitor";
+import InvitePeople from "../../components/invite-people";
+import HelpCard from "../../components/help-card";
+import PointDemo from "../../components/point-demo/point-demo";
+import { isOfficialSite, isPlatform } from "../../utils/platform";
+import "./index.scss";
+import { getTenantInfo } from "../../utils/helpers";
+import HrHeader from "../../components/hr-header";
 
 const preCls = `titaui-aha-2021`;
 
 const ContentTemplate = (props) => {
   const { children, title } = props;
 
-  const [isTrial] = useState(window.BSGlobal.tenantAuthentication.Version == 1);
-
   useEffect(() => {
     if (title) document.title = title;
   }, []);
@@ -40,12 +41,19 @@ const PageLayout = (props) => {
   const { children } = props;
 
   const isTrial =
-    window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
+    window.BSGlobal.tenantAuthentication.Version !== 1 && isOfficialSite();
+
+  const onClickKefu = () => {
+    const kefuUrl = isTrial
+      ? "https://wpa1.qq.com/vZYKN3kT?_type=wpa&qidian=true"
+      : "https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true";
+    window.open(kefuUrl);
+  };
 
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
-        <NavTop />
+        {getTenantInfo().Source == 964 ? <HrHeader /> : <NavTop />}
       </div>
       <div className={classNames(`${preCls}__message`)}>
         <FollowerVisitor />
@@ -54,6 +62,18 @@ const PageLayout = (props) => {
       <div className={classNames(`${preCls}__help`)}>
         <HelpCard />
       </div>
+      {!isTrial && (
+        <Tooltip
+          overlay={"联系客服"}
+          placement="left"
+          align={{ offset: [0, 0] }}
+        >
+          <div
+            className={classNames(`${preCls}__kefu`)}
+            onClick={onClickKefu}
+          />
+        </Tooltip>
+      )}
       {isTrial && (
         <div className={classNames(`${preCls}__invite`)}>
           <InvitePeople />

package/src/pages/aha2021/kefu.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42px" height="42px" viewBox="0 0 42 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>联系客服</title>
+    <defs>
+        <linearGradient x1="50%" y1="3.061617e-15%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#4E90FF" offset="0%"></stop>
+            <stop stop-color="#2879FF" offset="100%"></stop>
+        </linearGradient>
+        <circle id="path-2" cx="21" cy="21" r="21"></circle>
+        <filter x="-9.5%" y="-9.5%" width="119.0%" height="119.0%" filterUnits="objectBoundingBox" id="filter-3">
+            <feMorphology radius="2" operator="erode" in="SourceAlpha" result="shadowSpreadInner1"></feMorphology>
+            <feGaussianBlur stdDeviation="3" in="shadowSpreadInner1" result="shadowBlurInner1"></feGaussianBlur>
+            <feOffset dx="0" dy="0" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
+            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
+            <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.5 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
+        </filter>
+        <path d="M16.0326322,22.3870375 C17.2658552,23.6988927 19.0348583,24.52 21,24.52 C22.9651417,24.52 24.7341448,23.6988927 25.9677254,22.3884226 C28.2561116,22.7713626 30,24.7620278 30,27.16 L30,28.48 C30,30.4240423 28.4240423,32 26.48,32 L15.52,32 C13.5759577,32 12,30.4240423 12,28.48 L12,27.16 C12,24.7620278 13.7438884,22.7713626 16.0326322,22.3870375 Z M21,12.75 C23.7338095,12.75 25.95,15.0646878 25.95,17.92 C25.95,20.7753122 23.7338095,23.09 21,23.09 C18.2661905,23.09 16.05,20.7753122 16.05,17.92 C16.05,15.0646878 18.2661905,12.75 21,12.75 Z" id="path-4"></path>
+        <filter x="-8.3%" y="-7.8%" width="116.7%" height="115.6%" filterUnits="objectBoundingBox" id="filter-5">
+            <feGaussianBlur stdDeviation="1.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
+            <feOffset dx="0" dy="0" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
+            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
+            <feColorMatrix values="0 0 0 0 0.156862745   0 0 0 0 0.474509804   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
+        </filter>
+        <path d="M21,10 C24.9277825,10 28.2259218,12.625855 29.1450821,16.1736317 C29.6496186,16.4041954 30,16.914055 30,17.5057506 L30,19.053028 C30,19.8630456 29.343351,20.5196947 28.5333333,20.5196947 L28.3666667,20.5196947 C27.556649,20.5196947 26.9,19.8630456 26.9,19.053028 L26.9,17.5057506 C26.9,17.0104727 27.1454948,16.5725332 27.5214379,16.3069786 C26.6936147,13.562158 24.0870351,11.5584733 21,11.5584733 C17.9129808,11.5584733 15.3064121,13.5621374 14.4762481,16.3071469 C14.8545052,16.5725332 15.1,17.0104727 15.1,17.5057506 L15.1,19.053028 C15.1,19.8630456 14.443351,20.5196947 13.6333333,20.5196947 L13.4666667,20.5196947 C12.656649,20.5196947 12,19.8630456 12,19.053028 L12,17.5057506 C12,16.9136645 12.3508441,16.4035223 12.8559786,16.171878 C13.7744369,12.6255694 17.0724311,10 21,10 Z" id="path-6"></path>
+        <filter x="-2.8%" y="-4.8%" width="105.6%" height="109.5%" filterUnits="objectBoundingBox" id="filter-7">
+            <feGaussianBlur stdDeviation="0.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
+            <feOffset dx="0" dy="0" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
+            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
+            <feColorMatrix values="0 0 0 0 0.156862745   0 0 0 0 0.474509804   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="整体框架" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-1142.000000, -684.000000)" id="联系客服">
+            <g transform="translate(1142.000000, 684.000000)">
+                <g id="椭圆形">
+                    <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                </g>
+                <g id="形状结合">
+                    <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-4"></use>
+                    <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
+                </g>
+                <g id="形状结合" fill-rule="nonzero">
+                    <use fill="#FFFFFF" xlink:href="#path-6"></use>
+                    <use fill="black" fill-opacity="1" filter="url(#filter-7)" xlink:href="#path-6"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/pages/group-management/tree/group-form/index.js

@@ -4,6 +4,7 @@ import UserSelector from '../../../../components/user-selector';
 import { Textarea, Radio } from 'tita-ui';
 import { getVisible } from '../../groupInterface';
 import { getLocale } from '../../../../utils/getLocale';
+import { inputWordTrans } from '../../../../utils/i18n-front-translate';
 import './index.scss'
 
 const preCls = 'user-group-page'
@@ -58,7 +59,7 @@ export default forwardRef((props, ref) => {
       }
     }
     if (value.length > 50) {
-      setGroupNameErrMsg(`已输入${value.length}个字，最多可输入50个字`)
+      setGroupNameErrMsg(inputWordTrans(value.length, 50))
     } else {
       setGroupNameErrMsg('')
     }
@@ -66,7 +67,7 @@ export default forwardRef((props, ref) => {
 
   const onGroupNameBlur = () => {
     if (groupName.length > 50) {
-      setGroupNameErrMsg(`已输入${groupName.length}个字，最多可输入50个字`)
+      setGroupNameErrMsg(inputWordTrans(groupName.length, 50))
     } else {
       setGroupNameErrMsg('')
     }

package/src/pages/home/components/data-list/index.scss

@@ -1,8 +1,8 @@
 .homepage-datalist {
-  background-color: #f7f9fb;
   height: calc(100vh - 41px);
   overflow: auto;
-  padding: 14px 20px;
+  box-sizing: border-box;
+  padding-bottom: 20px;
   box-sizing: border-box;
   div {
     // box-sizing: border-box;
@@ -54,8 +54,27 @@
       justify-content: start;
       align-items: center;
       &--type {
-        width: 58px;
+        .titaui-select .tui-select-selection-item, .titaui-select .tui-select-selection-placeholder {
+          font-size: 12px !important;
+          font-weight: 400 !important;
+          color: #3f4755;
+          line-height: 30px;
+        }
+        .titaui-select .tui-select-selector:before {
+          display: none;
+        }
+        .titaui-select .tui-select-selector {
+          padding: 0 !important;
+        }
         position: relative;
+        cursor: pointer;
+        display: inline-flex;
+        align-items: center;
+        font-size: 12px;
+        margin-right: 12px;
+        &:hover {
+          color: #2879ff;
+        }
         &--text {
           width: 58px;
           position: absolute;
@@ -73,12 +92,6 @@
             height: 8px;
           }
         }
-        &:hover > div {
-          color: #2879ff;
-          .tu-icon-arrow-down1 {
-            color: #2879ff;
-          }
-        }
       }
       b {
         margin: 0 10px;

package/src/pages/home/components/data-list/index.tsx

@@ -19,7 +19,7 @@ const HomePageDataList = () => {
 
   const [source, setSource] = useState('')//从url中获取页面来源
   const [type, setType] = useState('')//从url中获取查找类型
-  const [cycleTime, setCycleTime] = useState<CycleTime>({ name: getLocale('OKR_MyO_Butt_AllStates'), yearNum: '2021', cycleType: '-1', yqmNum: '0' })//周期时间
+  const [cycleTime, setCycleTime] = useState<CycleTime>({ name: getLocale('OKR_MyO_Butt_AllStatee'), yearNum: '2021', cycleType: '-1', yqmNum: '0' })//周期时间
 
   const typeMap = new Map()
   typeMap.set('all', getLocale('Mod_all'))
@@ -57,9 +57,9 @@ const HomePageDataList = () => {
           {getLocale('Mod_Back')}
         </a>
         <b />
-        {source === 'align' && 'OKR 对齐'}
-        {source === 'update' && 'OKR 更新'}
-        {source === 'target' && '我的OKR'}
+        {source === 'align' && getLocale('HP_OKRAlignment')}
+        {source === 'update' && getLocale('OKR_MyO_OKRUpdate')}
+        {source === 'target' && getLocale('OKR_Menu_Title_MyOKRs')}
       </div>
       <div className={`${preCls}__main`}>
         <HomeNavSelector