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

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

@@ -44,6 +44,8 @@ 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,
@@ -61,7 +63,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,7 +62,7 @@ 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,
@@ -84,7 +84,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

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,9 +66,15 @@ 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;
+      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,
+      emptyPage = props.emptyPage;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
   var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
@@ -142,15 +148,11 @@ function _default(props) {
         startDate: startDate,
         endDate: endDate,
         toLevel: toLevel,
-        includeWork: includeWork
+        includeWork: includeWork,
+        IncludeNoTaskKr: IncludeNoTaskKr,
+        IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
-      debugger;
-
-      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;
@@ -166,17 +168,24 @@ function _default(props) {
     });
   };
 
+  (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);
   }, [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: "".concat(preCls, " ").concat(className)
@@ -191,7 +200,7 @@ 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"], {
@@ -212,7 +221,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"),
@@ -222,4 +231,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,9 @@ var formatCondition = function formatCondition(_ref) {
       startDate = _ref.startDate,
       endDate = _ref.endDate,
       toLevel = _ref.toLevel,
-      includeWork = _ref.includeWork;
+      includeWork = _ref.includeWork,
+      IncludeNoTaskKr = _ref.IncludeNoTaskKr,
+      IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -200,6 +202,8 @@ var formatCondition = function formatCondition(_ref) {
     startDate: startDate || '',
     endDate: endDate || '',
     includeWork: includeWork,
+    IncludeNoTaskKr: IncludeNoTaskKr,
+    IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

package/package.json

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