@titaui/pc 1.9.8 → 1.9.12

package/src/components/change-okr-modal/constant.ts

@@ -1,3 +1,4 @@
+import { getBSGlobal } from "&/utils/bs-global";
 import { getLocale, isEn } from "../../utils/getLocale";
 
 export const getYear = () => {
@@ -87,7 +88,7 @@ export const getBimonthlyMonthKeyValue = (startMonth) => {
     value: string[];
   }[] = [];
   const monthLang = getMonth();
-  if (!i18nInfo || (i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN")) {
+  if (!isEn) {
     datas.push({
       title: `${start} - ${getNextMonth(start)}月`,
       value: [`4,${start}`],

package/src/components/create-okr-modal/createCycle.tsx

@@ -44,7 +44,7 @@ function CreateCycle({ cycle, container, onChange }: Props): ReactElement {
   },[])
 
   const onSelectClickHandler = () => {
-    setSelfCycle(cycle);
+    setSelfCycle(cycle || {});
     popRef.current && popRef.current.show(btnRef.current);
   }
 

package/src/components/dialog/index.scss

@@ -89,6 +89,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     color: #ffffff;
     transition: 0.2s all;
     &:hover {
+      border: 1px solid #5c8eff;
       background: #5c8eff;
       color: #ffffff;
     }

package/src/components/dynamic/constant.ts

@@ -60,7 +60,7 @@ export const ObjectType = {
   4: getLocale('Menu_Title_Projects'),
   5: getLocale('Mod_sPerformanceForm'),
   6: getLocale('Mod_sPerformanceGoals'),
-  7: getLocale('Mod_stask'),
+  7: getLocale('Mod_stasks'),
   8: getLocale('Mod_sDailySummary'),
   10: getLocale('Feed_sFeed'),
   11: getLocale('Pro_page_Plan'),

package/src/components/dynamic/dynamic-item/dynamic-assessment/index.tsx

@@ -28,7 +28,7 @@ const DynamicShare: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
   const renderDesc = useMemo(() => {
     return (
       <Fragment>
-        <span className={prefix + "__operate-desc"}>{getLocale('Mod_skeyprogress')}</span>
+        <span className={prefix + "__operate-desc"}>{getLocale('Mod_sassessment')}</span>
         <span
           className={prefix + "-desc-operate-type"}
           style={{ background: feedTypeColor }}

package/src/components/dynamic/dynamic-item/dynamic-progress/index.tsx

@@ -108,12 +108,12 @@ const DynamicProgress: FC<IDynamicItemContentProps> = ({
           >
             <SearchKeyHandle str={relationParentName} keyWord={searchKeyWord} />
           </span>
-          {getLocale('Mod_skeyresspross')}
+          {getLocale('Mod_skeyrprogress')}
         </span>
       );
     }
     if (obj && obj.objType === EObjType.O) {
-      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_skeyprogress')}`;
+      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_objectiveprog')}`;
     }
     if (obj && obj.objType === EObjType.Task) {
       dom = `${getLocale('Mod_Updated')}${getLocale('Data_Taskprogress')}`;

package/src/components/form/form-fields/input/index.scss

@@ -7,7 +7,6 @@
     }
     .form-field-input__border{
       margin-left: 16px;
-      border: 1px solid #DFE3EA;
       flex: 1;
     }
   }

package/src/components/form/form-fields/password/index.scss

@@ -51,7 +51,7 @@
   &__input {
     display: inline-block;
     padding: 0;
-    width: calc(100% - 12px);
+    width: calc(100% - 20px);
     font-size: 14px;
     font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
       sans-serif, PingFang SC, Microsoft YaHei;
@@ -80,7 +80,7 @@
   }
   &__hide-icon {
     position: absolute;
-    right: 3px;
+    right: 12px;
     top: 10px;
     width: 16px;
     height: 16px;

package/src/components/grid-layout/words-cloud/index.tsx

@@ -7,6 +7,7 @@ import lvMask from '../image/lv'
 import couldMask from '../image/could'
 import titaMask from '../image/tita-mask'
 import { getLocale } from "../../../utils/getLocale";
+import { getBSGlobal } from "../../../utils/bs-global";
 
 const ComponentId = 'Enterprise-Focus-Hotspots'
 
@@ -14,6 +15,7 @@ const ComponentId = 'Enterprise-Focus-Hotspots'
 
 export default function WordCloudComponent() {
 
+  const versionInfo = getBSGlobal("tenantAuthentication");
   const [wordsData, setWordsData] = useState<WordsData>([])
 
   useEffect(() => {
@@ -40,7 +42,7 @@ export default function WordCloudComponent() {
         iconUrl={require('../image/Collaboration.png')}
         tips={getLocale('HP_Theenterprise')}
       >
-        {wordsData.length === 0 && (
+        {versionInfo.Version === 1 && wordsData.length === 0 && (
           <Advice
             styles={{ float: 'right' }}
             link="https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true"

package/src/components/upload-photo-modal/constant.ts

@@ -2,20 +2,20 @@
 export const List = [
 	{
 		id: 'person',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 1,
-		tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
+		tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
 		previewTitle: '预览',
     minCropBoxHeight: 60,
     minCropBoxWidth: 60,
 	},
   {
 		id: 'enterprise',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 5,
-		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
+		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、png 格式',
 		previewTitle: 'logo 预览',
     minCropBoxHeight: 20,
     minCropBoxWidth: 20,

package/src/pages/like-ranking/filter-buttons/timer.tsx

@@ -20,7 +20,7 @@ const Timer: FC<any> = ({ setParma, parmas,setType }) => {
   return (
     <Fragment>
       <RangePickerPop
-        format="YYYY-MM-DD"
+        format="YYYY/MM/DD"
         controlled
         onConfirm={onStartDateConfirmHandler}
         defaultRange={{

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

@@ -61,35 +61,17 @@
       }
     }
   }
-  .form-field-input__label {
-    margin-bottom: 4px;
-  }
-  .form-field-input__border {
-    padding: 0;
-    border: none;
-    background-color: #fff;
-  }
-  .form-field-input__label-text {
-    font-weight: 600;
-  }
-  .form-field-input__input {
-    font-size: 12px;
-    line-height: 18px;
-    background-color: #fff;
-  }
-  .form-field-input__border--disabled input:disabled {
-    background-color: #fff;
-  }
   &__form {
-    height: 66px;
     box-sizing: border-box;
-    padding: 10px 0;
+    margin-bottom: 16px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
     &-title {
       font-size: 14px;
-      font-weight: normal;
+      font-weight: 600;
       color: #141C28;
       line-height: 22px;
-      margin-bottom: 6px;
     }
     &-value {
       font-size: 12px;

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

@@ -8,7 +8,7 @@ import "./index.scss";
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", id: '' });
+  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", userId: '' });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
@@ -25,7 +25,7 @@ const BaseInfo: FC = () => {
 
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
-			if (resp.Code === 1 && resp.Data) {
+			if (resp.Code === 1 && resp.Data) {        
 				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
 			}
 		});
@@ -40,11 +40,11 @@ const BaseInfo: FC = () => {
           text={getLocale('Mod_Editor')}
           onClick={handleClickEdit}
         />
-        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo} info={userInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>姓名</div>
-        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.id} name={userInfo.name} /></span>
+        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.userId} name={userInfo.name} /></span>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>手机号码</div>

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

@@ -10,7 +10,7 @@ const { Fields } = Form;
 const prefix = "titaui-edit-personal-info"
 
 const EditBaseInfo = (props) => {
-	const { visible, onCancel, handleSuccessEditBaseInfo } = props;
+	const { visible, onCancel, handleSuccessEditBaseInfo, info } = props;
 
 	const modalRef = useRef<any>();
   const formContainerRef = useRef<any>();
@@ -89,8 +89,14 @@ const EditBaseInfo = (props) => {
 			title={'基本信息设置'}
 			noHeadLine
 			maskClosable={false}
-			onClose={onCancel}
-			onCancel={onCancel}
+			onClose={() => {
+        onCancel();        
+        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
+      }}
+			onCancel={() => {
+        onCancel();
+        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
+      }}
 			okText="确定"
 			noFooterLine
 			onOk={handleSaveUserInfo}

package/src/utils/format-time.ts

@@ -51,7 +51,7 @@ export const timeFormat = (NowDate) => {
   var y = date.getFullYear(); //年
   var m = date.getMonth() + 1; //月
   var d = date.getDate(); //日
-  return y + "-" + m + "-" + d+" 0:0:0";
+  return y + "/" + m + "/" + d+" 0:0:0";
 };
 
 // 获取当年第一天
@@ -74,7 +74,7 @@ export const showWeekFirstDay = () => {
   // @ts-ignore
   let WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   let M = Number(WeekFirstDay.getMonth()) + 1;
-  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate()+" 0:0:0";
+  return WeekFirstDay.getFullYear() + "/" + M + "/" + WeekFirstDay.getDate()+" 0:0:0";
 };
 
 // 本周最后一天
@@ -86,7 +86,7 @@ export const showWeekLastDay = () => {
   // @ts-ignore
   let WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   let M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate();
+  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate();
 };
 
 // 下周第一天
@@ -98,7 +98,7 @@ export const showNextWeekFirstDay = () => {
   // @ts-ignore
   let WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   let M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate()+" 0:0:0";
+  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate()+" 0:0:0";
 };
 
 // 本月第一天
@@ -106,7 +106,7 @@ export const showMonthFirstDay = () => {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate()+" 0:0:0";
+  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate()+" 0:0:0";
 };
 
 // 本月最后一天
@@ -120,7 +120,7 @@ export const showMonthLastDay = () => {
   // @ts-ignore
   var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
   var M = Number(MonthLastDay.getMonth()) + 1;
-  return MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
+  return MonthLastDay.getFullYear() + "/" + M + "/" + MonthLastDay.getDate();
 };
 // 下个月第一天
 export const showNextMonthFirstDay = () => {
@@ -131,5 +131,5 @@ export const showNextMonthFirstDay = () => {
     1
   );
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate()+" 0:0:0";
+  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate()+" 0:0:0";
 };

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