@titaui/pc 1.9.28 → 1.9.32

package/src/components/dialog/index.js

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import Dialog from 'rc-dialog';
+import loading from './loading.png';
 import { getLocale } from '../../utils/getLocale'
 
 import 'rc-dialog/assets/index.css';
@@ -20,25 +21,38 @@ export default props => {
     noCloseIcon,
     noFooterLine,
     visible,
-    extraClass=[],
+    extraClass = [],
     extendFooterBtn,
     disabled = false,
+    confirmLoading = false,
     ...restProps
   } = props;
 
+  const handleOK = () => {
+    if (confirmLoading) return
+    onOk && onOk()
+  }
+
   const baseFooter = [
     extendFooterBtn,
     <span key="cancel" className={classNames(`${preCls}__btn`, `${preCls}__btn-cancel`)} onClick={onCancel}>
       <span className={classNames(`${preCls}__btn-cancel-text`)}>{cancelText}</span>
     </span>,
-    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`, {[`${preCls}__btn-ok-not-allowed`]:disabled})} onClick={onOk}>
-      <span className={classNames(`${preCls}__btn-ok-text`)}>{okText}</span>
+    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`, { [`${preCls}__btn-ok-not-allowed`]: disabled || confirmLoading })} onClick={handleOK}>
+      {confirmLoading ?
+        <span className={classNames(`${preCls}__btn-ok-loading`)}>
+          <img className={classNames(`${preCls}__btn-ok-loading-icon`)} src={loading} />
+          {getLocale('Mod_loading')}
+        </span>
+        :
+        <span className={classNames(`${preCls}__btn-ok-text`)}>{okText}</span>
+      }
     </span>
   ];
 
   return <Dialog
     visible={visible}
-    className={classNames(preCls,[...extraClass], { 
+    className={classNames(preCls, [...extraClass], {
       [`${preCls}-no-head-line`]: noHeadLine,
       [`${preCls}-no-footer-line`]: noFooterLine,
       [`${preCls}-no-close`]: noCloseIcon,

package/src/components/dialog/index.scss

@@ -1,13 +1,23 @@
-$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+$font-family: -apple-system,
+Arial,
+Verdana,
+Helvetica Neue,
+Helvetica,
+sans-serif,
+PingFang SC,
+Microsoft YaHei;
+
 .rc-dialog-close {
   z-index: 100;
 }
+
 .rc-dialog-wrap {
   display: flex;
   justify-content: center;
   align-items: center;
   z-index: 1299 !important;
 }
+
 .rc-dialog-mask {
   z-index: 1299 !important;
   background: rgba(20, 28, 40, 0.7) !important;
@@ -16,6 +26,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
 .titaui-dialog {
   border-radius: 24px;
   overflow: hidden;
+
   &.rc-dialog {
     display: inline-block;
     margin: 0;
@@ -49,10 +60,12 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   .rc-dialog-header {
     padding: 18px 32px;
   }
+
   .rc-dialog-body {
     // padding: 0 32px 0 32px;
     padding: 0;
   }
+
   .rc-dialog-footer {
     padding: 20px 32px;
     display: flex;
@@ -72,12 +85,15 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     justify-content: center;
     cursor: pointer;
     box-sizing: border-box;
-    & > span {
+
+    &>span {
       font-size: 14px;
       font-family: $font-family;
       font-weight: 400;
       line-height: 20px;
       text-align: center;
+      display: flex;
+      align-items: center;
       box-sizing: border-box;
     }
   }
@@ -88,20 +104,36 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     border: 1px solid #2879ff;
     color: #ffffff;
     transition: 0.2s all;
+    user-select: none;
+
     &:hover {
       border: 1px solid #5c8eff;
       background: #5c8eff;
       color: #ffffff;
     }
+
     &-not-allowed {
+      background-color: #5C8EFF;
       cursor: not-allowed;
     }
+
+    &-loading {
+      &-icon {
+        width: 14px;
+        margin-right: 6px;
+        animation-name: spin;
+        animation-timing-function: linear;
+        animation-iteration-count: infinite;
+        animation-duration: 1s;
+      }
+    }
   }
 
   &__btn-cancel {
     border: 1px solid #DFE3EA;
     color: #6f7886;
     transition: 0.2s all;
+
     &:hover {
       border: 1px solid #2879ff;
       color: #2879ff;
@@ -114,11 +146,13 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     border-bottom: none;
   }
 }
+
 .titaui-dialog.titaui-dialog-no-footer-line {
   .rc-dialog-footer {
     border-top: none;
   }
 }
+
 .titaui-dialog.titaui-dialog-no-close {
   .rc-dialog-close {
     display: none;
@@ -130,3 +164,13 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     display: none;
   }
 }
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}

package/src/components/dynamic/dynamic-item/dynamic-create-o/index.scss

@@ -36,6 +36,7 @@
       line-height: 18px;
       margin-right: 4px;
       margin-top: 1px;
+      word-break: keep-all;
     }
     &-name {
       font-size: 14px;

package/src/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.tsx

@@ -9,6 +9,7 @@ import { getFeedTypeAndTypeColor } from '../../util';
 import { highLightWord } from '../../../../utils/tools';
 import { getUserInfo } from '../../../../utils/bs-global';
 import Guanlian from './img/guanlian.png';
+import { getLocale } from '../../../../utils/getLocale';
 import './index.scss';
 
 const prefix = 'titaui-dynamic-share-to-dynamic';
@@ -27,7 +28,7 @@ const DynamicShare: FC<IDynamicItemContentProps> = ({ data, hasDynamicOpereateAu
 	const renderDesc = useMemo(() => {
 		return (
 			<Fragment>
-				<span className={prefix + '__operate-desc'}>分享了一堂好课</span>
+				<span className={prefix + '__operate-desc'}>{getLocale('Feed_sharedexcelle')}</span>
 				<span className={prefix + '-desc-operate-type'} style={{ background: feedTypeColor }} />
 			</Fragment>
 		);

package/src/components/help-card/image/liaojie.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="240px" height="240px" viewBox="0 0 240 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>liaojie</title>
+    <g id="liaojie" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M120,20 C64.771525,20 20,64.771525 20,120 C20,175.228475 64.771525,220 120,220 C175.228475,220 220,175.228475 220,120 C220,64.771525 175.228475,20 120,20 Z M120,36 C166.391919,36 204,73.608081 204,120 C204,166.391919 166.391919,204 120,204 C73.608081,204 36,166.391919 36,120 C36,73.608081 73.608081,36 120,36 Z" id="椭圆形" fill="#141C28" fill-rule="nonzero"></path>
+        <path d="M120.008756,67 C111.978786,67 104.365434,69.5751522 98.5581514,74.2740154 C92.5462972,79.1476855 89.1380286,85.7464547 89.0041026,92.8525998 L89,93.4421688 C89,98.0147412 92.7048728,101.721543 97.275065,101.721543 C101.845257,101.721543 105.55013,98.0147412 105.55013,93.4421688 L105.55013,93.2882935 C105.55013,87.633082 111.918127,82.717229 120.008756,82.717229 C128.099386,82.717229 134.467382,87.633082 134.467382,93.2882935 C134.467382,97.3618411 131.236598,101.705432 126.529119,103.512236 L126.226653,103.624092 C121.998705,105.120732 118.37505,107.759616 115.76761,111.242806 C113.200769,114.69201 111.71593,119.721641 111.71593,124.292547 L111.71593,134.720625 C111.71593,139.293198 115.420803,143 119.990995,143 C124.561188,143 128.26606,139.293198 128.26606,134.720625 L128.26606,124.095087 C128.26606,121.733292 129.969128,119.083428 132.030331,118.350524 C143.332617,114.321686 151.000085,104.106804 151.000085,93.2882935 C151.0197,86.0248852 147.599248,79.251479 141.461239,74.2755365 C135.666971,69.5693086 128.057111,67 120.008756,67 Z" id="路径" fill="#2879FF" fill-rule="nonzero"></path>
+        <path d="M109,162 C109,168.075132 113.924868,173 120,173 C126.075132,173 131,168.075132 131,162 C131,155.924868 126.075132,151 120,151 C113.924868,151 109,155.924868 109,162 Z" id="路径" fill="#000000" fill-rule="nonzero"></path>
+    </g>
+</svg>

package/src/components/help-card/index.scss

@@ -14,7 +14,8 @@
   &-image {
     width: 24px;
     height: 24px;
-    background: url("./image/kefu.svg") 50% 50% no-repeat;
+    background: url("./image/liaojie.svg") 50% 50% no-repeat;
+    background-size: 24px 24px;
   }
 
   &-canceled {
@@ -206,20 +207,20 @@
   }
 
   100% {
-    transform: rotate(90deg);
+    transform: rotate(-90deg);
   }
 }
 
 @keyframes titaZoomInLB {
   0% {
     opacity: 0;
-    transform-origin: 0 100%;
+    transform-origin: 100% 100%;
     transform: scale(0, 0);
   }
 
   100% {
     opacity: 1;
-    transform-origin: 0 100%;
+    transform-origin: 100% 100%;
     transform: scale(1, 1);
   }
 }
@@ -227,13 +228,13 @@
 @keyframes titaZoomOutLB {
   0% {
     opacity: 1;
-    transform-origin: 0 100%;
+    transform-origin: 100% 100%;
     transform: scale(1, 1);
   }
 
   100% {
     opacity: 0;
-    transform-origin: 0 100%;
+    transform-origin: 100% 100%;
     transform: scale(0, 0);
   }
 }

package/src/components/help-card/index.tsx

@@ -209,7 +209,7 @@ const HelpCard: FC<HelpCardProps> = ({ ...restProps }) => {
     <div {...restProps}>
       <Popup
         popupTransitionName="tita-popup-zoom-left-bottom"
-        placement="topRight"
+        placement="topLeft"
         popupAlign={{
           offset: [-32, -10],
           overflow: {

package/src/components/hr-header/index.tsx

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import classNames from 'classnames';
 import axios from 'axios';
 import  Popup  from '../popup';
-import { getLoginUserInfo } from '&/utils/helpers';
+import { getLoginUserInfo } from '../../utils/helpers';
 import './index.scss';
 
 interface Props {}

package/src/components/menus/components/flip-menu-card/index.scss

@@ -130,6 +130,7 @@
     background-repeat: no-repeat;
     background-position: 50% 4px;
     animation: hasMoreLight 0.5s 0.2s linear infinite;
+    cursor: pointer;
   }
 }
 @keyframes hasMoreLight {

package/src/components/menus/components/flip-menu-card/index.tsx

@@ -159,6 +159,13 @@ export default forwardRef((props: Props, ref) => {
       } else {
         setShowMore(false);
       }
+      scrollArea.addEventListener('scroll', () => {
+        if(scrollArea.scrollHeight - scrollArea.offsetHeight == scrollArea.scrollTop) {
+          setShowMore(false)
+        } else {
+          setShowMore(true);
+        }
+      })
     };
     const observer = new MutationObserver(callback);
 

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

@@ -1,7 +1,8 @@
 import React, { useState, useRef, useEffect } from "react";
 import classNames from "classnames";
 import { withRouter } from "react-router";
-import { ResizeObserver } from '@juggle/resize-observer';
+// import { ResizeObserver } from '@juggle/resize-observer';
+import ResizeObserver from 'resize-observer-polyfill';
 import FlipCard, { flipRefIns } from "../../components/flip-menu-card";
 import MenuTree from "../../components/menu-tree";
 import Scrollbar from '../../../scrollbar';
@@ -22,7 +23,7 @@ const AppraisalMenus = (props: Props) => {
   const { onSelect = () => { }, history } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - (220 + 28 * 2);
+    return document.body.offsetHeight - 170;
   });
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
 
@@ -74,7 +75,7 @@ const AppraisalMenus = (props: Props) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - (220 + 28 * 2));
+        setMaxHeight(cr.height - 170);
       }
     })
     obs.observe(document.body);

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

@@ -1,7 +1,8 @@
 import React, { useState, useEffect, useRef } from "react";
 import classNames from 'classnames';
 import { locale } from '../../../i18n';
-import { ResizeObserver } from '@juggle/resize-observer';
+// import { ResizeObserver } from '@juggle/resize-observer';
+import ResizeObserver from 'resize-observer-polyfill';
 import MenuTree from "../../../components/menu-tree";
 import { getDepsAndUsers } from "../../../request-apis";
 import { DEPART_NODE, USER_NODE } from '../../../components/menu-tree/tree-node/index';

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

@@ -1,6 +1,7 @@
 import React, { useState, useRef, useEffect, forwardRef, useImperativeHandle } from "react";
 // import classNames from "classnames";
-import { ResizeObserver } from '@juggle/resize-observer';
+// import { ResizeObserver } from '@juggle/resize-observer';
+import ResizeObserver from 'resize-observer-polyfill';
 import { flipRefIns } from "../../components/flip-menu-card";
 import Scrollbar from '../../../scrollbar';
 import MenuTree from "../../components/menu-tree";
@@ -31,7 +32,7 @@ export default forwardRef((props: Props, ref) => {
   } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - (220 + 28 * 2);
+    return document.body.offsetHeight - 210;
   });
   const [expandedKeys, setExpandedKeys] = useState(['myokr']);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
@@ -158,7 +159,7 @@ export default forwardRef((props: Props, ref) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - (220 + 28 * 2));
+        setMaxHeight(cr.height - 210);
       }
     })
     obs.observe(document.body);

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

@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useRef } from "react";
 import classNames from 'classnames';
-import { ResizeObserver } from '@juggle/resize-observer';
+// import { ResizeObserver } from '@juggle/resize-observer';
+import ResizeObserver from 'resize-observer-polyfill';
 import MenuTree from "../../../components/menu-tree";
 import { getSubordinates } from "../../../request-apis";
 import { ITreeNode } from "../../../types";
@@ -24,7 +25,7 @@ export default (props) => {
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
   const [loginUserId] = useState(window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0);
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - (240);
+    return document.body.offsetHeight - 200;
   });
 
   useEffect(() => {
@@ -76,7 +77,7 @@ export default (props) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - (240));
+        setMaxHeight(cr.height - 200);
       }
     })
     obs.observe(document.body);

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

@@ -28,7 +28,7 @@ const Reply = (props) => {
 
   const feedText = () => {
     if (!item.content.trim()) {
-      return '分享了附件';
+      return '分享了文件';
     } else {
       return deleteText(htmlToText(item.content));
     }

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

@@ -1,4 +1,5 @@
 import React, { FC, useState, useEffect, useRef, useCallback } from "react";
+import { inputWordTrans } from "../../../../utils/i18n-front-translate";
 import { getLocale } from "../../../../utils/getLocale";
 import "./index.scss";
 
@@ -93,7 +94,7 @@ const ODesc: FC<IODescProps> = ({
     if (!hasError) return <span></span>;
     return (
       <span className="o-desc__errror-tips">
-        已输入{desc.trim().length}个字,最多可输入{maxLength}字
+        {inputWordTrans(desc.trim().length, maxLength)}
       </span>
     );
   };

package/src/components/okr-detail/components/editable-input/index.tsx

@@ -1,6 +1,7 @@
 import React, { useRef, useState, useEffect } from "react";
-import ErrorTip from "../../../tooltip/error-tip";
 import classNames from "classnames";
+import ErrorTip from "../../../tooltip/error-tip";
+import { inputWordTrans } from "../../../../utils/i18n-front-translate";
 
 import './index.scss';
 
@@ -45,7 +46,7 @@ export default (props: IProps) => {
       return setErrorTip(emptyMessage || '');
     }
     if (val.length > maxLength) {
-      return setErrorTip(`已输入${val.length}字，最多可输入${maxLength}字`);
+      return setErrorTip(inputWordTrans(val.length, maxLength));
     }
     setText(val);
     setErrorTip('');

package/src/components/okr-detail/components/header/edit-name.tsx

@@ -3,6 +3,7 @@ import classNames from "classnames";
 import Toast from "../../../toast";
 import { updateOkrName } from "../../request-apis";
 import { getLocale } from "../../../../utils/getLocale";
+import { inputWordTrans } from "../../../../utils/i18n-front-translate";
 
 interface IEditNameProps {
   okrName: string;
@@ -27,7 +28,7 @@ const EditNameCmp = (props: IEditNameProps) => {
       return;
     }
     if (val.length > 500) {
-      setErrorTip(`已输入${val.length}字，最多可输入500字`);
+      setErrorTip(inputWordTrans(val.length, 500));
       return;
     }
     setErrorTip("");

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

@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react'
 import Popup from '../../../../../../popup';
 import styled from 'styled-components'
 import { getLocale, isEn } from "../../../../../../../utils/getLocale";
+import { inputWordTrans } from '../../../../../../../utils/i18n-front-translate';
 
 const Wrapper = styled.div`
   min-width: 343px;
@@ -172,7 +173,7 @@ export default class EditPop extends PureComponent<Props> {
     this.setState({
       value: value,
       showError: maxLength && value.length > maxLength,
-      errMsg: `已输入 ${value.length} 个字，最多可输入 ${maxLength} 个字`,
+      errMsg: inputWordTrans(value.length, maxLength),
       disable: maxLength && value.length > maxLength && disable ? true : false
     })
 

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/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/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/table/index.scss

@@ -42,6 +42,7 @@
     .rc-table td {
       font-size: 14px;
       padding: 13px 4px;
+      overflow: hidden;
     }
 
     .rc-table-content {

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>