@titaui/pc 1.8.5 → 1.8.9

package/src/components/upload-photo-modal/index.tsx

@@ -1,44 +1,37 @@
 import React, { useState, useRef } from 'react';
 import classNames from 'classnames';
 import Cropper from 'react-cropper';
-import 'cropperjs/dist/cropper.css';
 import Toast from '../../components/toast';
 import ConditionRender from '../condition-render';
 import { saveTenantLogo, saveBrowserIcon, saveUserPhoto } from './request-api';
 import Dialog from '../../components/dialog';
-import { List } from './constant'
+import { List } from './constant';
+import 'cropperjs/dist/cropper.css';
 import './index.scss';
-import uuid from 'uuid';
-import { getBSGlobal, getUserInfo, getTenantInfo } from '../../utils/bs-global';
-const apiServer = getBSGlobal("apiPath")
-const userid = getUserInfo().Id;
-const tenantId = getTenantInfo().Id
-
 
 const preCls = 'tita-ui-change-person-photo';
-
 interface Props {
   visible: boolean;
 	type: string; // person enterprise browser
   onCancel: Function;
+  handleSuccessUploadPhoto: Function;
 }
 
 const ChangePhoto = (props: Props) => {
-	const { visible, onCancel, type = 'browser' } = props;
+	const { visible, onCancel, type = 'person', handleSuccessUploadPhoto } = props;
 
 	const modalRef = useRef<any>();
+  const cropperRef = useRef<HTMLImageElement>(null);
 
 	const [ image, setImage ] = useState('');
 	const [ cropper, setCropper ] = useState<any>();
 	const [ cropData, setCropData ] = useState('#');
-  const [item] = useState(List.find(item => item.id === type));
-  const [isEnter, setIsEnter] = useState(false);
-  const [fileName, setFileName] = useState('')
-
-	const cropperRef = useRef<HTMLImageElement>(null);
+  const [ isEnter, setIsEnter ] = useState(false);
+  const [ fileName, setFileName ] = useState('')
 
+  const item = List.find(item => item.id === type)
+	
 	const onChange = (e: any) => {    
-		e.preventDefault();
 		let files;
 		if (e.dataTransfer) {
 			files = e.dataTransfer.files;
@@ -81,36 +74,37 @@ const ChangePhoto = (props: Props) => {
     setCropper(formData);
 	};
 
+  const handleSuccessSave = (resp) => {
+    if (resp.Code === 1) {
+      Toast.Success('保存成功', {
+        style: { position: "fixed", top: " 36px", left: "50%" },
+      });
+      onCancel();
+      setImage('');
+      handleSuccessUploadPhoto(cropData);
+    } else {
+      Toast.Error(resp.Message, {
+        style: { position: "fixed", top: " 36px", left: "50%" },
+      });
+      setImage('');
+    }
+  }
+
   const handleSaveInfo =  () => {
     if (!image) {
       return;
     } else {
       if(type === "person")  {
         saveUserPhoto(cropper).then((resp) => {
-          if (resp.Code === 1) {
-            Toast.Success('保存成功', { canClose: false });
-            onCancel();
-          } else {
-            Toast.Error(resp.Message, { canClose: false });
-          }
+          handleSuccessSave(resp);
         });
       } else if(type === "enterprise") {  
         saveTenantLogo( cropper ).then((resp) => {
-          if (resp.Code === 1) {
-            Toast.Success('保存成功', { canClose: false });
-            onCancel();
-          } else {
-            Toast.Error(resp.Message, { canClose: false });
-          }
+          handleSuccessSave(resp);
         });
       }  else {
         saveBrowserIcon( cropper ).then((resp) => {
-          if (resp.Code === 1) {
-            Toast.Success('保存成功', { canClose: false });
-            onCancel();
-          } else {
-            Toast.Error(resp.Message, { canClose: false });
-          }
+          handleSuccessSave(resp);
         });
       }  
     }
@@ -124,6 +118,11 @@ const ChangePhoto = (props: Props) => {
     setIsEnter(false);
   }
 
+  const handleCancel = () => {
+    onCancel();
+    setImage('');
+  } 
+
 	return (
 		<Dialog
 			visible={visible}
@@ -134,8 +133,8 @@ const ChangePhoto = (props: Props) => {
 			title={'上传头像'}
 			noHeadLine
 			maskClosable={false}
-			onClose={onCancel}
-			onCancel={onCancel}
+			onClose={handleCancel}
+			onCancel={handleCancel}
 			okText="保存"
 			noFooterLine
 			onOk={handleSaveInfo}
@@ -153,19 +152,9 @@ const ChangePhoto = (props: Props) => {
 									accept={item?.accept}
 								/>
 								<span className={`${preCls}__upload-right-title`}>点击上传</span>
-								<ConditionRender condition={type === 'person'}>
-									<span className={`${preCls}__upload-right-tips`}>
-										{item?.tips}
-									</span>
-								</ConditionRender>
-								<ConditionRender condition={type === 'enterprise'}>
-									<span className={`${preCls}__upload-right-tips`}>
-                  {item?.tips}
-									</span>
-								</ConditionRender>
-								<ConditionRender condition={type === 'browser'}>
-									<span className={`${preCls}__upload-right-tips`}>{item?.tips}</span>
-								</ConditionRender>
+								<span className={`${preCls}__upload-right-tips`}>
+									{item?.tips}
+								</span>
 							</div>
 						</div>
 						<div className={`${preCls}__upload-left`}>
@@ -174,11 +163,7 @@ const ChangePhoto = (props: Props) => {
 								<div className={`${preCls}__upload-left-box2`} />
 								<div className={`${preCls}__upload-left-box3`} />
 							</ConditionRender>
-							<ConditionRender condition={type === 'enterprise'}>
-								<div className={`${preCls}__upload-left-box`} />
-								<span className={`${preCls}__upload-left-preview`}>{item?.previewTitle}</span>
-							</ConditionRender>
-							<ConditionRender condition={type === 'browser'}>
+							<ConditionRender condition={type === 'enterprise' || type === 'browser'}>
 								<div className={`${preCls}__upload-left-box`} />
 								<span className={`${preCls}__upload-left-preview`}>{item?.previewTitle}</span>
 							</ConditionRender>
@@ -203,9 +188,9 @@ const ChangePhoto = (props: Props) => {
 						/>
 						<div className={classNames(`${preCls}__preview-box`, {[`${preCls}__preview-box-bgc`]:type === "enterprise"}, {[`${preCls}__preview-box-browser`]:type === "browser"})}>
               <ConditionRender condition={type === "person"}>
-							<img src={cropData} className={`${preCls}__preview-box1`} />
-							<img src={cropData} className={`${preCls}__preview-box2`} />
-							<img src={cropData} className={`${preCls}__preview-box3`} />
+							  <img src={cropData} className={`${preCls}__preview-box1`} />
+							  <img src={cropData} className={`${preCls}__preview-box2`} />
+							  <img src={cropData} className={`${preCls}__preview-box3`} />
               </ConditionRender>
               <ConditionRender condition={type === "enterprise"}>
                 <img src={cropData} className={`${preCls}__preview-enterprise-img`}/>

package/src/components/upvote/attitude.ts

@@ -1,32 +1,36 @@
-export default [
-  {
-    type: 2,
-    tittle: '祝贺',
-    img: require('./img/welldone.svg'),
-  },
-  {
-    type: 4,
-    tittle: '加油',
-    img: require('./img/fighting.svg'),
-  },
-  {
-    type: 3,
-    tittle: '比心',
-    img: require('./img/bixin.svg'),
-  },
-  {
-    type: 6,
-    tittle: '666',
-    img: require('./img/666.svg'),
-  },
-  {
-    type: 5,
-    tittle: '有见地',
-    img: require('./img/nice.svg'),
-  },
-  {
-    type: 1,
-    tittle: '点赞',
-    img: require('./img/thumb-up.svg'),
-  },
-];
+import { getLocale } from "../../utils/getLocale";
+
+export default () => {
+  return [
+    {
+      type: 2,
+      tittle: getLocale('Pro_page_Int_Butt_Congratulate'),
+      img: require('./img/welldone.svg'),
+    },
+    {
+      type: 4,
+      tittle: getLocale('Pro_page_Int_Butt_Comeon'),
+      img: require('./img/fighting.svg'),
+    },
+    {
+      type: 3,
+      tittle: getLocale('Pro_page_Int_Butt_Finheart'),
+      img: require('./img/bixin.svg'),
+    },
+    {
+      type: 6,
+      tittle: '666',
+      img: require('./img/666.svg'),
+    },
+    {
+      type: 5,
+      tittle: getLocale('Pro_page_Int_Beinsightful'),
+      img: require('./img/nice.svg'),
+    },
+    {
+      type: 1,
+      tittle: getLocale('Mod_Kudos'),
+      img: require('./img/thumb-up.svg'),
+    },
+  ]
+};

package/src/components/upvote/index.tsx

@@ -7,11 +7,12 @@ import React, {
 } from "react";
 import firework from "../firework";
 import VoteSelector from "./selector";
-import attitudeArr from "./attitude";
+import getAttitudeArr from "./attitude";
 import classnames from "classnames";
 import { praise, cancelPraise } from "./request-apis";
 import UpvoteListModal from "./upvoteListModal";
 import Tooltip from "../tooltip";
+import { getLocale } from "../../utils/getLocale";
 import "./index.scss";
 
 interface Props {
@@ -30,7 +31,7 @@ interface Props {
 }
 
 const getBackgroundImage = (type) => {
-  let selected = attitudeArr.find((a) => a.type == type);
+  let selected = getAttitudeArr().find((a) => a.type == type);
   if (selected) {
     return {
       backgroundImage: `url(${selected.img})`,
@@ -66,7 +67,7 @@ function UpvoteButton({
     firework({
       x: x,
       y: y,
-      images: attitudeArr.map((a) => a.img),
+      images: getAttitudeArr().map((a) => a.img),
     });
   }, []);
   return (
@@ -131,7 +132,7 @@ function UpvoteButton({
           upvoteState.count > 0 && setModalVisible(true);
         }}
       >
-        <Tooltip overlay={"点赞记录"} placement="top">
+        <Tooltip overlay={getLocale('Tasks_Tab_MyS_Kudosrec')} placement="top">
           <span>
             {renderCount
               ? renderCount(upvoteState.type, upvoteState.count)
@@ -152,7 +153,7 @@ export const UpvoteButtonForFeed = (props: Props) => {
     <UpvoteButton
       {...props}
       renderBuntton={(type) => {
-        let text = !type ? "点赞" : "已赞";
+        let text = !type ? getLocale('Mod_Kudos') : getLocale('Mod_Alreadyliked');
         return (
           <div style={{ display: "flex", alignItems: "center" }}>
             <div
@@ -173,7 +174,7 @@ export const UpvoteButtonForFeed = (props: Props) => {
     />
   );
 };
-UpvoteButton.getAttitudes = () => attitudeArr.map(att => ({...att}))
+UpvoteButton.getAttitudes = () => getAttitudeArr().map(att => ({...att}))
 UpvoteButton.ForFeed = UpvoteButtonForFeed;
 
 export default UpvoteButton;

package/src/components/upvote/selector.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, cloneElement, useCallback, useRef } from 'react';
 import Trigger from 'rc-trigger';
 import Queue from 'rc-queue-anim';
-import attitudeArr from './attitude';
+import getAttitudeArr from './attitude';
 
 type alignType = 'right'|'center'|'left';
 interface Props {
@@ -96,7 +96,7 @@ const VoteSelector: React.FC<Props> = ({ getPopupContainer, children, onSelect,a
                 onMouseOut={hide}
                 className='feed-upvote-selector'
               >
-                {attitudeArr.map((att) => (
+                {getAttitudeArr().map((att) => (
                   <div
                     key={att.type}
                     className='feed-upvote-selector__item'

package/src/components/upvote/upvoteListModal.tsx

@@ -2,6 +2,7 @@ import React, { ReactElement, useCallback, useEffect, useRef, useState } from 'r
 import { Avatar, Modal } from 'tita-ui';
 import { getPriseList } from './request-apis';
 import { OpenUserName } from '../../utils/open-data';
+import { getLocale } from '../../utils/getLocale';
 
 interface Props {
   feedId: string;
@@ -74,7 +75,7 @@ function UpvoteListModal({ feedId, visible, onClose }) {
     visible={visible}
     className='pull-screen-ignore document-mouse-event-ignore'
     destroyOnClose
-    title='点赞记录'
+    title={getLocale('Tasks_Tab_MyS_Kudosrec')}
     height={480}
     width={480}
     onCancel={onClose}

package/src/components/user-selector/action-btns/btn-cancel.js

@@ -1,8 +1,9 @@
 import React from 'react';
+import {getLocale} from '../../../utils/getLocale';
 import './index.scss';
 
 export default props => {
   return <span className="persel-btn-cancel" onClick={props.onClick}>
-    <span>取消</span>
+    <span>{getLocale('Mod_Cancel')}</span>
   </span>
 }

package/src/components/user-selector/action-btns/btn-ok.js

@@ -1,8 +1,9 @@
 import React from 'react';
+import {getLocale} from '../../../utils/getLocale';
 import './index.scss';
 
 export default props => {
   return <span className="persel-btn-ok" onClick={props.onClick}>
-    <span>确定</span>
+    <span>{getLocale('OKR_MyO_Butt_Determine')}</span>
   </span>
 }

package/src/components/user-selector/category-selector-panel/depart-tree.tsx

@@ -26,19 +26,20 @@ export default (props: Props) => {
     departOnly,
     sourceFrom,
     auth,
+    authType,
     isGetRoot,
     disabledDepartSelect,
   } = useContext(CommonContext);
 
   const onGetDepartTreeData = () => {
     return getTreeData('-1', {
-      departOnly, auth, isGetRoot, sourceFrom,
+      departOnly, auth, authType, isGetRoot, sourceFrom,
     });
   }
 
   const onLoadDepartNodes = nodeId => {
     return getTreeData(nodeId, {
-      departOnly, auth, isGetRoot, sourceFrom,
+      departOnly, auth, authType, isGetRoot, sourceFrom,
       'isLoadNodes': true
     });
   }

package/src/components/user-selector/category-selector-panel/index.tsx

@@ -1,22 +1,12 @@
 import React, { useContext, useState } from 'react';
 import Tabs, { TabPane } from '../../tabs';
+import { getPanesConfig } from '../constant';
 import { CommonContext } from '../context';
 import DepartTree from './depart-tree';
 import GroupTree from './group-tree';
 
 import './index.scss';
 
-const panesConfig = {
-  'depart': {
-    'label': '部门',
-    'Component': DepartTree
-  },
-  'group': {
-    'label': '群组',
-    'Component': GroupTree
-  }
-};
-
 interface Props {
   onSelect?: Function;
   selected?: any;
@@ -57,7 +47,7 @@ export default (props: Props) => {
         animated={{ 'inkBar': true, 'tabPane': true }}
       >
         {Object.keys(panes).map(panelKey => {
-          const { label, Component } = panesConfig[panelKey]
+          const { label, Component } = getPanesConfig()[panelKey]
           return <TabPane tab={label} key={panelKey}>
             {<Component
               onSelect={onSelect}
@@ -75,7 +65,7 @@ export default (props: Props) => {
       const panelKeys = Object.keys(panes);
       for (let i=0; i<panelKeys.length; i++) {
         if (panes[panelKeys[i]]) {
-          Component = panesConfig[panelKeys[i]].Component;
+          Component = getPanesConfig()[panelKeys[i]].Component;
           break;
         }
       }

package/src/components/user-selector/constant.ts

@@ -0,0 +1,16 @@
+import { getLocale } from '../../utils/getLocale';
+import DepartTree from './category-selector-panel/depart-tree';
+import GroupTree from './category-selector-panel/group-tree';
+
+export const getPanesConfig = () => {
+  return {
+    'depart': {
+      'label': getLocale('Mod_Department'),
+      'Component': DepartTree
+    },
+    'group': {
+      'label': getLocale('Mod_Groups'),
+      'Component': GroupTree
+    }
+  }
+};

package/src/components/user-selector/empty/group.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { isWechat } from '../../../utils/open-data';
-
+import {getLocale} from '../../../utils/getLocale';
 import './index.scss';
 
 export default () => {
@@ -16,7 +16,7 @@ export default () => {
         <div className="persel-empty">
           <span className="icon"></span>
         </div>
-        <div className='empty-tip'>您可以根据团队设置群组，设置后可以为团队目标选择群组</div>
+        <div className='empty-tip'>{getLocale('OKR_MyO_Pop_Teamsettings')}</div>
         <a href={url} target="_blank" className='add-group'>添加群组</a>
       </div>
     );

package/src/components/user-selector/empty/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import {getLocale} from '../../../utils/getLocale'
 import './index.scss';
 
 export default () => {
@@ -7,7 +8,7 @@ export default () => {
 		<div className="persel-empty">
 			<span className="icon"></span>
 		</div>
-		<span className='empty-tip'>这里什么都没有</span>
+		<span className='empty-tip'>{getLocale('OKR_MyO_Thnothinghere')}</span>
 	</div>
 	)
 }

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

@@ -20,7 +20,7 @@ interface Props {
   forceRender?: boolean;
   destroyPopupOnHide?: boolean;
   onPopupVisibleChange?: Function;
-  children?: JSX.Element[];
+  children?: any;
 }
 
 export default forwardRef((props: Props, ref) => {

package/src/components/user-selector/export-modules/field-tree-selector/index.scss

@@ -65,6 +65,6 @@
     background: #ffffff;
     box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
     border: 1px solid #f0f2f5;
-    border-radius: 4px;
+    border-radius: 12px;
   }
 }

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

@@ -14,7 +14,7 @@ import {
 import SelectorGenerater from './selector-generater';
 import Popup from "../../../popup";
 import { User } from "../../interface";
-
+import { getLocale } from "../../../../utils/getLocale";
 import "../../index.scss";
 import "./index.scss";
 
@@ -47,6 +47,7 @@ export interface PropsInterface {
   sourceFrom?: string;
   departOnly?: boolean;
   auth?: boolean;
+  authType?: string;
   placeholder?: string;
   getDepartRoot?: Function;
   destroyPopupOnHide?: boolean;
@@ -91,7 +92,8 @@ export default forwardRef((props: PropsInterface, ref) => {
     sourceFrom,
     departOnly,
     auth = false, // 数据权限
-    placeholder = "请选择",
+    placeholder = getLocale('Mod_Pleaseselect'),
+    authType,
     getDepartRoot,
     destroyPopupOnHide = true,
     forceRender = false,
@@ -259,6 +261,7 @@ export default forwardRef((props: PropsInterface, ref) => {
         sourceFrom,
         departOnly,
         auth,
+        authType,
         isGetRoot,
         disabledDepartSelect,
         panes,

package/src/components/user-selector/export-modules/multiple-user-selector--bak/index.js

@@ -3,6 +3,7 @@ import { CommonContext } from '../../context';
 import { OpenUserName, OpenDepartmentName, isWechat } from '../../../../utils/open-data';
 import MultiSelector from '../field-tree-selector/multiple-selector';
 import Popup from '../../../popup';
+import {getLocale} from '../../../../utils/getLocale';
 import classNames from 'classnames';
 
 import '../../index.scss';
@@ -19,7 +20,7 @@ export default forwardRef((props, ref) => {
     selectNodes = {},
     sourceFrom,
     auth = false, // 数据权限
-    placeholder = '请选择',
+    placeholder = getLocale('Mod_Pleaseselect'),
     // className,
     destroyPopupOnHide = true,
     forceRender = false,

package/src/components/user-selector/request-apis.js

@@ -120,7 +120,7 @@ export const searchGroups = ({ searchKey }) => {
 }
 
 export const getDuties = () => {
-  return axios.get(`${requestDomain()}/api/v1/${tenantId}/${userId}/position/get?status=1&pageNum=1&pageSize=100`)
+  return axios.get(`${requestDomain()}/api/v1/${tenantId}/${userId}/position/get?status=1&pageNum=1&pageSize=1000`)
     .then(res => {
       return res.data;
     })

package/src/components/user-selector/searched-panel/index.js

@@ -6,7 +6,7 @@ import ResultPart from './result-part';
 import Empty from '../empty';
 import GroupEmpty from '../empty/group';
 import { CommonContext } from '../context';
-
+import {getLocale} from '../../../utils/getLocale'
 import './index.scss';
 
 export default props => {
@@ -54,10 +54,10 @@ export default props => {
     {loading ?
       <Loading /> :
       <div>
-        {( searchedPanes.user && person && person.length) ? <ResultPart title="人员" treeData={person} onSelect={onNodeSelect} selected={selected} /> : undefined}
-        {( searchedPanes.depart && departs && departs.length) ? <ResultPart title="部门" treeData={departs} onSelect={onNodeSelect} selected={selected} /> : undefined}
+        {( searchedPanes.user && person && person.length) ? <ResultPart title={getLocale('Per_Ma_form_detail_Personnel')} treeData={person} onSelect={onNodeSelect} selected={selected} /> : undefined}
+        {( searchedPanes.depart && departs && departs.length) ? <ResultPart title={getLocale('Mod_Department')} treeData={departs} onSelect={onNodeSelect} selected={selected} /> : undefined}
         {( searchedPanes.group && group && group.length) ? <ResultPart
-          title="群组"
+          title={getLocale('Mod_Groups')}
           treeData={group}
           onSelect={onNodeSelect}
           selected={selected}

package/src/components/user-selector/selected-panel/index.tsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import SelectedPanelTree from '../select-tree/selected-tree';
 import { TreeNodeContext } from '../context';
 import './index.scss';
+import { getLocale } from '../../../utils/getLocale';
 
 export default props => {
   const { selected = [], setSelected } = props;
@@ -17,11 +18,11 @@ export default props => {
       if (it.nodeType == 'person') person.push(1);
       if (it.nodeType == 'group') gourp.push(1);
     })
-    if (person.length) res.push(`人员${person.length}`);
-    if (departments.length) res.push(`部门${departments.length}`);
-    if (gourp.length) res.push(`群组${gourp.length}`);
+    if (person.length) res.push(`${getLocale('OKR_MyO_Ew_Staff')}${person.length}`);
+    if (departments.length) res.push(`${getLocale('Mod_Department')}${departments.length}`);
+    if (gourp.length) res.push(`${getLocale('Mod_Groups')}${gourp.length}`);
     if (!res.length) res.push(`0`);
-    setTotalText(`已选：${res.join('，')}`)
+    setTotalText(`${getLocale('Data_Selected')}${res.join('，')}`)
   }, [selected])
 
   const onClearHandler = () => {
@@ -36,9 +37,9 @@ export default props => {
   return <div className="persel-selected-panel">
     <div className="persel-selected-panel__result">
       <span className="persel-selected-panel__result-total">{totalText}</span>
-      {selected.length ? <span className="persel-selected-panel__result-clear" onClick={onClearHandler}>清空</span> : undefined}
+      {selected.length ? <span className="persel-selected-panel__result-clear" onClick={onClearHandler}>{getLocale('Mod_Empty')}</span> : undefined}
     </div>
-    {selected.length == 0 && <div className="empty-tip">请在左侧选择人员</div>}
+    {selected.length == 0 && <div className="empty-tip">{getLocale('Mod_persononleft')}</div>}
     <div className="persel-selected-panel__content">
       <TreeNodeContext.Provider value={{}}>
         <SelectedPanelTree selected={selected} onRemove={onRemoveHandler} />