@titaui/pc 1.9.72 → 1.9.76

package/lib/utils/tools.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.changeQueryString = changeQueryString;
 exports.getQueryString = getQueryString;
 exports.highLightWord = exports.hexToRgba = exports.getUrlForUserPage = void 0;
+exports.htmlDecodeByHtmlRegExp = htmlDecodeByHtmlRegExp;
 exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
 exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
+exports.htmlEncodeToHtmlByRegExp = htmlEncodeToHtmlByRegExp;
 exports.unHighLight = exports.openPage = void 0;
 
 var _platform = require("./platform");
@@ -20,6 +22,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function htmlEncodeByRegExp(str) {
   if (!str) return "";
   var htmlString = {
@@ -50,7 +64,7 @@ function htmlDecodeByRegExp(str) {
 }
 
 function changeQueryString(key, value) {
-  var hash = decodeURIComponent(location.hash);
+  var hash = decodeURIComponent(window.location.hash);
   var queryObject = {};
   var markIndex = hash.indexOf("?"); // contain query string in fragments
 
@@ -60,25 +74,27 @@ function changeQueryString(key, value) {
     var queryString = hash.slice(markIndex + 1);
     var queryArray = queryString.split("&");
     queryArray.forEach(function (item) {
-      item = item.split("=");
-      queryObject[item[0]] = item[1];
+      var _item$split = item.split("="),
+          _item$split2 = _slicedToArray(_item$split, 2),
+          tempItem0 = _item$split2[0],
+          tempItem1 = _item$split2[1];
+
+      queryObject[tempItem0] = tempItem1;
     });
     queryObject[key] = value;
     var arr = [];
-
-    for (var name in queryObject) {
+    Object.keys(queryObject).forEach(function (name) {
       arr.push("".concat(name, "=").concat(queryObject[name]));
-    }
-
-    location.hash = "".concat(hashName, "?").concat(arr.join("&"));
+    });
+    window.location.hash = "".concat(hashName, "?").concat(arr.join("&"));
   } else {
-    location.hash = hash;
+    window.location.hash = hash;
   }
 }
 
 function getQueryString() {
   // 获取Url上的参数，以{}返回
-  var hash = decodeURIComponent(location.hash);
+  var hash = decodeURIComponent(window.location.hash);
   var queryObject = {};
   var markIndex = hash.indexOf("?"); // contain query string in fragments
 
@@ -87,7 +103,7 @@ function getQueryString() {
     var queryString = hash.slice(markIndex + 1);
     var queryArray = queryString.split("&");
 
-    for (var i = 0; i < queryArray.length; i++) {
+    for (var i = 0; i < queryArray.length; i += 1) {
       var queryPair = queryArray[i].split("=");
 
       if (queryPair[0] !== "_k") {
@@ -127,39 +143,42 @@ var highLightWord = function highLightWord(_ref) {
       }
     } else {
       var doms = Array.from(parentDom.childNodes);
-      doms && doms.length > 0 && doms.map(function (dom) {
-        // @ts-ignore      1是元素  3是文本节点
-        if (dom.nodeType === 3) {
-          var _match = dom.data.match(reg);
 
-          var _currentDom = dom;
+      if (doms && doms.length > 0) {
+        doms.forEach(function (dom) {
+          // @ts-ignore      1是元素  3是文本节点
+          if (dom.nodeType === 3) {
+            var _match = dom.data.match(reg);
 
-          while (_match) {
-            var _highlight = document.createElement(nodeType);
+            var _currentDom = dom;
 
-            _highlight.className = className;
+            while (_match) {
+              var _highlight = document.createElement(nodeType);
 
-            var _wordNode = _currentDom.splitText(_match.index);
+              _highlight.className = className;
 
-            _currentDom = _wordNode.splitText(_match[0].length);
+              var _wordNode = _currentDom.splitText(_match.index);
 
-            var _wordClone = _wordNode.cloneNode(true);
+              _currentDom = _wordNode.splitText(_match[0].length);
 
-            _highlight.appendChild(_wordClone);
+              var _wordClone = _wordNode.cloneNode(true);
 
-            _wordNode.parentNode.replaceChild(_highlight, _wordNode);
+              _highlight.appendChild(_wordClone);
 
-            _match = _currentDom.data.match(reg);
-          }
-        } else if (dom.nodeType === 1 && dom.childNodes) {
-          for (var i = 0; i < dom.childNodes.length; i++) {
-            i += highLightWord({
-              parentDom: dom.childNodes[i],
-              keyWord: keyWord
-            });
+              _wordNode.parentNode.replaceChild(_highlight, _wordNode);
+
+              _match = _currentDom.data.match(reg);
+            }
+          } else if (dom.nodeType === 1 && dom.childNodes) {
+            for (var i = 0; i < dom.childNodes.length; i += 1) {
+              i += highLightWord({
+                parentDom: dom.childNodes[i],
+                keyWord: keyWord
+              });
+            }
           }
-        }
-      });
+        });
+      }
     }
   }
 };
@@ -173,19 +192,22 @@ var unHighLight = function unHighLight(_ref2) {
       _ref2$nodeType = _ref2.nodeType,
       nodeType = _ref2$nodeType === void 0 ? "span" : _ref2$nodeType;
   var doms = parentDom.querySelectorAll("".concat(nodeType, " .").concat(className));
-  doms && doms.forEach(function (dom) {
-    var parentNode = dom.parentNode;
-    var firstChild = dom.firstChild;
-    parentNode.replaceChild(firstChild, dom);
-    parentNode.normalize();
-  });
+
+  if (doms) {
+    doms.forEach(function (dom) {
+      var parentNode = dom.parentNode;
+      var firstChild = dom.firstChild;
+      parentNode.replaceChild(firstChild, dom);
+      parentNode.normalize();
+    });
+  }
 };
 
 exports.unHighLight = unHighLight;
 
 var hexToRgba = function hexToRgba(hex) {
   var opacity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-  return "rgba(".concat(parseInt("0x".concat(hex.slice(1, 3))), ",").concat(parseInt("0x".concat(hex.slice(3, 5))), ",").concat(parseInt("0x".concat(hex.slice(5, 7))), ",").concat(opacity, ")");
+  return "rgba(".concat(parseInt("0x".concat(hex.slice(1, 3)), 16), ",").concat(parseInt("0x".concat(hex.slice(3, 5)), 16), ",").concat(parseInt("0x".concat(hex.slice(5, 7)), 16), ",").concat(opacity, ")");
 };
 
 exports.hexToRgba = hexToRgba;
@@ -199,13 +221,13 @@ var getUrlForUserPage = function getUrlForUserPage(options) {
 
   var configs = _objectSpread(_objectSpread({}, defults), options);
 
-  if (!configs.userId || (0, _platform.isDD)(true) || (0, _platform.isFeishu)(true) || configs.userType == 2) {
+  if (!configs.userId || (0, _platform.isDD)(true) || (0, _platform.isFeishu)(true) || configs.userType === 2) {
     return "";
   }
 
   var userInfo = window.BSGlobal.loginUserInfo;
 
-  if (configs.userId == undefined) {
+  if (configs.userId === undefined) {
     configs.userId = userInfo.Id;
   }
 
@@ -223,6 +245,33 @@ var openPage = function openPage(url) {
   } else {
     window.open(url, "_blank");
   }
-};
+}; // html标签转义
+
+
+exports.openPage = openPage;
+
+function htmlEncodeToHtmlByRegExp(str) {
+  var temp = "";
+  if (str.length === 0) return ""; // temp = str.replace(/&/g, "&amp;")
+
+  temp = str.replace(/</g, "&lt;");
+  temp = temp.replace(/>/g, "&gt;"); // temp = temp.replace(/ /g, "&nbsp;")
+
+  temp = temp.replace(/'/g, "&#39;");
+  temp = temp.replace(/"/g, "&quot;");
+  temp = temp.replace(/\n/g, "<br/>");
+  return temp;
+}
 
-exports.openPage = openPage;
+function htmlDecodeByHtmlRegExp(str) {
+  var temp = "";
+  if (str.length === 0) return "";
+  temp = str.replace(/&amp;/g, "&");
+  temp = temp.replace(/&lt;/g, "<");
+  temp = temp.replace(/&gt;/g, ">");
+  temp = temp.replace(/&nbsp;/g, " ");
+  temp = temp.replace(/&#39;/g, "'");
+  temp = temp.replace(/&quot;/g, "\"");
+  temp = temp.replace(/<br\/>/g, "\n");
+  return temp;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.72",
+  "version": "1.9.76",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/create-okr-modal/fields/okr-case.tsx

@@ -3,7 +3,7 @@ import { CaseLink, Line } from "../style";
 import OKRCases from "../../okrcase-library";
 import Dialog from "../../dialog";
 import Toast from "../../toast";
-import { isLocal } from "../../../utils/helpers";
+import { isLocal, isTencentHr } from "../../../utils/helpers";
 import { getLocale } from "../../../utils/getLocale";
 import "./index.scss";
 
@@ -12,7 +12,7 @@ interface Props {
   okrTemplateEnabled: boolean;
 }
 
-export default function ({ onOkrApply, okrTemplateEnabled }: Props) {
+export default function OkrCase({ onOkrApply, okrTemplateEnabled }: Props) {
   const [visible, setVisible] = useState(false);
 
   const okrCaseClickHandler = () => {
@@ -24,14 +24,14 @@ export default function ({ onOkrApply, okrTemplateEnabled }: Props) {
   };
 
   const OnOkrApplyHandler = (data) => {
-    onOkrApply && onOkrApply(data);
+    onOkrApply?.(data);
     setVisible(false);
     Toast.Success("成功套用");
   };
 
   return (
     <Line>
-      {okrTemplateEnabled && !isLocal() ? (
+      {okrTemplateEnabled && !isLocal() && !isTencentHr() ? (
         <CaseLink onClick={okrCaseClickHandler} className="tu-icon-shoushi">
           {getLocale("OKR_MyO_Pop_Butt_AddfromOKR")}
         </CaseLink>
@@ -68,7 +68,7 @@ export default function ({ onOkrApply, okrTemplateEnabled }: Props) {
 //     offsetPosition={{ 'top': 41 }}
 //     fullSize={true}
 // >
-{
-  /* <OKRCases onClose={onCasesCloseHandler} onApplyTpl={OnOkrApplyHandler} /> */
-}
+// {
+//   /* <OKRCases onClose={onCasesCloseHandler} onApplyTpl={OnOkrApplyHandler} /> */
+// }
 // </OldModal>

package/src/components/dynamic/constant.ts

@@ -55,25 +55,25 @@ export const ObjTypeMapText = {
   [EObjType.KanBan]: getLocale("Pro_page_V_Tab_Kanban"),
 };
 
-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 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 EStatusStatus2ClassType = {
   2: "tu-icon-finished",

package/src/components/dynamic/dynamic-item/dynamic-project/constant.ts

@@ -1,6 +1,6 @@
 import { getLocale } from "../../../../utils/getLocale";
 
-export const EStatusClass2StatusTypeText = {
+export const getEStatusClass2StatusTypeText = () => ({
   2: getLocale("OKR_MyO_E_From_Completed"),
   1: getLocale("Per_MyRe_text_Inprogress"),
   4: getLocale("OKR_MyO_E_From_Cancelled"),
@@ -8,4 +8,6 @@ export const EStatusClass2StatusTypeText = {
   6: getLocale("OKR_MyO_E_From_Suspended"),
   0: getLocale("OKR_MyO_E_From_NotStarted"),
   5: getLocale("OKR_MyO_E_From_Notaccepted"),
-};
+});
+
+export default getEStatusClass2StatusTypeText;

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

@@ -1,10 +1,10 @@
 import React, {
-  FC, useContext, useMemo, Fragment,
+  FC, useContext, useMemo,
 } from "react";
 import classNames from "classnames";
 import { IDynamicItemContentProps } from "../../interface";
 import DynamicItemHeader from "../components/header";
-import { EStatusClass2StatusTypeText } from "./constant";
+import { getEStatusClass2StatusTypeText } from "./constant";
 import { EStatusStatus2ClassType } from "../../constant";
 import { SearchKeyContext } from "../../context";
 import SearchKeyHandle from "../../../search-key-handle";
@@ -31,7 +31,7 @@ const DynamicProject: FC<IDynamicItemContentProps> = ({
   const handleClickTitle = () => {
     window.open(
       window.location.href.replace(
-        location.hash,
+        window.location.hash,
         `#work?iTalentNavCode=tita-work&work_id=${data.obj.objId}`,
       ),
     );
@@ -69,7 +69,7 @@ const DynamicProject: FC<IDynamicItemContentProps> = ({
         user={principalUser}
       />
       <div className={`${prefix}__content`}>
-        <img className={`${prefix}__content-img`} src={ProjectImg} />
+        <img className={`${prefix}__content-img`} src={ProjectImg} alt="" />
         <div className={`${prefix}__content-info`}>
           <div className={`${prefix}__content-title`}>
             <Tooltip.Text isPercent text={renderName} minusWidth={30} />
@@ -77,7 +77,7 @@ const DynamicProject: FC<IDynamicItemContentProps> = ({
           <div className={`${prefix}__content-status-and-time-range`}>
             <i className={classNames(EStatusStatus2ClassType[status])} />
             <span className={`${prefix}__content-status-text`}>
-              {EStatusClass2StatusTypeText[status]}
+              {getEStatusClass2StatusTypeText()[status]}
             </span>
             <i className={classNames("tu-icon-deferred")} />
             <span className={`${prefix}__content-time-range`}>

package/src/components/dynamic/dynamic-item/dynamic-replay/index.scss

@@ -22,7 +22,7 @@
         line-height: 22px;
         cursor: pointer;
         &::before {
-          content: "";
+          content: '';
           display: inline-block;
           width: 6px;
           height: 6px;
@@ -45,7 +45,7 @@
         align-items: center;
         margin-bottom: 8px;
         &::before {
-          content: "";
+          content: '';
           display: inline-block;
           width: 4px;
           height: 12px;
@@ -63,8 +63,9 @@
         color: #3f4755;
         line-height: 22px;
         margin-left: 8px;
+        white-space: pre-wrap;
         &::before {
-          content: "";
+          content: '';
           display: inline-block;
           width: 6px;
           height: 6px;
@@ -80,6 +81,7 @@
         line-height: 22px;
         margin-bottom: 4px;
         margin-left: 8px;
+        white-space: pre-wrap;
       }
       &-content--sub {
         margin-left: 20px;

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

@@ -1,5 +1,5 @@
 import React, {
-  FC, useContext, useMemo, Fragment,
+  FC, useContext, useMemo,
 } from "react";
 import classNames from "classnames";
 import { IDynamicItemContentProps } from "../../interface";
@@ -12,6 +12,7 @@ import DynamicTitle from "../../components/title";
 import { getFeedTypeAndTypeColor } from "../../util";
 import Tooltip from "../../../tooltip";
 import { getLocale } from "../../../../utils/getLocale";
+import { htmlDecodeByHtmlRegExp } from "../../../../utils/tools";
 import "./index.scss";
 
 const prefix = "titaui-dynamic-reply-item";
@@ -84,7 +85,7 @@ const DynamicReply: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
           <div className={`${prefix}__detail-gain`}>
             <div className={`${prefix}__detail-block-title`}>{getLocale("OKR_MyO_KRP_Pop_Value")}</div>
             <div className={`${prefix}__detail-block-content`}>
-              <SearchKeyHandle str={data.gains} keyWord={searchKeyWord} />
+              <SearchKeyHandle str={htmlDecodeByHtmlRegExp(data.gains)} keyWord={searchKeyWord} />
             </div>
           </div>
           <div>
@@ -101,7 +102,7 @@ const DynamicReply: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
                   </div>
                   <div className={`${prefix}__detail-block-content`}>
                     <SearchKeyHandle
-                      str={item.drawback}
+                      str={htmlDecodeByHtmlRegExp(item.drawback)}
                       keyWord={searchKeyWord}
                     />
                   </div>
@@ -117,7 +118,7 @@ const DynamicReply: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
                       )}
                     >
                       <SearchKeyHandle
-                        str={item.cause}
+                        str={htmlDecodeByHtmlRegExp(item.cause)}
                         keyWord={searchKeyWord}
                       />
                     </div>
@@ -135,7 +136,7 @@ const DynamicReply: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
                       )}
                     >
                       <SearchKeyHandle
-                        str={item.measures}
+                        str={htmlDecodeByHtmlRegExp(item.measures)}
                         keyWord={searchKeyWord}
                       />
                     </div>

package/src/components/dynamic/dynamic-item/dynamic-task/constant.ts

@@ -1,6 +1,6 @@
 import { getLocale } from "../../../../utils/getLocale";
 
-export const EStatusClass2StatusTypeText = {
+export const getEStatusClass2StatusTypeText = () => ({
   2: getLocale("OKR_MyO_E_From_Completed"),
   1: getLocale("Per_MyRe_text_Inprogress"),
   4: getLocale("OKR_MyO_E_From_Cancelled"),
@@ -8,4 +8,6 @@ export const EStatusClass2StatusTypeText = {
   6: getLocale("OKR_MyO_E_From_Suspended"),
   0: getLocale("OKR_MyO_E_From_NotStarted"),
   5: getLocale("OKR_MyO_E_From_Notaccepted"),
-};
+});
+
+export default getEStatusClass2StatusTypeText;

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

@@ -4,7 +4,7 @@ import React, {
 import classNames from "classnames";
 import { IDynamicItemContentProps } from "../../interface";
 import DynamicItemHeader from "../components/header";
-import { EStatusClass2StatusTypeText } from "./constant";
+import { getEStatusClass2StatusTypeText } from "./constant";
 import TaskPng from "./img/task-icon.png";
 import {
   EObjType,
@@ -51,7 +51,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
     if (objType === EObjType.Project) {
       window.open(
         window.location.href.replace(
-          location.hash,
+          window.location.hash,
           `#work?iTalentNavCode=tita-work&work_id=${objId}`,
         ),
       );
@@ -60,7 +60,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
       if (workId <= 0) return;
       window.open(
         window.location.href.replace(
-          location.hash,
+          window.location.hash,
           `#work?work_id=${workId}&detail_type=milepost`,
         ),
       );
@@ -70,7 +70,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
       if (workId <= 0) return;
       window.open(
         window.location.href.replace(
-          location.hash,
+          window.location.hash,
           `#work?work_id=${workId}&detail_type=kanban`,
         ),
       );
@@ -125,7 +125,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
         user={principalUser}
       />
       <div className={`${prefix}__content`}>
-        <img className={`${prefix}__content-img`} src={TaskPng} />
+        <img className={`${prefix}__content-img`} src={TaskPng} alt="" />
         <div className={`${prefix}__content-info`}>
           <div className={`${prefix}__content-title`}>
             <Tooltip.Text isPercent text={renderName} minusWidth={30} />
@@ -133,7 +133,7 @@ const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
           <div className={`${prefix}__content-status-and-time-range`}>
             <i className={classNames(EStatusStatus2ClassType[status])} />
             <span className={`${prefix}__content-status-text`}>
-              {EStatusClass2StatusTypeText[status]}
+              {getEStatusClass2StatusTypeText()[status]}
             </span>
             <i className={classNames("tu-icon-deferred")} />
             <span className={`${prefix}__content-time-range`}>

package/src/components/dynamic/dynamic-like-ranking/index.scss

@@ -66,8 +66,9 @@
       }
       &-items {
         display: grid;
-        grid-template-columns: auto auto auto auto;
+        grid-template-columns: auto 28px auto auto;
         grid-row-gap: 16px;
+        margin-left: -8px;
       }
     }
   }
@@ -93,8 +94,6 @@
     }
 
     &-avatar {
-      margin-left: 9px;
-
       .titaui-pc-avator-container {
         display: inline-flex !important;
       }

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

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

package/src/components/dynamic/dynamic.tsx

@@ -80,9 +80,14 @@ const Dynamic: FC = () => {
   };
 
   const handleDeleteFeed = (feedId) => {
-    setDynamicData([
-      ...dynamicData.filter((item: any) => item.feedId !== feedId),
-    ]);
+    const newDatas = dynamicData.filter((item: any) => item.feedId !== feedId);
+    setDynamicData([]);
+    // 动画效果如果直接设置新的数据，diff时间会比较长，所以直接清空再赋值，这样不会出现删除时等待长时间空白
+    setTimeout(() => {
+      setDynamicData([
+        ...newDatas,
+      ]);
+    }, 0);
   };
 
   const getDynamicData = (needResetValue) => {

package/src/components/mblog/style.ts

@@ -26,7 +26,7 @@ export const DivMblogContent = styled.div`
   background-color: #fff;
   position: relative;
   transition: all .2s ease-in-out;
-  height: 124px;
+  height: 200px;
   box-sizing: border-box;
 
   &.input_default-active {
@@ -60,7 +60,7 @@ export const Textarea = styled.textarea`
   resize: none;
   word-break: break-all;
   word-wrap: break-word;
-  height: 86px;
+  height: 160px;
 
   &.textarea-setheight {
     visibility: hidden;

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

@@ -114,7 +114,7 @@ function EditChildOkrWeight(props: IProps) {
           ))}
         </div>
       </Dialog>
-      <DialogConfirm zIndex={1299} visible={showDialogConfirm} type="warning" className={`${precls}__confirm`}>
+      <DialogConfirm zIndex={2301} visible={showDialogConfirm} type="warning" className={`${precls}__confirm`}>
         {/* @ts-ignore */}
         <span type="title">{getLocale("OKR_MyO_Err_Delefocus")}</span>
         <CancelButton type="button" onClick={closeDialogConfirm}>