@titaui/pc 1.11.52-beta.13 → 1.11.52-beta.14

package/lib/components/drop-selector/index.js

@@ -156,8 +156,7 @@ function DropSelector(props) {
   }
 
   var handlePopVisibleChange = (0, _react.useCallback)(function (visible) {
-    console.log('visible' in props);
-
+    // console.log('visible' in props)
     if (!('visible' in props)) {
       setVisible(visible);
     }

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

@@ -133,7 +133,7 @@ var DynamicAlign = function DynamicAlign(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _tools.htmlDecodeByRegExp)(parentObjName),
+      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(parentObjName)),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -170,7 +170,7 @@ var DynamicAlign = function DynamicAlign(_ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: (0, _tools.htmlDecodeByRegExp)(okrName)
+    text: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(okrName))
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-other-info")
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -176,7 +176,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _tools.htmlDecodeByRegExp)(relateObjName),
+      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(relateObjName)),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -213,7 +213,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: (0, _tools.htmlDecodeByRegExp)(objName)
+    text: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(objName))
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-other-info")
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -29,6 +29,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _tools = require("../../../../utils/tools");
 
+var _openData = require("../../../../utils/open-data");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -95,7 +97,7 @@ var DynamicReply = function DynamicReply(_ref) {
         className: "".concat(prefix, "__object-name"),
         onClick: handleClickOTitle
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-        text: (0, _tools.htmlDecodeByRegExp)(data.obj.objName),
+        text: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(data.obj.objName)),
         isPercent: true
       })), "\u4E0B\u5173\u952E\u6210\u679C\u7684\u590D\u76D8");
     }

package/lib/components/okr-detail/components/header/edit-name.js

@@ -69,13 +69,9 @@ function EditNameCmp(props) {
       errorTip = _useState4[0],
       setErrorTip = _useState4[1];
 
-  var _useState5 = (0, _react.useState)({
-    mentionUsers: [],
-    pureText: '',
-    pureTextExcludeAt: '',
-    richText: okrName,
-    state: 'normal'
-  }),
+  var _useState5 = (0, _react.useState)(_objectSpread(_objectSpread({}, okrName), {}, {
+    editorState: 'normal'
+  })),
       _useState6 = _slicedToArray(_useState5, 2),
       okrNameData = _useState6[0],
       setOkrNameData = _useState6[1];
@@ -111,19 +107,15 @@ function EditNameCmp(props) {
     setEditing(false);
     setErrorTip('');
     setOkrNameData(function (prevData) {
-      return {
-        mentionUsers: [],
-        pureText: okrName,
-        pureTextExcludeAt: okrName,
-        richText: (0, _richEditor.TitaRichEditorInitTextState)(okrName),
-        state: prevData.state === 'normal' ? 'reset' : 'normal'
-      };
+      return _objectSpread(_objectSpread({}, okrName), {}, {
+        editorState: prevData.editorState === 'normal' ? 'reset' : 'normal'
+      });
     });
   };
 
   var confiremEditHandle = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var mentionUsers, pureText, pureTextExcludeAt, richText, data;
+      var mentionUsers, pureText, richText, data;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -136,9 +128,9 @@ function EditNameCmp(props) {
               return _context.abrupt("return");
 
             case 2:
-              mentionUsers = okrNameData.mentionUsers, pureText = okrNameData.pureText, pureTextExcludeAt = okrNameData.pureTextExcludeAt, richText = okrNameData.richText;
+              mentionUsers = okrNameData.mentionUsers, pureText = okrNameData.pureText, richText = okrNameData.richText;
 
-              if (!(okrName == pureTextExcludeAt)) {
+              if (!(okrName.pureText == pureText)) {
                 _context.next = 6;
                 break;
               }
@@ -187,7 +179,7 @@ function EditNameCmp(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefixCls, "-input"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-input--editable"), editable), _defineProperty(_classNames, "".concat(prefixCls, "-input--editing"), editing), _defineProperty(_classNames, "".concat(prefixCls, "-input--error"), errorTip.length > 0), _classNames))
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
-    key: okrNameData.state,
+    key: okrNameData.editorState,
     editable: editable,
     initialState: okrNameData.richText,
     manualWrap: true,

package/lib/components/okr-detail/components/header/index.js

@@ -68,12 +68,19 @@ function Header(props) {
 
   // 外部取到的 headInfo
   var okrInfo = props.okrInfo;
-  var workNameRichText = okrInfo.workNameRichText ? JSON.parse(okrInfo.workNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(okrInfo.workName);
-
-  var _useState = (0, _react.useState)(workNameRichText),
+  var workName = okrInfo.workName,
+      workNameRichText = okrInfo.workNameRichText;
+  var richText = workNameRichText ? JSON.parse(workNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(workName);
+
+  var _useState = (0, _react.useState)({
+    mentionsUsers: [],
+    pureText: workName,
+    pureTextExcludeAt: workName,
+    richText: richText
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      okrName = _useState2[0],
-      setOkrName = _useState2[1];
+      okrNameData = _useState2[0],
+      setOkrNameData = _useState2[1];
 
   var _useContext = (0, _react.useContext)(_context.GeneralDataContext),
       generalPrincipalUser = _useContext.generalPrincipalUser,
@@ -162,9 +169,9 @@ function Header(props) {
     className: "".concat(precls, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_editName["default"], {
     editable: editable,
-    okrName: okrName,
+    okrName: okrNameData,
     okrId: okrInfo.workId,
-    setOkrName: setOkrName
+    setOkrName: setOkrNameData
   }), /*#__PURE__*/_react["default"].createElement("section", {
     className: "".concat(precls, "__action")
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -21,6 +21,8 @@ var _precls = _interopRequireDefault(require("../../precls"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../../drawer-manager"));
 
+var _taskRelationModal = _interopRequireDefault(require("../../../../../task-relation-modal"));
+
 var _auth = require("../../../../../../utils/auth");
 
 var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
@@ -43,10 +45,25 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var hasProject = (0, _bsGlobal.hasWebHead)("project");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var hasProject = (0, _bsGlobal.hasWebHead)('project');
+var RelationTaskModel = _taskRelationModal["default"].RelationTaskModel,
+    RelationWorkModel = _taskRelationModal["default"].RelationWorkModel;
+var baseAuth = new _auth.BaseAuth();
 
 var EKrNode = function EKrNode(props) {
-  var _okrInfo$authority;
+  var _window, _window$BSGlobal, _window$BSGlobal$Work, _window$BSGlobal$Work2, _okrInfo$authority;
 
   var index = props.index,
       title = props.title,
@@ -62,6 +79,19 @@ var EKrNode = function EKrNode(props) {
   var _useContext2 = (0, _react.useContext)(_context2.EListContext),
       refreshEList = _useContext2.refreshEList;
 
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isShowWork = _useState2[0],
+      setIsShowWork = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isShowTask = _useState4[0],
+      setIsShowTask = _useState4[1];
+
+  var onlySuperCreateWork = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$Work = _window$BSGlobal.WorkAdvancedSetting) === null || _window$BSGlobal$Work === void 0 ? void 0 : (_window$BSGlobal$Work2 = _window$BSGlobal$Work.WorkFunctionSetting) === null || _window$BSGlobal$Work2 === void 0 ? void 0 : _window$BSGlobal$Work2.WorkCreate; //开启后，仅超管、目标管理员、老板/助理可创建项目
+
+  var canCreateWork = baseAuth.isBoss() || baseAuth.isManager() || baseAuth.isWorkManager() || baseAuth.isAssistant() || !onlySuperCreateWork;
   var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth;
 
@@ -87,7 +117,7 @@ var EKrNode = function EKrNode(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (name === "addTask") {
+              if (name === 'addTask') {
                 params = {
                   objId: data.workId,
                   objType: 4,
@@ -107,7 +137,7 @@ var EKrNode = function EKrNode(props) {
                     allowObjectOptions: false
                   }
                 }).then(function () {
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
                     canClose: false
                   });
 
@@ -118,7 +148,7 @@ var EKrNode = function EKrNode(props) {
                   okrId: data.workId,
                   krId: data.mileStoneId
                 }).then(function () {
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
                     canClose: false
                   });
 
@@ -139,38 +169,29 @@ var EKrNode = function EKrNode(props) {
     };
   }(), []);
   var openRelatePop = (0, _react.useCallback)(function (name) {
-    if (name === "relateTask") {
-      window.openRelateTaskPop(btnRef.current, {
-        okrId: data.workId,
-        krId: data.mileStoneId
-      }).then(function () {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-          canClose: false
-        });
-
-        setTimeout(refreshEList, 2000);
-      })["catch"](function (e) {
-        _toast["default"].Error(e, {
-          canClose: false
-        });
-      });
+    if (name === 'relateTask') {
+      setIsShowTask(true);
     } else {
-      window.openRelateProjectPop(btnRef.current, {
-        okrId: data.workId,
-        krId: data.mileStoneId
-      }).then(function () {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-          canClose: false
-        });
-
-        setTimeout(refreshEList, 2000);
-      })["catch"](function (e) {
-        _toast["default"].Error(e.errorMsg, {
-          canClose: false
-        });
-      });
+      setIsShowWork(true);
     }
-  });
+  }, []);
+
+  var onModelCancel = function onModelCancel() {
+    setIsShowTask(false);
+  };
+
+  var onModelWorkCancel = function onModelWorkCancel() {
+    setIsShowWork(false);
+  };
+
+  var onModelOk = function onModelOk(data) {
+    setTimeout(refreshEList, 2000);
+  };
+
+  var onModelWorkOK = function onModelWorkOK(data) {
+    setTimeout(refreshEList, 2000);
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
@@ -182,7 +203,7 @@ var EKrNode = function EKrNode(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
     onClick: function onClick() {
       if (data.mileStoneId) {
-        _drawerManager["default"].open("krDetail", {
+        _drawerManager["default"].open('krDetail', {
           krId: data.mileStoneId
         });
       }
@@ -201,32 +222,47 @@ var EKrNode = function EKrNode(props) {
       ref: btnRef
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-add1"
-    }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Newlybuild"))
+    }), (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Newlybuild'))
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-Add-renwu",
     exIconClass: "e-kr-node-layer-icon",
     name: "addTask"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addtask"))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Addtask'))), hasProject && canCreateWork ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-Add-xiangmu",
     exIconClass: "e-kr-node-layer-icon",
     name: "addProject"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addproject"))) : /*#__PURE__*/_react["default"].createElement("span", null)), hasRelation && /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Addproject'))) : /*#__PURE__*/_react["default"].createElement("span", null)), hasRelation && /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
     onChange: openRelatePop,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-actions-connect"))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-guanlian e-kr-node__guanlian-icon"
-    }), (0, _getLocale.getLocale)("Mod_Associate"))
+    }), (0, _getLocale.getLocale)('Mod_Associate'))
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-GL-renwu",
     exIconClass: "e-kr-node-layer-icon",
     name: "relateTask"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Assotask"))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Assotask'))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-GL-xiangmu",
     exIconClass: "e-kr-node-layer-icon",
     name: "relateProject"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_AssProjects"))) : /*#__PURE__*/_react["default"].createElement("span", null))) : null);
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_AssProjects'))) : /*#__PURE__*/_react["default"].createElement("span", null)), isShowTask && /*#__PURE__*/_react["default"].createElement(RelationTaskModel, {
+    noScreen: true,
+    zIndex: 2400,
+    krId: data === null || data === void 0 ? void 0 : data.mileStoneId,
+    okrId: data.workId,
+    defaultVisible: true,
+    onCancel: onModelCancel,
+    onRelateSuccess: onModelOk
+  }), isShowWork && /*#__PURE__*/_react["default"].createElement(RelationWorkModel, {
+    zIndex: 2400,
+    krId: data === null || data === void 0 ? void 0 : data.mileStoneId,
+    okrId: data.workId,
+    defaultVisible: true,
+    onCancel: onModelWorkCancel,
+    onRelateSuccess: onModelWorkOK
+  })) : null);
 };
 
 var _default = EKrNode;

package/lib/components/okr-flow/export-modal/index.js

@@ -201,31 +201,41 @@ var ExportMapModal = function ExportMapModal(props) {
                 }
 
                 size = size / 1024 / 1024; // @ts-ignore
+                // window.titaTracker && window.titaTracker("action").record({
+                //   actionName: userId+'租户：'+telentId+'我得到了图片大小为：'+size+'，路径为'+imgUrl.slice(1,200),
+                //   actionGroup: 'okr地图图片',
+                //   productName: 'okr地图导出',
+                // });
 
                 // @ts-ignore
-                window.titaTracker && window.titaTracker("action").record({
-                  actionName: userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl.slice(1, 200),
-                  actionGroup: 'okr地图图片',
-                  productName: 'okr地图导出'
-                });
+                // window.titaTracker && window.titaTracker("action").record({
+                //   actionName: userId+'租户：'+telentId+'我得到了图片大小为：'+size+'，路径为'+imgUrl.slice(1,200),
+                //   actionGroup: 'okr地图图片',
+                //   productName: 'okr地图导出',
+                // });
                 Sentry.withScope(function (scope) {
-                  scope.setTag("error-level", "P0");
-                  scope.setTag("error-type", "地图导出-图片生成");
-                  scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                  scope.setTag('error-level', "P0");
+                  scope.setTag('error-type', '地图导出-图片生成');
+                  scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                 });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
                   var image = new Image(); // @ts-ignore
+                  // window.titaTracker && window.titaTracker("action").record({
+                  //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
+                  //   actionGroup: 'okr地图接口',
+                  //   productName: 'okr地图导出',
+                  // });
 
                   // @ts-ignore
-                  window.titaTracker && window.titaTracker("action").record({
-                    actionName: userId + '租户：' + telentId + '我获得了地址' + url.Data.obj,
-                    actionGroup: 'okr地图接口',
-                    productName: 'okr地图导出'
-                  });
+                  // window.titaTracker && window.titaTracker("action").record({
+                  //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
+                  //   actionGroup: 'okr地图接口',
+                  //   productName: 'okr地图导出',
+                  // });
                   Sentry.withScope(function (scope) {
-                    scope.setTag("error-level", "P0");
-                    scope.setTag("error-type", "地图导出-图片地址");
-                    scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                    scope.setTag('error-level', "P0");
+                    scope.setTag('error-type', '地图导出-图片地址');
+                    scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                   });
 
                   _toast["default"].Warning('图片上传成功，准备本地下载', {

package/lib/components/progress/circle-progress/index.css

@@ -7,4 +7,6 @@
 .titaui-progress-circle .text-content {
   font-size: 12px;
   color: #89919f;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }

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

@@ -29,7 +29,7 @@ var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "krId", "okrId", "isRelationOther", "onRelateSuccess", "lastSelected"];
+var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "krId", "okrId", "zIndex", "isRelationOther", "onRelateSuccess", "noScreen", "lastSelected"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -76,9 +76,13 @@ function OkrRelationTaskModal(props) {
       onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
       krId = props.krId,
       okrId = props.okrId,
+      _props$zIndex = props.zIndex,
+      zIndex = _props$zIndex === void 0 ? 1000 : _props$zIndex,
       _props$isRelationOthe = props.isRelationOther,
       isRelationOther = _props$isRelationOthe === void 0 ? false : _props$isRelationOthe,
       onRelateSuccess = props.onRelateSuccess,
+      _props$noScreen = props.noScreen,
+      noScreen = _props$noScreen === void 0 ? false : _props$noScreen,
       _props$lastSelected = props.lastSelected,
       lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
       restProps = _objectWithoutProperties(props, _excluded);
@@ -220,7 +224,7 @@ function OkrRelationTaskModal(props) {
       height: '590px'
     },
     width: 840,
-    zIndex: 1000,
+    zIndex: zIndex,
     noHeadLine: true,
     noFooterLine: true // getContainer={getContainer}
     ,
@@ -246,7 +250,8 @@ function OkrRelationTaskModal(props) {
     setSelected: setSelected,
     data: taskData,
     multiple: true,
-    pageSize: pageSize
+    pageSize: pageSize,
+    noScreen: noScreen
   })), !!total && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content-pagination")
   }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], {

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

@@ -21,7 +21,7 @@ var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "onRelateSuccess", "krId", "okrId", "isRelationOther", "lastSelected"];
+var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "onRelateSuccess", "krId", "zIndex", "okrId", "isRelationOther", "lastSelected"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -59,6 +59,8 @@ function OkrRelationWorkModal(props) {
       onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
       onRelateSuccess = props.onRelateSuccess,
       krId = props.krId,
+      _props$zIndex = props.zIndex,
+      zIndex = _props$zIndex === void 0 ? 1000 : _props$zIndex,
       okrId = props.okrId,
       _props$isRelationOthe = props.isRelationOther,
       isRelationOther = _props$isRelationOthe === void 0 ? false : _props$isRelationOthe,
@@ -111,7 +113,7 @@ function OkrRelationWorkModal(props) {
       height: '590px'
     },
     width: 840,
-    zIndex: 1000,
+    zIndex: zIndex,
     noHeadLine: true,
     noFooterLine: true // getContainer={getContainer}
     ,

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

@@ -3,13 +3,13 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  color: #A4ACB9;
+  color: #a4acb9;
 }
 
 .okr-relation-tree__header {
   font-size: 12px;
   font-weight: 400;
-  color: #A4ACB9;
+  color: #a4acb9;
   position: relative;
   display: flex;
   align-items: center;
@@ -50,7 +50,7 @@
 .okr-relation-tree__content {
   margin-right: -32px;
   margin-left: -4px;
-  height: 305px;
+  height: 320px;
   font-size: 14px;
   font-weight: 400;
   line-height: 22px;

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

@@ -48,7 +48,9 @@ var TaskTree = function TaskTree(_ref) {
       setSelected = _ref.setSelected,
       pageSize = _ref.pageSize,
       _ref$isWork = _ref.isWork,
-      isWork = _ref$isWork === void 0 ? false : _ref$isWork;
+      isWork = _ref$isWork === void 0 ? false : _ref$isWork,
+      _ref$noScreen = _ref.noScreen,
+      noScreen = _ref$noScreen === void 0 ? false : _ref$noScreen;
   var scrollStyle = {
     height: '100%',
     backgroundColor: 'transparent',
@@ -59,7 +61,11 @@ var TaskTree = function TaskTree(_ref) {
     if (isWork) {
       window.open("#work?work_id=".concat(id, "&to_user_id=").concat((0, _helpers.getLoginUserInfo)().Id, "&status=1"));
     } else {
-      window.Talent.app.vent.trigger('global-pull-screen', id, 'task');
+      if (noScreen) {
+        window.open("https://".concat(location.host).concat(location.pathname, "#more/taskinfo?id=").concat(id));
+      } else {
+        window.Talent.app.vent.trigger('global-pull-screen', id, 'task');
+      }
     }
   };
 

package/lib/components/task-tree/task-item-node/index.css

@@ -107,7 +107,7 @@
   top: 3px;
   color: #89919f;
   cursor: auto;
-  width: 68px;
+  width: 72px;
   margin-left: 20px;
 }
 
@@ -263,7 +263,7 @@
   top: 3px;
   color: #89919f;
   cursor: auto;
-  width: 68px;
+  width: 72px;
   margin-left: 20px;
 }