@titaui/pc 1.10.6-3.beta-1 → 1.10.6-3.beta-4

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

@@ -38,7 +38,6 @@
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
-  margin-right: 20px;
   display: inline-flex;
   align-items: center;
 }
@@ -58,6 +57,7 @@
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
+  margin-left: 20px;
   display: inline-flex;
   align-items: center;
 }

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

@@ -47,8 +47,13 @@ var EKrNode = function EKrNode(props) {
   var index = props.index,
       title = props.title,
       data = props.data,
-      isOTask = props.isOTask;
+      isOTask = props.isOTask,
+      _props$hasAddProject = props.hasAddProject,
+      hasAddProject = _props$hasAddProject === void 0 ? true : _props$hasAddProject,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
   var btnRef = (0, _react.useRef)();
+  hasProject = hasProject && hasAddProject;
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       okrInfo = _useContext.okrInfo;
@@ -202,7 +207,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-task.js

@@ -87,7 +87,11 @@ function ETaskNode(props) {
       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;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -369,7 +373,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 +384,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/e-list/index.js

@@ -52,9 +52,25 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var preCls = "okr-detail-e";
 
 function _default(props) {
-  var okrId = props.okrId;
+  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,
+      changeData = props.changeData,
+      _props$includeWork = props.includeWork,
+      includeWork = _props$includeWork === void 0 ? true : _props$includeWork;
   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 +127,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,11 +138,20 @@ function _default(props) {
         selectName: selectName,
         checkedStatus: checkedStatus,
         users: selectUsers,
-        keyWord: searchKey
+        keyWord: searchKey,
+        startDate: startDate,
+        endDate: endDate,
+        toLevel: toLevel,
+        includeWork: includeWork
       })
     }).then(function (krs) {
       debugger;
-      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
+
+      if (!krs || !krs.length) {
+        changeData(true);
+      }
+
+      var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
       var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
@@ -141,7 +167,8 @@ function _default(props) {
   };
 
   (0, _react.useEffect)(function () {
-    getKrEsData();
+    // 可以接收一个格式化方法
+    getKrEsData(formatTree);
   }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
   (0, _react.useEffect)(function () {
     var oElistLength = oEList[0] && oEList[0].length || 0;
@@ -152,8 +179,8 @@ function _default(props) {
       refreshEList: getKrEsData
     }
   }, /*#__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,
@@ -173,7 +200,7 @@ function _default(props) {
       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) {

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

@@ -163,7 +163,11 @@ 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,
+      includeWork = _ref.includeWork;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -189,10 +193,13 @@ 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 || '',
+    includeWork: includeWork,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

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/package.json

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