@titaui/pc 1.7.99 → 1.8.0

package/src/pages/okr-map/export-modules/okr-map/header/index.js

@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 import classNames from 'classnames';
 import Switch from '../../../../../components/switch';
 import Popup from '../../../../../components/popup';
-import { getLocale } from '../../../../../utils/getLocale';
 import SearchDropdown from '../../../../../components/search-dropdown';
 import PeriodSelector from '../../../../../components/period-selector';
 import IconButtonList from '../../../../../components/icon-button-list';
@@ -35,19 +34,19 @@ export default props => {
   const [visible, setVisible] = useState(false);
 
   const iconButtons = [
-    { 'icon': 'export', 'overlay': getLocale('Mod_Export') },
-    { 'icon': 'share', 'overlay': getLocale('OKR_MyO_Share') },
-    { 'icon': fullScreen ? 'quit-fullscreen' : 'fullscreen', 'overlay': getLocale('OKR_Ali_Butt_Fullscreen') },
-    { 'icon': direction == 'horizontal' ? 'vertical' : 'horizontal', 'overlay': direction == 'horizontal' ? `${getLocale('OKR_Ali_Butt_Toggleportrait')}` : `${getLocale('OKR_Ali_Butt_Togglelandscape')}`, 'placement': 'topRight' },
+    { 'icon': 'export', 'overlay': '导出' },
+    { 'icon': 'share', 'overlay': '分享' },
+    { 'icon': fullScreen ? 'quit-fullscreen' : 'fullscreen', 'overlay': '全屏' },
+    { 'icon': direction == 'horizontal' ? 'vertical' : 'horizontal', 'overlay': direction == 'horizontal' ? '切换纵向查看' : '切换横向查看', 'placement': 'topRight' },
   ];
 
   const popup = (
     <div className={classNames(`${preCls}__show-more-popup`)}>
       <div className={classNames(`${preCls}__header-action-showkr`)}>
-        <Switch label={getLocale('OKR_Ali_Butt_ExhibitionKRs')} checked={showkr} onChange={() => setVisible(true)} />
+        <Switch label='展示 KR' checked={showkr} onChange={() => setVisible(true)} />
       </div>
       <div className={classNames(`${preCls}__header-action-level`)}>
-        <NumberSelect max={10} min={1} onChange={num => onLevelChange(num)} label={getLocale('OKR_Ali_Butt_Displaylevel')} defaultValue={openLevel} />
+        <NumberSelect max={10} min={1} onChange={num => onLevelChange(num)} label="展示层级" defaultValue={openLevel} />
       </div>
     </div>
   )
@@ -61,7 +60,7 @@ export default props => {
   return (
     <div className={classNames(`${preCls}__header`, { [`${preCls}__header__folded`]: fold })}>
       <div className={classNames(`${preCls}__header-title`)}>
-        <span className={classNames(`${preCls}__header-title-text`)}>{getLocale('OKR_Ali_Title_Objectivemap')}</span>
+        <span className={classNames(`${preCls}__header-title-text`)}>目标地图</span>
         <span className={classNames(`${preCls}__header-title-right`)}>
           <span className={classNames(`${preCls}__header-theme`)} onClick={onThemeChange}>
             切换{darkTheme ? '浅色' : '深色'}模式
@@ -73,25 +72,25 @@ export default props => {
       <div className={classNames(`${preCls}__header-action`)}>
 
         <span className={classNames(`${preCls}__header-action-search`)}>
-          <SearchDropdown placeholder={getLocale('Mod_Pleaseselect')} value={searchType} onChange={onSearchChange}>
-            <SearchDropdown.Option value='company'>{getLocale('OKR_Ali_From_Companyobje')}</SearchDropdown.Option>
-            <SearchDropdown.Option value='depart'>{getLocale('OKR_Ali_From_Viewdepartment')}</SearchDropdown.Option>
+          <SearchDropdown placeholder='请选择' value={searchType} onChange={onSearchChange}>
+            <SearchDropdown.Option value='company'>公司目标</SearchDropdown.Option>
+            <SearchDropdown.Option value='depart'>按部门查看</SearchDropdown.Option>
             {OkrTypeSetting && (
-              <SearchDropdown.Option value='group'>{getLocale('OKR_Ali_From_Viewteam')}</SearchDropdown.Option>
+              <SearchDropdown.Option value='group'>按团队查看</SearchDropdown.Option>
             )}
-            <SearchDropdown.Option value='user'>{getLocale('OKR_Ali_From_Viewmember')}</SearchDropdown.Option>
+            <SearchDropdown.Option value='user'>按成员查看</SearchDropdown.Option>
           </SearchDropdown>
         </span>
 
         <Popup popup={popup} >
-          <span className={classNames(`${preCls}__header-action--show-more`)}>{getLocale('OKR_Ali_Butt_Exhibitionmore')}</span>
+          <span className={classNames(`${preCls}__header-action--show-more`)}>展示更多</span>
         </Popup>
 
         <span className={classNames(`${preCls}__header-action-btns`)}>
           <IconButtonList items={iconButtons} onClick={(e, iconType) => onBtnClick(iconType)} />
         </span>
       </div>
-      <Tooltip overlay={fold ? `${getLocale('Mod_Unfold')}` : `${getLocale('Mod_Fold')}`} placement='top' >
+      <Tooltip overlay={fold ? '展开' : '收起'} placement='top' >
         <span className={classNames(`${preCls}__header-fold`, { [`${preCls}__header-fold__close`]: fold })} onClick={() => setFold(!fold)}></span>
       </Tooltip>
 

package/src/pages/okr-map/export-modules/okr-map/header/show-kr-confirm.js

@@ -1,5 +1,4 @@
 import Dialog from '../../../../../components/dialog'
-import { getLocale } from '../../../../../utils/getLocale';
 import classNames from 'classnames';
 
 import precls from '../../../precls';
@@ -10,18 +9,18 @@ const ShowKrConfirmDialog = (props) => {
     return <Dialog
         visible={visible}
         width={360}
-        title={<span className={classNames(`${precls}--kr-dialog--title`)}>{showkr ? getLocale('OKR_Ali_Text_Areclose') : getLocale('OKR_Ali_Text_Aresureon')}</span>}
+        title={<span className={classNames(`${precls}--kr-dialog--title`)}>确定{showkr ? '关闭' : '开启'}吗</span>}
         noHeadLine={true}
         noFooterLine={true}
         noCloseIcon={true}
-        okText={getLocale('OKR_MyO_Butt_Determine')}
+        okText='确定'
         destroyOnClose={true}
-        cancelText={getLocale('Mod_Cancel')}
+        cancelText="取消"
         onOk={() => onConfirmHandler(!showkr)}
         onCancel={() => setVisible(false)}
     >
         <span className={classNames(`${precls}--kr-dialog--content`)}>
-            {showkr ? getLocale('OKR_Ali_Text_Pageclosing') : getLocale('OKR_Ali_Text_Pagerefreshed')}
+            {showkr ? '关闭' : '开启'}后页面将重新刷新，按默认层级展示
         </span>
     </Dialog>
 }

package/src/pages/okr-map/export-modules/share-okr-page/header/index.js

@@ -2,7 +2,6 @@ import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import IconButtonList from '../../../../../components/icon-button-list';
 import Switch from '../../../../../components/switch';
-import { getLocale } from '../../../../../utils/getLocale';
 import preCls from '../../../precls';
 
 import './index.scss';
@@ -21,8 +20,8 @@ export default props => {
   const period = {}
   
   const iconButtons = [
-    { 'icon': 'export', 'overlay': getLocale('Mod_Export')},
-    { 'icon': direction == 'horizontal' ? 'vertical' : 'horizontal', 'overlay': direction == 'horizontal' ? `${getLocale('OKR_Ali_Butt_Toggleportrait')}` : `${getLocale('OKR_Ali_Butt_Togglelandscape')}` },
+    { 'icon': 'export', 'overlay': '导出'},
+    { 'icon': direction == 'horizontal' ? 'vertical' : 'horizontal', 'overlay': direction == 'horizontal' ? '切换纵向查看' : '切换横向查看' },
   ]
   // 获取地图数据
   useEffect(() => {
@@ -30,9 +29,9 @@ export default props => {
   }, [])
 
   return <div className={classNames(`${preCls}-share-okr__header`)}>
-    <span className={classNames(`${preCls}-share-okr__header-title`)}>{getLocale('OKR_Menu_Title_Alignment')}</span>
+    <span className={classNames(`${preCls}-share-okr__header-title`)}>OKR 地图</span>
     <span className={classNames(`${preCls}-share-okr__header-showkr`)}>
-      <Switch label={getLocale('OKR_Ali_Butt_ExhibitionKRs')} checked={showkr} onChange={checked => setShowKr(checked)} />
+      <Switch label="展示 KR" checked={showkr} onChange={checked => setShowKr(checked)} />
     </span>
     <span className={classNames(`${preCls}-share-okr__header-dark`)} onClick={() => setDarkTheme(!darkTheme)}>
       切换{darkTheme ? '浅色' : '深色'}模式

package/src/pages/okr-map/level2-search/level2-input.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
 import { OpenUserName, OpenDepartmentName, isWechat } from '../open-data';
-import { getLocale } from '../../../utils/getLocale';
 import preCls from '../precls';
 
 export default props => {
@@ -15,7 +14,7 @@ export default props => {
         } else if (type == 'user') {
           return <OpenUserName id={selected.id} name={selected.name} />;
         } else {
-          return selected.name || getLocale('Mod_Pleaseselect');
+          return selected.name || '请选择';
         }
       })()}
     </span>

package/src/pages/okr-map/no-okr/index.js

@@ -1,5 +1,4 @@
 import "./index.scss";
-import { getLocale } from "../../../utils/getLocale";
 
 export default () => {
   return (
@@ -9,7 +8,7 @@ export default () => {
         你还没有制定目标，系统根据目标件的关联性自动生成目标地图
       </div>
       <div className="titaui-button">
-        <a href="/#okr/manage">{getLocale('OKR_OKRW_Butt_Toformulate')}</a>
+        <a href="/#okr/manage">去制定</a>
       </div>
     </div>
   );

package/src/pages/okr-map/number-select/index.js

@@ -1,13 +1,12 @@
 import { useState } from "react";
 import classNames from 'classnames';
-import { getLocale } from "../../../utils/getLocale";
 
 import './index.scss';
 
 const preCls = 'titaui-number-select';
 
 const NumberSelect = (props) => {
-    const { max = 10, min = 2, onChange = () => { }, defaultValue = 2, label = getLocale('Mod_Editor') } = props
+    const { max = 10, min = 2, onChange = () => { }, defaultValue = 2, label = '编辑' } = props
     const [num, setNum] = useState(defaultValue);
 
     const addHandler = () => {

package/src/pages/okr-map/share-dialog/index.js

@@ -4,7 +4,6 @@ import copyToClipboard from 'copy-to-clipboard';
 import Dialog from '../../../components/dialog';
 import preCls from '../precls';
 import { getShareUrl } from '../request-apis';
-import { getLocale } from '../../../utils/getLocale';
 import Toast from '@titaui/toast';
 
 import './index.scss';
@@ -40,9 +39,9 @@ const ShareContent = props => {
   }, [])
 
   return <div className={classNames(`${preCls}__share-content`)}>
-    <div className={classNames(`${preCls}__share-content-text`)}>{getLocale('OKR_Ali_Aftersendinlink')}</div>
+    <div className={classNames(`${preCls}__share-content-text`)}>发送链接后，同事即可通过扫码识别身份，查看当前地图</div>
     <div className={classNames(`${preCls}__share-content-link`)}>
-      <span className={classNames(`${preCls}__share-content-link-label`)}>{getLocale('OKR_MyO_KRP_Link')}</span>
+      <span className={classNames(`${preCls}__share-content-link-label`)}>链接</span>
       <span className={classNames(`${preCls}__share-content-link-url`)}>
         {copyUrl}
       </span>
@@ -62,20 +61,20 @@ export default props => {
   const onCopyUrlHandler = () => {
     copyToClipboard(copyUrl)
     setVisible(false);
-    Toast.Success(getLocale('OKR_Ali_Copylinksuc'))
+    Toast.Success('复制链接成功')
   }
 
   return <div className={classNames(`${preCls}__share-dialog`)}>
     <Dialog
       visible={visible}
       width={480}
-      title={getLocale('OKR_Ali_Copyandsharethelink')}
+      title="复制分享链接"
       noHeadLine={true}
       noFooterLine={true}
       noCloseIcon={true}
-      okText={getLocale('OKR_Ali_Butt_Copylink')}
+      okText={"复制链接"}
       destroyOnClose={true}
-      cancelText={getLocale('Mod_Cancel')}
+      cancelText={"取消"}
       onOk={onCopyUrlHandler}
       onCancel={() => setVisible(false)}
     >

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,7 @@
 import React, { FC, useState, useRef, useEffect } from "react";
-import { RectBtn } from "../../../../components/button";
+import { getUserInfoFun } from '../../request-api';
 import Form from "../../../../components/form";
-import { getUserInfoFun, saveUserInfo } 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 +10,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-title`}>基本信息</span>
+        <span className={`${prefix}__header-btn`} onClick={handleClickEdit}>编辑</span>
+        <EditModle visible={visible} onCancel={handleCancelEdit}/>
       </div>
       <div className={`${prefix}__form`}>
         <Form ref={formRef}>
           <Fields.Input
             name="name"
-            label={getLocale('Mod_UserName')}
-            placeholder={"请输入姓名"}
+            label={"姓名"}
+            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.tsx

@@ -0,0 +1,152 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { getUserInfoFun, saveUserInfo } from '../../request-api';
+import Toast from '../../../../components/toast';
+import Input from './input';
+import Dialog from '../../../../components/dialog';
+
+const EditBaseInfo = (props) => {
+	const { visible, onCancel } = props;
+
+	const modalRef = 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}
+		>
+			<Input
+				name="name"
+				label={'姓名'}
+				placeholder={'请输入姓名'}
+				type="text"
+				require
+				verifies={[
+					{
+						tip: '姓名不能为空',
+						test: /\S/
+					},
+					{
+						tip: '姓名只能为中文，英文字母和数字及下划线的组合',
+						test: /^((?!(\uff08|\uff09)).)*$/g
+					}
+				]}
+				value={userInfo.name}
+				onChange={handleNameChange}
+			/>
+			<Input
+				name="phone"
+				type="text"
+				label={'手机号码'}
+				placeholder={'请输入手机号'}
+				require
+				value={userInfo.mobile}
+				verifies={[
+					{
+						tip: '手机号不能为空',
+						test: /^[\s\S]+$/
+					},
+					{
+						tip: '请输入11位手机号',
+						test: /^1[3456789]\d{9}$/
+					}
+				]}
+				onChange={handlePhoneChange}
+			/>
+			<Input
+				name="email"
+				type="text"
+				label={'邮箱'}
+				value={userInfo.email}
+				require
+				placeholder={'请输入邮箱'}
+				verifies={[
+					{
+						tip: '邮箱格式错误',
+						test: /^([a-zA-Z0-9_-]|\.)+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
+					}
+				]}
+				onChange={handleEmailChange}
+			/>
+		</Dialog>
+	);
+};
+
+export default EditBaseInfo;