@titaui/pc 1.7.46 → 1.7.50

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/dynamic/quick-operation/index.js

@@ -76,8 +76,7 @@ var DynamicQuickOperation = function DynamicQuickOperation(_ref) {
         "objType": 4,
         "AppId": 1,
         "AppType": 1,
-        "TaskType": 0,
-        "WorkMileStoneId": ""
+        "TaskType": 0
       }
     }).then(function () {
       _toast["default"].Success("发布成功", {

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

@@ -78,6 +78,24 @@ var Inform = function Inform(props) {
 
       Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
       return;
+    }
+
+    if (messageType === 99) {
+      var _options = {
+        width: 680,
+        showScroll: false,
+        type: 'message',
+        // 推屏类型
+        data: {
+          type: 'okrDashBoard',
+          // 消息类型
+          objId: item.messageId,
+          objType: messageType
+        }
+      }; // @ts-ignore
+
+      Talent.app.vent.trigger('openReactScreenPush', _options);
+      return;
     } // 处理合并的消息
 
 
@@ -87,14 +105,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 +135,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/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

@@ -135,13 +135,14 @@ var OkrTree = function OkrTree() {
     };
   }, [treeNodes]);
 
-  var formatKrNodes = function formatKrNodes(krs) {
+  var formatKrNodes = function formatKrNodes(krs, o) {
     return krs.map(function (item, index) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == item.feedId;
       });
+      item['workName'] = o.workName;
       return {
-        key: "".concat(item.mileStoneId),
+        key: "".concat(item.feedId),
         nodeType: "kr-node",
         data: item,
         title: "",
@@ -157,15 +158,15 @@ 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) {
           return item.mileStoneId !== 0;
-        })),
+        }), item),
         data: item,
         checked: checked,
         disabled: !checked && selectedRoots.includes(item.workId)

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

@@ -123,13 +123,14 @@ var WorkTree = function WorkTree() {
     };
   }, [treeNodes]);
 
-  var formatKrNodes = function formatKrNodes(krs) {
+  var formatKrNodes = function formatKrNodes(krs, work) {
     return krs.map(function (item, key) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == "mileStoneId-".concat(item.mileStoneId);
       });
+      item['workName'] = work.WorkName;
       return {
-        key: item.mileStoneId,
+        key: "mileStoneId-".concat(item.mileStoneId),
         nodeType: "milestone",
         data: item,
         title: "",
@@ -151,7 +152,7 @@ var WorkTree = function WorkTree() {
         key: item.WorkId,
         nodeType: "work-node",
         title: "",
-        children: formatKrNodes(mileStones || []),
+        children: formatKrNodes(mileStones || [], item),
         data: item,
         checked: checked,
         disabled: !checked && selectedRoots.includes(item.WorkId)

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

@@ -63,10 +63,11 @@ var KrNode = function KrNode(props) {
       type: "kr",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
-      name: data.mileStoneName
+      id: data.feedId,
+      name: data.mileStoneName,
+      workName: data.workName
     });
-    !checked && removeSelected(data.mileStoneId);
+    !checked && removeSelected(data.feedId);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -84,7 +85,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,11 @@ var MileStone = function MileStone(props) {
       type: "milestone",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
-      name: data.mileStoneName
+      id: "mileStoneId-".concat(data.mileStoneId),
+      name: data.mileStoneName,
+      workName: data.workName
     });
-    !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/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/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,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.46",
+  "version": "1.7.50",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",