@titaui/pc 1.7.101 → 1.8.3

package/src/components/upload-photo-modal/request-api.ts

@@ -0,0 +1,33 @@
+import qs from "qs";
+import { rput, rpost } from "../../utils/request";
+import { getUserInfo } from "../../utils/bs-global";
+
+export const getUserInfoFun = () => {
+  return rpost("v1")(`manage/user/profile?toUserId=${getUserInfo().Id}`);
+};
+
+export const saveUserInfo = ({ data }) => {
+  return rput("v1")("manage/user/update", data, {
+    "headers": { "Content-Type": "multipart/form-data"},
+    "transformRequest": qs.stringify,
+  });
+};
+
+export const saveUserPhoto = (params)  => {
+  return rpost("v1")("manage/user/avatar", params, {
+    "headers": { "Content-Type": "multipart/form-data"},
+  });
+}
+
+export const saveTenantLogo = (params)  => {
+  return rpost("v1")("tenant/update/logo", params, {
+    "headers": { "Content-Type": "multipart/form-data"},
+  });
+}
+
+export const saveBrowserIcon = (params)  => {
+  return rpost("v1")("tenant/update/browerIcon", params, {
+    "headers": { "Content-Type": "multipart/form-data"},
+  });
+}
+

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/getAll`)
+  return axios.get(`${requestDomain()}/api/v1/${tenantId}/${userId}/position/get?status=1&pageNum=1&pageSize=100`)
     .then(res => {
       return res.data;
     })

package/src/index.js

@@ -85,3 +85,4 @@ export { default as requestApi } from "./utils/request";
 export { default as PointDemo} from './components/point-demo';
 export { default as Scrollbar } from './components/scrollbar';
 export { default as WeeklyReport} from './components/weekly-report';
+export { default as UploadPhotoModal } from './components/upload-photo-modal';

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

@@ -5,7 +5,6 @@
   padding: 20px 32px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
     sans-serif, PingFang SC, Microsoft YaHei;
-  height: 100%;
   &__header {
     display: flex;
     align-items: center;
@@ -31,8 +30,38 @@
         top: 3px;
       }
     }
+    &-btn {
+      width: 64px;
+      height: 28px;
+      box-sizing: border-box;
+      padding: 3px 18px;
+      background: rgba(40, 121, 255, 0.2);
+      border-radius: 14px;
+      font-size: 14px;
+      color: #2879FF;
+      line-height: 22px;
+      cursor: pointer;
+      &:hover {
+        color: #fff;
+        background-color: #2879ff;
+      }
+    }
   }
   &__form {
     width: 342px;
   }
+  .form-field-input__border {
+    padding: 0;
+    border: none;
+    background-color: #fff;
+  }
+  .form-field-input__label-text {
+    font-weight: 600;
+  }
+  .form-field-input__input {
+    background-color: #fff;
+  }
+  .form-field-input__border--disabled input:disabled {
+    background-color: #fff;
+  }
 }

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

@@ -1,9 +1,8 @@
 import React, { FC, useState, useRef, useEffect } from "react";
-import { RectBtn } from "../../../../components/button";
 import Form from "../../../../components/form";
-import { getUserInfoFun, saveUserInfo } from "../../request-api";
+import { getUserInfoFun } from "../../request-api";
 import { getLocale } from "../../../../utils/getLocale";
-import Toast from "../../../../components/toast";
+import EditModle from '../edit-info'
 import "./index.scss";
 
 const {Fields} = Form
@@ -12,129 +11,59 @@ const prefix = "titaui-personal-info-base-info";
 const BaseInfo: FC = () => {
   const formRef = useRef<any>();
   const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "" });
-  const [isDisable, setIsDisable] = useState(false);
-  const [isEdit, setIsEdit] = useState(false);
+  const [visible, setVisible] = useState(false);
 
-  const handleSaveInfo = () => {
-    //校验
-    const err = formRef.current.verifing({ truonlyFirstErrore: false });
-    if (err.length > 0) {
-      return;
-    } else {
-      saveUserInfo({ data: userInfo }).then((resp) => {
-        if (resp.Code === 1) {
-          Toast.Success(getLocale('Per_Ma_form_Updatesuc'), { canClose: false });
-        } else {
-          Toast.Error(resp.Message, { canClose: false });
-        }
-      });
-    }
-  };
+  const handleClickEdit = () => {
+    setVisible(true);
+  }
 
-  const handleNameChange = (value) => {
-    setUserInfo({
-      ...userInfo,
-      name: value || "",
-    });
-    setIsEdit(true);
-  };
-
-  const handlePhoneChange = (value) => {
-    setUserInfo({
-      ...userInfo,
-      mobile: value || "",
-    });
-    setIsEdit(true);
-  };
-
-  const handleEmailChange = (value) => {
-    setUserInfo({
-      ...userInfo,
-      email: value || "",
-    });
-    setIsEdit(true);
-  };
-
-  useEffect(() => {
-    getUserInfoFun().then((resp) => {
-      if (resp.Code === 1 && resp.Data) {
-        setUserInfo({...resp.Data, position: resp.Data.positionCode});
-      }
-    });
-  }, []);
+  const handleCancelEdit = () => {
+    setVisible(false);
+  }
 
   useEffect(() => {
-    if (userInfo.name && userInfo.mobile && isEdit) {
-      setIsDisable(false);
-    } else {
-      setIsDisable(true);
-    }
-  }, [userInfo, isEdit]);
+		getUserInfoFun().then((resp) => {
+			if (resp.Code === 1 && resp.Data) {
+				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
+			}
+		});
+	}, []);
 
   return (
     <div className={prefix}>
       <div className={`${prefix}__header`}>
         <span className={`${prefix}__header-title`}>{getLocale('Per_Ass_New_title_text_BasicIn')}</span>
-        <RectBtn
-          type={"primary"}
-          text={getLocale('Mod_Save')}
-          disabled={isDisable}
-          onClick={handleSaveInfo}
-        />
+        <span className={`${prefix}__header-btn`} onClick={handleClickEdit}>{getLocale('Mod_Editor')}</span>
+        <EditModle visible={visible} onCancel={handleCancelEdit}/>
       </div>
       <div className={`${prefix}__form`}>
         <Form ref={formRef}>
           <Fields.Input
             name="name"
             label={getLocale('Mod_UserName')}
-            placeholder={"请输入姓名"}
+            placeholder={"未设置"}
             type="text"
-            require
-            verifies={[
-              {
-                "tip": "姓名不能为空",
-                "test": /\S/,
-              },
-              {
-                "tip": "姓名只能为中文，英文字母和数字及下划线的组合",
-                "test": /^((?!(\uff08|\uff09)).)*$/g,
-              },
-            ]}
+            verifies={[]}
             value={userInfo.name}
-            onChange={handleNameChange}
+            disabled
           />
           <Fields.Input
             name="phone"
             type="text"
             label={"手机号码"}
-            placeholder={"请输入联系手机号码"}
-            require
+            placeholder={"未设置"}
             value={userInfo.mobile}
-            verifies={[
-              {
-                "tip": "手机号不能为空",
-                "test": /^[\s\S]+$/,
-              },
-              {
-                "tip": "请输入11位手机号",
-                "test": /^1[3456789]\d{9}$/,
-              },
-            ]}
-            onChange={handlePhoneChange}
+            verifies={[]}
+            disabled
           />
           <Fields.Input
             name="email"
             type="text"
             label={"电子邮箱"}
             value={userInfo.email}
-            placeholder={"请输入联系邮箱"}
-            verifies={[
-              {
-                "tip": "邮箱格式错误",
-                "test": /^([a-zA-Z0-9_-]|\.)+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
-              },
-            ]}
-            onChange={handleEmailChange}
+            placeholder={"未设置"}
+            verifies={[]}
+            disabled
           />
         </Form>
       </div>

package/src/pages/personal-info/components/edit-info/index.scss

@@ -0,0 +1,20 @@
+.titaui-edit-personal-info {
+  &__form {
+    .titaui-form {
+      box-sizing: border-box;
+      padding: 0 32px;
+    }
+    .form-field-input__label {
+      width: 62px;
+    }
+    .form-field-input__label-text {
+      font-size: 14px;
+      font-weight: 400;
+      color: #89919F;
+      line-height: 22px;
+    }
+    .rc-tooltip {
+      left:110.5px !important;
+    }
+  }
+}

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

@@ -0,0 +1,166 @@
+import React, { useState, useRef, useEffect } from 'react';
+import Form from '../../../../components/form';
+import { getUserInfoFun, saveUserInfo } from '../../request-api';
+import Toast from '../../../../components/toast';
+// import Input from './input';
+import Dialog from '../../../../components/dialog';
+import './index.scss';
+
+const { Fields } = Form;
+
+const prefix = "titaui-edit-personal-info"
+
+const EditBaseInfo = (props) => {
+	const { visible, onCancel } = props;
+
+	const modalRef = useRef<any>();
+  const formContainerRef = useRef<any>();
+	const formRef = useRef<any>();
+
+	const [ isDisable, setIsDisable ] = useState(false);
+	const [ isEdit, setIsEdit ] = useState(false);
+	const [ userInfo, setUserInfo ] = useState({ name: '', email: '', mobile: '' });
+
+	const handleNameChange = (value) => {
+		setUserInfo({
+			...userInfo,
+			name: value || ''
+		});
+		setIsEdit(true);
+	};
+
+	const handlePhoneChange = (value) => {
+		setUserInfo({
+			...userInfo,
+			mobile: value || ''
+		});
+		setIsEdit(true);
+	};
+
+	const handleEmailChange = (value) => {
+		setUserInfo({
+			...userInfo,
+			email: value || ''
+		});
+		setIsEdit(true);
+	};
+
+	const handleSaveUserInfo = () => {
+		if (!userInfo.email || !userInfo.mobile || !userInfo.name || isDisable) {
+      setIsDisable(true);
+			return;
+		} else {
+			saveUserInfo({ data: userInfo }).then((resp) => {
+				if (resp.Code === 1) {
+					Toast.Success('更新成功', { canClose: false });
+          onCancel();
+          setTimeout(() => {
+            window.location.reload();
+          }, 2000)
+				} else {
+					Toast.Error(resp.Message, { canClose: false });
+				}
+			});
+		}
+	};
+
+	useEffect(() => {
+		getUserInfoFun().then((resp) => {
+			if (resp.Code === 1 && resp.Data) {
+				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
+			}
+		});
+	}, []);
+
+	useEffect(
+		() => {
+			if (userInfo.name && userInfo.mobile && isEdit) {
+				setIsDisable(false);
+			} else {
+				setIsDisable(true);
+			}
+		},
+		[ userInfo, isEdit ]
+	);
+
+	return (
+		<Dialog
+			visible={visible}
+			ref={modalRef}
+			width={480}
+			mask
+			centered
+			title={'基本信息设置'}
+			noHeadLine
+			maskClosable={false}
+			onClose={onCancel}
+			onCancel={onCancel}
+			okText="确定"
+			noFooterLine
+			onOk={handleSaveUserInfo}
+			disabled={isDisable}
+		>
+      <div className={`${prefix}__form`} ref={formContainerRef}>
+				<Form ref={formRef} getFormContainer={() => formContainerRef.current}>
+			<Fields.Input
+				name="name"
+				label={'姓名'}
+				placeholder={'请输入姓名'}
+				type="text"
+				require
+        layout="row"
+				verifies={[
+					{
+						tip: '姓名不能为空',
+						test: /\S/
+					},
+					{
+						tip: '姓名只能为中文，英文字母和数字及下划线的组合',
+						test: /^((?!(\uff08|\uff09)).)*$/g
+					}
+				]}
+				value={userInfo.name}
+				onChange={handleNameChange}
+			/>
+			<Fields.Input
+				name="phone"
+				type="text"
+				label={'手机号码'}
+				placeholder={'请输入手机号'}
+				require
+        layout="row"
+				value={userInfo.mobile}
+				verifies={[
+					{
+						tip: '手机号不能为空',
+						test: /^[\s\S]+$/
+					},
+					{
+						tip: '请输入11位手机号',
+						test: /^1[3456789]\d{9}$/
+					}
+				]}
+				onChange={handlePhoneChange}
+			/>
+			<Fields.Input
+				name="email"
+				type="text"
+				label={'邮箱'}
+				value={userInfo.email}
+        layout="row"
+				placeholder={'请输入邮箱'}
+				verifies={[
+					{
+						tip: '邮箱格式错误',
+						test: /^([a-zA-Z0-9_-]|\.)+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
+					}
+				]}
+				onChange={handleEmailChange}
+			/>
+      </Form>
+			</div>
+		</Dialog>
+	);
+};
+
+export default EditBaseInfo;

package/src/pages/personal-info/components/edit-info/input/index.scss

@@ -0,0 +1,82 @@
+.edit-base-info-input {
+  display: flex;
+  box-sizing: border-box;
+  padding: 0 32px;
+  align-items: center;
+  margin-bottom: 16px;
+  &__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;
+
+    &-text {
+      color: #89919F;
+    }
+
+    &-require {
+      color: red;
+    }
+  }
+
+  &__border {
+    flex:1;
+    padding: 6px 12px;
+    transition: all 0.2s;
+    border: 1px solid #e9ecf0;
+    box-sizing: border-box;
+    border-radius: 8px;
+
+    &--disabled {
+      background-color: #fafafa;
+      cursor: not-allowed;
+      input:disabled {
+        background-color: #fafafa;
+        cursor: not-allowed;
+        color: #3f475594;
+      }
+    }
+  }
+  &__border--error {
+    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) !important;
+    border: 1px solid #f05e5e !important;
+  }
+  &__border--active {
+    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
+    border: 1px solid #2879ff;
+  }
+
+  &__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;
+
+    &::-webkit-input-placeholder {
+      color: #bfc7d5;
+      font-weight: unset;
+    }
+    &::-moz-placeholder {
+      color: #bfc7d5;
+      font-weight: unset;
+    }
+    &:-moz-placeholder {
+      color: #bfc7d5;
+      font-weight: unset;
+    }
+    &:-ms-input-placeholder {
+      color: #bfc7d5;
+      font-weight: unset;
+    }
+  }
+}

package/src/pages/personal-info/components/edit-info/input/index.tsx

@@ -0,0 +1,145 @@
+import React, { useState, useRef, useEffect, forwardRef, useImperativeHandle } from 'react';
+import classNames from 'classnames';
+import ToolTip from '../../../../../components/tooltip/error-tip';
+import './index.scss'
+
+const preCls = 'edit-base-info-input';
+
+interface verify {
+  tip: string;
+  test: RegExp;
+}
+interface Props {
+  label: string;
+  verifies?: verify[];
+  placeholder?: string;
+  onChange?: Function;
+  value?: any;
+  require?: boolean;
+  type?: string;
+  name: string;
+  getContainer?: Function;
+  disabled?: boolean
+}
+interface Error {
+  name: string;
+  tip: string;
+}
+
+const OverlayInner = ({ hasError, hasActive, tip }) => {
+  if (hasError) return <span style={{ 'color': '#F05E5E' }}>{tip}</span>;
+  if (hasActive) return <span style={{ 'color': '#3F4755' }}>{tip}</span>;
+  return <span />;
+}
+
+const popupAlign = {
+  offset: [-12, -4],
+  overflow: { adjustX: true, adjustY: true },
+  targetOffset: [0, 0],
+};
+
+export default forwardRef((props: Props, ref) => {
+  const {
+    label,
+    verifies,
+    placeholder,
+    onChange,
+    require,
+    type,
+    name,
+    disabled,
+    getContainer
+  } = props;
+
+  const inputRef = useRef<any>();
+  const [hasError, setHasError] = useState<boolean>(false);
+  const [hasActive, setHasActive] = useState<boolean>(false);
+  const [tip, setTip] = useState<string>('');
+  const [value, setValue] = useState<string>(props.value || '');
+
+  useEffect(() => {
+    setValue(props.value);
+  }, [props.value])
+
+  const verifing = (): Error[] => {
+    const value = inputRef.current && inputRef.current.value;
+    if (!verifies || !verifies.length) return [];
+    if (!require && !value) return [];
+    const errors: Error[] = [];
+    for (let i = 0; i < verifies.length; i++) {
+      let { test, tip } = verifies[i];
+      if (!value.match(test)) {
+        errors.push({ name, tip });
+      }
+    }
+    return errors;
+  }
+
+  const onInputFocusHandler = () => {
+    setHasActive(true);
+    inputRef.current.setSelectionRange(9999999, 9999999);
+  }
+
+  const onBlurHandler = () => {
+    setHasActive(false);
+  }
+
+  const onChangeHandler = () => {
+    const value = inputRef.current && inputRef.current.value;
+    onChange && onChange(value);
+    setValue(value);
+    const errors = verifing();
+    if (errors.length) {
+      setHasError(true);
+      setTip(errors[0].tip);
+    } else {
+      setHasError(false);
+      setTip('');
+    }
+  }
+
+  useImperativeHandle(ref, () => ({
+    'verifing': (): Error[] => {
+      const errors = verifing();
+      if (errors.length) {
+        setHasError(true);
+        setTip(errors[0].tip);
+        inputRef.current.focus();
+      }
+      return errors;
+    }
+  }))
+
+  return <div className={classNames(preCls)}>
+    <div className={classNames(`${preCls}__label`)}>
+      <span className={classNames(`${preCls}__label-text`)}>{label}</span>
+    </div>
+    <div className={classNames(`${preCls}__border`, {
+      [`${preCls}__border--error`]: hasError,
+      [`${preCls}__border--active`]: hasActive,
+      [`${preCls}__border--disabled`]: disabled
+    })}>
+      <ToolTip
+        placement={'topLeft'}
+        popupAlign={popupAlign}
+        destroyTooltipOnHide={true}
+        visible={(hasActive || hasError) && tip}
+        overlay={<OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />}
+        getTooltipContainer={getContainer}
+      >
+        <input
+          ref={inputRef}
+          type={type}
+          disabled={disabled}
+          className={classNames(`${preCls}__input`)}
+          value={value}
+          placeholder={placeholder}
+          onFocus={onInputFocusHandler}
+          onBlur={onBlurHandler}
+          onChange={onChangeHandler}
+          autoComplete='off'
+        />
+      </ToolTip>
+    </div>
+  </div>
+})