@titaui/pc 1.9.32 → 1.9.36

package/src/components-v1/userSelector/components/MultiMode/DepartmentTree.tsx

@@ -5,6 +5,7 @@ import UserItem from '../UserItem';
 import { TreeHeader, TreeList } from '../../style';
 import { getApiUrl, taker } from '../../../../utils/request-v1';
 import { OpenDepartmentName } from '../../../../utils/open-data';
+import { getLocale } from '../../../../utils/getLocale';
 interface Props {
   tree: Dept;
   level: number;
@@ -82,7 +83,7 @@ export default class DepartmentTree extends PureComponent<Props, State> {
               <OpenDepartmentName name={tree.DepartmentName} id={tree.Id} />
               {/* {tree.DepartmentName} */}
             </span>
-            <span>{tree.TotalUserCount}人</span>
+            <span>{tree.TotalUserCount}{getLocale('Mod_Number')}</span>
           </div>
           {isRootSelect && onSelectDept && <i className='tu-icon-add2' onMouseDown={this.handleSelectDept} />}
           {onDeleteDept && <i className='tu-icon-cross' onMouseDown={this.handleDeleteDept} />}

package/src/components-v1/userSelector/components/MultiMode/SubsList.tsx

@@ -4,6 +4,7 @@ import { getApiUrl, taker } from '../../../../utils/request-v1'
 import { getUserInfo } from '../../../../utils/bs-global'
 import { ListHeader, ListWrapper, List, EmptyWrapper, ListEmptyText } from '../../style'
 import UserItem from '../UserItem'
+import { getLocale, isEn } from '../../../../utils/getLocale'
 import PerfectScrollbar from 'react-perfect-scrollbar'
 import 'react-perfect-scrollbar/dist/css/styles.css';
 interface Props {
@@ -38,7 +39,7 @@ export default class CommonList extends PureComponent<Props,State> {
         {
           hasUser && 
           <ListHeader>
-            <span>下属&nbsp;{users.length}人</span>
+            <span>{getLocale('OKR_MyO_Butt_Subordinate')}&nbsp;{users.length}{getLocale('Mod_Number')}</span>
             <i className="tu-icon-add2" onMouseDown={()=>this.props.onSelect(users)}/>
           </ListHeader>
         }

package/src/index.js

@@ -43,6 +43,7 @@ export { default as GridLayout } from "./components/grid-layout";
 export { default as HelpCard } from "./components/help-card";
 export { default as ImgViewer } from "./components/img-viewer";
 export { default as InvitePeople } from "./components/invite-people";
+export { default as KeywordSearch } from './components/keyword-search';
 export { default as Mblog } from "./components/mblog";
 export { default as Menus } from "./components/menus";
 export { default as NavTop } from "./components/nav-top";

package/src/pages/aha2021/index.tsx

@@ -41,7 +41,7 @@ const PageLayout = (props) => {
   const { children } = props;
 
   const isTrial =
-    window.BSGlobal.tenantAuthentication.Version !== 1 && isOfficialSite();
+    window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
 
   const onClickKefu = () => {
     const kefuUrl = isTrial
@@ -69,13 +69,13 @@ const PageLayout = (props) => {
           align={{ offset: [0, 0] }}
         >
           <div
-            className={classNames(`${preCls}__kefu`)}
+            className={`${preCls}__kefu`}
             onClick={onClickKefu}
           />
         </Tooltip>
       )}
       {isTrial && (
-        <div className={classNames(`${preCls}__invite`)}>
+        <div className={`${preCls}__invite`}>
           <InvitePeople />
         </div>
       )}

package/src/pages/like-ranking/index.tsx

@@ -144,9 +144,10 @@ const LikeRanking: FC = () => {
   };
 
   const handleLinkToPraiseRaking = () => {
-    let href = window.location.href;
-    let url = `${href.split("#")[0]}#dev`;
-    window.open(url, "self");
+    window.history.go(-1)
+    // let href = window.location.href;
+    // let url = `${href.split("#")[0]}#dynamic`;
+    // window.open(url, "self");
   };
 
   return (

package/src/pages/new-okr-list/index.tsx

@@ -89,7 +89,7 @@ const NewOkrList = (props) => {
 
   useEffect(() => {
     setPageNum(1);
-  }, [relation, toUserId, departmentId]);
+  }, [relation, toUserId, departmentId, query]);
 
   useEffect(() => {
     getOkrs();

package/src/utils/date-test-change.ts

@@ -1,27 +1,30 @@
-import { getMonth } from "./constant"
-import { getLocale, isEn } from "./getLocale"
+import { getMonth } from "./constant";
+import { getLocale, isEn } from "./getLocale";
 
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
+  const handleDate =
+    date.length == 5 ? `${new Date().getFullYear()}/${date}` : date;
+  const testTime = Date.parse(
+    handleDate.replace(/-/g, "/").split("T").join(" ").split(".")[0]
+  );
+  const now = Date.now();
 
-  const handleDate = date.length == 5 ? `${new Date().getFullYear()}/${date}` : date
-  const testTime = Date.parse(handleDate.replace(/-/g, '/').split('T').join(' ').split('.')[0])
-  const now = Date.now()
+  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24));
 
-  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24))
-
-  return diffDay
-}
+  return diffDay;
+};
 
 //精确到天的检测
-export const judgeTimeSpaceFromNow = (date) => {
-
-  if (!date)
-    return getLocale('OKR_MyO_KRP_Notupdated');
+export const judgeTimeSpaceFromNow = (date, withHM = true) => {
+  if (!date) return getLocale("OKR_MyO_KRP_Notupdated");
 
   const months = getMonth();
   // 兼容safari，safari不支持yy-mm-dd格式，支持yy/mm/dd格式
-  const handleDate = date.length === 5 ? new Date().getFullYear() + '/' + date : date.replace(/-/g, '/').split('T').join(' ').split('.')[0]
+  const handleDate =
+    date.length === 5
+      ? new Date().getFullYear() + "/" + date
+      : date.replace(/-/g, "/").split("T").join(" ").split(".")[0];
   const timeDateObj = new Date(handleDate);
   const timeMilliSecond = timeDateObj.getTime();
   const timeYear = timeDateObj.getFullYear();
@@ -30,7 +33,7 @@ export const judgeTimeSpaceFromNow = (date) => {
   const timeHours = timeDateObj.getHours();
   const timeMinutes = timeDateObj.getMinutes();
 
-  const nowTime = new Date()
+  const nowTime = new Date();
 
   const nowMilliSecond = nowTime.getTime();
   const nowYear = nowTime.getFullYear();
@@ -38,32 +41,70 @@ export const judgeTimeSpaceFromNow = (date) => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return getLocale('Pro_page_Int_Justnow');
+    return getLocale("Pro_page_Int_Justnow");
   }
   if (secondDiff < 60) {
-    return `${secondDiff}${getLocale('Mood_secago')}`;
+    return `${secondDiff}${getLocale("Mood_secago")}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
+    return `${Math.floor(secondDiff / 60)}${getLocale(
+      "Tasks_Tab_MyS_minuteago"
+    )}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}${getLocale('Mood_hoursago')}`;
+    return `${Math.floor(secondDiff / (60 * 60))}${getLocale("Mood_hoursago")}`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("OKR_MyO_Pr_Text_Yesterday")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("Mood_2daysago")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (timeYear === nowYear) {
-    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
-    return `${dateStr} ${
-      timeHours < 10 ? "0" + timeHours : timeHours
-    }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
+    const dateStr =
+      months[timeMonth - 1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`);
+    return (
+      `${dateStr}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
-  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
-  return `${dateStr} ${
-    timeHours < 10 ? "0" + timeHours : timeHours
-  }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
-
-}
+  const dateStr =
+    (isEn ? "" : `${timeYear}年`) +
+    months[timeMonth - 1] +
+    (isEn ? ` ${timeDate}` : `${timeDate}日`) +
+    (isEn ? `,${timeYear}` : "");
+  return (
+    `${dateStr}` +
+    (withHM
+      ? ` ${
+          (timeHours < 10 ? "0" + timeHours : timeHours) +
+          ":" +
+          (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+        }`
+      : "")
+  );
+};

package/yarn-error.log

@@ -1,103 +0,0 @@
-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