@titaui/pc 1.7.65 → 1.7.69

package/src/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.tsx

@@ -0,0 +1,82 @@
+import React, { FC, useContext, useMemo, Fragment, useEffect, useRef } from "react";
+import classNames from "classnames";
+import { IDynamicItemContentProps } from "../../interface";
+import LeftQuotoSvg from "../../img/dynamic-left-quoto.svg";
+import { SearchKeyContext } from "../../context";
+import DynamicItemHeader from "../components/header";
+import DangerousHtml from "../../components/dangerous-html";
+import { getFeedTypeAndTypeColor } from "../../util";
+import { highLightWord } from '../../../../utils/tools';
+import Photo from './img/user-photo.png'
+import "./index.scss";
+
+const prefix = "titaui-dynamic-share-to-dynamic";
+
+const DynamicShare: FC<IDynamicItemContentProps> = ({
+  data,
+  hasDynamicOpereateAuth = false,
+  ...restProps
+}) => {
+  const { searchKeyWord } = useContext(SearchKeyContext);
+  const contentRef = useRef<any>();
+  const { feedTypeText, feedTypeColor } = getFeedTypeAndTypeColor(
+    data.feedType
+  );
+  const isPublisher = data.publishUser.userId === window.BSGlobal.loginUserInfo.Id;
+
+  const renderDesc = useMemo(() => {
+    return (
+      <Fragment>
+        <span className={prefix + "__operate-desc"}>分享了一篇文章</span>
+        <span
+          className={prefix + "-desc-operate-type"}
+          style={{ background: feedTypeColor }}
+        >
+        </span>
+      </Fragment>
+    );
+  }, []);
+
+  useEffect(() => {
+    highLightWord({
+      parentDom: contentRef.current,
+      keyWord: searchKeyWord,
+    });
+  }, [data, searchKeyWord]);
+
+  return (
+    <div className={prefix}>
+      <DynamicItemHeader
+        data={data}
+        desc={renderDesc}
+        showDelete={hasDynamicOpereateAuth || isPublisher}
+        showTopping={hasDynamicOpereateAuth}
+        user={data.publishUser}
+        {...restProps}
+      />
+      <div className={prefix + "__content"}>
+        <div>
+          <img
+            className={classNames(
+              prefix + "__content-quoto",
+              prefix + "__content-quoto--left"
+            )}
+            src={LeftQuotoSvg}
+          />
+        </div>
+        <div ref={contentRef}>
+          <DangerousHtml htmlText={"团队12312为当你把策划久别重逢后金"}/>
+        </div>
+      </div>
+      <div className={classNames(`${prefix}__share`)}>
+        <img src={Photo} className={classNames(`${prefix}__share-img`)}/>
+        <div className={classNames(`${prefix}__share-right`)}>
+          <span className={classNames(`${prefix}__share-right-title`)}>团队如何开始 OKR 之旅？</span>
+          <span className={classNames(`${prefix}__share-right-content`)}>多年来，我有幸一直在创新和交付生命周期的所必经的阶段上工作。无论是在战略、产品还是交付阶段，我都发觉，如何确保将从最初的想法带入世界，对领导者来说是一个多么大的挑战。多年来，我有幸一直在创交ncmjdksncjndskjcndjsk无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将无论是在战略、产品还是交付阶段，我都发觉，如何确保将如何确保将如何确保将如何确保将</span>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DynamicShare;

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

@@ -14,6 +14,7 @@ import SearchKeyHandle from "../../../search-key-handle";
 import Tooltip from '../../../tooltip';
 import { getFeedTypeAndTypeColor } from "../../util";
 import drawerManager from "../../../drawer-manager";
+import { htmlDecodeByRegExp } from '../../../../utils/mblog';
 import "./index.scss";
 
 const prefix = "titaui-dynamic-task-item";
@@ -79,7 +80,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
         className={prefix + "__content-title-text"}
         onClick={handleClickTaskTitle}
       >
-        <SearchKeyHandle str={taskName} keyWord={searchKeyWord} />
+        <SearchKeyHandle str={htmlDecodeByRegExp(taskName)} keyWord={searchKeyWord} />
       </span>
     );
   }, [taskName, searchKeyWord]);

package/src/components/dynamic/quick-operation/index.tsx

@@ -22,7 +22,9 @@ const DynamicQuickOperation: FC<IDynamicQuickOperation> = ({
   const hasDynamicAnnouncementAuth = new DynamicManagerAuth().hasAuth();
   const createTaskDivRef = useRef(document.createElement("div"));
   const isNewUI = getBSGlobal("tenantInfo").isNewIndex;
-  const hasOKRApp = getBSGlobal("newNavigation").find(
+
+  const newNavigation = getBSGlobal("newNavigation")||[]
+  const hasOKRApp =  newNavigation.find(
     (item) => item.appId === 113
   );
 

package/src/components/dynamic/util.ts

@@ -57,6 +57,14 @@ export const getFeedTypeAndTypeColor = (feedType: number) => {
     feedTypeText = "任务";
     feedTypeColor = "linear-gradient(90deg, #0080FF 0%, #8FC7FF 100%)";
   }
+  if (feedType === EFeedType.PlanCommunication) {
+    feedTypeText = "计划表";
+    feedTypeColor = "linear-gradient(90deg, #0080FF 0%, #8FC7FF 100%)";
+  }
+  if (feedType === EFeedType.OKRsCommunication) {
+    feedTypeText = "OKRs";
+    feedTypeColor = "linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)";
+  }
   return {
     feedTypeText,
     feedTypeColor,

package/src/components/nav-top/index.tsx

@@ -11,7 +11,8 @@ import "./index.scss";
 import { rpost } from "../../utils/request";
 import Toast from "../toast";
 const Logo = getLogo();
-const hasOKRApp = getBSGlobal("newNavigation").find(
+const newNavigation = getBSGlobal("newNavigation")||[]
+const hasOKRApp = newNavigation.find(
   (item) => item.appId === 113
 );
 const preCls = "titaui-nav-top";

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/weight-input.tsx

@@ -16,8 +16,9 @@ const WeightInput = (props: IProps) => {
 
   const onChangeHandler = (e) => {
     const currentValue = e.currentTarget.value;
-    setIsError(!/^(\d{1,2}(\.\d{1})?|100)$/g.test(currentValue));
-    onChange({ workId, value: currentValue, isError });
+    const error = !/^(\d{1,2}(\.\d{1})?|100)$/g.test(currentValue);
+    setIsError(error);
+    onChange({ workId, value: currentValue, error });
   };
 
   const onBlurHandler = (e) => {

package/src/components/tooltip/index.scss

@@ -1,5 +1,5 @@
 .rc-tooltip {
-  z-index: 1400;
+  z-index: 2400;
   opacity: 1;
 }
 .rc-tooltip-inner {

package/src/components/user-selector/select-tree/tree-nodes/tree-depart-node/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
+import Tooltip from '../../../../tooltip';
 import { OpenDepartmentName } from '../../../../../utils/open-data';
 
 import './index.scss';
@@ -15,7 +16,7 @@ export default props => {
     <span className="perspm-depart__icon" />
 
     <span className="perspm-depart__name" title="">
-      <OpenDepartmentName id={data.id} name={data.name} />
+      <Tooltip.Text text={<OpenDepartmentName id={data.id} name={data.name} />} isPercent />
     </span>
 
     {!isSelectedPanel ? <span className={classNames(

package/src/components/user-selector/select-tree/tree-nodes/tree-depart-node/index.scss

@@ -23,7 +23,6 @@
     line-height: 22px;
     overflow: hidden;
     white-space: nowrap;
-    text-overflow: ellipsis;
   }
 
   &__member-count {

package/src/components/version-change-modal/index.tsx

@@ -10,7 +10,7 @@ import { getBSGlobal } from "../../utils/bs-global";
 import { cancelGuide, setVersion } from "./request-api";
 import { versionList, Versions } from "./constant";
 import "./index.scss";
-import { getTenantInfo } from "&/utils/helpers";
+import { getTenantInfo } from "../../utils/helpers";
 
 const prefix = "titaui-version-change-modal";
 

package/src/components/weekly-report/common-painter/openDataPainter.ts

@@ -1,5 +1,5 @@
-import { getOpenId } from "&/components/common/openData";
-import { isWx } from "&/components/helper";
+import { getOpenId } from "../../../utils/open-data";
+import { isWx } from "../../../utils/bs-global";
 
 
 interface openDataParam {

package/src/index.js

@@ -65,6 +65,7 @@ export { default as TaskRelationModal } from "./components/task-relation-modal";
 export { default as Tabs } from "./components/tabs";
 export { default as TitaChart } from "./components/tita-chart";
 export { default as Tooltip } from "./components/tooltip";
+export { default as TooltipText } from './components/tooltip/tooltip-text';
 export { default as UpdateModal } from "./components/update-modal";
 export { default as upload } from "./components/upload";
 export { default as Upvote } from "./components/upvote";

package/src/pages/new-okr-list/header/comments.tsx

@@ -11,7 +11,6 @@ const Comments = (props) => {
   const { OkrCommunicationPush, annualNum, cycleType, yqmNum } = useContext(
     Context
   );
-
   const openComments = () => {
     pushRef.current && pushRef.current.show();
   };
@@ -41,7 +40,7 @@ const Comments = (props) => {
             Id: userInfo.userId,
             Name: userInfo.name,
             Color: userInfo.avatar.color,
-            AvatarsUrl: userInfo.avatar.small,
+            AvatarsUrl: userInfo.avatar.original,
             Type: 1,
           }}
         />

package/src/utils/mblog.js

@@ -8,6 +8,7 @@ export function htmlEncodeByRegExp(str) {
   temp = temp.replace(/\'/g, "'")
   temp = temp.replace(/\"/g, """)
   temp = temp.replace(/\n/g, "<br/>")
+  temp = temp.replace(/\+/g, "&#43;")
   return temp
 }
 
@@ -20,6 +21,6 @@ export function htmlDecodeByRegExp(str) {
   temp = temp.replace(/&nbsp;/g, " ")
   temp = temp.replace(/&#39;/g, "\'")
   temp = temp.replace(/&quot;/g, "\"")
-  temp = temp.replace(/<br\/>/g, "\n")
+  temp = temp.replace(/&#43;/g, "+")
   return temp
 }