@titaui/pc 1.16.52 → 1.16.54

package/lib/components/dingding-btn/index.js

@@ -184,6 +184,8 @@ var DingdingBtn = function DingdingBtn(props) {
                 userIds: [loginUserOpenId + ''] //需要入群的成员userId。
 
               }).then(function (res) {
+                console.log(res, 'addMembers');
+
                 if (res.errorCode === '0') {
                   console.log('添加成功' + JSON.stringify(res));
 
@@ -238,6 +240,8 @@ var DingdingBtn = function DingdingBtn(props) {
         mentionAllAuthority: 1
       }
     }).then(function (res) {
+      console.log(res, 'createGroup');
+
       if (res.errorCode === '0') {
         // 建群成功
         if (res.detail.openConversationId) {
@@ -250,7 +254,8 @@ var DingdingBtn = function DingdingBtn(props) {
           });
         }
       }
-    })["catch"](function (e) {// 用户主动退出安装
+    })["catch"](function (e) {
+      console.log(e); // 用户主动退出安装
     });
     setCreateDingchatVisible(false);
     setPrincipalUserModalVisible(false);
@@ -279,6 +284,8 @@ var DingdingBtn = function DingdingBtn(props) {
         objType: objType,
         SourceTye: dingdingSource
       }).then(function (res) {
+        console.log(res, 'chat/info');
+
         if (res.Message === '没有权限') {
           setIsShowDingChat(false);
           return;
@@ -297,6 +304,7 @@ var DingdingBtn = function DingdingBtn(props) {
               objType: objType,
               SourceTye: dingdingSource
             }).then(function (res) {
+              console.log(res, 'chat/users');
               var _res$Data = res.Data,
                   CoolAppCode = _res$Data.CoolAppCode,
                   SuiteKey = _res$Data.SuiteKey,
@@ -342,7 +350,7 @@ var DingdingBtn = function DingdingBtn(props) {
     overlay: tooltip,
     placement: "bottom"
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup), _defineProperty({}, 'tu-icon-qw-chat', isShowDingChat)),
+    className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup), _defineProperty({}, 'tu-icon-dd-m', isShowDingChat)),
     onMouseDown: handleClickWechatBtn
   })), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
     zIndex: 1200,

package/lib/components/dynamic/dynamic-item/components/task-progress/render-row.js

@@ -35,12 +35,8 @@ var RenderRow = function RenderRow(_ref) {
   };
 
   var render = function render() {
-    var _item$LastRichContent;
-
-    console.log('LastRichContent', item === null || item === void 0 ? void 0 : (_item$LastRichContent = item.LastRichContent) === null || _item$LastRichContent === void 0 ? void 0 : _item$LastRichContent.trim());
-
     if (item.IsImport) {
-      var _item$LastRichContent2;
+      var _item$LastRichContent;
 
       return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__table-row-title"),
@@ -62,7 +58,7 @@ var RenderRow = function RenderRow(_ref) {
         value: item.Progress,
         editable: false
       })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
-        oldValue: (item === null || item === void 0 ? void 0 : (_item$LastRichContent2 = item.LastRichContent) === null || _item$LastRichContent2 === void 0 ? void 0 : _item$LastRichContent2.trim()) || (item === null || item === void 0 ? void 0 : item.LastContent) || "" // oldValue={item?.LastRichContent?.trim() ||  ""}
+        oldValue: (item === null || item === void 0 ? void 0 : (_item$LastRichContent = item.LastRichContent) === null || _item$LastRichContent === void 0 ? void 0 : _item$LastRichContent.trim()) || (item === null || item === void 0 ? void 0 : item.LastContent) || "" // oldValue={item?.LastRichContent?.trim() ||  ""}
         ,
         value: item.LastContents,
         editable: false,

package/lib/components/dynamic/dynamic-item/components/work-progress/mile-stone.js

@@ -17,10 +17,10 @@ var _schedule = _interopRequireDefault(require("../schedule"));
 
 var _tools = require("../../../../../utils/tools");
 
-var _constant = require("../../../constant");
-
 require("./index.css");
 
+var _utils = require("./utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -55,7 +55,7 @@ var MileStone = function MileStone(_ref) {
   }, data.RemainingContent))), /*#__PURE__*/_react["default"].createElement("td", null, !!data.MilestoneId && /*#__PURE__*/_react["default"].createElement(_progress["default"], {
     id: "".concat(data.MilestoneId),
     type: "task",
-    status: _constant.OkrRiskMapping[data.RiskLevel],
+    status: (0, _utils.getStatus)(data.RiskLevel || 1),
     value: Number(data.Progress),
     editable: false
   })), /*#__PURE__*/_react["default"].createElement("td", null, !!data.MilestoneId && /*#__PURE__*/_react["default"].createElement(_schedule["default"], {

package/lib/components/dynamic/dynamic-item/components/work-progress/render-row.js

@@ -25,7 +25,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var prefix = "tita-summary-work-progress";
+var prefix = 'tita-summary-work-progress';
 
 var RenderRow = function RenderRow(_ref) {
   var item = _ref.item,
@@ -42,13 +42,15 @@ var RenderRow = function RenderRow(_ref) {
           data: child
         }));
 
-        if (child.Milestones && openWorkMileSetting) {
+        if (child.Milestones) {
           var _child$Milestones;
 
           (_child$Milestones = child.Milestones) === null || _child$Milestones === void 0 ? void 0 : _child$Milestones.forEach(function (mileStone) {
-            result.push( /*#__PURE__*/_react["default"].createElement(_mileStone["default"], {
-              data: mileStone
-            }));
+            if (openWorkMileSetting) {
+              result.push( /*#__PURE__*/_react["default"].createElement(_mileStone["default"], {
+                data: mileStone
+              }));
+            }
 
             if (mileStone.Tasks && openWorkTaskSetting) {
               var _mileStone$Tasks;

package/lib/components/dynamic/dynamic-item/components/work-progress/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toTree = exports.getMapText = exports.getMapDeleteText = exports.formatWorkData = exports.formatTime = void 0;
+exports.toTree = exports.getStatus = exports.getMapText = exports.getMapDeleteText = exports.formatWorkData = exports.formatTime = void 0;
 
 var _getLocale = require("../../../../../utils/getLocale");
 
@@ -127,6 +127,18 @@ var getMapText = function getMapText(types, type) {
 
 exports.getMapText = getMapText;
 
+var getStatus = function getStatus(status) {
+  // 复制前面人的逻辑
+  var obj = {
+    1: 'normal',
+    2: 'delay',
+    3: 'risk'
+  };
+  return obj[status] || 'normal';
+};
+
+exports.getStatus = getStatus;
+
 var getMapDeleteText = function getMapDeleteText(types) {
   if (types.includes(_constant.EObjType.Task)) {
     return (0, _getLocale.getLocale)("Rep_NewS_Afterdetask");

package/lib/components/dynamic/dynamic-item/components/work-progress/work-task.js

@@ -27,11 +27,18 @@ var WorkTask = function WorkTask(_ref) {
   var _data$LastRichContent;
 
   var data = _ref.data;
+
+  var handleShowTaskDetail = function handleShowTaskDetail() {
+    // @ts-ignore
+    window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__table-task-title"),
     style: {
       'paddingLeft': 24
-    }
+    },
+    onClick: handleShowTaskDetail
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "".concat(preCls, "__table-row-title-icon ").concat(_constant.EStatusStatus2ClassType[data.iconStatus])
   }), /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/dynamic/dynamic-item/components/work-progress/work.js

@@ -13,12 +13,12 @@ var _progress = _interopRequireDefault(require("../progress"));
 
 var _schedule = _interopRequireDefault(require("../schedule"));
 
+var _utils = require("./utils");
+
 require("./index.css");
 
 var _tools = require("../../../../../utils/tools");
 
-var _constant = require("../../../constant");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var preCls = 'tita-summary-work-progress';
@@ -46,7 +46,7 @@ var Work = function Work(_ref) {
   }, data.DateContent))), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
     id: "".concat(data.Id),
     type: "task",
-    status: _constant.OkrRiskMapping[data.RiskLevel],
+    status: (0, _utils.getStatus)(data.RiskLevel || data.riskLevel || 1),
     value: Number(data.Progress)
   })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
     curContent: (data === null || data === void 0 ? void 0 : (_data$LastRichContent = data.LastRichContent) === null || _data$LastRichContent === void 0 ? void 0 : _data$LastRichContent.trim()) || (data === null || data === void 0 ? void 0 : data.LastContent) || "",

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -321,7 +321,7 @@ var DynamicReply = function DynamicReply(_ref) {
   var handleInView = function handleInView(inview) {
     if (!isFold) return;
 
-    if (inview) {
+    if (inview && window.titaTracker) {
       window.titaTracker('planAction').record({
         actionName: '查看日报',
         actionGroup: '动态-查看日报',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.16.52",
+  "version": "1.16.54",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",