@titaui/pc 1.10.6-3.beta-5 → 1.10.6-3.beta-8

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

@@ -44,16 +44,15 @@ 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,
-      _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;
@@ -61,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) {

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,6 +83,8 @@ 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,
@@ -91,7 +93,9 @@ function ETaskNode(props) {
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
-      hasRelation = _props$hasRelation === void 0 ? true : _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),
@@ -154,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
@@ -328,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", {

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,7 +51,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "okr-detail-e";
 
-function _default(props) {
+function Elist(props, ref) {
   var okrId = props.okrId,
       _props$hasSearch = props.hasSearch,
       hasSearch = _props$hasSearch === void 0 ? true : _props$hasSearch,
@@ -66,15 +66,14 @@ function _default(props) {
       _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,
       _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;
+      IsDateFilter = _props$IsDateFilter === void 0 ? false : _props$IsDateFilter,
+      emptyPage = props.emptyPage,
+      setIsEmpty = props.setIsEmpty;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
   var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
@@ -148,35 +147,47 @@ function _default(props) {
         startDate: startDate,
         endDate: endDate,
         toLevel: toLevel,
-        includeWork: includeWork,
         IncludeNoTaskKr: IncludeNoTaskKr,
         IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
-      debugger;
       var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
-      var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
+      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(formatTree);
-  }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
+  }, [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]);
+  var krsTree = (0, _react.useCallback)(function (kr) {
+    return /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
+      data: [kr],
+      defaultExpandedKeys: expandedKrEs
+    });
+  }, [expandedKrEs, krList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
       refreshEList: function refreshEList() {
@@ -201,10 +212,7 @@ function _default(props) {
   }, 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"
-    }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
-      data: [kr],
-      defaultExpandedKeys: expandedKrEs
-    })), // kr左后一个节点 && 没有 OE 时，不显示横线
+    }, krsTree(kr)), // kr左后一个节点 && 没有 OE 时，不显示横线
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
@@ -217,7 +225,7 @@ function _default(props) {
     }));
   })), /*#__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"),
@@ -227,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

@@ -167,7 +167,6 @@ var formatCondition = function formatCondition(_ref) {
       startDate = _ref.startDate,
       endDate = _ref.endDate,
       toLevel = _ref.toLevel,
-      includeWork = _ref.includeWork,
       IncludeNoTaskKr = _ref.IncludeNoTaskKr,
       IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
@@ -201,7 +200,6 @@ var formatCondition = function formatCondition(_ref) {
     FilterKey: keyWord,
     startDate: startDate || '',
     endDate: endDate || '',
-    includeWork: includeWork,
     IncludeNoTaskKr: IncludeNoTaskKr,
     IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),

package/package.json

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