@titaui/pc 1.10.59 → 1.10.60-beta.1

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

@@ -103,12 +103,14 @@ var Item = /*#__PURE__*/function (_PureComponent) {
   // @ts-ignore
   // const {data,keywords} = props
   function Item(props) {
+    var _window$BSGlobal$OkrA;
+
     var _this;
 
     _classCallCheck(this, Item);
 
     _this = _super.call(this, props);
-    _this.isObjectiveRelevanceKr = window.BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
+    _this.isObjectiveRelevanceKr = (_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.ObjectiveRelevanceKr;
 
     _this.onSelect = function (e, pdata) {
       e.stopPropagation();

package/lib/components/dynamic/components/obj-status/utils.js

@@ -9,7 +9,7 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var getStatusTextMapping = function getStatusTextMapping(status) {
   var statusMapText = {
-    delay: (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed"),
+    delay: (0, _getLocale.getLocale)("OKR_MyO_Postoned"),
     normal: (0, _getLocale.getLocale)("Pro_page_Mil_Normal"),
     risk: (0, _getLocale.getLocale)("Pro_page_Mil_Existingrisk"),
     end: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")

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

@@ -6,7 +6,7 @@
   display: flex;
   font-size: 12px;
   line-height: 18px;
-  margin-top: 12px;
+  margin-top: 8px;
   position: relative;
 }
 
@@ -41,6 +41,11 @@
   cursor: pointer;
 }
 
+.titaui-dynamic-operation__operate-item-left {
+  display: inline-flex;
+  margin-right: 12px;
+}
+
 .titaui-dynamic-operation__operate-item-right {
   flex: 1;
 }
@@ -57,7 +62,7 @@
 
 .titaui-dynamic-operation__operate-user {
   color: #3f4755;
-  margin: 0 8px 16px;
+  margin-right: 8px;
 }
 
 .titaui-dynamic-operation__operate-content {

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

@@ -46,7 +46,8 @@ var DynamicOperation = function DynamicOperation(_ref) {
       });
     } else if (feedType === _constant.EFeedType.O) {
       _drawerManager["default"].open("okrDetail", {
-        okrId: okrId
+        okrId: okrId,
+        activeTabKey: "cooperation"
       });
     } else if (feedType === _constant.EFeedType.Task) {
       window.Talent.app.vent.trigger("global-pull-screen", taskId, "task");

package/lib/components/menus/export-modules/okr-menus/depart-menus/index.js

@@ -60,6 +60,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default() {
+  var _window$BSGlobal$OkrA;
+
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)([]),
@@ -92,7 +94,7 @@ function _default() {
       _useState12 = _slicedToArray(_useState11, 1),
       itemHeight = _useState12[0];
 
-  var _useState13 = (0, _react.useState)(window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrDepsShowUser),
+  var _useState13 = (0, _react.useState)((_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.OkrDepsShowUser),
       _useState14 = _slicedToArray(_useState13, 1),
       isGetUser = _useState14[0];
 

package/lib/components/nav-top/request.apis.js

@@ -36,7 +36,7 @@ var getData = function getData(url, saveData) {
 exports.getData = getData;
 
 var getReplys = function getReplys(pageNum) {
-  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1"));
+  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1&clear=0"));
 };
 
 exports.getReplys = getReplys;

package/lib/components/okr-detail/components/o-classify.js

@@ -50,7 +50,9 @@ function OClassify(props) {
       onOkrClassifyChange = props.onOkrClassifyChange;
 
   var _useState = (0, _react.useState)(function () {
-    return window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrClassify;
+    var _window$BSGlobal$OkrA;
+
+    return (_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.OkrClassify;
   }),
       _useState2 = _slicedToArray(_useState, 1),
       OkrClassifySetting = _useState2[0];

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

@@ -91,6 +91,8 @@ function OkrRowColumn(_ref) {
 }
 
 function _default(props) {
+  var _getBSGlobal$KRSettin, _getBSGlobal$KRSettin2;
+
   var data = props.data,
       index = props.index,
       title = props.title,
@@ -135,12 +137,12 @@ function _default(props) {
       krName = _useState14[0],
       setKrName = _useState14[1];
 
-  var _useState15 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.ShowKrConfidence),
+  var _useState15 = (0, _react.useState)((_getBSGlobal$KRSettin = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.ShowKrConfidence),
       _useState16 = _slicedToArray(_useState15, 1),
       showHeart = _useState16[0]; // 高级功能： 关键成果信心指数
 
 
-  var _useState17 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.KrWeight),
+  var _useState17 = (0, _react.useState)((_getBSGlobal$KRSettin2 = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin2 === void 0 ? void 0 : _getBSGlobal$KRSettin2.KrWeight),
       _useState18 = _slicedToArray(_useState17, 1),
       showKrWeight = _useState18[0]; // 高级功能： 关见成果权重
 

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

@@ -78,6 +78,8 @@ function OkrRowColumn(_ref) {
 }
 
 function _default(props) {
+  var _getBSGlobal$KRSettin;
+
   var data = props.data,
       index = props.index,
       title = props.title;
@@ -98,7 +100,7 @@ function _default(props) {
       krName = _useState4[0],
       setKrName = _useState4[1];
 
-  var _useState5 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.KrWeight),
+  var _useState5 = (0, _react.useState)((_getBSGlobal$KRSettin = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.KrWeight),
       _useState6 = _slicedToArray(_useState5, 1),
       showKrWeight = _useState6[0]; // 高级功能： 关见成果权重
 

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

@@ -48,8 +48,10 @@ function OType(props) {
       groupName = type.groupName;
 
   var _useState = (0, _react.useState)(function () {
+    var _window$BSGlobal$OkrA;
+
     return (// @ts-ignore
-      window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrTypeSetting
+      (_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.OkrTypeSetting
     );
   }),
       _useState2 = _slicedToArray(_useState, 1),

package/lib/components/okr-detail/detail-header/actions.js

@@ -91,12 +91,14 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
 };
 
 var addFollowButton = function addFollowButton(_ref3, actions) {
+  var _getBSGlobal$KRSettin;
+
   var roleType = _ref3.roleType,
       detailInfo = _ref3.detailInfo,
       onChangeOkrFollow = _ref3.onChangeOkrFollow;
 
   // 未开启关注目标功能
-  if (!(0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.TargetFollowers) {
+  if (!((_getBSGlobal$KRSettin = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting) !== null && _getBSGlobal$KRSettin !== void 0 && _getBSGlobal$KRSettin.TargetFollowers)) {
     return;
   } // 是负责人或是内部成员不能关注目标
 

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

@@ -51,6 +51,8 @@ var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
 
+var _BSGlobal$OkrAdvanced, _BSGlobal$OkrAdvanced2;
+
 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); }
@@ -77,8 +79,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "okr-detail"; // E周报和复盘开关
 
-var EWorkReport = BSGlobal.OkrAdvancedSetting ? BSGlobal.OkrAdvancedSetting.KRSetting.EWorkReport : false;
-var OkrAnalyse = BSGlobal.OkrAdvancedSetting ? BSGlobal.OkrAdvancedSetting.KRSetting.OkrAnalyse : false;
+var EWorkReport = BSGlobal.OkrAdvancedSetting ? (_BSGlobal$OkrAdvanced = BSGlobal.OkrAdvancedSetting.KRSetting) === null || _BSGlobal$OkrAdvanced === void 0 ? void 0 : _BSGlobal$OkrAdvanced.EWorkReport : false;
+var OkrAnalyse = BSGlobal.OkrAdvancedSetting ? (_BSGlobal$OkrAdvanced2 = BSGlobal.OkrAdvancedSetting.KRSetting) === null || _BSGlobal$OkrAdvanced2 === void 0 ? void 0 : _BSGlobal$OkrAdvanced2.OkrAnalyse : false;
 var source = window.BSGlobal.tenantInfo.Source;
 
 function OkrDetail(props) {

package/lib/components/okr-flow/utils/config.js

@@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.OkrTypeSetting = exports.OkrClassifySetting = exports.KrWeightSetting = void 0;
 exports.getBSGlobal = getBSGlobal;
 
+var _getBSGlobal$KRSettin, _getBSGlobal$KRSettin2;
+
 function getBSGlobal(name) {
   return name ? BSGlobal && BSGlobal[name] : BSGlobal;
 }
 
 var OkrTypeSetting = getBSGlobal("OkrAdvancedSetting").KRSetting.OkrTypeSetting;
 exports.OkrTypeSetting = OkrTypeSetting;
-var OkrClassifySetting = getBSGlobal("OkrAdvancedSetting").KRSetting.OkrClassify;
+var OkrClassifySetting = (_getBSGlobal$KRSettin = getBSGlobal("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OkrClassify;
 exports.OkrClassifySetting = OkrClassifySetting;
-var KrWeightSetting = getBSGlobal("OkrAdvancedSetting").KRSetting.KrWeight;
+var KrWeightSetting = (_getBSGlobal$KRSettin2 = getBSGlobal("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin2 === void 0 ? void 0 : _getBSGlobal$KRSettin2.KrWeight;
 exports.KrWeightSetting = KrWeightSetting;

package/lib/components/task-relation-modal/search/okr-type-select.js

@@ -43,7 +43,9 @@ function OkrTypeSelect(props) {
       setSelectText = _useState2[1];
 
   var _useState3 = (0, _react.useState)(function () {
-    return window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrTypeSetting;
+    var _window$BSGlobal$OkrA;
+
+    return (_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.OkrTypeSetting;
   }),
       _useState4 = _slicedToArray(_useState3, 1),
       OkrTypeSetting = _useState4[0];

package/lib/components/task-relation-modal/tree-node/o-node/index.js

@@ -57,7 +57,9 @@ function ONode(props) {
   var principalUser = data.principalUser;
 
   var _useState = (0, _react.useState)(function () {
-    return window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrTypeSetting;
+    var _window$BSGlobal$OkrA;
+
+    return (_window$BSGlobal$OkrA = window.BSGlobal.OkrAdvancedSetting.KRSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : _window$BSGlobal$OkrA.OkrTypeSetting;
   }),
       _useState2 = _slicedToArray(_useState, 1),
       OkrTypeSetting = _useState2[0];

package/lib/pages/new-okr-list/index.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; }
 
 var NewOkrList = function NewOkrList(props) {
+  var _getBSGlobal$KRSettin;
+
   var OkrListCmp = props.OkrListCmp,
       OkrCommunicationPush = props.OkrCommunicationPush,
       Empty = props.Empty,
@@ -114,7 +116,7 @@ var NewOkrList = function NewOkrList(props) {
     };
   }();
 
-  var showWorkExecution = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.ShowWorkExecution;
+  var showWorkExecution = (_getBSGlobal$KRSettin = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.ShowWorkExecution;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),

package/package.json

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