@titaui/pc 1.8.4 → 1.8.61

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/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/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/pages/personal-info/components/base-info/index.scss

@@ -2,14 +2,14 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px;
+  padding: 20px 32px 30px 36px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
     sans-serif, PingFang SC, Microsoft YaHei;
   &__header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 12px;
+    margin-bottom: 20px;
     &-title {
       font-size: 16px;
       font-weight: 600;
@@ -26,10 +26,25 @@
         border-radius: 2px;
         display: inline-block;
         position: absolute;
-        left: -8px;
+        left: -12px;
         top: 3px;
       }
     }
+    .titaui-rect-btn--primary {
+      font-size: 14px;
+      font-weight: normal;
+      color: #2879FF;
+      line-height: 26px;
+      background: rgba(40, 121, 255, 0.2);
+      &:hover {
+        color: #fff;
+        background-color: #2879ff;
+      }
+    }
+    .titaui-rect-btn--normal {
+      height: 28px;
+      min-width: 64px;
+    }
     &-btn {
       width: 64px;
       height: 28px;
@@ -49,6 +64,12 @@
   }
   &__form {
     width: 342px;
+    .form-field-input__border--disabled input:disabled {
+      color: #6F7886;
+    }
+  }
+  .form-field-input__label {
+    margin-bottom: 4px;
   }
   .form-field-input__border {
     padding: 0;
@@ -59,6 +80,8 @@
     font-weight: 600;
   }
   .form-field-input__input {
+    font-size: 12px;
+    line-height: 18px;
     background-color: #fff;
   }
   .form-field-input__border--disabled input:disabled {

package/src/pages/personal-info/components/base-info/index.tsx

@@ -1,7 +1,8 @@
 import React, { FC, useState, useRef, useEffect } from "react";
 import { getUserInfoFun } from '../../request-api';
+import { RectBtn } from "../../../../components/button";
 import Form from "../../../../components/form";
-import EditModle from '../edit-info'
+import EditModle from '../edit-base-info'
 import "./index.scss";
 
 const {Fields} = Form
@@ -20,6 +21,10 @@ const BaseInfo: FC = () => {
     setVisible(false);
   }
 
+  const handleSuccessEditBaseInfo = (userInfo) => {
+    setUserInfo({...userInfo});
+  }
+
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
 			if (resp.Code === 1 && resp.Data) {
@@ -32,8 +37,12 @@ const BaseInfo: FC = () => {
     <div className={prefix}>
       <div className={`${prefix}__header`}>
         <span className={`${prefix}__header-title`}>基本信息</span>
-        <span className={`${prefix}__header-btn`} onClick={handleClickEdit}>编辑</span>
-        <EditModle visible={visible} onCancel={handleCancelEdit}/>
+        <RectBtn
+          type={"primary"}
+          text={"编辑"}
+          onClick={handleClickEdit}
+        />
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <Form ref={formRef}>

package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.scss

@@ -5,7 +5,7 @@
       padding: 0 32px;
     }
     .form-field-input__label {
-      width: 62px;
+      min-width: 64px;
     }
     .form-field-input__label-text {
       font-size: 14px;

package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.tsx

@@ -11,7 +11,7 @@ const { Fields } = Form;
 const prefix = "titaui-edit-personal-info"
 
 const EditBaseInfo = (props) => {
-	const { visible, onCancel } = props;
+	const { visible, onCancel, handleSuccessEditBaseInfo } = props;
 
 	const modalRef = useRef<any>();
   const formContainerRef = useRef<any>();
@@ -53,10 +53,8 @@ const EditBaseInfo = (props) => {
 			saveUserInfo({ data: userInfo }).then((resp) => {
 				if (resp.Code === 1) {
 					Toast.Success('更新成功', { canClose: false });
+          handleSuccessEditBaseInfo(userInfo);
           onCancel();
-          setTimeout(() => {
-            window.location.reload();
-          }, 2000)
 				} else {
 					Toast.Error(resp.Message, { canClose: false });
 				}

package/src/pages/personal-info/components/person-photo/index.scss

@@ -2,14 +2,14 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px;
+  padding: 20px 32px 30px 36px;
   margin-top: 10px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   &__header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 12px;
+    margin-bottom: 20px;
     &-title {
       font-size: 16px;
       font-weight: 600;
@@ -26,7 +26,7 @@
         border-radius: 2px;
         display: inline-block;
         position: absolute;
-        left: -8px;
+        left: -12px;
         top: 3px;
       }
     }
@@ -46,11 +46,23 @@
       color: #FFFFFF;
       line-height: 18px;
     }
-    & > span {
-      margin-left: 24px;
+    &-tip {
+      margin-left: 32px;
       font-size: 12px;
       color: #A4ACB9;
       line-height: 20px;
+      position: relative;
+      &::before {
+        display: block;
+        content: '';
+        width: 4px;
+        height: 4px;
+        background: #A4ACB9;
+        position: absolute;
+        top: 7px;
+        left: -12px;
+        border-radius: 50%;
+      }
     }
   }
   .titaui-pc-avator-container {

package/src/pages/personal-info/components/person-photo/index.tsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import classNames from 'classnames';
 import { getUserInfo } from '../../../../utils/bs-global';
 import Avatar from '../../../../components/avatar';
 import ChangePhotoModal from '../../../../components/upload-photo-modal';
@@ -12,6 +11,7 @@ const { Id, Name, UserAvatar } = getUserInfo();
 const PersonPhoto = () => {
 
   const [visible, setVisible] = useState(false);
+  const [avatar, setAvatar] = useState('');
 
   const handleChangePhoto = () => {
     setVisible(true);
@@ -21,6 +21,14 @@ const PersonPhoto = () => {
     setVisible(false);
   }
 
+  const handleSuccessUploadPhoto = (image) => {
+    setAvatar(image);
+  }
+
+  useEffect(() => {
+    setAvatar(UserAvatar.Large)
+  }, [])
+
 	return (
 		<div className={prefix}>
 			<div className={`${prefix}__header`}>
@@ -31,7 +39,7 @@ const PersonPhoto = () => {
 					userId={Id}
 					name={Name}
 					color={UserAvatar.Color}
-					src={UserAvatar.Large}
+					src={avatar}
 					size={{
 						width: 160,
 						textNum: 1,
@@ -39,9 +47,9 @@ const PersonPhoto = () => {
 					}}
           onClick={handleChangePhoto}
 				/>
-        <span>· 建议图片最小尺寸 150*150px</span>
+        <span className={`${prefix}__main-tip`}>建议图片最小尺寸 150*150px</span>
 			</div>
-      <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person"/>
+      <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person" handleSuccessUploadPhoto={handleSuccessUploadPhoto}/>
     </div>
 	);
 };

package/lib/pages/personal-info/components/edit-info/input/index.css

@@ -1,89 +0,0 @@
-.edit-base-info-input {
-  display: flex;
-  box-sizing: border-box;
-  padding: 0 32px;
-  align-items: center;
-  margin-bottom: 16px;
-}
-
-.edit-base-info-input__label {
-  width: 56px;
-  height: 22px;
-  font-size: 14px;
-  margin-bottom: 5px;
-  margin-right: 20px;
-  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  font-weight: 400;
-  line-height: 22px;
-}
-
-.edit-base-info-input__label-text {
-  color: #89919F;
-}
-
-.edit-base-info-input__label-require {
-  color: red;
-}
-
-.edit-base-info-input__border {
-  flex: 1;
-  padding: 6px 12px;
-  transition: all 0.2s;
-  border: 1px solid #e9ecf0;
-  box-sizing: border-box;
-  border-radius: 8px;
-}
-
-.edit-base-info-input__border--disabled {
-  background-color: #fafafa;
-  cursor: not-allowed;
-}
-
-.edit-base-info-input__border--disabled input:disabled {
-  background-color: #fafafa;
-  cursor: not-allowed;
-  color: #3f475594;
-}
-
-.edit-base-info-input__border--error {
-  box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) !important;
-  border: 1px solid #f05e5e !important;
-}
-
-.edit-base-info-input__border--active {
-  box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
-  border: 1px solid #2879ff;
-}
-
-.edit-base-info-input__input {
-  display: inline-block;
-  padding: 0;
-  width: calc(100% - 12px);
-  font-size: 14px;
-  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  font-weight: 400;
-  color: #3f4755;
-  height: 22px;
-  line-height: inherit;
-  border: none;
-}
-
-.edit-base-info-input__input::-webkit-input-placeholder {
-  color: #bfc7d5;
-  font-weight: unset;
-}
-
-.edit-base-info-input__input::-moz-placeholder {
-  color: #bfc7d5;
-  font-weight: unset;
-}
-
-.edit-base-info-input__input:-moz-placeholder {
-  color: #bfc7d5;
-  font-weight: unset;
-}
-
-.edit-base-info-input__input:-ms-input-placeholder {
-  color: #bfc7d5;
-  font-weight: unset;
-}