@titaui/pc 1.11.44 → 1.11.47

package/lib/components/change-okr-modal/index.js

@@ -504,7 +504,7 @@ var _initialiseProps = function _initialiseProps() {
 
   this.getListData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(isLoading) {
-      var _this4$state2, keywords, type, users, departments, data, nextPage, toUserId, _this4$state3, status, cycle, year, okrPopType, url;
+      var _this4$state2, keywords, type, users, departments, data, nextPage, toUserId, _this4$state3, status, cycle, year, _this4$props2, okrPopType, _this4$props2$include, includeCreateFailApprovalOkr, url;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -520,7 +520,7 @@ var _initialiseProps = function _initialiseProps() {
             case 2:
               _this4$state2 = _this4.state, keywords = _this4$state2.keywords, type = _this4$state2.type, users = _this4$state2.users, departments = _this4$state2.departments, data = _this4$state2.data, nextPage = _this4$state2.nextPage, toUserId = _this4$state2.toUserId;
               _this4$state3 = _this4.state, status = _this4$state3.status, cycle = _this4$state3.cycle, year = _this4$state3.year;
-              okrPopType = _this4.props.okrPopType;
+              _this4$props2 = _this4.props, okrPopType = _this4$props2.okrPopType, _this4$props2$include = _this4$props2.includeCreateFailApprovalOkr, includeCreateFailApprovalOkr = _this4$props2$include === void 0 ? false : _this4$props2$include;
               cycle = cycle || '-1';
               year = year || -1;
               status = status || 0;
@@ -565,7 +565,7 @@ var _initialiseProps = function _initialiseProps() {
                 searchKr: okrPopType,
                 // 是否搜索KR：默认为0-不搜索，1-只有对齐目标弹层可以搜索KR
                 toUserId: toUserId,
-                includeCreateFailApprovalOkr: false
+                includeCreateFailApprovalOkr: includeCreateFailApprovalOkr
               }).then(function (res) {
                 _this4.pending = false;
                 var resData = res && res.Data && res.Data.works || [];
@@ -630,9 +630,9 @@ var _initialiseProps = function _initialiseProps() {
     var _this4$state4 = _this4.state,
         selected = _this4$state4.selected,
         selectOkr = _this4$state4.selectOkr;
-    var _this4$props2 = _this4.props,
-        onConfirm = _this4$props2.onConfirm,
-        parentId = _this4$props2.parentId;
+    var _this4$props3 = _this4.props,
+        onConfirm = _this4$props3.onConfirm,
+        parentId = _this4$props3.parentId;
     var parentType = selected && selected.mileStoneId ? 2 : 1; // 临时注入
 
     var data = _objectSpread(_objectSpread({}, selected), {}, {

package/lib/pages/new-okr-list/header/index.js

@@ -37,6 +37,8 @@ var _requestApi = require("../request-api");
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _tools = require("../../../utils/tools");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -124,45 +126,45 @@ function Header(props, ref) {
     var rootNode = {
       rootId: 0,
       // @ts-ignore
-      rootName: window.BSGlobal.tenantInfo.Name || ''
+      rootName: window.BSGlobal.tenantInfo.Name || ""
     };
     var level2Selected = {
       id: 0,
       // @ts-ignore
-      name: window.BSGlobal.tenantInfo.Name || ''
+      name: window.BSGlobal.tenantInfo.Name || ""
     };
-    var searchType = 'company';
+    var searchType = "company";
 
     if (departmentId && departmentId !== -1) {
       rootNode.rootId = departmentId;
-      rootNode.rootName = departmentName || '';
-      searchType = 'depart';
+      rootNode.rootName = departmentName || "";
+      searchType = "depart";
       level2Selected.id = departmentId;
-      level2Selected.name = departmentName || '';
+      level2Selected.name = departmentName || "";
     }
 
     if (toUserId) {
       rootNode.rootId = toUserId;
-      rootNode.rootName = userInfo.name || '';
-      searchType = 'user';
+      rootNode.rootName = userInfo.name || "";
+      searchType = "user";
       level2Selected.id = toUserId;
-      level2Selected.name = userInfo.name || '';
+      level2Selected.name = userInfo.name || "";
     }
 
     if (parseInt(relation, 10) === 1) {
       rootNode.rootId = (0, _bsGlobal.getUserInfo)().Id;
-      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || '';
-      searchType = 'user';
+      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || "";
+      searchType = "user";
       level2Selected.id = (0, _bsGlobal.getUserInfo)().Id;
-      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || '';
+      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || "";
     }
 
     var urlQuery = ["searchType=".concat(searchType), "period=".concat(JSON.stringify({
       cycleType: cycleType,
       annualNum: annualNum,
       yqmNum: yqmNum
-    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join('&');
-    var origin = window.location.href.split('#')[0];
+    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
+    var origin = window.location.href.split("#")[0];
     window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
@@ -221,7 +223,7 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item"),
     onClick: gotoOkrMap
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
+    overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Alignment"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-icon")
@@ -233,7 +235,7 @@ function Header(props, ref) {
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: onSearch
-  }), Number(cycleType) !== -1 && relation === "1" && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+  }), Number(cycleType) !== -1 && (Number(relation) === 1 || Object.keys((0, _tools.getQueryString)()).length === 0) && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
     toUserId: toUserId,
     userInfo: userInfo,
     relation: relationShip,

package/lib/pages/new-okr-list/header/operate-record.js

@@ -23,6 +23,8 @@ var _common = require("./common");
 
 var _requestApi = require("../request-api");
 
+var _tools = require("../../../utils/tools");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -63,10 +65,15 @@ var OperateRecord = function OperateRecord(props) {
       yqmNum = _useContext.yqmNum;
 
   var openOperateRecordPush = function openOperateRecordPush() {
-    // @ts-ignore
-    popupRef.current && popupRef.current.close(); // @ts-ignore
+    if (popupRef.current) {
+      // @ts-ignore
+      popupRef.current.close();
+    }
 
-    drawerRef.current && drawerRef.current.showOperateDrawerVisible();
+    if (drawerRef.current) {
+      // @ts-ignore
+      drawerRef.current.showOperateDrawerVisible();
+    }
   };
 
   var popup = /*#__PURE__*/_react["default"].createElement("div", {
@@ -78,7 +85,7 @@ var OperateRecord = function OperateRecord(props) {
     className: "tu-icon-jinzhan-s"
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-record-item-content")
-  }, (0, _getLocale.getLocale)('Per_details_OperationRecord'))));
+  }, (0, _getLocale.getLocale)("Per_details_OperationRecord"))));
 
   (0, _react.useEffect)(function () {
     if (toUserId) {
@@ -101,13 +108,13 @@ var OperateRecord = function OperateRecord(props) {
       offset: [0, 4]
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('Feed_Set_Pop_Butt_More'),
+    overlay: (0, _getLocale.getLocale)("Feed_Set_Pop_Butt_More"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-record")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-more1"
-  })))), (toUserId !== undefined || relation === 1) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
+  })))), (toUserId !== undefined || Number(relation) === 1 || Object.keys((0, _tools.getQueryString)()).length === 0) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
     ref: drawerRef,
     userInfo: {
       id: userInfo.userId,

package/package.json

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