@titaui/pc 1.9.37 → 1.9.38

package/lib/utils/request-v1.js

@@ -10,9 +10,9 @@ exports.taker = taker;
 
 var _bsGlobal = require("./bs-global");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 

package/lib/utils/roundWeight.js

@@ -8,9 +8,9 @@ exports.AccMul = AccMul;
 exports.ReCalibratePrecision = ReCalibratePrecision;
 exports.RoundWeight = RoundWeight;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 

package/package.json

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

package/src/components/change-okr-modal/Filter.tsx

@@ -282,8 +282,8 @@ export default class FilterComp extends PureComponent<Props, State> {
                   </ToolTip>
                 </a>
               ) : (
-                <ConfirmPop align='bottom left' confirmTipText='确定取消吗？取消后将不再记住以上条件' onSubmit={() => this.handlerFilterOptions(2)}>
-                  <ToolTip title='不再显示以上条件' overlayStyle={{ zIndex: 999999 }}>
+                <ConfirmPop align='bottom left' confirmTipText={getLocale('OKR_MyO_Err_Bemembere')} onSubmit={() => this.handlerFilterOptions(2)}>
+                  <ToolTip title={getLocale('OKR_MyO_Err_Showabove')} overlayStyle={{ zIndex: 999999 }}>
                     <a>{getLocale('OKR_MyO_Pop_Cancelremember')}</a>
                   </ToolTip>
                 </ConfirmPop>

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

@@ -137,12 +137,11 @@ const DynamicItemHeader: FC<IDynamicItemHeaderProps> = ({
       <DialogConfirm visible={showDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">
-          确定删除该{feedType === EFeedType.Share ? getLocale('OKR_MyO_Share') : '公告'}吗？
+          {feedType === EFeedType.Share ? getLocale('OKR_MyO_Err_Delesh') : getLocale('OKR_MyO_Err_Delepost')}
         </span>
         {/* @ts-ignore */}
         <span type="content">
-          该{feedType === EFeedType.Share ? getLocale('OKR_MyO_Share') : '公告'}
-          将被删除不可恢复，请谨慎操作!
+          {feedType === EFeedType.Share ? getLocale('OKR_MyO_Err_Deleshre') : getLocale('OKR_MyO_Err_Delepostsu')}
         </span>
         <CancelButton type="button" onClick={cancelDeleteDynamic}>
           {getLocale('Mod_Cancel')}

package/src/components/form/form-fields/duties/duties-input.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import { getLocale } from '../../../../utils/getLocale';
+import Tooltip from '../../../tooltip';
 import './index.scss';
 
 interface Props {
@@ -28,7 +29,9 @@ export default (props: Props) => {
   return <div className={classNames(`${preCls}__input`)} onClick={onClick}>
     {!duties ?
       <span className={classNames(`${preCls}__input--placeholder`)}>{placeholder}</span> :
-      duties.name
+      // @ts-ignore
+      <Tooltip.Text text={ duties.name } isPercent />
+     
     }
     {duties && <span className={classNames(`tu-icon-cross ${preCls}__input--clear`)} onClick={onHandleClear}></span>}
     <span className={classNames(`${preCls}__input--down tu-icon-sort-down`)}></span>

package/src/components/form/form-fields/duties/index.scss

@@ -22,6 +22,7 @@
     transition: all 0.2s;
     border: 1px solid #e9ecf0;
     box-sizing: border-box;
+    overflow: hidden;
   }
   &__border--error {
     box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3);

package/src/components/okr-detail/base-info/base-info.tsx

@@ -377,8 +377,10 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
       <DialogConfirm visible={showDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">
-          确定删除此
-          {delUserType === 1 ? "参与" : getLocale("OKR_MyO_Butt_Follow")}人吗？
+          {delUserType === 1
+            ? getLocale("OKR_MyO_Err_Delepar")
+            : getLocale("OKR_MyO_Err_Delefol")}
+          ？
         </span>
         <CancelButton type="button" onClick={cancelDelPerson}>
           {getLocale("Mod_Cancel")}

package/src/components/okr-detail/base-info/other-infos/principal/index.tsx

@@ -59,7 +59,7 @@ const Principal: FC<IPrincipalProps> = ({user, onChangeUser, canEdit = false}) =
             ref={popConfirmRef}
             showArrow={false}
             style={{ width: 300 }}
-            title="您确定把负责人的权限转交吗?"
+            title={getLocale('OKR_MyO_Err_Transfer')}
             onCancel={cancelHandler}
             onConfirm={confirmHandler}
           >

package/src/components/okr-detail/components/header/o-avatar.tsx

@@ -5,6 +5,7 @@ import UserSelector from "../../../user-selector";
 import { GeneralDataContext } from "../../context";
 import { updateOkrPrincipal } from "../../request-apis";
 import PopConfirm from "../../../../components-v1/popConfirm";
+import { getLocale } from "../../../../utils/getLocale";
 
 interface IProps {
   editable: boolean;
@@ -79,7 +80,7 @@ const OAvatar = (props: IProps) => {
         ref={popConfirmRef}
         showArrow={false}
         style={{ width: 300 }}
-        title="您确定把负责人的权限转交吗?"
+        title={getLocale('OKR_MyO_Err_Transfer')}
         onCancel={cancelHandler}
         onConfirm={confirmHandler}
       >

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

@@ -100,7 +100,7 @@ const EditChildOkrWeight = (props: IProps) => {
               <span className={`${precls}__item-precls`} />
               <div className={`${precls}__item-name`}>{item.workName}</div>
               <div className={`${precls}__item-weight`}>
-                <span className={`${precls}__item-weight-label`}>权重</span>
+                <span className={`${precls}__item-weight-label`}>{getLocale('OKR_MyO_Err_Weights')}</span>
                 <WeightInput
                   workId={item.workId}
                   value={item.pweight}
@@ -113,7 +113,7 @@ const EditChildOkrWeight = (props: IProps) => {
       </Dialog>
       <DialogConfirm zIndex={1299} visible={showDialogConfirm} type="warning" className={`${precls}__confirm`}>
         {/* @ts-ignore */}
-        <span type="title">当前子目标权重合计小于100%，确定要保存吗？</span>
+        <span type="title">{getLocale('OKR_MyO_Err_Delefocus')}</span>
         <CancelButton type="button" onClick={closeDialogConfirm}>
           {getLocale('Mod_Cancel')}
         </CancelButton>

package/src/components/okr-detail/detail-header/index.tsx

@@ -94,10 +94,10 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onChangeOkrFollow: async (follow: boolean) => {
         const res = await openOkrHeaderConfirm(
-          follow ? "确定关注该目标吗？" : "确定取消关注该目标吗？",
+          follow ? getLocale('OKR_MyO_Err_Focuson') : getLocale('OKR_MyO_Err_Unfollow'),
           follow
             ? "关注后进展信息将推送到 “动态” 下"
-            : "取消后进展信息将不在推送到 “动态” 下"
+            : getLocale('OKR_MyO_Err_Progress')
         );
         if (res) {
           follow
@@ -114,7 +114,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onFinishOrReOpen: async (isFinish: boolean) => {
         const res = await openOkrHeaderConfirm(
-          isFinish ? getLocale('OKR_MyO_Areycloseobjective') : "确定重启该目标吗？"
+          isFinish ? getLocale('OKR_MyO_Areycloseobjective') : getLocale('OKR_MyO_Err_Restart')
         );
         if (res) {
           isFinish
@@ -127,8 +127,8 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onQuit: async () => {
         const res = await openOkrHeaderConfirm(
-          "确定退出吗？",
-          "再次加入需要联系负责人"
+          getLocale('OKR_MyO_Err_Quit'),
+          getLocale('OKR_MyO_Err_Inchargec')
         );
         if (res) {
           await deleteUser(loginUserId, detailInfo.workId, 2);

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

@@ -1,11 +1,14 @@
 import React from 'react';
+import Tooltip from "../../../../tooltip"
 import './index.scss';
 
 export default props => {
   const { data } = props;
   return <div className="perspm-duties">
     <span className="perspm-duties__name" title="">
-      <span>{data.name}</span>
+      <span>
+        <Tooltip.Text text={data.name} isPercent />
+      </span>
     </span>
   </div>
 }

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

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

package/src/pages/aha2021/index.scss

@@ -28,13 +28,31 @@
   &__kefu {
     width: 42px;
     height: 42px;
-    background: url('./kefu.svg') no-repeat;
+    background: url('./img/kefu.svg') no-repeat;
     background-size: 42px;
     box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
     cursor: pointer;
     border-radius: 50%;
   }
-
+  &__notice {
+    width: 42px;
+    height: 42px;
+    background: linear-gradient(180deg, #4E90FF 0%, #2879FF 100%);
+    box-shadow: 0px 4px 12px 0px rgba(40, 121, 255, 0.3), inset 0px 0px 6px 2px rgba(255, 255, 255, 0.5);
+    cursor: pointer;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    bottom: 36px;
+    right: 24px;
+    z-index: 2;
+    img {
+      width: 32px;
+      height: 42px;
+    }
+  }
   &__help {
     position: absolute;
     bottom: 20px;

package/src/pages/aha2021/index.tsx

@@ -41,7 +41,8 @@ const PageLayout = (props) => {
   const { children } = props;
 
   const isTrial =
-    window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
+    window.BSGlobal.tenantAuthentication.Version !== 1 && isOfficialSite();
+  const isTencentHr = window.BSGlobal.tenantInfo.Source == 964;
 
   const onClickKefu = () => {
     const kefuUrl = isTrial
@@ -50,6 +51,11 @@ const PageLayout = (props) => {
     window.open(kefuUrl);
   };
 
+  const onClickNotice = () => {
+    const url = `//${location.host}/u/${window.BSGlobal.loginUserInfo.Id}/Home#more/messages?messageType=1&isRead=2&messageSubNav=1`
+    window.open(url)
+  }
+
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
@@ -59,10 +65,10 @@ const PageLayout = (props) => {
         <FollowerVisitor />
       </div>
       <div className={classNames(`${preCls}__body`)}>{children}</div>
-      <div className={classNames(`${preCls}__help`)}>
+      {!isTencentHr && <div className={classNames(`${preCls}__help`)}>
         <HelpCard />
-      </div>
-      {!isTrial && (
+      </div>}
+      {!isTrial && !isTencentHr && (
         <Tooltip
           overlay={"联系客服"}
           placement="left"
@@ -74,11 +80,19 @@ const PageLayout = (props) => {
           />
         </Tooltip>
       )}
-      {isTrial && (
+      {isTrial && !isTencentHr &&(
         <div className={`${preCls}__invite`}>
           <InvitePeople />
         </div>
       )}
+      {isTencentHr && (
+        <div
+          className={classNames(`${preCls}__notice`)}
+          onClick={onClickNotice}
+        >
+          <img src={require('./img/notice.png')}/>
+        </div>
+      )}
       <PointDemo />
     </div>
   );

package/src/pages/group-management/tree/delete-group-dialog/index.js

@@ -35,10 +35,10 @@ export default props => {
       visible={visible}
     >
         <div className={classNames(`${preCls}__dialog-dele-group-title`)} >
-            <span className="tu-icon-tishi"/><span className={classNames(`${preCls}__dialog-dele-group-title-text`)}>确定要删除该群组吗？</span>
+            <span className="tu-icon-tishi"/><span className={classNames(`${preCls}__dialog-dele-group-title-text`)}>{getLocale('OKR_MyO_Err_Delegroup')}</span>
         </div>
         <div className={classNames(`${preCls}__dialog-dele-group-subtitle`)}>
-            删除群组不会导致成员从组织架构中删除
+            {getLocale('OKR_MyO_Err_Remove')}
         </div>
         <div className={classNames(`${preCls}__dialog-dele-group-footer`)}>
             <div type="button" className="btn btn-default" key="close" onClick={() => setVisible(false)}>