@titaui/pc 1.15.45-beta.1 → 1.15.45-beta.2

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/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 }; }
@@ -91,6 +93,14 @@ var isSelfTenant = function isSelfTenant() {
   ].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');
+};
+
 function Header(props, ref) {
   var _useContext = (0, _react.useContext)(_context.Context),
       departmentName = _useContext.departmentName,
@@ -138,7 +148,8 @@ function Header(props, ref) {
     }, /*#__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'
+    value: 'map',
+    visible: relationShip === 1
   }] : [{
     label: /*#__PURE__*/_react["default"].createElement("p", {
       className: "".concat(_precls.precls, "__view-tyoe-list-item")
@@ -152,7 +163,8 @@ function Header(props, ref) {
     }, /*#__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'
+    value: 'map',
+    visible: relationShip === 1
   }]),
       _useState6 = _slicedToArray(_useState5, 1),
       viewTypeMenuData = _useState6[0];
@@ -162,10 +174,15 @@ function Header(props, ref) {
       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 () {
     if (toUserId !== undefined || relationShip === 1) {
@@ -288,6 +305,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 +321,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/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-beta.1",
+  "version": "1.15.45-beta.2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",