@titaui/pc 1.9.72 → 1.9.73

package/lib/components/create-okr-modal/fields/okr-case.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = OkrCase;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -41,7 +41,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _default(_ref) {
+function OkrCase(_ref) {
   var onOkrApply = _ref.onOkrApply,
       okrTemplateEnabled = _ref.okrTemplateEnabled;
 
@@ -59,13 +59,13 @@ function _default(_ref) {
   };
 
   var OnOkrApplyHandler = function OnOkrApplyHandler(data) {
-    onOkrApply && onOkrApply(data);
+    onOkrApply === null || onOkrApply === void 0 ? void 0 : onOkrApply(data);
     setVisible(false);
 
     _toast["default"].Success("成功套用");
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_style.Line, null, okrTemplateEnabled && !(0, _helpers.isLocal)() ? /*#__PURE__*/_react["default"].createElement(_style.CaseLink, {
+  return /*#__PURE__*/_react["default"].createElement(_style.Line, null, okrTemplateEnabled && !(0, _helpers.isLocal)() && !(0, _helpers.isTencentHr)() ? /*#__PURE__*/_react["default"].createElement(_style.CaseLink, {
     onClick: okrCaseClickHandler,
     className: "tu-icon-shoushi"
   }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Butt_AddfromOKR")) : null, okrTemplateEnabled && /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
@@ -95,8 +95,7 @@ function _default(_ref) {
 //     offsetPosition={{ 'top': 41 }}
 //     fullSize={true}
 // >
-
-
-{
-  /* <OKRCases onClose={onCasesCloseHandler} onApplyTpl={OnOkrApplyHandler} /> */
-} // </OldModal>
+// {
+//   /* <OKRCases onClose={onCasesCloseHandler} onApplyTpl={OnOkrApplyHandler} /> */
+// }
+// </OldModal>

package/lib/components/dynamic/dynamic-liking/item.js

@@ -43,7 +43,6 @@ var Item = function Item(_ref) {
   //   window.open(url, "_blank");
   // };
 
-  var ObjectTypeText = (0, _constant.ObjectType)();
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -65,7 +64,7 @@ var Item = function Item(_ref) {
     text: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("Feed_Kudos"), /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       id: toUserId,
       name: toUserName
-    }), "".concat(ObjectTypeText[pariseObjType] || "feed")),
+    }), "".concat((0, _constant.ObjectType)()[pariseObjType] || "feed")),
     maxWidth: 150
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "-center-time")

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/edit-child-okr-weight.js

@@ -270,7 +270,7 @@ function EditChildOkrWeight(props) {
       onChange: onChangeHandler
     })));
   }))), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
-    zIndex: 1299,
+    zIndex: 2301,
     visible: showDialogConfirm,
     type: "warning",
     className: "".concat(precls, "__confirm")

package/lib/components/photo-card/index.js

@@ -95,17 +95,14 @@ function PhotoCard(props) {
 
   (0, _react.useEffect)(function () {
     (0, _request.getOtherUserInfo)(userId).then(function (res) {
-      var currentUser;
-
       if (res.Code === 1) {
-        currentUser = res.Data;
         setUserInfo(res.Data);
       }
 
-      (0, _request.getAttentionData)().then(function (res) {
+      (0, _request.getAttentionData)(userId).then(function (res) {
         if (res.Code === 1) {
-          (res.Data || []).forEach(function (item) {
-            if (item.userId === currentUser.userId) {
+          res.Data.followerUsers.forEach(function (item) {
+            if (item.userId === userownInfo.Id) {
               setIsAttention(true);
             }
           });

package/lib/components/photo-card/request.apis.js

@@ -7,8 +7,8 @@ exports.postAttention = exports.getVisitData = exports.getOtherUserInfo = export
 
 var _request = require("../../utils/request");
 
-var getAttentionData = function getAttentionData() {
-  return (0, _request.rget)("v1")("follow/followerList");
+var getAttentionData = function getAttentionData(userId) {
+  return (0, _request.rget)("v1")("follow/getFollowerList?toUserId=".concat(userId));
 };
 
 exports.getAttentionData = getAttentionData;

package/lib/pages/new-okr-list/index.js

@@ -331,7 +331,7 @@ var NewOkrList = function NewOkrList(props) {
     replaceOkr: replaceOkr,
     isShowPrincple: isShowPrincple,
     isShowPeriod: isShowPeriod,
-    isShowEasyCreate: relation !== 2 && relation !== 3,
+    isShowEasyCreate: relation !== "2" && relation !== "3",
     openCreateModal: openCreateModal
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__pagination")

package/lib/utils/helpers.js

@@ -8,7 +8,7 @@ exports.escapeHtml = escapeHtml;
 exports.getLoginUserInfo = void 0;
 exports.getTenantInfo = getTenantInfo;
 exports.getUploadMaxSize = getUploadMaxSize;
-exports.isLocal = exports.isDingDing = void 0;
+exports.isTencentHr = exports.isLocal = exports.isDingDing = void 0;
 
 var _bsGlobal = require("./bs-global");
 
@@ -25,8 +25,8 @@ function cssSupport(attr, value) {
 
 function getUploadMaxSize() {
   var info = (0, _bsGlobal.getBSGlobal)("tenantInfo");
-  var isDingDing = info.Source == 861;
-  var isDingZhi = window.dingZhiSize && window.dingZhiSize.indexOf(info.Id) != -1;
+  var isDingDing = info.Source === 861;
+  var isDingZhi = window.dingZhiSize && window.dingZhiSize.indexOf(info.Id) !== -1;
   if (isDingDing) return 20;
   if (isDingZhi) return 100;
   return 50;
@@ -37,7 +37,7 @@ function getTenantInfo() {
 }
 
 var isDingDing = function isDingDing() {
-  return getTenantInfo().Source == 861;
+  return getTenantInfo().Source === 861;
 };
 
 exports.isDingDing = isDingDing;
@@ -48,6 +48,12 @@ var isLocal = function isLocal() {
 
 exports.isLocal = isLocal;
 
+var isTencentHr = function isTencentHr() {
+  return getTenantInfo().Source === 964;
+};
+
+exports.isTencentHr = isTencentHr;
+
 function escapeHtml(str) {
   var htmlEscapes = {
     "&": "&",
@@ -56,8 +62,8 @@ function escapeHtml(str) {
     """: "\"",
     "'": "'"
   };
-  return str.replace(/(&|<|>|"|')/g, function (str) {
-    return htmlEscapes[str];
+  return str.replace(/(&|<|>|"|')/g, function (s) {
+    return htmlEscapes[s];
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.72",
+  "version": "1.9.73",
   "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-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/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}>

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

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

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

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

@@ -234,7 +234,7 @@ const NewOkrList: FC<any> = (props: {
               replaceOkr={replaceOkr}
               isShowPrincple={isShowPrincple}
               isShowPeriod={isShowPeriod}
-              isShowEasyCreate={relation !== 2 && relation !== 3}
+              isShowEasyCreate={relation !== "2" && relation !== "3"}
               openCreateModal={openCreateModal}
             />
             <div className={`${precls}__pagination`}>

package/src/utils/helpers.ts

@@ -10,8 +10,8 @@ export function cssSupport(attr, value) {
 }
 export function getUploadMaxSize() {
   const info = getBSGlobal("tenantInfo");
-  const isDingDing = info.Source == 861;
-  const isDingZhi = window.dingZhiSize && (window.dingZhiSize).indexOf(info.Id) != -1;
+  const isDingDing = info.Source === 861;
+  const isDingZhi = window.dingZhiSize && (window.dingZhiSize).indexOf(info.Id) !== -1;
   if (isDingDing) return 20;
   if (isDingZhi) return 100;
   return 50;
@@ -21,9 +21,11 @@ export function getTenantInfo() {
   return getBSGlobal("tenantInfo");
 }
 
-export const isDingDing = () => getTenantInfo().Source == 861;
+export const isDingDing = () => getTenantInfo().Source === 861;
 
 export const isLocal = () => !!getTenantInfo().isLocal;
+
+export const isTencentHr = () => getTenantInfo().Source === 964;
 export function escapeHtml(str) {
   const htmlEscapes = {
     "&": "&",
@@ -32,6 +34,6 @@ export function escapeHtml(str) {
     """: "\"",
     "'": "'",
   };
-  return str.replace(/(&|<|>|"|')/g, (str) => htmlEscapes[str]);
+  return str.replace(/(&|<|>|"|')/g, (s) => htmlEscapes[s]);
 }
 export const getLoginUserInfo = () => getBSGlobal("loginUserInfo");