@titaui/pc 1.7.65 → 1.7.69

package/lib/components/dynamic/quick-operation/index.js

@@ -49,7 +49,8 @@ var DynamicQuickOperation = function DynamicQuickOperation(_ref) {
   var hasDynamicAnnouncementAuth = new _auth.DynamicManagerAuth().hasAuth();
   var createTaskDivRef = (0, _react.useRef)(document.createElement("div"));
   var isNewUI = (0, _bsGlobal.getBSGlobal)("tenantInfo").isNewIndex;
-  var hasOKRApp = (0, _bsGlobal.getBSGlobal)("newNavigation").find(function (item) {
+  var newNavigation = (0, _bsGlobal.getBSGlobal)("newNavigation") || [];
+  var hasOKRApp = newNavigation.find(function (item) {
     return item.appId === 113;
   });
 

package/lib/components/dynamic/util.js

@@ -77,6 +77,16 @@ var getFeedTypeAndTypeColor = function getFeedTypeAndTypeColor(feedType) {
     feedTypeColor = "linear-gradient(90deg, #0080FF 0%, #8FC7FF 100%)";
   }
 
+  if (feedType === _constant.EFeedType.PlanCommunication) {
+    feedTypeText = "计划表";
+    feedTypeColor = "linear-gradient(90deg, #0080FF 0%, #8FC7FF 100%)";
+  }
+
+  if (feedType === _constant.EFeedType.OKRsCommunication) {
+    feedTypeText = "OKRs";
+    feedTypeColor = "linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)";
+  }
+
   return {
     feedTypeText: feedTypeText,
     feedTypeColor: feedTypeColor

package/lib/components/nav-top/index.js

@@ -52,7 +52,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var Logo = (0, _utils.getLogo)();
-var hasOKRApp = (0, _bsGlobal.getBSGlobal)("newNavigation").find(function (item) {
+var newNavigation = (0, _bsGlobal.getBSGlobal)("newNavigation") || [];
+var hasOKRApp = newNavigation.find(function (item) {
   return item.appId === 113;
 });
 var preCls = "titaui-nav-top";

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

@@ -49,11 +49,12 @@ var WeightInput = function WeightInput(props) {
 
   var onChangeHandler = function onChangeHandler(e) {
     var currentValue = e.currentTarget.value;
-    setIsError(!/^(\d{1,2}(\.\d{1})?|100)$/g.test(currentValue));
+    var error = !/^(\d{1,2}(\.\d{1})?|100)$/g.test(currentValue);
+    setIsError(error);
     onChange({
       workId: workId,
       value: currentValue,
-      isError: isError
+      error: error
     });
   };
 

package/lib/components/tooltip/index.css

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

package/lib/components/user-selector/select-tree/tree-nodes/tree-depart-node/index.css

@@ -24,7 +24,6 @@
   line-height: 22px;
   overflow: hidden;
   white-space: nowrap;
-  text-overflow: ellipsis;
 }
 
 .perspm-depart__member-count {

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
+
 var _openData = require("../../../../../utils/open-data");
 
 require("./index.css");
@@ -31,9 +33,12 @@ var _default = function _default(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-depart__name",
     title: ""
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
-    id: data.id,
-    name: data.name
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
+    text: /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+      id: data.id,
+      name: data.name
+    }),
+    isPercent: true
   })), !isSelectedPanel ? /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])('perspm-tree__selector', 'perspm-tree__selector-depart')
   }) : undefined, isSelectedPanel ? /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/version-change-modal/index.js

@@ -19,7 +19,7 @@ var _constant = require("./constant");
 
 require("./index.css");
 
-var _helpers = require("&/utils/helpers");
+var _helpers = require("../../utils/helpers");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/lib/components/weekly-report/common-painter/openDataPainter.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = _default;
 
-var _openData = require("&/components/common/openData");
+var _openData = require("../../../utils/open-data");
 
-var _helper = require("&/components/helper");
+var _bsGlobal = require("../../../utils/bs-global");
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -33,7 +33,7 @@ function _ref() {
             maxWidth = _args.length > 3 && _args[3] !== undefined ? _args[3] : Infinity;
             name = openDataParams.name;
 
-            if (!(0, _helper.isWx)()) {
+            if (!(0, _bsGlobal.isWx)()) {
               _context.next = 6;
               break;
             }

package/lib/index.js

@@ -435,6 +435,12 @@ Object.defineProperty(exports, "Tooltip", {
     return _tooltip["default"];
   }
 });
+Object.defineProperty(exports, "TooltipText", {
+  enumerable: true,
+  get: function get() {
+    return _tooltipText["default"];
+  }
+});
 Object.defineProperty(exports, "Tree", {
   enumerable: true,
   get: function get() {
@@ -640,6 +646,8 @@ var _titaChart = _interopRequireDefault(require("./components/tita-chart"));
 
 var _tooltip = _interopRequireDefault(require("./components/tooltip"));
 
+var _tooltipText = _interopRequireDefault(require("./components/tooltip/tooltip-text"));
+
 var _updateModal = _interopRequireDefault(require("./components/update-modal"));
 
 var _upload = _interopRequireDefault(require("./components/upload"));

package/lib/pages/new-okr-list/header/comments.js

@@ -72,7 +72,7 @@ var Comments = function Comments(props) {
       Id: userInfo.userId,
       Name: userInfo.name,
       Color: userInfo.avatar.color,
-      AvatarsUrl: userInfo.avatar.small,
+      AvatarsUrl: userInfo.avatar.original,
       Type: 1
     }
   }));

package/lib/utils/mblog.js

@@ -15,6 +15,7 @@ function htmlEncodeByRegExp(str) {
   temp = temp.replace(/\'/g, "'");
   temp = temp.replace(/\"/g, """);
   temp = temp.replace(/\n/g, "<br/>");
+  temp = temp.replace(/\+/g, "&#43;");
   return temp;
 }
 
@@ -27,6 +28,6 @@ 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;
 }

package/package.json

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

package/src/components/button/rect-btn/index.scss

@@ -24,8 +24,8 @@
 
   &--big {
     border-radius: 18px;
-    height: 34px;
-    line-height: 32px;
+    height: 36px;
+    line-height: 34px;
     min-width: 90px;
     padding: 0 16px;
   }
@@ -95,7 +95,7 @@
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--big {
-  line-height: 34px;
+  line-height: 36px;
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled {

package/src/components/button/rect-btn/index.tsx

@@ -8,11 +8,12 @@ const RectBtn = (props: RectBtnProps) => {
   const {
     type = "default",
     icon = "",
-    size = "normal",
+    size = "normal",//big|normal|small
     text = "确定",
     onClick = () => {},
     className = "",
     disabled = false,
+    style,
   } = props;
 
   const renderIcon = () => {
@@ -40,6 +41,7 @@ const RectBtn = (props: RectBtnProps) => {
         { [`${precls}--disabled`]: disabled },
         className
       )}
+      style={style}
       onClick={onClickHandler}
     >
       {icon && renderIcon()}

package/src/components/button/types.ts

@@ -5,6 +5,7 @@ export interface RectBtnProps {
   icon?: string | React.ReactElement;
   text?: string | React.ReactElement;
   size?: "small" | "normal" | "big";
+  style?: any;
   onClick?: Function;
   className?: string;
   disabled?: boolean;

package/src/components/dynamic/constant.ts

@@ -20,7 +20,7 @@ export enum EFeedType {
   Bless = 14, // 祝福
   Kr = 15, // 关键成果
   MileStone = 16, // 里程碑
-  OkrEStatistics = 17, // E报告
+  OKREStatistics = 17, // E报告
   Reply = 18, // 复盘
   OkrCycle = 19, // 目标周期
   Task = 20, // 任务
@@ -30,6 +30,8 @@ export enum EFeedType {
   Announcement = 24, // 公告
   Signin = 80, // 签到
   O = 101, // 目标
+  OKRsCommunication = 102, // okr页面沟通
+  PlanCommunication = 103, // 计划表页面沟通
 }
 
 export enum EObjType {

package/src/components/dynamic/dynamic-item/dynamic-okrs-communication/index.scss

@@ -0,0 +1,77 @@
+.titaui-dynamic-okrs-communication-item {
+  border-radius: 12px;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  background: #ffffff;
+  box-sizing: border-box;
+  overflow: hidden;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+    sans-serif, PingFang SC, Microsoft YaHei;
+  &__content {
+    height: 78px;
+    display: flex;
+    align-items: center;
+    border-radius: 8px;
+    background: rgba(240, 244, 250, 0.5);
+    padding: 16px 12px 16px 16px;
+    box-sizing: border-box;
+    margin-left: 69px;
+    &-img {
+      display: inline-block;
+      width: 36px;
+      border-radius: 6px;
+    }
+    &-info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      margin-left: 16px;
+      overflow: hidden;
+    }
+    &-title {
+      flex: 1;
+      word-break: keep-all;
+      white-space: nowrap;
+      overflow: hidden;
+      font-size: 16px;
+      font-weight: 600;
+      color: #3f4755;
+      line-height: 24px;
+      &-text {
+        cursor: pointer;
+        &:hover {
+          color: #2879ff;
+        }
+      }
+      &-priority {
+        width: 18px;
+        height: 26px;
+        margin-right: 4px;
+      }
+    }
+  }
+  &__operate-desc {
+    font-size: 14px;
+    font-weight: 400;
+    color: #89919f;
+    line-height: 22px;
+    margin: 0 8px 0 4px;
+    overflow: hidden;
+    &-wrapper {
+      display: flex;
+    }
+  }
+  &-desc-operate-type {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 2px;
+    height: 18px;
+    min-width: 40px;
+    clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+    -webkit-clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+    border-radius: 14px 10px 10px 4px;
+    font-size: 12px;
+    color: #ffffff;
+    line-height: 18px;
+  }
+}

package/src/components/dynamic/dynamic-item/dynamic-okrs-communication/index.tsx

@@ -0,0 +1,81 @@
+import React, { FC, useContext, useMemo, Fragment } from "react";
+import classNames from "classnames";
+import { IDynamicItemContentProps } from "../../interface";
+import DynamicItemHeader from "../components/header";
+import TaskPng from "./img/okrs-icon.png";
+import {
+  EObjType,
+  EStatusStatus2ClassType,
+  ObjTypeMapText,
+} from "../../constant";
+import { SearchKeyContext } from "../../context";
+import SearchKeyHandle from "../../../search-key-handle";
+import { TooltipText } from "../../../tooltip";
+import { getFeedTypeAndTypeColor } from "../../util";
+import drawerManager from "../../../drawer/manager";
+import "./index.scss";
+
+const prefix = "titaui-dynamic-okrs-communication-item";
+
+const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
+  const {
+    status,
+    taskName,
+    startDate,
+    deadline,
+    feedType,
+    principalUser,
+  } = data;
+  const { searchKeyWord } = useContext(SearchKeyContext);
+  const { feedTypeText, feedTypeColor } = getFeedTypeAndTypeColor(feedType);
+
+  const handleClickPlanTitle = () => {
+    window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
+  };
+
+  const renderName = useMemo(() => {
+    return (
+      <span
+        className={prefix + "__content-title-text"}
+        onClick={handleClickPlanTitle}
+      >
+        <SearchKeyHandle str={taskName} keyWord={searchKeyWord} />
+      </span>
+    ); 
+  }, [taskName, searchKeyWord]);
+
+  const renderDesc = useMemo(() => {
+    return (
+      <Fragment>
+        <span className={prefix + "__operate-desc"}>的计划表</span>
+        <span
+          className={prefix + "-desc-operate-type"}
+          style={{ background: feedTypeColor }}
+        >
+          {feedTypeText}
+        </span>
+      </Fragment>
+    );
+  }, []);
+
+  return (
+    <div className={prefix}>
+      <DynamicItemHeader
+        data={data}
+        {...restProps}
+        desc={renderDesc}
+        user={principalUser}
+      />
+      <div className={`${prefix}__content`}>
+        <img className={`${prefix}__content-img`} src={TaskPng} />
+        <div className={prefix + "__content-info"}>
+          <div className={prefix + "__content-title"}>
+            <TooltipText isPercent text={renderName} minusWidth={30} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DynamicTask;

package/src/components/dynamic/dynamic-item/dynamic-plan-communication/index.scss

@@ -0,0 +1,77 @@
+.titaui-dynamic-plan-communication-item {
+  border-radius: 12px;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  background: #ffffff;
+  box-sizing: border-box;
+  overflow: hidden;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+    sans-serif, PingFang SC, Microsoft YaHei;
+  &__content {
+    height: 78px;
+    display: flex;
+    align-items: center;
+    border-radius: 8px;
+    background: rgba(240, 244, 250, 0.5);
+    padding: 16px 12px 16px 16px;
+    box-sizing: border-box;
+    margin-left: 69px;
+    &-img {
+      display: inline-block;
+      width: 36px;
+      border-radius: 6px;
+    }
+    &-info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      margin-left: 16px;
+      overflow: hidden;
+    }
+    &-title {
+      flex: 1;
+      word-break: keep-all;
+      white-space: nowrap;
+      overflow: hidden;
+      font-size: 16px;
+      font-weight: 600;
+      color: #3f4755;
+      line-height: 24px;
+      &-text {
+        cursor: pointer;
+        &:hover {
+          color: #2879ff;
+        }
+      }
+      &-priority {
+        width: 18px;
+        height: 26px;
+        margin-right: 4px;
+      }
+    }
+  }
+  &__operate-desc {
+    font-size: 14px;
+    font-weight: 400;
+    color: #89919f;
+    line-height: 22px;
+    margin: 0 8px 0 4px;
+    overflow: hidden;
+    &-wrapper {
+      display: flex;
+    }
+  }
+  &-desc-operate-type {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 2px;
+    height: 18px;
+    min-width: 40px;
+    clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+    -webkit-clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+    border-radius: 14px 10px 10px 4px;
+    font-size: 12px;
+    color: #ffffff;
+    line-height: 18px;
+  }
+}

package/src/components/dynamic/dynamic-item/dynamic-plan-communication/index.tsx

@@ -0,0 +1,81 @@
+import React, { FC, useContext, useMemo, Fragment } from "react";
+import classNames from "classnames";
+import { IDynamicItemContentProps } from "../../interface";
+import DynamicItemHeader from "../components/header";
+import TaskPng from "./img/plan-icon.png";
+import {
+  EObjType,
+  EStatusStatus2ClassType,
+  ObjTypeMapText,
+} from "../../constant";
+import { SearchKeyContext } from "../../context";
+import SearchKeyHandle from "../../../search-key-handle";
+import { TooltipText } from "../../../tooltip";
+import { getFeedTypeAndTypeColor } from "../../util";
+import drawerManager from "../../../drawer/manager";
+import "./index.scss";
+
+const prefix = "titaui-dynamic-plan-communication-item";
+
+const DynamicTask: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
+  const {
+    status,
+    taskName,
+    startDate,
+    deadline,
+    feedType,
+    principalUser,
+  } = data;
+  const { searchKeyWord } = useContext(SearchKeyContext);
+  const { feedTypeText, feedTypeColor } = getFeedTypeAndTypeColor(feedType);
+
+  const handleClickPlanTitle = () => {
+    window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
+  };
+
+  const renderName = useMemo(() => {
+    return (
+      <span
+        className={prefix + "__content-title-text"}
+        onClick={handleClickPlanTitle}
+      >
+        <SearchKeyHandle str={taskName} keyWord={searchKeyWord} />
+      </span>
+    ); 
+  }, [taskName, searchKeyWord]);
+
+  const renderDesc = useMemo(() => {
+    return (
+      <Fragment>
+        <span className={prefix + "__operate-desc"}>的计划表</span>
+        <span
+          className={prefix + "-desc-operate-type"}
+          style={{ background: feedTypeColor }}
+        >
+          {feedTypeText}
+        </span>
+      </Fragment>
+    );
+  }, []);
+
+  return (
+    <div className={prefix}>
+      <DynamicItemHeader
+        data={data}
+        {...restProps}
+        desc={renderDesc}
+        user={principalUser}
+      />
+      <div className={`${prefix}__content`}>
+        <img className={`${prefix}__content-img`} src={TaskPng} />
+        <div className={prefix + "__content-info"}>
+          <div className={prefix + "__content-title"}>
+            <TooltipText isPercent text={renderName} minusWidth={30} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DynamicTask;

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

@@ -0,0 +1,72 @@
+.titaui-dynamic-share-to-dynamic {
+  &__operate-desc {
+    margin-left: 4px;
+    font-size: 14px;
+    font-family: OPPOSans-R, OPPOSans;
+    font-weight: normal;
+    color: #89919f;
+    line-height: 22px;
+  }
+  &__content {
+    height: 24px;
+    display: flex;
+    padding: 0 50px;
+    box-sizing: border-box;
+    margin-top: 16px;
+    font-size: 14px;
+    font-family: OPPOSans-R, OPPOSans;
+    font-weight: normal;
+    color: #3f4755;
+    line-height: 24px;
+    cursor: pointer;
+    &-quoto {
+      vertical-align: text-top;
+      margin-right: 6px;
+      width: 12px;
+      width: 12px;
+      height: 12px;
+    }
+  }
+  &__share {
+    box-sizing: border-box;
+    height: 104px;
+    display: flex;
+    border-radius: 18px;
+    background: rgba(240, 244, 250, 0.5);
+    padding: 12px;
+    box-sizing: border-box;
+    margin-left: 68px;
+    margin-top: 12px;
+    &-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 8px;
+      margin-right: 12px;
+    }
+    &-right {
+      cursor: pointer;
+      &-title {
+        display: block;
+        font-size: 16px;
+        font-family: OPPOSans-B, OPPOSans;
+        font-weight: normal;
+        color: #141c28;
+        line-height: 24px;
+        margin-bottom: 8px;
+      }
+      &-content {
+        font-size: 14px;
+        font-family: OPPOSans-R, OPPOSans;
+        font-weight: normal;
+        color: #3f4755;
+        line-height: 24px;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
+    }
+  }
+}