@titaui/pc 1.9.67 → 1.9.71

package/src/components/dynamic/constant.ts

@@ -55,23 +55,25 @@ export const ObjTypeMapText = {
   [EObjType.KanBan]: getLocale("Pro_page_V_Tab_Kanban"),
 };
 
-export const ObjectType = {
-  1: getLocale("Mod_sannouncement"),
-  4: getLocale("Menu_Title_Projects"),
-  5: getLocale("Mod_sPerformanceForm"),
-  6: getLocale("Mod_sPerformanceGoals"),
-  7: getLocale("Mod_stasks"),
-  8: getLocale("Mod_sDailySummary"),
-  10: getLocale("Feed_sFeed"),
-  11: getLocale("Pro_page_Plan"),
-  12: getLocale("Feed_OperationTasks"),
-  62: getLocale("Mod_sobjective"),
-  65: getLocale("Feed_Keyresults"),
-  70: getLocale("OKR_MyO_KRP_Review"),
-  79: getLocale("Mod_skeyprogress"),
-  80: getLocale("Feed_sAnnouncement"),
-  42: getLocale("OKR_MyO_E_Reward"),
-};
+export const ObjectType = () => { 
+    return {
+    1: getLocale("Mod_sannouncement"),
+    4: getLocale("Menu_Title_Projects"),
+    5: getLocale("Mod_sPerformanceForm"),
+    6: getLocale("Mod_sPerformanceGoals"),
+    7: getLocale("Mod_stasks"),
+    8: getLocale("Mod_sDailySummary"),
+    10: getLocale("Feed_sFeed"),
+    11: getLocale("Pro_page_Plan"),
+    12: getLocale("Feed_OperationTasks"),
+    62: getLocale("Mod_sobjective"),
+    65: getLocale("Feed_Keyresults"),
+    70: getLocale("OKR_MyO_KRP_Review"),
+    79: getLocale("Mod_skeyprogress"),
+    80: getLocale("Feed_sAnnouncement"),
+    42: getLocale("OKR_MyO_E_Reward"),
+  };
+}
 
 export const EStatusStatus2ClassType = {
   2: "tu-icon-finished",

package/src/components/dynamic/dynamic-liking/item.tsx

@@ -28,6 +28,7 @@ const Item: FC<any> = ({ userInfo }) => {
   // const handleOpenUserPage = () => {
   //   window.open(url, "_blank");
   // };
+  const ObjectTypeText = ObjectType();
   return (
     <div className={`${preCls}`}>
       <div className={`${preCls}-center`}>
@@ -47,7 +48,7 @@ const Item: FC<any> = ({ userInfo }) => {
                 <span>
                   {getLocale("Feed_Kudos")}
                   <OpenUserName id={toUserId} name={toUserName} />
-                  {`${ObjectType[pariseObjType] || "feed"}`}
+                  {`${ObjectTypeText[pariseObjType] || "feed"}`}
                 </span>
               )}
               maxWidth={150}

package/src/components/hr-header/index.scss

@@ -26,7 +26,7 @@
     justify-content: center;
     margin: 0 5px;
     position: relative;
-    color: #ffffff !important;
+    color: #ffffff;
     & > a {
       color: #ffffff !important;
     }

package/src/components/hr-header/index.tsx

@@ -2,7 +2,7 @@ import React, { ReactElement, useState, useEffect } from "react";
 import classNames from "classnames";
 import axios from "axios";
 import Popup from "../popup";
-import { getLoginUserInfo } from "../../utils/helpers";
+import { getLoginUserInfo, getTenantInfo } from "../../utils/helpers";
 import ArrowImg from "./img/arrow.png";
 import "./index.scss";
 
@@ -22,7 +22,7 @@ function HrHeader(): ReactElement {
   }, []);
   return (
     <div className={preCls}>
-      <span className={`${preCls}__title`}>腾讯HR助手</span>
+      <span className={`${preCls}__title`}>{getTenantInfo().Name}</span>
       <div className={`${preCls}__menu-list`}>
         {menus.slice(0, 5).map((menu) => (
           <div

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -44,7 +44,7 @@ export function SubmitDialog(props: Props1) {
   };
 
   return (
-    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body}>
+    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body} zIndex={1200}>
       <div className="okr-cases-library__submitWindow">
         <img src={require("../image/submit小驴.svg")} />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />

package/src/components/okrcase-library-card/index.tsx

@@ -70,7 +70,7 @@ function OkrCaseCard(props: Props) {
     window.titaTracker
       // @ts-ignore
       && window.titaTracker("action").record({
-        action: getLocale("Per_Ass_Pop_button_Apply"),
+        action: '套用',
         actionGroup: getLocale("OKR_OKRex_Casebase"),
         productName: getLocale("OKR_OKRex_Casebase"),
       });

package/src/components/photo-card/index.tsx

@@ -6,7 +6,7 @@ import Tooltip from "../tooltip";
 import ConditionRender from "../condition-render";
 import Avatar from "../../components/avatar";
 import { OpenUserName } from "../../utils/open-data";
-import { getUserInfo } from "../../utils/bs-global";
+import { getBSGlobal, getUserInfo } from "../../utils/bs-global";
 import Card from "./components/card";
 import {
   getAttentionData,
@@ -32,7 +32,6 @@ interface IProps {
 
 function PhotoCard(props: IProps) {
   const { userId, isNameVisible = true } = props;
-
   const [userInfo, setUserInfo] = useState<any>();
   const [isAttention, setIsAttention] = useState(false);
 
@@ -51,13 +50,15 @@ function PhotoCard(props: IProps) {
 
   useEffect(() => {
     getOtherUserInfo(userId).then((res) => {
+      let currentUser;
       if (res.Code === 1) {
+        currentUser = res.Data;
         setUserInfo(res.Data);
       }
-      getAttentionData(userId).then((res) => {
+      getAttentionData().then((res) => {
         if (res.Code === 1) {
-          res.Data.followerUsers.forEach((item) => {
-            if (item.userId === userownInfo.Id) {
+          (res.Data || []).forEach((item) => {
+            if (item.userId === currentUser.userId) {
               setIsAttention(true);
             }
           });

package/src/components/photo-card/request.apis.ts

@@ -1,6 +1,6 @@
 import { rget, rpost } from "../../utils/request";
 
-export const getAttentionData = (userId) => rget("v1")(`follow/getFollowerList?toUserId=${userId}`);
+export const getAttentionData = () => rget("v1")(`follow/followerList`);
 
 export const getVisitData = (userId) => rget("v1")(`okr/okrCyclePageVisitor?toUserId=${userId}`);
 

package/src/pages/aha2021/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  Children, ReactChild, useEffect, useState,
+  Children, ReactChild, useEffect,
 } from "react";
 import classNames from "classnames";
 import Tooltip from "../../components/tooltip";
@@ -9,15 +9,12 @@ import InvitePeople from "../../components/invite-people";
 import HelpCard from "../../components/help-card";
 import PointDemo from "../../components/point-demo/point-demo";
 import { isOfficialSite } from "../../utils/platform";
-import TopGlobalCard from "../../components/top-global-prompt";
 import "./index.scss";
 import { getTenantInfo } from "../../utils/helpers";
 import HrHeader from "../../components/hr-header";
 import HrMessage from "../../components/nav-top/components/user-message/hrMessage";
-import { LocalStorage } from "../../utils/local-storage";
 
 const preCls = "titaui-aha-2021";
-const storage = new LocalStorage();
 
 function ContentTemplate(props: {
   children: ReactChild,
@@ -50,19 +47,7 @@ function PageLayout(props: {
   children: ReactChild
 }) {
   const { children } = props;
-  const [topCardVisible, setTopCardVisible] = useState(() => {
-    if (getTenantInfo().Source === 964) return false;
-    const stopTaking: any = storage.getItem("topGlobalCard");
-    if (stopTaking?.date) {
-      const oldDate = new Date(stopTaking?.date).getDate();
-      const newDate = new Date().getDate();
-      if (newDate > oldDate) {
-        return true;
-      }
-      return false;
-    }
-    return true;
-  });
+
   const isTrial = window.BSGlobal.tenantAuthentication.Version === 1 && isOfficialSite();
   const isTencentHr = window.BSGlobal.tenantInfo.Source === 964;
 
@@ -82,21 +67,12 @@ function PageLayout(props: {
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
-        {topCardVisible
-          ? (
-            <TopGlobalCard
-              text="为了给您带来安全与稳定的体验，我们将于 1.21 23:00 - 1.22 23:59 进行停服升级，请您提前安排好工作，感谢您的支持与理解！"
-              link="https://wiki.tita.com/x/RICeAQ"
-              setTopCardVisible={setTopCardVisible}
-            />
-          )
-          : null}
         {getTenantInfo().Source === 964 ? <HrHeader /> : <NavTop />}
       </div>
       <div className={classNames(`${preCls}__message`)}>
         <FollowerVisitor />
       </div>
-      <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${topCardVisible ? 114 : 74}px)` }}>
+      <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${74}px)` }}>
         {children}
       </div>
       {!isTencentHr && (

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

@@ -120,6 +120,9 @@ const NewOkrList: FC<any> = (props: {
       params.showOkrE = 1;
       params.Searchpage = 2;
     }
+    if(departmentId !== 0) {
+      params.keyWords = ''
+    }
     let request;
 
     if (!relation) {

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