@titaui/pc 1.8.4 → 1.8.8

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

@@ -1,57 +1,47 @@
 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 { saveUserInfo, saveTenantLogo, saveBrowserIcon, saveUserPhoto } from './request-api';
+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 { rput, rpost } from "../../utils/request";
-import axios from 'axios';
-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 [ userInfo, setUserInfo ] = useState({ Avatar: '' });
-  const [item] = useState(List.find(item => item.id === type));
-  const [isEnter, setIsEnter] = useState(false);
-  const [fileName, setFileName] = useState('')
+  const [ isEnter, setIsEnter ] = useState(false);
+  const [ fileName, setFileName ] = useState('')
 
-	const cropperRef = useRef<HTMLImageElement>(null);
-
-	const onChange = (e: any) => {
-		e.preventDefault();
+  const item = List.find(item => item.id === type)
+	
+	const onChange = (e: any) => {    
 		let files;
 		if (e.dataTransfer) {
 			files = e.dataTransfer.files;
 		} else if (e.target) {
 			files = e.target.files;
-		}
+		}    
     setFileName(files[0].name)
 		const reader = new FileReader();    
 		reader.onload = () => {
-			setImage(reader.result as any);      
+			setImage(reader.result as any);            
 		};
 		reader.readAsDataURL(files[0]);
 	};
@@ -67,140 +57,59 @@ const ChangePhoto = (props: Props) => {
 }
 
 
-	const onCrop = () => {
-
+	const onCrop = () => {   
 		const imageElement: any = cropperRef.current;
-		const cropper: any = imageElement.cropper;
+		const cropper: any = imageElement.cropper;    
 
 		setCropData(cropper.getCroppedCanvas().toDataURL());
-		setUserInfo(cropper.getCroppedCanvas().toDataURL());
-
-    let base64Url = cropper.getCroppedCanvas().toDataURL();
-
-    const newFile = dataURLtoFile(base64Url, fileName);
-    console.log(newFile);
     
+    let base64Url = cropper.getCroppedCanvas().toDataURL();
+        
+    const newFile = dataURLtoFile(base64Url, fileName);    
 
     let formData = new FormData();
 
     formData.append('file', newFile);
 
-    console.log(formData);
     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 =  () => {
-    let timestamp = new Date().getTime(); // 给每个文件加一个时间戳
     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") {  
-        // console.log(cropper);
         saveTenantLogo( cropper ).then((resp) => {
-          if (resp.Code === 1) {
-            Toast.Success('保存成功', { canClose: false });
-            onCancel();
-          } else {
-            Toast.Error(resp.Message, { canClose: false });
-          }
+          handleSuccessSave(resp);
         });
-        // axios({headers: {
-        //   'Content-Type': 'multipart/form-data',
-        // },
-        // method: 'post',
-        // data: cropper,
-        // url: `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo?format=json&timestamp=${timestamp}`})
-        // dealSelectFiles(image)
       }  else {
         saveBrowserIcon( cropper ).then((resp) => {
-          if (resp.Code === 1) {
-            Toast.Success('保存成功', { canClose: false });
-            onCancel();
-          } else {
-            Toast.Error(resp.Message, { canClose: false });
-          }
+          handleSuccessSave(resp);
         });
       }  
     }
   };
 
-  const [uploadSuccessFile, setUploadSuccessFile] = useState();
-
-
-  const dealSelectFiles = (uploadSelectFile) => {
-
-    let uploadStartFiles = []; // 开始上传的文件
-      let formData = new FormData(); // FormData 对象
-      let uploadStartFile;
-      let timestamp = new Date().getTime(); // 给每个文件加一个时间戳
-      // let uploadFileType = uploadSelectFile.name.substring(uploadSelectFile.name.lastIndexOf('.') + 1);
-
-      uploadStartFile = {
-        FileName: uploadSelectFile.name,
-        // FileType: _dealAttachmentType(uploadFileType).FileType,
-        FileSize: uploadSelectFile.size,
-        FileLastModified: uploadSelectFile.lastModified,
-        // IsImage: _dealAttachmentType(uploadFileType).IsImage,
-        percentComplete: 0,
-        uploadStatus: 1, // 开始上传
-        IsSuccess: false,
-        uid: uuid(),
-        _smallImageUrl: '',
-        _bigImageUrl: '',
-        MediaType: '',
-        UserId: 0,
-        MaxDocCount: 0,
-        DfsPath: '',
-        ClientUrl: '',
-        SmallImageUrl: '',
-        BigImageUrl: '',
-        DownloadUrl: '',
-        Msg: '',
-        AllowUploadAttachmentSize: 50,
-        Deleteable: true,
-        requestXHR: new XMLHttpRequest(), //在这创建是为了取消用
-      };
-
-      // uploadStartFiles.push(uploadStartFile);
-      // _dealUploadStart(uploadStartFiles); // 处理开始上传的文件
-      formData.append('file', uploadSelectFile);
-      let url = `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo`;
-      _dealUploadXHRRequest(formData, url, uploadStartFile);
-  };
-
-  /**
-   * 处理文件上传请求
-   *
-   * @formData
-   * @url 上传文件请求地址
-   * @uploadStartFile 上传的文件
-   *
-   * @memberof Upload
-   */
-  const _dealUploadXHRRequest = (formData: any, url: string, uploadStartFile) => {
-    let xhr = uploadStartFile.requestXHR;
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState == 4 && xhr.status == 200) {
-        let result = Object.assign({}, { ...JSON.parse(xhr.responseText).Result[0] }); // 上传成功接口返回数据
-        result.percentComplete = 100;
-        result.IsSuccess = !!result.IsSuccess;
-        result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功；4上传失败
-        // _dealUploadSuccess({ ...uploadStartFile, ...result });
-      }
-    };
-    xhr.open('POST', url, true);
-    xhr.send(formData); //开始上传，发送form数据
-  };
-
   const handleEnterAgain = () => {
     setIsEnter(true);
   }
@@ -209,6 +118,11 @@ const ChangePhoto = (props: Props) => {
     setIsEnter(false);
   }
 
+  const handleCancel = () => {
+    onCancel();
+    setImage('');
+  } 
+
 	return (
 		<Dialog
 			visible={visible}
@@ -219,8 +133,8 @@ const ChangePhoto = (props: Props) => {
 			title={'上传头像'}
 			noHeadLine
 			maskClosable={false}
-			onClose={onCancel}
-			onCancel={onCancel}
+			onClose={handleCancel}
+			onCancel={handleCancel}
 			okText="保存"
 			noFooterLine
 			onOk={handleSaveInfo}
@@ -238,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`}>
@@ -259,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>
@@ -278,22 +178,19 @@ const ChangePhoto = (props: Props) => {
 							responsive={true}
 							autoCropArea={item?.autoCropArea}
 							checkOrientation={true}
-							minCropBoxHeight={10}
-							minCropBoxWidth={10}
+							minCropBoxHeight={item?.minCropBoxHeight}
+							minCropBoxWidth={item?.minCropBoxWidth}
 							initialAspectRatio={item?.initialAspectRatio}
 							guides={true}
 							preview=".img-preview"
 							ref={cropperRef}
-							// onInitialized={(instance) => {
-							// 	setCropper(instance);
-							// }}
 							crop={onCrop}
 						/>
 						<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;
   }
 }