@titaui/pc 1.7.45 → 1.7.49

package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js

@@ -19,8 +19,6 @@ var _title = _interopRequireDefault(require("../../components/title"));
 
 var _util = require("../../util");
 
-var _constant = require("../../constant");
-
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 require("./index.css");
@@ -72,7 +70,7 @@ var DynamicKr = function DynamicKr(_ref) {
       className: prefix + '__operate-desc'
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + '__operate-desc-wrapper'
-    }, "\u8D1F\u8D23\u4E86", _constant.ObjTypeMapText[data.obj.objType], /*#__PURE__*/_react["default"].createElement("span", {
+    }, "\u8D1F\u8D23\u4E86\u76EE\u6807", /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + '__object-name',
       onClick: handleClickOTitle
     }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -87,14 +87,13 @@ var Inform = function Inform(props) {
       if (messageType === _constant.informType.details) {
         (0, _tools.openPage)("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId));
         return;
-      } else if (objId && objType !== 8) {
-        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
-        return;
       } else if (messageType === _constant.informType.todayJob) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#plan?tag_id=0&tag_type=0&filter=1"));
         return;
       } else if (objType === 0) {
-        var str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+        var str = item.content.match(/\/\/.*?[\"|\']/gi);
+        if (!str) return;
+        str = str.join("");
         var url = str.slice(0, str.length - 1);
 
         if (url) {
@@ -118,20 +117,37 @@ var Inform = function Inform(props) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/work?iTalentNavCode=tita-work&work_id=").concat(objId));
         return;
       } else if (objType === _constant.informType.plan) {
-        var _str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+        var _str = item.content.match(/\/\/.*?[\"|\']/gi);
+
+        if (!_str) return;
+        _str = _str.join("");
 
         var _url2 = _str.slice(0, _str.length - 1);
 
         (0, _tools.openPage)(_url2);
+        return;
+      } else if (objType === _constant.informType.remindLeader) {
+        var _str2 = item.content.match(/https:.*?[\"|\']/gi);
+
+        if (!_str2) return;
+        _str2 = _str2.join("");
+
+        var _url3 = _str2.slice(0, _str2.length - 1);
+
+        (0, _tools.openPage)(_url3);
+        return;
+      } else if (objId && objType !== 8) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
+        return;
       } else {
         var reg = /href='.*?(?=')/g;
-        var _url3 = '';
+        var _url4 = '';
         item.content.replace(reg, function ($0) {
-          _url3 = $0.slice(6);
+          _url4 = $0.slice(6);
         });
 
-        if (_url3) {
-          (0, _tools.openPage)(_url3);
+        if (_url4) {
+          (0, _tools.openPage)(_url4);
           return;
         }
       }

package/lib/components/nav-top/components/user-message/constant.js

@@ -25,14 +25,16 @@ var informType = {
   //进入项目
   "details": 69,
   //查看详情
-  "daily": 55,
+  "daily1": 0,
   //日报月报周报
   "todayJob": 81,
   //进入今日工作
-  "Okr": 0,
-  //Okr
+  "Okr": 83,
   "okrRemind": 4,
-  "plan": 11 //计划
+  //okr提醒
+  "plan": 11,
+  //计划
+  "remindLeader": 74 //提醒上级邀请
 
 };
 exports.informType = informType;

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

@@ -166,10 +166,13 @@ var UserMessage = function UserMessage() {
           }; // @ts-ignore
 
           window.util.openGift(options);
-        } // if(weeklyReportIndicator.length){
-        // 	window?.Talent.app.vent.trigger('open-weekly-report-modal')
-        // }
+        }
+
+        if (weeklyReportIndicator.length) {
+          var _window;
 
+          (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger('open-weekly-report-modal');
+        }
       }
     });
   };

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

@@ -108,7 +108,9 @@ var NavTop = function NavTop() {
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
-        return hash.includes(item.href.split("#")[1].split('?')[0]);
+        var _item$href$split, _item$href$split$;
+
+        return hash.includes((_item$href$split = item.href.split("#")) === null || _item$href$split === void 0 ? void 0 : (_item$href$split$ = _item$href$split[1]) === null || _item$href$split$ === void 0 ? void 0 : _item$href$split$.split('?')[0]);
       });
 
       if (hash.includes('homepage')) {

package/lib/components/task-relation-modal/index.js

@@ -233,6 +233,7 @@ var TaskRelationModal = function TaskRelationModal(props) {
   };
 
   var removeSelected = function removeSelected(id) {
+    debugger;
     var newSelected = selected.filter(function (item) {
       return item.id !== id;
     });

package/lib/components/task-relation-modal/tree/okr-tree/index.js

@@ -126,6 +126,8 @@ var OkrTree = function OkrTree() {
   };
 
   (0, _react.useEffect)(function () {
+    console.log(treeNodes);
+
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -138,10 +140,10 @@ var OkrTree = function OkrTree() {
   var formatKrNodes = function formatKrNodes(krs) {
     return krs.map(function (item, index) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == item.feedId;
       });
       return {
-        key: "".concat(item.mileStoneId),
+        key: "".concat(item.feedId),
         nodeType: "kr-node",
         data: item,
         title: "",
@@ -157,10 +159,10 @@ var OkrTree = function OkrTree() {
       var _item$Krs = item.Krs,
           Krs = _item$Krs === void 0 ? [] : _item$Krs;
       var checked = !!selected.find(function (i) {
-        return i.id == item.workId;
+        return i.id == item.feedId;
       });
       return {
-        key: item.workId,
+        key: item.feedId,
         nodeType: "o-node",
         title: "",
         children: formatKrNodes(Krs.filter(function (item) {

package/lib/components/task-relation-modal/tree/work-tree/index.js

@@ -114,6 +114,8 @@ var WorkTree = function WorkTree() {
   };
 
   (0, _react.useEffect)(function () {
+    console.log(treeNodes);
+
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -126,10 +128,10 @@ var WorkTree = function WorkTree() {
   var formatKrNodes = function formatKrNodes(krs) {
     return krs.map(function (item, key) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == "mileStoneId-".concat(item.mileStoneId);
       });
       return {
-        key: item.mileStoneId,
+        key: "mileStoneId-".concat(item.mileStoneId),
         nodeType: "milestone",
         data: item,
         title: "",

package/lib/components/task-relation-modal/tree-node/kr-node/index.js

@@ -63,10 +63,10 @@ var KrNode = function KrNode(props) {
       type: "kr",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
+      id: data.feedId,
       name: data.mileStoneName
     });
-    !checked && removeSelected(data.mileStoneId);
+    !checked && removeSelected(data.feedId);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -84,7 +84,7 @@ var KrNode = function KrNode(props) {
     className: "".concat(precls, "__checkbox")
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     onChange: onCheckHandler,
-    id: data.mileStoneId,
+    id: data.feedId,
     checked: checked
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(precls, "__pointer"), _defineProperty({}, "".concat(precls, "__pointer-first"), krIndex === 1))

package/lib/components/task-relation-modal/tree-node/milestone-node/index.js

@@ -68,10 +68,10 @@ var MileStone = function MileStone(props) {
       type: "milestone",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
+      id: "mileStoneId-".concat(data.mileStoneId),
       name: data.mileStoneName
     });
-    !checked && removeSelected(data.mileStoneId);
+    !checked && removeSelected("mileStoneId-".concat(data.mileStoneId));
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/task-relation-modal/tree-node/o-node/index.js

@@ -85,10 +85,10 @@ var ONode = function ONode(props) {
       type: "okr",
       workId: data.workId,
       krId: 0,
-      id: data.workId,
+      id: data.feedId,
       name: data.workName
     });
-    !checked && removeSelected(data.workId);
+    !checked && removeSelected(data.feedId);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,7 +106,7 @@ var ONode = function ONode(props) {
     className: "".concat(precls, "__checkbox")
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     onChange: onCheckHandler,
-    id: data.workId,
+    id: data.feedId,
     checked: checked
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__name")

package/lib/components/weekly-report/index.js

@@ -197,7 +197,7 @@ function WeeklyReportModal(_ref4) {
     }
 
     if (visible) {
-      (0, _request.rdelete)('v1')('Indicator/Clear?message_type=0&indicator_type=15');
+      (0, _request.rdelete)('v1')('Indicator/Clear?message_type=0&indicator_type=mWeekStatisticIndicator');
     }
   }, [visible]);
   if (!data) return null;

package/lib/pages/group-management/components/table/index.css

@@ -37,6 +37,10 @@
   font-size: 14px;
 }
 
+.tita-components__table .rc-table-cell-row-hover {
+  background: #F7F8FA !important;
+}
+
 .tita-components__table__select-td {
   display: inline-block;
   min-width: 23px;
@@ -61,3 +65,14 @@
   border-width: 1px;
   padding: 4px;
 }
+
+.tita-components__select-td {
+  display: flex;
+  align-items: center;
+  position: relative;
+  top: -1px;
+}
+
+.rc-table-cell-row-hover {
+  background: #F7F8FA !important;
+}

package/lib/pages/group-management/components/table/index.js

@@ -15,7 +15,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcPagination = _interopRequireDefault(require("rc-pagination"));
 
-var _checkbox = _interopRequireDefault(require("../checkbox"));
+var _checkbox = _interopRequireDefault(require("../../../../components/checkbox"));
 
 require("rc-table/assets/index.css");
 
@@ -97,10 +97,10 @@ var _default = function _default(props) {
       return status;
     };
 
-    var onCheckAllHandler = function onCheckAllHandler(e) {
+    var onCheckAllHandler = function onCheckAllHandler(checked) {
       var arr = [];
 
-      if (e.target.checked) {
+      if (checked) {
         for (var i = 0; i < tdata.length; i++) {
           arr.push(i);
         }
@@ -109,10 +109,10 @@ var _default = function _default(props) {
       setRowSelected(arr);
     };
 
-    var onCheckHandler = function onCheckHandler(e, id) {
+    var onCheckHandler = function onCheckHandler(checked, id) {
       var arr = _toConsumableArray(rowSelected);
 
-      if (e.target.checked) {
+      if (checked) {
         arr.push(id);
         arr.sort(function (a, b) {
           return a - b;
@@ -129,12 +129,12 @@ var _default = function _default(props) {
     };
 
     var selectCloumn = {
-      title: /*#__PURE__*/_react["default"].createElement("span", null, " ", /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+      title: /*#__PURE__*/_react["default"].createElement("span", {
+        className: (0, _classnames["default"])("".concat(preCls, "__select-td"))
+      }, " ", /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
         className: "tita-checkbox",
         checked: rowSelected.length === tdata.length,
-        onChange: function onChange(e) {
-          return onCheckAllHandler(e);
-        }
+        onChange: onCheckAllHandler
       }), " "),
       dataIndex: 'key',
       key: 'key',
@@ -146,9 +146,8 @@ var _default = function _default(props) {
         }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
           className: "tita-checkbox",
           checked: has(id),
-          onChange: function onChange(e) {
-            return onCheckHandler(e, id);
-          }
+          name: id,
+          onChange: onCheckHandler
         }));
       }
     };

package/lib/pages/group-management/table/index.css

@@ -54,6 +54,11 @@
   margin-left: 6px;
 }
 
+.user-group-page__email-td {
+  display: flex;
+  align-items: center;
+}
+
 .user-group-page__email-td > span {
   display: inline-block;
   max-width: 200px;

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

@@ -52,8 +52,11 @@ var KeywordSearch = function KeywordSearch(props) {
 
   var handleSearchClick = function handleSearchClick() {
     if (!active) {
-      setActive(true);
-      inputRef.current.focus();
+      var _inputRef$current;
+
+      setActive(true); //@ts-ignore
+
+      inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
     } else {
       handleSearch();
     }

package/lib/pages/personal-info/components/base-info/index.js

@@ -117,7 +117,9 @@ var BaseInfo = function BaseInfo() {
   (0, _react.useEffect)(function () {
     (0, _requestApi.getUserInfoFun)().then(function (resp) {
       if (resp.Code === 1 && resp.Data) {
-        setUserInfo(resp.Data);
+        setUserInfo(_objectSpread(_objectSpread({}, resp.Data), {}, {
+          position: resp.Data.positionCode
+        }));
       }
     });
   }, []);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.45",
+  "version": "1.7.49",
   "nameCN": "",
   "description": "",
-  "main": "src/index.js",
+  "main": "lib/index.js",
   "scripts": {
     "storybook": "start-storybook -p 6006 --no-dll",
     "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",

package/src/components/avatar/default.tsx

@@ -1,173 +0,0 @@
-import React, { FC, useState, useCallback } from "react";
-import { isWechat, OpenUserName } from "../../utils/open-data";
-import Tooltip from "../tooltip";
-import CloseSvg from "./img/avatar-close-normal.svg";
-import CloseRedSvg from './img/avatar-close-red.svg';
-
-import "./index.scss";
-interface IAvatarProps {
-  src?: string;
-  name: string;
-  color: string;
-  size?: Size;
-  userId?: number;
-  style?: React.CSSProperties;
-  nameTips?: (string) => React.ReactElement;
-  showNameTips?: boolean;
-  onClick?: any;
-  onMouseEnter?: any;
-  onMouseLeave?: any;
-  canDelUser?: boolean;
-  onDelUser?: Function;
-}
-
-interface Size {
-  width: number;
-  textNum: number;
-  fontSize: number;
-}
-
-const Avatar: FC<IAvatarProps> = (props) => {
-  const {
-    size = { width: 24, textNum: 1, fontSize: 12 },
-    src,
-    userId,
-    style,
-    name,
-    onClick,
-    onMouseEnter,
-    onMouseLeave,
-    nameTips = (name) => name,
-    showNameTips = false,
-    color,
-    canDelUser,
-    onDelUser,
-  } = props;
-
-  const [mouseIsEnter, setMouseIsEnter] = useState(false);
-  const [mouseIsEnterCloseIcon, setMouseIsEnterCloseIcon] = useState(false);
-
-  const handleDelUser = () => {
-    onDelUser && onDelUser({ name, id: userId });
-  };
-
-  const handleMouseEnter = useCallback(() => {
-    setMouseIsEnter(true);
-  }, []);
-
-  const handleMouseLeave = useCallback(() => {
-    setMouseIsEnter(false);
-  }, []);
-
-  const handleCloseIconMouseEnter = useCallback(() => {
-    setMouseIsEnterCloseIcon(true);
-  }, []);
-
-  const handleCloseIconMouseLeave = useCallback(() => {
-    setMouseIsEnterCloseIcon(false);
-  }, []);
-
-  const renderImgAvatar = () => {
-    return (
-      <img
-        style={{ width: size.width, height: size.width, verticalAlign: "top" }}
-        src={src}
-      />
-    );
-  };
-  const renderTextAvatar = () => {
-    if (isWechat())
-      return (
-        <div
-          className="titaui-pc-avatar--text"
-          style={{
-            width: size.width,
-            height: size.width,
-            backgroundColor: color,
-          }}
-        >
-          <div
-            style={{
-              display: "inline-block",
-              width: size.fontSize + "px",
-              margin: "0 auto",
-              overflow: "hidden",
-              whiteSpace: "nowrap",
-              fontSize: size.fontSize + "px",
-              lineHeight: size.width + "px",
-            }}
-          >
-            <OpenUserName name={name} id={userId} />
-          </div>
-        </div>
-      );
-    let cuttedName = "";
-    let cuttedNameLen = 0;
-    for (let i = 0, lent = name.length; i < lent; i++) {
-      let len = 1;
-      name[i].match(/[0-9a-z]/) && (len = 0.6);
-      if (cuttedNameLen + len > size.textNum) break;
-      cuttedNameLen += len;
-      cuttedName += name[i];
-    }
-
-    return (
-      <div
-        className="titaui-pc-avatar--text"
-        style={{
-          width: size.width,
-          height: size.width,
-          backgroundColor: color,
-          fontSize: size.fontSize + "px",
-        }}
-      >
-        {cuttedName}
-      </div>
-    );
-  };
-
-  const hasAvatar = src && !src.match(/default\w*.jpg$/);
-  const avatarContent = hasAvatar ? renderImgAvatar() : renderTextAvatar();
-
-  let avatar = (
-    <div
-      className="titaui-pc-avator-container"
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={handleMouseLeave}
-    >
-      <div
-        onClick={handleDelUser}
-        onMouseLeave={handleCloseIconMouseLeave}
-        onMouseEnter={handleCloseIconMouseEnter}
-        className={`titaui-pc-avator__delete-wrapper ${canDelUser && mouseIsEnter ? "titaui-pc-avator--enter" : ""
-          }`}
-      >
-        <img width={6} height={6} src={mouseIsEnterCloseIcon ? CloseRedSvg : CloseSvg} />
-      </div>
-      <div
-        className="titaui-pc-avator-wrapper"
-        style={style}
-        onClick={onClick}
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-      >
-        {avatarContent}
-      </div>
-    </div>
-  );
-
-  if (showNameTips) {
-    avatar = (
-      <Tooltip
-        overlay={nameTips(<OpenUserName name={name} id={userId} />)}
-        placement="top"
-        align={{ offset: [0, 5] }}
-      >
-        {avatar}
-      </Tooltip>
-    );
-  }
-  return avatar;
-};
-
-export default Avatar;

package/src/components/avatar/icon-avatar/index.scss

@@ -1,13 +0,0 @@
-.tita-icon-avatar{
-  position: relative;
-  .titaui-pc-avator-container{
-    display: inline-flex;
-  }
-  &-image{
-    position: absolute;
-    width: 18px;
-    height: 18px;
-    bottom: -3px;
-    right: -2px;
-  }
-}

package/src/components/avatar/icon-avatar/index.tsx

@@ -1,42 +0,0 @@
-import React, { FC } from "react";
-import Avatar from "../default";
-import attitudeArr from "../../upvote/attitude";
-
-import "./index.scss";
-
-interface IconAvatarProps {
-  userId?: any;
-  avatar?: any;
-  name?: any;
-  type?: Number;
-  [key: string]: any;
-}
-
-const IconAvatar: FC<IconAvatarProps> = ({
-  userId,
-  avatar,
-  name,
-  type,
-  ...restProps
-}) => {
-  return (
-    <div className={`tita-icon-avatar`}>
-      <Avatar
-        userId={userId}
-        src={avatar.HasAvatar || avatar.hasAvatar ? avatar.medium : ""}
-        color={avatar.color}
-        name={name}
-        {...restProps}
-      />
-      <img
-        className={`tita-icon-avatar-image`}
-        src={
-          // @ts-ignore
-          attitudeArr.find((att) => att.type == type).img
-        }
-      />
-    </div>
-  );
-};
-
-export default IconAvatar;

package/src/components/avatar/img/avatar-close-normal.svg

@@ -1,3 +0,0 @@
-<svg width="6" height="6" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
-	<path d="M5.873 5.872c-.163.163-.42.17-.573.017L3 3.59l-2.3 2.3c-.154.154-.41.146-.573-.017-.163-.162-.17-.419-.017-.572L2.41 3 .11.7C-.043.546-.036.29.127.127.29-.036.547-.043.7.11L3 2.41 5.3.11c.154-.153.41-.146.573.017.163.163.17.42.017.573L3.59 3l2.3 2.3c.153.153.146.41-.017.572z" fill="#A4ACB9" fill-rule="nonzero" />
-</svg>

package/src/components/avatar/img/avatar-close-red.svg

@@ -1,3 +0,0 @@
-<svg width="6" height="6" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
-	<path d="M5.873 5.872c-.163.163-.42.17-.573.017L3 3.59l-2.3 2.3c-.154.154-.41.146-.573-.017-.163-.162-.17-.419-.017-.572L2.41 3 .11.7C-.043.546-.036.29.127.127.29-.036.547-.043.7.11L3 2.41 5.3.11c.154-.153.41-.146.573.017.163.163.17.42.017.573L3.59 3l2.3 2.3c.153.153.146.41-.017.572z" fill="#F05E5E" fill-rule="nonzero" />
-</svg>