@titaui/pc 1.15.45 → 1.15.46-beta.3

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

@@ -176,7 +176,7 @@ var _default = function _default() {
           deWeightData[item.id] = item;
         });
         var result = Object.values(deWeightData);
-        setRawTreeData(_toConsumableArray(result));
+        setRawTreeData([].concat(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

package/lib/components/okr-excel/hooks.js

@@ -239,8 +239,11 @@ var useOkrColumns = function useOkrColumns(columns) {
   var _useState3 = (0, _react.useState)(formatColumnsByOption(optionDic, columns)),
       _useState4 = _slicedToArray(_useState3, 2),
       columnDefs = _useState4[0],
-      setColumnDefs = _useState4[1]; // 右上角控制列是否展示的数据
+      setColumnDefs = _useState4[1];
 
+  (0, _react.useEffect)(function () {
+    setColumnDefs(formatColumnsByOption(optionDic, columns));
+  }, [columns]); // 右上角控制列是否展示的数据
 
   var _useState5 = (0, _react.useState)(formatColumnCtlData(optionDic, defaultColumnCtlData())),
       _useState6 = _slicedToArray(_useState5, 2),

package/lib/components/okr-excel/index.css

@@ -8,6 +8,15 @@
   overflow: hidden;
 }
 
+.tita-okr-excel .tita-okr-type-icon {
+  display: inline-block;
+  transform: translateY(4px);
+}
+
+.tita-okr-excel .titaui-tag {
+  transform: translateY(-1px);
+}
+
 .tita-okr-excel__column-ctl {
   position: absolute;
   background-color: #F0F4FA;
@@ -81,6 +90,8 @@
   font-size: 16px;
   font-weight: 400;
   margin-right: 8px;
+  display: inline-block;
+  transform: translateY(2.5px);
 }
 
 .tita-okr-excel__kr-name {

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

@@ -37,18 +37,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var defaultColumnOption = {
   resizable: true,
   editable: false
@@ -70,92 +58,86 @@ var App = function App(_ref2) {
   var showCycle = _ref2.showCycle,
       data = _ref2.data,
       onRefresh = _ref2.onRefresh;
-
-  var _useState = (0, _react.useState)(data),
-      _useState2 = _slicedToArray(_useState, 2),
-      selfData = _useState2[0],
-      setSelfData = _useState2[1];
-
-  (0, _react.useEffect)(function () {
-    setSelfData(data);
-  }, [data]);
   var dicData = (0, _hooks.dic)();
-
-  var _useOkrColumns = (0, _hooks.useOkrColumns)([_objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标（O）'],
-    width: 400,
-    valueGetter: 'data.workName',
-    pinned: 'left',
-    // autoHeight: true,
-    wrapText: true,
-    cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['类型'],
-    valueGetter: 'data.okrType',
-    hide: true,
-    width: 100,
-    cellRenderer: _renders.okrTypeRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['负责人'],
-    valueGetter: 'data.principalUser.name',
-    hide: true,
-    width: 100,
-    cellRenderer: _renders.userRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['对齐目标'],
-    valueGetter: 'data.parentPrincipal.principalName',
-    width: 100,
-    hide: true
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['可见范围'],
-    valueGetter: 'data.visibility',
-    width: 100,
-    hide: true,
-    cellRenderer: _renders.visibilityRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标完成度'],
-    valueGetter: 'data.progress',
-    width: 120,
-    cellRenderer: _renders.TaskProgressRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标最新进展'],
-    valueGetter: 'data.progressDescription',
-    cellRenderer: _renders.tooltipRenderer,
-    width: 200,
-    hide: true
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['关键成果（KR）'],
-    valueGetter: 'data.Kr.mileStoneName',
-    width: 400,
-    cellRenderer: (0, _renders.krNameRenderer)(onRefresh)
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 负责人'],
-    valueGetter: 'data.Kr.user.name',
-    width: 100,
-    hide: true,
-    cellRenderer: _renders.krUserRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['权重'],
-    valueGetter: 'data.Kr.krWeight',
-    width: 80,
-    hide: true,
-    cellRenderer: _renders.krWeightRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['信心指数'],
-    valueGetter: 'data.Kr.confidenceIndex',
-    width: 80,
-    cellRenderer: _renders.ConfidenceRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 完成度'],
-    valueGetter: 'data.Kr.progress',
-    width: 120,
-    cellRenderer: _renders.KrProgressRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 最新进展'],
-    valueGetter: 'data.Kr.progressDescription',
-    cellRenderer: _renders.tooltipRenderer,
-    width: 200
-  })]),
+  var okrColumnOptions = (0, _react.useMemo)(function () {
+    return [_objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标（O）'],
+      width: 400,
+      valueGetter: 'data.workName',
+      pinned: 'left',
+      // autoHeight: true,
+      wrapText: true,
+      cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['类型'],
+      valueGetter: 'data.okrType',
+      hide: true,
+      width: 100,
+      cellRenderer: _renders.okrTypeRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['负责人'],
+      valueGetter: 'data.principalUser.name',
+      hide: true,
+      width: 100,
+      cellRenderer: _renders.userRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['对齐目标'],
+      valueGetter: 'data.parentPrincipal.principalName',
+      width: 100,
+      hide: true
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['可见范围'],
+      valueGetter: 'data.visibility',
+      width: 100,
+      hide: true,
+      cellRenderer: _renders.visibilityRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标完成度'],
+      valueGetter: 'data.progress',
+      width: 120,
+      cellRenderer: _renders.TaskProgressRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标最新进展'],
+      valueGetter: 'data.progressDescription',
+      cellRenderer: _renders.tooltipRenderer,
+      width: 200,
+      hide: true
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['关键成果（KR）'],
+      valueGetter: 'data.Kr.mileStoneName',
+      width: 400,
+      cellRenderer: (0, _renders.krNameRenderer)(onRefresh)
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 负责人'],
+      valueGetter: 'data.Kr.user.name',
+      width: 100,
+      hide: true,
+      cellRenderer: _renders.krUserRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['权重'],
+      valueGetter: 'data.Kr.krWeight',
+      width: 80,
+      hide: true,
+      cellRenderer: _renders.krWeightRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['信心指数'],
+      valueGetter: 'data.Kr.confidenceIndex',
+      width: 80,
+      cellRenderer: _renders.ConfidenceRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 完成度'],
+      valueGetter: 'data.Kr.progress',
+      width: 120,
+      cellRenderer: _renders.KrProgressRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 最新进展'],
+      valueGetter: 'data.Kr.progressDescription',
+      cellRenderer: _renders.tooltipRenderer,
+      width: 200
+    })];
+  }, [showCycle]);
+
+  var _useOkrColumns = (0, _hooks.useOkrColumns)(okrColumnOptions),
       columnDefs = _useOkrColumns.columnDefs,
       onColumnMoved = _useOkrColumns.onColumnMoved,
       onColumnResized = _useOkrColumns.onColumnResized,
@@ -201,7 +183,7 @@ var App = function App(_ref2) {
     enableRangeSelection: true,
     domLayout: "autoHeight",
     getRowId: getRowId,
-    rowData: selfData,
+    rowData: data,
     columnDefs: columnDefs,
     detailRowAutoHeight: true,
     onColumnMoved: onColumnMovedHandler,

package/lib/components/okr-excel/renders.js

@@ -118,6 +118,8 @@ exports.OkrNameRenderer = OkrNameRenderer;
 
 var krNameRenderer = function krNameRenderer(onRefresh) {
   return function (params) {
+    if (!params.data.Kr) return '';
+
     var onOpendrawer = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -200,6 +202,7 @@ exports.EObjType = EObjType;
 
 var KrProgressRenderer = function KrProgressRenderer(_ref4) {
   var data = _ref4.data;
+  if (!data.Kr) return '';
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__okr-progress")
   }, /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
@@ -212,10 +215,10 @@ exports.KrProgressRenderer = KrProgressRenderer;
 
 var ConfidenceRenderer = function ConfidenceRenderer(_ref5) {
   var data = _ref5.data;
-  return data.Kr.confidenceIndex && /*#__PURE__*/_react["default"].createElement(_newConfidence["default"], {
+  return data.Kr && data.Kr.confidenceIndex ? /*#__PURE__*/_react["default"].createElement(_newConfidence["default"], {
     value: data.Kr.confidenceIndex,
     editable: false
-  }) || '';
+  }) : '';
 };
 
 exports.ConfidenceRenderer = ConfidenceRenderer;
@@ -224,7 +227,7 @@ var krWeightRenderer = function krWeightRenderer(_ref6) {
   var value = _ref6.value;
   return /*#__PURE__*/_react["default"].createElement("p", {
     className: "".concat(preCls, "__kr-weight")
-  }, "".concat(value, "%"));
+  }, value && "".concat(value, "%"));
 };
 
 exports.krWeightRenderer = krWeightRenderer;
@@ -234,7 +237,7 @@ var krUserRenderer = function krUserRenderer(_ref7) {
 
   var value = _ref7.value,
       data = _ref7.data;
-  if (!data.Kr.user) return '';
+  if (!data.Kr || !data.Kr.user) return '';
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__kr-user")
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {

package/lib/components/okr-filter-drawer/filter-form.js

@@ -85,9 +85,9 @@ var getOkrClassifyList = function getOkrClassifyList() {
 
 var getOrderTypeList = function getOrderTypeList() {
   return [{
-    label: '自定义排序',
+    label: (0, _getLocale.getLocale)('OKR_MyO_Text_CustomSorting'),
     value: 0,
-    toolTip: '自定义排序'
+    toolTip: (0, _getLocale.getLocale)('OKR_MyO_Text_CustomSorting')
   }, {
     label: (0, _getLocale.getLocale)("OKR_MyO_Text_Firstcreated"),
     value: 2,

package/lib/components/okr-type-icon/index.js

@@ -17,27 +17,32 @@ require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var OkrClassifyImgMapping = {
-  1: {
-    icon: _okrClassifyNuoCopy["default"],
-    text: (0, _getLocale.getLocale)('OKR_MyO_Es_Commitment')
-  },
-  2: {
-    icon: _okrClassifyYuanCopy["default"],
-    text: (0, _getLocale.getLocale)('OKR_MyO_Es_Visiontype')
-  }
+var OkrClassifyImgMapping = function OkrClassifyImgMapping(okrClassify) {
+  return {
+    1: {
+      icon: _okrClassifyNuoCopy["default"],
+      text: (0, _getLocale.getLocale)('OKR_MyO_Es_Commitment')
+    },
+    2: {
+      icon: _okrClassifyYuanCopy["default"],
+      text: (0, _getLocale.getLocale)('OKR_MyO_Es_Visiontype')
+    }
+  }[okrClassify];
 };
 
 var OkrTypeIcon = function OkrTypeIcon(_ref) {
   var okrClassify = _ref.okrClassify;
-  return !!okrClassify && /*#__PURE__*/React.createElement(_tooltip["default"], {
-    content: OkrClassifyImgMapping[okrClassify].text
+  if (!okrClassify) return '';
+  var iconConfig = OkrClassifyImgMapping(okrClassify);
+  return /*#__PURE__*/React.createElement(_tooltip["default"], {
+    overlay: iconConfig.text,
+    placement: "top"
   }, /*#__PURE__*/React.createElement("span", {
     className: "tita-okr-type-icon",
     style: {
-      backgroundImage: "url(".concat(OkrClassifyImgMapping[okrClassify].icon, ")")
+      backgroundImage: "url(".concat(iconConfig.icon, ")")
     }
-  })) || '';
+  }));
 };
 
 var _default = OkrTypeIcon;

package/lib/components/picker/range-picker/components/picker-trigger/index.js

@@ -35,6 +35,8 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
   var children = props.children,
       focused = props.focused,
       viewDate = props.viewDate,
+      _props$triggerClassNa = props.triggerClassName,
+      triggerClassName = _props$triggerClassNa === void 0 ? '' : _props$triggerClassNa,
       disabled = props.disabled,
       allowClear = props.allowClear,
       placeholder = props.placeholder,
@@ -77,7 +79,7 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
         return !disabled && _onClick();
       }
     }, children) : /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames)),
+      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames), triggerClassName),
       onClick: function onClick() {
         return !disabled && _onClick();
       }

package/lib/components/popup-select/index.css

@@ -49,6 +49,7 @@
   width: 100%;
   align-items: center;
   justify-content: space-between;
+  white-space: nowrap;
 }
 
 .titaui-popup-select__checkbox-icon {

package/lib/components/tag/index.css

@@ -1,14 +1,14 @@
 .titaui-tag {
   height: 18px;
   margin-left: 6px;
-  padding: 2px 8px;
+  padding: 0 8px;
   font-size: 12px;
-  line-height: 14px;
   border-radius: 9px;
   background: #f7f8fa;
   box-sizing: border-box;
   color: #a4acb9;
-  display: inline-block;
+  display: inline-flex;
+  align-items: center;
   white-space: nowrap;
   font-weight: 400;
 }

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

@@ -7,6 +7,12 @@
   margin-left: 5px;
 }
 
+.tita-okr-list-v2__table-tip {
+  color: #fff;
+  font-size: 14px;
+  line-height: 22px;
+}
+
 .tita-okr-list-v2__header {
   display: flex;
   margin-bottom: 16px;

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

@@ -39,6 +39,8 @@ var _getLocale = require("../../../utils/getLocale");
 
 var _popupSelect = _interopRequireDefault(require("../../../components/popup-select"));
 
+var _guideTip = _interopRequireDefault(require("../../../components/guide-tip"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -85,10 +87,54 @@ var viewConfig = function viewConfig() {
   };
 };
 
-var isSelfTenant = function isSelfTenant() {
-  return ['352728', '564003', '511477', '596303', // 正式环境
-  '500019', '500017', '500011', '500036' // 测试环境
-  ].includes(String((0, _bsGlobal.getBSGlobal)('tenantInfo').Id));
+var getTableTip = function getTableTip() {
+  return !localStorage.getItem("OkrTableTypeTip_".concat(window.BSGlobal.loginUserInfo.Id));
+};
+
+var setTableTip = function setTableTip() {
+  localStorage.setItem("OkrTableTypeTip_".concat(window.BSGlobal.loginUserInfo.Id), 'true');
+};
+
+var titaTracker = function titaTracker(type) {
+  var name = {
+    card: '卡片',
+    table: '表格',
+    map: '地图'
+  }[type];
+
+  if (window.titaTracker && !localStorage.getItem('titaccc')) {
+    window.titaTracker("action").record({
+      productName: "OKR展示模式",
+      actionGroup: "选择OKR展示模式",
+      actionName: "\u9009\u62E9OKR\u5C55\u793A\u6A21\u5F0F\uFF1A".concat(name)
+    });
+  }
+};
+
+var getViewTypeMenuData = function getViewTypeMenuData(relationShip) {
+  return [{
+    label: /*#__PURE__*/_react["default"].createElement("p", {
+      className: "".concat(_precls.precls, "__view-tyoe-list-item")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "tu-icon-pc-card-s"
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Pro_Butt_Card'))),
+    value: 'card'
+  }, {
+    label: /*#__PURE__*/_react["default"].createElement("p", {
+      className: "".concat(_precls.precls, "__view-tyoe-list-item")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "tu-icon-pc-table-s"
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_KRP_Table'))),
+    value: 'table'
+  }, {
+    label: /*#__PURE__*/_react["default"].createElement("p", {
+      className: "".concat(_precls.precls, "__view-tyoe-list-item")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "tu-icon-yangshi-ditu"
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'))),
+    value: 'map',
+    visible: relationShip === 1
+  }];
 };
 
 function Header(props, ref) {
@@ -118,55 +164,29 @@ function Header(props, ref) {
       viewType = _useState4[0],
       setViewType = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(isSelfTenant() ? [{
-    label: /*#__PURE__*/_react["default"].createElement("p", {
-      className: "".concat(_precls.precls, "__view-tyoe-list-item")
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-pc-card-s"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Pro_Butt_Card'))),
-    value: 'card'
-  }, {
-    label: /*#__PURE__*/_react["default"].createElement("p", {
-      className: "".concat(_precls.precls, "__view-tyoe-list-item")
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-pc-table-s"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_KRP_Table'))),
-    value: 'table'
-  }, {
-    label: /*#__PURE__*/_react["default"].createElement("p", {
-      className: "".concat(_precls.precls, "__view-tyoe-list-item")
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-yangshi-ditu"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'))),
-    value: 'map'
-  }] : [{
-    label: /*#__PURE__*/_react["default"].createElement("p", {
-      className: "".concat(_precls.precls, "__view-tyoe-list-item")
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-pc-card-s"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Pro_Butt_Card'))),
-    value: 'card'
-  }, {
-    label: /*#__PURE__*/_react["default"].createElement("p", {
-      className: "".concat(_precls.precls, "__view-tyoe-list-item")
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-yangshi-ditu"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'))),
-    value: 'map'
-  }]),
-      _useState6 = _slicedToArray(_useState5, 1),
-      viewTypeMenuData = _useState6[0];
+  var _useState5 = (0, _react.useState)(getViewTypeMenuData(relationShip)),
+      _useState6 = _slicedToArray(_useState5, 2),
+      viewTypeMenuData = _useState6[0],
+      setViewTypeMenuData = _useState6[1];
 
   var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
       init = _useState8[0],
       setInit = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(),
+  var _useState9 = (0, _react.useState)(getTableTip()),
       _useState10 = _slicedToArray(_useState9, 2),
-      userInfo = _useState10[0],
-      setUserInfo = _useState10[1];
+      showTableTip = _useState10[0],
+      setShowTableTip = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(),
+      _useState12 = _slicedToArray(_useState11, 2),
+      userInfo = _useState12[0],
+      setUserInfo = _useState12[1];
 
+  (0, _react.useEffect)(function () {
+    setViewTypeMenuData(getViewTypeMenuData(relationShip));
+  }, [relationShip]);
   (0, _react.useEffect)(function () {
     if (toUserId !== undefined || relationShip === 1) {
       var userId = toUserId;
@@ -279,6 +299,8 @@ function Header(props, ref) {
   };
 
   var onChangeViewTypeHandler = (0, _react.useCallback)(function (type) {
+    titaTracker(type);
+
     if (type === ViewType.Map) {
       gotoOkrMap();
       return;
@@ -288,6 +310,10 @@ function Header(props, ref) {
     if (onChangeViewType) onChangeViewType(type);
   }, [onChangeViewType]);
   var viewInfo = viewConfig()[viewType];
+  var onHideTableTip = (0, _react.useCallback)(function () {
+    setTableTip();
+    setShowTableTip(false);
+  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -300,21 +326,29 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item")
   }, /*#__PURE__*/_react["default"].createElement(_keywordSearch["default"], {
     onSearch: onSearch
-  })), relationShip !== 2 && relationShip !== 3 &&
+  })), ![2, 3].includes(relationShip) &&
   /*#__PURE__*/
   // 我关注的 我参与的 没有创建按钮
-  _react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  _react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header-item")
   }, /*#__PURE__*/_react["default"].createElement(_createOkr["default"], {
     ref: createOkrRef,
     onFrontAddOKR: onFrontAddOKR
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header-item")
+  }, /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+    visible: showTableTip,
+    content: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(_precls.precls, "__table-tip")
+    }, "\u65B0\u589E OKR \u8868\u683C\u67E5\u770B\u6A21\u5F0F\uFF0C\u67E5\u770B\u66F4\u4FBF\u6377\uFF0C\u5207\u6362\u4F53\u9A8C\u4E00\u4E0B"),
+    onClickClose: setTableTip,
+    popupPlacement: "bottom"
   }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
     menuData: viewTypeMenuData,
     popupPlacement: "bottom",
     action: "click",
-    onChange: onChangeViewTypeHandler
+    onChange: onChangeViewTypeHandler,
+    onVisableChange: onHideTableTip
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: viewInfo.title,
     placement: "top"

package/lib/pages/new-okr-list/index.css

@@ -1,4 +1,5 @@
 .tita-okr-list-v2 {
+  position: relative;
   height: calc(100% - 20px);
   overflow-y: scroll;
   margin-right: -16px;
@@ -10,11 +11,15 @@
 }
 
 .tita-okr-list-v2__loading {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
   height: 32px;
   width: 80px;
   background: url("./img/loading.gif") no-repeat;
   background-size: contain;
   margin: 200px auto;
+  z-index: 3;
 }
 
 .tita-okr-list-v2 .okr-list__empty-tip > img {

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

@@ -86,7 +86,15 @@ var cacheViewType = localStorage.getItem('cacheViewType');
 function getOkrExcelData(okrData) {
   var okrExcelData = [];
   okrData.forEach(function (okrInfo) {
+    if (!okrInfo.Krs || !okrInfo.Krs.length) {
+      okrExcelData.push(_objectSpread({}, okrInfo));
+      return;
+    }
+
     okrInfo.Krs.forEach(function (kr, i) {
+      // 过滤目标下的其他执行（默认分组）
+      if (kr.mileStoneId === 0) return;
+
       var data = _objectSpread(_objectSpread({}, i === 0 ? okrInfo : {}), {}, {
         feedId: okrInfo.feedId,
         Kr: _objectSpread(_objectSpread({}, kr), {}, {
@@ -94,7 +102,9 @@ function getOkrExcelData(okrData) {
         })
       });
 
-      if (i === 0) data.rowSpan = okrInfo.Krs.length;
+      if (i === 0) data.rowSpan = okrInfo.Krs.filter(function (kr) {
+        return kr.mileStoneId;
+      }).length;
       okrExcelData.push(data);
     });
   });
@@ -237,7 +247,7 @@ var NewOkrList = function NewOkrList(props) {
     }
   };
 
-  var getOkrs = function getOkrs() {
+  var getOkrsRequest = function getOkrsRequest() {
     var params = _objectSpread(_objectSpread({
       relation: relation,
       toUserId: (0, _bsGlobal.getUserInfo)().Id,
@@ -260,7 +270,6 @@ var NewOkrList = function NewOkrList(props) {
       params.keyWords = "";
     }
 
-    setLoading(true);
     recordVisitUser();
     (0, _requestApi.okrSearch)(params).then(function (res) {
       setOkrs(res && res.works || []);
@@ -269,6 +278,17 @@ var NewOkrList = function NewOkrList(props) {
     });
   };
 
+  var getOkrs = function getOkrs() {
+    // 这个用于loading加载
+    setLoading(true);
+    getOkrsRequest();
+  };
+
+  var onRefreshOkrs = function onRefreshOkrs() {
+    // 这个不要loading，推屏出来的时候用这个
+    getOkrsRequest();
+  };
+
   (0, _react.useEffect)(function () {
     okrsRef.current = okrs;
   }, [okrs]);
@@ -391,7 +411,7 @@ var NewOkrList = function NewOkrList(props) {
   }))), okrs.length > 0 && viewType === _header.ViewType.Table && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_okrExcel["default"], {
     showCycle: query.cycleType === '-1',
     data: okrExcelData,
-    onRefresh: getOkrs
+    onRefresh: onRefreshOkrs
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__pagination")
   }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], {
@@ -400,7 +420,7 @@ var NewOkrList = function NewOkrList(props) {
     pageSize: pageSize,
     current: pageNum,
     size: "sm"
-  }))), okrs.length === 0 && /*#__PURE__*/_react["default"].createElement(Empty, {
+  }))), !loading && okrs.length === 0 && /*#__PURE__*/_react["default"].createElement(Empty, {
     openCreate: function openCreate() {
       return openCreateModal();
     },

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

@@ -42,12 +42,14 @@ function List(props) {
       annualNum = _useContext.annualNum,
       cycleType = _useContext.cycleType,
       yqmNum = _useContext.yqmNum,
-      orderType = _useContext.orderType;
+      orderType = _useContext.orderType,
+      relation = _useContext.relation;
 
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
     orderType: orderType,
     okrData: okrs,
     setData: setOkrs,
+    relation: relation,
     cycle: {
       annualNum: annualNum,
       cycleType: cycleType,

package/package.json

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