@titaui/pc 1.8.7 → 1.8.61

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

@@ -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,8 +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 { getUserInfoFun } from "../../request-api";
-import { getLocale } from "../../../../utils/getLocale";
-import EditModle from '../edit-info'
+import EditModle from '../edit-base-info'
 import "./index.scss";
 
 const {Fields} = Form
@@ -21,6 +21,10 @@ const BaseInfo: FC = () => {
     setVisible(false);
   }
 
+  const handleSuccessEditBaseInfo = (userInfo) => {
+    setUserInfo({...userInfo});
+  }
+
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
 			if (resp.Code === 1 && resp.Data) {
@@ -32,15 +36,19 @@ const BaseInfo: FC = () => {
   return (
     <div className={prefix}>
       <div className={`${prefix}__header`}>
-        <span className={`${prefix}__header-title`}>{getLocale('Per_Ass_New_title_text_BasicIn')}</span>
-        <span className={`${prefix}__header-btn`} onClick={handleClickEdit}>{getLocale('Mod_Editor')}</span>
-        <EditModle visible={visible} onCancel={handleCancelEdit}/>
+        <span className={`${prefix}__header-title`}>基本信息</span>
+        <RectBtn
+          type={"primary"}
+          text={"编辑"}
+          onClick={handleClickEdit}
+        />
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <Form ref={formRef}>
           <Fields.Input
             name="name"
-            label={getLocale('Mod_UserName')}
+            label={"姓名"}
             placeholder={"未设置"}
             type="text"
             verifies={[]}

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/src/utils/date-test-change.ts

@@ -1,5 +1,3 @@
-import { getLocale } from "./getLocale"
-
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
 
@@ -40,7 +38,7 @@ export const testDateDiff = (date) => {
 //           if (hourDiff < 1) {
 //             const minDiff = Math.floor((nTime - tTime) / (1000 * 60))
 //             if (minDiff < 1) {
-//               return getLocale('Pro_page_Int_Justnow')
+//               return '刚刚'
 //             } else {
 //               return `${minDiff}分钟前`
 //             }
@@ -83,7 +81,7 @@ export const testDayChange = (date) => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return getLocale('Pro_page_Int_Justnow');
+    return '刚刚';
   }
   if (secondDiff < 60) {
     return `${secondDiff}秒前`;
@@ -95,7 +93,7 @@ export const testDayChange = (date) => {
     return `${Math.floor(secondDiff / (60 * 60))}小时前`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return getLocale('OKR_MyO_Pr_Text_Yesterday');
+    return `昨天`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
     return `前天`;

package/src/utils/format-time.ts

@@ -1,8 +1,6 @@
-import { getLocale } from "./getLocale";
-
 export const getTimeString = (time: string, nowTime): string => {
   if (!time) {
-    return getLocale('OKR_MyO_KRP_Notupdated');
+    return "暂未更新";
   }
   const timeDateObj = new Date(time);
   const timeMilliSecond = timeDateObj.getTime();
@@ -18,7 +16,7 @@ export const getTimeString = (time: string, nowTime): string => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return getLocale('Pro_page_Int_Justnow');
+    return "刚刚";
   }
   if (secondDiff < 60) {
     return `${secondDiff}秒前`;
@@ -30,7 +28,7 @@ export const getTimeString = (time: string, nowTime): string => {
     return `${Math.floor(secondDiff / (60 * 60))}小时前`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
+    return `昨天 ${timeHours + ":" + timeMinutes}`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
     return `前天 ${timeHours + ":" + timeMinutes}`;

package/yarn-error.log

@@ -0,0 +1,103 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn
+
+PATH: 
+  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  12.22.1
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@titaui/pc",
+  <<<<<<< HEAD
+    "version": "1.2.22",
+  =======
+    "version": "1.2.13",
+  >>>>>>> master
+    "nameCN": "",
+    "description": "",
+    "main": "src/index.js",
+    "scripts": {
+      "storybook": "start-storybook -p 6006 --no-dll",
+      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
+      "build-storybook": "build-storybook --docs --no-dll",
+      "build:es": "babel src -d es --ignore **/__tests__",
+      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
+      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
+      "build": "npm run build:lib && npm run build:es && npm run build:umd"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+      "del": "^6.0.0",
+      "gulp": "^3.x",
+      "gulp-autoprefixer": "^7.0.1",
+      "gulp-babel": "^8.0.0",
+      "gulp-concat": "^2.6.1",
+      "gulp-cssbeautify": "^3.0.0",
+      "gulp-cssnano": "^2.1.3",
+      "gulp-filesize": "0.0.6",
+      "gulp-postcss": "^9.0.0",
+      "gulp-rename": "^2.0.0",
+      "gulp-replace": "^1.0.0",
+      "gulp-sass": "^4.1.0",
+      "gulp-sourcemaps": "^2.6.5",
+      "sass-resources-loader": "^2.2.1"
+    },
+    "dependencies": {
+      "@titaui/dagre": "^0.8.8-pre",
+      "@titaui/rc-tree2": "^4.1.15",
+      "@titaui/rc-trigger": "^5.2.5",
+      "@titaui/react-flow-renderer": "9.5.4",
+      "@titaui/toast": "^1.0.0",
+      "axios": "^0.21.1",
+      "classnames": "^2.2.6",
+      "clone-deep": "^4.0.1",
+      "d3-cloud": "^1.2.5",
+      "dayjs": "^1.10.4",
+      "html2canvas": "^1.0.0-rc.7",
+      "moment": "^2.29.1",
+      "qs": "^6.10.1",
+      "rc-checkbox": "^2.3.2",
+      "rc-dialog": "8.5.2",
+      "rc-drawer": "^4.3.1",
+      "rc-input-number": "^5.0.0",
+      "rc-pagination": "^3.1.6",
+      "rc-queue-anim": "1.4.1",
+      "rc-select": "^12.1.7",
+      "rc-switch": "^3.2.2",
+      "rc-table": "^7.13.2",
+      "rc-tabs": "^11.7.3",
+      "rc-tooltip": "^5.1.1",
+      "rc-tree": "^4.1.5",
+      "rc-trigger": "^5.2.3",
+      "rc-upload": "^4.2.0-alpha.0",
+      "rc-util": "^5.13.1",
+      "react-collapse": "^5.1.0",
+      "react-perfect-scrollbar": "^1.5.2",
+      "url-parse": "^1.5.1",
+      "uuid": "^3.1.0",
+      "wordcloud": "^1.2.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile