@titaui/pc 1.10.65 → 1.10.68

package/lib/components/dynamic/dynamic-item/components/feed-operate/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _dangerousHtml = _interopRequireDefault(require("../../../../dangerous-html"));
-
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _openData = require("../../../../../utils/open-data");
@@ -93,9 +91,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
       })
     })), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-content")
-    }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
-      htmlText: content
-    })))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _openData.parseHtmlAndTextTag)(content)))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__operate-item")
     }, /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefix, "__operate-icon"),

package/lib/components/e-status-dropdown/index.css

@@ -0,0 +1,3 @@
+.e-node-status-icon {
+  color: #89919F;
+}

package/lib/components/e-status-dropdown/index.js

@@ -0,0 +1,94 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _dropSelector = _interopRequireWildcard(require("../drop-selector"));
+
+var _getLocale = require("../../utils/getLocale");
+
+require("./index.css");
+
+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); }
+
+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; }
+
+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; }
+
+function _default(props) {
+  var onChange = props.onChange,
+      checked = props.checked,
+      hasAuth = props.hasAuth;
+
+  var _useState = (0, _react.useState)("tu-icon-notstart"),
+      _useState2 = _slicedToArray(_useState, 2),
+      status = _useState2[0],
+      setStatus = _useState2[1];
+
+  var onMenuClickHandler = function onMenuClickHandler(name) {
+    setStatus(name);
+    onChange && onChange(name);
+  };
+
+  (0, _react.useEffect)(function () {
+    setStatus(checked);
+  }, [checked]);
+  return /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
+    onChange: onMenuClickHandler,
+    checked: status,
+    canEdit: hasAuth,
+    trigger: /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        color: "#89919F",
+        fontSize: 14,
+        marginRight: 4,
+        verticalAlign: "baseline"
+      },
+      className: (0, _classnames["default"])(status)
+    })
+  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-finished",
+    icon: "tu-icon-finished",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-running",
+    icon: "tu-icon-running",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-canceled",
+    icon: "tu-icon-canceled",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-deferred",
+    icon: "tu-icon-deferred",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-paused",
+    icon: "tu-icon-paused",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+    name: "tu-icon-notstart",
+    icon: "tu-icon-notstart",
+    exIconClass: "e-node-status-icon"
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted")));
+}

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

@@ -5,6 +5,18 @@
   display: flex;
 }
 
+.tita-okrdt-tree__e-kr-node:hover .tita-okrdt-tree__e-kr-node-actions {
+  opacity: 1;
+  transition: all 0.2s linear;
+}
+
+.tita-okrdt-tree__e-kr-node-preicon {
+  display: inline-block;
+  line-height: 22px;
+  color: #6f7886;
+  font-size: 16px;
+}
+
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
   height: 22px;
@@ -27,8 +39,10 @@
 
 .tita-okrdt-tree__e-kr-node-actions {
   display: inline-block;
+  opacity: 0;
   position: absolute;
   right: 0;
+  transition: all 0.2s linear;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create {
@@ -38,13 +52,12 @@
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
-  margin-right: 20px;
   display: inline-flex;
   align-items: center;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create .tu-icon-add1 {
@@ -58,16 +71,17 @@
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
+  margin-left: 20px;
   display: inline-flex;
   align-items: center;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-connect:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .e-kr-node-layer-icon {
-  color: #89919F;
+  color: #89919f;
 }
 
 .e-kr-node__guanlian-icon {

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

@@ -44,10 +44,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var hasProject = (0, _bsGlobal.hasWebHead)("project");
 
 var EKrNode = function EKrNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
-      isOTask = props.isOTask;
+      isOTask = props.isOTask,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
   var btnRef = (0, _react.useRef)();
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
@@ -56,7 +60,7 @@ var EKrNode = function EKrNode(props) {
   var _useContext2 = (0, _react.useContext)(_context2.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth;
 
   if (isOTask) {
@@ -168,7 +172,9 @@ var EKrNode = function EKrNode(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
-  }, isOTask ? null : /*#__PURE__*/_react["default"].createElement("span", {
+  }, isOTask ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
+  }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
@@ -202,7 +208,7 @@ var EKrNode = function EKrNode(props) {
     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)), /*#__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", {

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

@@ -62,12 +62,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
-  var _data$principalUser, _data$principalUser2;
+  var _okrInfo$authority, _data$principalUser, _data$principalUser2;
 
   var index = props.index,
       title = props.title,
       data = props.data,
-      createUserId = props.createUserId;
+      createUserId = props.createUserId,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -84,7 +88,7 @@ function _default(props) {
   var _useContext2 = (0, _react.useContext)(_context.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId
@@ -154,7 +158,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_statusTime["default"], {
     deadLine: data.deadLine,
     isComplete: data.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-progress ").concat(isGray && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -165,7 +169,7 @@ function _default(props) {
     linearStartColor: (0, _getProcessColor["default"])(data.riskLevel, "linearStartColor", data.status),
     linearEndColor: (0, _getProcessColor["default"])(data.riskLevel, "linearEndColor", data.status),
     backgroundColor: (0, _getProcessColor["default"])(data.riskLevel, "backgroundColor", data.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-task-level2.js

@@ -82,6 +82,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
@@ -147,7 +149,7 @@ function _default(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId

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

@@ -83,11 +83,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // status=3 已过期 status=2 已完成
 function ETaskNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
       createUserId = props.createUserId,
-      krUser = props.krUser;
+      krUser = props.krUser,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$isPushScreen = props.isPushScreen,
+      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -150,7 +158,7 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: krUser,
     createUserId: createUserId
@@ -324,7 +332,18 @@ function ETaskNode(props) {
       _drawerManager["default"].close();
     }
 
-    window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    if (isPushScreen) {
+      var _window$Talent, _window$Talent2;
+
+      (_window$Talent = window.Talent) === null || _window$Talent === void 0 ? void 0 : _window$Talent.app.vent.off("global-pull-screen:closed:".concat(data.taskId));
+      (_window$Talent2 = window.Talent) === null || _window$Talent2 === void 0 ? void 0 : _window$Talent2.app.vent.on("global-pull-screen:closed:".concat(data.taskId), function () {
+        refreshEList && refreshEList();
+      }); // 任务：打开推屏
+
+      window.Talent.app.vent.trigger('global-pull-screen', data.taskId, 'task');
+    } else {
+      window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -369,7 +388,7 @@ function ETaskNode(props) {
     isLongTerm: dataInfo.isLongTerm,
     isCancel: dataInfo.status === 4,
     isComplete: dataInfo.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-progress ").concat((isGray || isCancel) && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -380,7 +399,7 @@ function ETaskNode(props) {
     linearStartColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearStartColor", dataInfo.status),
     linearEndColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearEndColor", dataInfo.status),
     backgroundColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "backgroundColor", dataInfo.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -84,13 +84,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-node-actions-date > span {
@@ -103,7 +103,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -171,14 +171,14 @@
   height: 20px;
   font-size: 12px;
   font-weight: 400;
-  color: #F05E5E;
+  color: #f05e5e;
   background: rgba(240, 94, 94, 0.1);
   border-radius: 10px;
   margin-left: 8px;
 }
 
 .tita-okrdt-tree__e-project-node-gray {
-  color: #BFC7D5 !important;
+  color: #bfc7d5 !important;
 }
 
 .tita-okrdt-tree__e-project-node-priority {
@@ -235,13 +235,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-project-node-actions-date > span {
@@ -254,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -357,13 +357,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-level2-node-actions-date > span {
@@ -376,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -398,7 +398,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   padding-left: 12px;
 }
@@ -408,5 +408,5 @@
 }
 
 .e-node-status-icon {
-  color: #89919F;
+  color: #89919f;
 }

package/lib/components/okr-detail/e-list/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -51,10 +51,33 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "okr-detail-e";
 
-function _default(props) {
-  var okrId = props.okrId;
+function Elist(props, ref) {
+  var okrId = props.okrId,
+      _props$hasSearch = props.hasSearch,
+      hasSearch = _props$hasSearch === void 0 ? true : _props$hasSearch,
+      _props$formatTree = props.formatTree,
+      formatTree = _props$formatTree === void 0 ? _util.formatEListDataToSelectTree : _props$formatTree,
+      _props$startDate = props.startDate,
+      startDate = _props$startDate === void 0 ? '' : _props$startDate,
+      _props$endDate = props.endDate,
+      endDate = _props$endDate === void 0 ? '' : _props$endDate,
+      _props$toLevel = props.toLevel,
+      toLevel = _props$toLevel === void 0 ? 999 : _props$toLevel,
+      _props$hasdivider = props.hasdivider,
+      hasdivider = _props$hasdivider === void 0 ? false : _props$hasdivider,
+      className = props.className,
+      _props$IncludeNoTaskK = props.IncludeNoTaskKr,
+      IncludeNoTaskKr = _props$IncludeNoTaskK === void 0 ? true : _props$IncludeNoTaskK,
+      _props$hasLoading = props.hasLoading,
+      hasLoading = _props$hasLoading === void 0 ? true : _props$hasLoading,
+      _props$IsDateFilter = props.IsDateFilter,
+      IsDateFilter = _props$IsDateFilter === void 0 ? false : _props$IsDateFilter,
+      emptyPage = props.emptyPage,
+      setIsEmpty = props.setIsEmpty,
+      _props$layoutPadding = props.layoutPadding,
+      layoutPadding = _props$layoutPadding === void 0 ? '0 32px 0 18px' : _props$layoutPadding;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
-  var hasCondition = localStorage.getItem("hasRememberCondition".concat(loginUser));
+  var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -111,8 +134,9 @@ function _default(props) {
       totalDataNum = _useState22[0],
       setTotalDataNum = _useState22[1];
 
-  var getKrEsData = function getKrEsData() {
+  var getKrEsData = function getKrEsData(formatTree) {
     setLoading(true);
+    var formatEList = formatTree ? formatTree : _util.formatEListDataToSelectTree;
     (0, _requestApis.getKrsByCondition)({
       okrId: okrId,
       condition: (0, _util.formatCondition)({
@@ -121,38 +145,53 @@ function _default(props) {
         selectName: selectName,
         checkedStatus: checkedStatus,
         users: selectUsers,
-        keyWord: searchKey
+        keyWord: searchKey,
+        startDate: startDate,
+        endDate: endDate,
+        toLevel: toLevel,
+        IncludeNoTaskKr: IncludeNoTaskKr,
+        IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
-      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
-      var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
+      var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
+      var newexpandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
-      var expandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
+      var newexpandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
         return it.key;
       });
-      setExpandedKrEs(expandedKrEs);
-      setExpandedOEs(expandedOEs);
+      setExpandedKrEs(newexpandedKrEs);
+      setExpandedOEs(newexpandedOEs);
       setKrList(formatKrs.krsEList);
       setOEList(formatKrs.oEList);
       setLoading(false);
     });
   };
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getKrEsData: getKrEsData
+    };
+  });
   (0, _react.useEffect)(function () {
-    getKrEsData();
-  }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
+    // 可以接收一个格式化方法
+    getKrEsData(formatTree);
+  }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers, startDate, endDate, okrId]);
   (0, _react.useEffect)(function () {
     var oElistLength = oEList[0] && oEList[0].length || 0;
-    setTotalDataNum(krList.length + oElistLength);
+    var totalLength = krList.length + oElistLength;
+    setTotalDataNum(totalLength);
+    setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
-      refreshEList: getKrEsData
+      refreshEList: function refreshEList() {
+        return getKrEsData(formatTree);
+      }
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls
-  }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
+    className: "".concat(preCls, " ").concat(className)
+  }, hasSearch && /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     checkedStatus: checkedStatus,
     setCheckedStatus: setCheckedStatus,
     selectName: selectName,
@@ -163,28 +202,30 @@ function _default(props) {
     selectUsers: selectUsers,
     setSelectUsers: setSelectUsers,
     okrId: okrId
-  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+  })), !loading || !hasLoading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: totalDataNum !== 0
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
+      padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
       data: [kr],
       defaultExpandedKeys: expandedKrEs
     })), // kr左后一个节点 && 没有 OE 时，不显示横线
-    !(index + 1 == krList.length && oEList.length == 0) && /*#__PURE__*/_react["default"].createElement("div", {
+    !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
   }), oEList.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
+      padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
       data: kr,
       defaultExpandedKeys: expandedOEs
     }));
   })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: totalDataNum === 0
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, emptyPage ? emptyPage() : /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__empty")
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: "".concat(preCls, "__empty-img"),
@@ -194,4 +235,9 @@ function _default(props) {
   }, "\u6CA1\u6709\u641C\u7D22\u5230\u7B26\u5408\u6761\u4EF6\u7684E-\u6267\u884C")))) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     type: "panel"
   })));
-}
+} // @ts-ignore
+
+
+Elist = /*#__PURE__*/(0, _react.forwardRef)(Elist);
+var _default = Elist;
+exports["default"] = _default;

package/lib/components/okr-detail/e-list/util.js

@@ -163,7 +163,12 @@ var formatCondition = function formatCondition(_ref) {
       selectName = _ref.selectName,
       checkedStatus = _ref.checkedStatus,
       users = _ref.users,
-      keyWord = _ref.keyWord;
+      keyWord = _ref.keyWord,
+      startDate = _ref.startDate,
+      endDate = _ref.endDate,
+      toLevel = _ref.toLevel,
+      IncludeNoTaskKr = _ref.IncludeNoTaskKr,
+      IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -189,10 +194,14 @@ var formatCondition = function formatCondition(_ref) {
     pageIndex: 1,
     FeedId: 0,
     filter: 1,
-    toLevel: 999,
+    toLevel: toLevel || 999,
     app_id: 1,
     app_type: 1,
     FilterKey: keyWord,
+    startDate: startDate || '',
+    endDate: endDate || '',
+    IncludeNoTaskKr: IncludeNoTaskKr,
+    IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

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

@@ -422,5 +422,7 @@ function OkrDetail(props) {
   }))));
 }
 
+OkrDetail.EList = _eList["default"];
+OkrDetail.CommonContext = _context.CommonContext;
 var _default = OkrDetail;
 exports["default"] = _default;

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

@@ -25,6 +25,8 @@ var _utils = require("./utils");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _dangerousHtml = _interopRequireDefault(require("../dangerous-html"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -128,7 +130,9 @@ var Detail = function Detail(_ref) {
     src: _progressLeftQuoto["default"]
   }) : null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat($prefix, "__content")
-  }, content && content.trim())), /*#__PURE__*/_react["default"].createElement("div", {
+  }, content && /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: content.trim()
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat($prefix, "__content-bottom")
   }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _utils.getTimeString)(time, nowTime)), canEdit && isMouseEnterDetail ? /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat($prefix, "__bottom-func-btns")

package/lib/components/okr-progress-detail/utils.js

@@ -22,8 +22,8 @@ var getTimeString = function getTimeString(time, nowTime) {
   var timeYear = timeDateObj.getFullYear();
   var timeMonth = timeDateObj.getMonth() + 1;
   var timeDate = timeDateObj.getDate();
-  var timeHours = timeDateObj.getHours();
-  var timeMinutes = timeDateObj.getMinutes();
+  var timeHours = timeDateObj.getHours() < 10 ? "0".concat(timeDateObj.getHours()) : timeDateObj.getHours();
+  var timeMinutes = timeDateObj.getMinutes() < 10 ? "0".concat(timeDateObj.getMinutes()) : timeDateObj.getMinutes();
   var nowMilliSecond = nowTime.getTime();
   var nowYear = nowTime.getFullYear();
   var nowDate = nowTime.getDate();
@@ -56,11 +56,11 @@ var getTimeString = function getTimeString(time, nowTime) {
   if (timeYear === nowYear) {
     var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
 
-    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+    return "".concat(_dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
   }
 
   var dateStr = (_getLocale.isEn ? "" : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : "");
-  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+  return "".concat(dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
 };
 
 exports.getTimeString = getTimeString;

package/lib/components/superset-charts/utils/axios.js

@@ -65,6 +65,14 @@ var beforeResponse = function beforeResponse(res) {
   config.retry = 3;
   config.retryCount = config.retryCount || 0;
 
+  if (window.titaTracker) {
+    window.titaTracker("action").record({
+      actionName: JSON.stringify(config),
+      actionGroup: "调用接口",
+      productName: "接口"
+    });
+  }
+
   if (res.data.code === 401) {
     // 401错误表示未登录授权或者token失效
     clearToken();

package/lib/components/upload-photo-modal/request-api.js

@@ -3,34 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.saveUserPhoto = exports.saveUserInfo = exports.saveTenantLogo = exports.saveBrowserIcon = exports.getUserInfoFun = void 0;
-
-var _qs = _interopRequireDefault(require("qs"));
+exports.saveUserPhoto = exports.saveTenantLogo = exports.saveBrowserIcon = exports.getUserInfoFun = void 0;
 
 var _request = require("../../utils/request");
 
 var _bsGlobal = require("../../utils/bs-global");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var getUserInfoFun = function getUserInfoFun() {
   return (0, _request.rpost)("v1")("manage/user/profile?toUserId=".concat((0, _bsGlobal.getUserInfo)().Id));
 };
 
 exports.getUserInfoFun = getUserInfoFun;
 
-var saveUserInfo = function saveUserInfo(_ref) {
-  var data = _ref.data;
-  return (0, _request.rput)("v1")("manage/user/update", data, {
-    headers: {
-      "Content-Type": "multipart/form-data"
-    },
-    transformRequest: _qs["default"].stringify
-  });
-};
-
-exports.saveUserInfo = saveUserInfo;
-
 var saveUserPhoto = function saveUserPhoto(params) {
   return (0, _request.rpost)("v1")("manage/user/avatar", params, {
     headers: {

package/lib/index.js

@@ -117,6 +117,12 @@ Object.defineProperty(exports, "ERROR_LEVEL", {
     return _errorLevel["default"];
   }
 });
+Object.defineProperty(exports, "EStatusDropdown", {
+  enumerable: true,
+  get: function get() {
+    return _eStatusDropdown["default"];
+  }
+});
 Object.defineProperty(exports, "EmotionsSelector", {
   enumerable: true,
   get: function get() {
@@ -590,6 +596,8 @@ var _progress = _interopRequireDefault(require("./components/progress"));
 
 var _ePriority = _interopRequireDefault(require("./components/e-priority"));
 
+var _eStatusDropdown = _interopRequireDefault(require("./components/e-status-dropdown"));
+
 var _statusTime = _interopRequireDefault(require("./components/status-time"));
 
 var _tree = _interopRequireDefault(require("./components/tree"));

package/lib/pages/personal-info/request-api.js

@@ -21,7 +21,7 @@ exports.getUserInfoFun = getUserInfoFun;
 
 var saveUserInfo = function saveUserInfo(_ref) {
   var data = _ref.data;
-  return (0, _request.rput)("v1")("manage/user/update", data, {
+  return (0, _request.rput)("v1")("manage/user/updatebasic", data, {
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
     },

package/lib/utils/open-data.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseTag = exports.parseString = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
+exports.parseTag = exports.parseString = exports.parseHtmlAndTextTag = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -254,6 +254,85 @@ var parseString = function parseString(str) {
 };
 
 exports.parseString = parseString;
+
+var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
+  var reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
+  var strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
+  var openDatas = [];
+  var matchStr = reg.exec(str);
+  var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
+  var openDataStrReg = /\[\w+?\:\w+?\]/;
+  var openDataMatchStr = openDatareg.exec(str);
+
+  while (matchStr != null || openDataMatchStr != null) {
+    if (matchStr) {
+      var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
+
+      if (!OpenDataCompoent) {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          dangerouslySetInnerHTML: {
+            __html: matchStr[0]
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }));
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          style: {
+            color: "#1890ff",
+            margin: '0 4px'
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }, "@", /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
+          id: matchStr[2],
+          name: matchStr[3]
+        })));
+      }
+
+      matchStr = reg.exec(str);
+    } else if (openDataMatchStr) {
+      var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
+
+      if (!_OpenDataCompoent) {
+        openDatas.push(openDataMatchStr[0]);
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_OpenDataCompoent, {
+          id: openDataMatchStr[1]
+        })));
+      }
+
+      openDataMatchStr = reg.exec(str);
+    }
+  }
+
+  var commonStrs = str.split(strReg);
+  var tempStrs = [];
+  commonStrs && commonStrs.forEach(function (item) {
+    tempStrs.push(item.split(openDataStrReg).filter(function (item) {
+      return item !== '';
+    }));
+  });
+  var renderData = [];
+
+  for (var i = 0; i < tempStrs.length; i++) {
+    renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        verticalAlign: 'middle'
+      },
+      dangerouslySetInnerHTML: {
+        __html: tempStrs[i]
+      }
+    }));
+    renderData.push(openDatas[i]);
+  }
+
+  return renderData;
+};
+
+exports.parseHtmlAndTextTag = parseHtmlAndTextTag;
 var _default = {
   OpenUserName: OpenUserName,
   OpenDepartmentName: OpenDepartmentName,

package/package.json

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