@titaui/pc 1.15.40-beta.8 → 1.15.40-beta.9

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

@@ -192,18 +192,18 @@ var defaultColumnCtlData = function defaultColumnCtlData() {
     }, {
       label: dicData['信心指数'],
       value: '1,2',
-      visable: _setting.showKrConfidence
+      visible: _setting.showKrConfidence
     }, {
       label: dicData['权重'],
       value: '1,3',
-      visable: _setting.showKrWeight
+      visible: _setting.showKrWeight
     }, {
       label: dicData['KR 完成度'],
-      value: '1,4',
-      visable: _setting.showKrProgress
+      value: '1,4'
     }, {
       label: dicData['KR 最新进展'],
-      value: '1,5'
+      value: '1,5',
+      visible: _setting.showKrProgress
     }]
   }];
 }; // 标记展示的列

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

@@ -64,6 +64,7 @@ var App = function App(_ref2) {
     field: dicData['目标（O）'],
     width: 400,
     valueGetter: 'data.workName',
+    pinned: 'left',
     // autoHeight: true,
     wrapText: true,
     cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)

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

@@ -15,7 +15,7 @@ var _popup = _interopRequireDefault(require("../popup"));
 
 require("./index.css");
 
-var _excluded = ["className", "style", "children", "menuData", "onChange", "visable", "action", "onVisableChange", "mode", "height"];
+var _excluded = ["className", "style", "children", "menuData", "onChange", "visible", "action", "onVisableChange", "mode", "height"];
 
 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); }
 
@@ -68,7 +68,7 @@ var PopupSelect = function PopupSelect(_ref) {
       children = _ref.children,
       menuData = _ref.menuData,
       onChange = _ref.onChange,
-      visable = _ref.visable,
+      visible = _ref.visible,
       _ref$action = _ref.action,
       action = _ref$action === void 0 ? 'click' : _ref$action,
       onVisableChange = _ref.onVisableChange,
@@ -77,14 +77,14 @@ var PopupSelect = function PopupSelect(_ref) {
       height = _ref.height,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
-  var _useState = (0, _react.useState)(visable),
+  var _useState = (0, _react.useState)(visible),
       _useState2 = _slicedToArray(_useState, 2),
       selfVisable = _useState2[0],
       setSelfVisable = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    setSelfVisable(visable);
-  }, [visable]);
+    setSelfVisable(visible);
+  }, [visible]);
   var menuList = (0, _react.useMemo)(function () {
     var onSelectItem = function onSelectItem(value, item, idx) {
       if (onChange) onChange(value, item, idx);
@@ -93,7 +93,7 @@ var PopupSelect = function PopupSelect(_ref) {
     var getLi = function getLi(item, idx) {
       var _item$children;
 
-      if (item.visable === false) return '';
+      if (item.visible === false) return '';
 
       if (item.type !== 'group') {
         return /*#__PURE__*/_react["default"].createElement("li", {
@@ -120,9 +120,9 @@ var PopupSelect = function PopupSelect(_ref) {
       }
     }, menuData.map(getLi));
   }, [menuData, onChange]);
-  var onPopupVisableChange = (0, _react.useCallback)(function (visable) {
-    setSelfVisable(visable);
-    if (onVisableChange) onVisableChange(visable);
+  var onPopupVisableChange = (0, _react.useCallback)(function (visible) {
+    setSelfVisable(visible);
+    if (onVisableChange) onVisableChange(visible);
   }, [onVisableChange]);
   return /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
     popup: menuList,

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

@@ -85,6 +85,10 @@ var viewConfig = function viewConfig() {
   };
 };
 
+var isSelfTenant = function isSelfTenant() {
+  return ['352728', '564003', '511477'].includes((0, _bsGlobal.getBSGlobal)('tenantInfo').Id);
+};
+
 function Header(props, ref) {
   var _useContext = (0, _react.useContext)(_context.Context),
       departmentName = _useContext.departmentName,
@@ -112,7 +116,7 @@ function Header(props, ref) {
       viewType = _useState4[0],
       setViewType = _useState4[1];
 
-  var _useState5 = (0, _react.useState)([{
+  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", {
@@ -133,6 +137,20 @@ function Header(props, ref) {
       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];

package/package.json

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