@titaui/pc 1.15.40-beta.4 → 1.15.40-beta.7

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

@@ -54,7 +54,7 @@ function needCoverCache(optionDic, columns) {
   return false;
 }
 
-function createDefaultOptions(columns) {
+function createDefaultOptions(cacheOptionDic, columns) {
   var optionDic = {};
   columns.forEach(function (item, idx) {
     optionDic[item.field] = {
@@ -62,7 +62,11 @@ function createDefaultOptions(columns) {
       hide: false,
       width: item.width,
       idx: idx
-    };
+    }; // 如果存在缓存，则复用现有的显示状态，避免在重置缓存后让用户以为是BUG
+
+    if (cacheOptionDic[item.field]) {
+      optionDic[item.field].hide = cacheOptionDic[item.field].hide;
+    }
   });
   return optionDic;
 }
@@ -70,7 +74,7 @@ function createDefaultOptions(columns) {
 function getCacheColumnOptions(columns) {
   var optionStr = localStorage.getItem('cacheOkrColumnOptions') || '{}';
   var optionDic = JSON.parse(optionStr);
-  if (optionStr === '{}' || needCoverCache(optionDic, columns)) optionDic = createDefaultOptions(columns);
+  if (optionStr === '{}' || needCoverCache(optionDic, columns)) optionDic = createDefaultOptions(optionDic, columns);
   return optionDic;
 }
 

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

@@ -43,7 +43,7 @@
   font-size: 14;
   display: flex;
   align-items: center;
-  font-weight: bold;
+  font-weight: 600;
   cursor: pointer;
   transition: color .3s;
   flex-wrap: wrap;

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

@@ -145,7 +145,6 @@ var App = function App(_ref2) {
   }, {
     wait: 200
   });
-  console.log('data', data);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "ag-theme-material ".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
@@ -158,7 +157,7 @@ var App = function App(_ref2) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__column-ctl")
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "tu-icon-fenlei"
+    className: "tu-icon-APP-shezhi"
   }))), /*#__PURE__*/_react["default"].createElement(_tableExcel["default"], {
     headerHeight: 40,
     rowHeight: 38,

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

@@ -39,6 +39,9 @@
 
 .titaui-table-excel .ag-cell {
   padding: 0 12px;
+  line-height: 22px;
+  display: flex;
+  align-items: center;
   border-right: var(--ag-borders-row) var(--ag-row-border-color) !important;
 }
 

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

@@ -68,6 +68,21 @@ exports.ViewType = ViewType;
   ViewType["Map"] = "map";
 })(ViewType || (exports.ViewType = ViewType = {}));
 
+var viewConfig = {
+  table: {
+    icon: 'tu-icon-pc-table-s',
+    title: (0, _getLocale.getLocale)('OKR_MyO_KRP_Table')
+  },
+  card: {
+    icon: 'tu-icon-pc-card-s',
+    title: (0, _getLocale.getLocale)('Pro_Butt_Card')
+  },
+  map: {
+    icon: 'tu-icon-yangshi-ditu',
+    title: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment')
+  }
+};
+
 function Header(props, ref) {
   var _useContext = (0, _react.useContext)(_context.Context),
       departmentName = _useContext.departmentName,
@@ -99,14 +114,14 @@ function Header(props, ref) {
     label: /*#__PURE__*/_react["default"].createElement("p", {
       className: "".concat(_precls.precls, "__view-tyoe-list-item")
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-yangshi-ditu"
+      className: "tu-icon-pc-card-s"
     }), /*#__PURE__*/_react["default"].createElement("span", null, "\u5361\u7247")),
     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"
+      className: "tu-icon-pc-table-s"
     }), /*#__PURE__*/_react["default"].createElement("span", null, "\u8868\u683C")),
     value: 'table'
   }, {
@@ -250,6 +265,7 @@ function Header(props, ref) {
     setViewType(type);
     if (onChangeViewType) onChangeViewType(type);
   }, [onChangeViewType]);
+  var viewInfo = viewConfig[viewType];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -278,12 +294,12 @@ function Header(props, ref) {
     action: "click",
     onChange: onChangeViewTypeHandler
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
+    overlay: viewInfo.title,
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-icon--view-type")
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "tu-icon-yangshi-ditu"
+    className: viewInfo.icon
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-caret-down ".concat(_precls.precls, "__header-down-icon")
   })))))), /*#__PURE__*/_react["default"].createElement(_comments["default"], {

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

@@ -81,6 +81,8 @@ 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; }
 
+var cacheViewType = localStorage.getItem('cacheViewType');
+
 function getOkrExcelData(okrData) {
   var okrExcelData = [];
   okrData.forEach(function (okrInfo) {
@@ -181,7 +183,7 @@ var NewOkrList = function NewOkrList(props) {
       isInit = _useState14[0],
       setIsInit = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(_header.ViewType.Table),
+  var _useState15 = (0, _react.useState)(cacheViewType || _header.ViewType.Card),
       _useState16 = _slicedToArray(_useState15, 2),
       viewType = _useState16[0],
       setViewType = _useState16[1];
@@ -338,12 +340,12 @@ var NewOkrList = function NewOkrList(props) {
     getOkrs();
   }, [pageNum, pageSize, query]);
   var onChangeViewTypeHandler = (0, _react.useCallback)(function (type) {
+    localStorage.setItem('cacheViewType', type);
     setViewType(type);
   }, []);
   var okrExcelData = (0, _react.useMemo)(function () {
     return getOkrExcelData(okrs);
   }, [okrs]);
-  console.log('okrs', okrs);
   return /*#__PURE__*/_react["default"].createElement(_context.Context.Provider, {
     value: _objectSpread({
       OkrCommunicationPush: OkrCommunicationPush,
@@ -359,7 +361,8 @@ var NewOkrList = function NewOkrList(props) {
     onSearch: handleOnSearch,
     ref: headerRef,
     onFrontAddOKR: onFrontAddOKR,
-    onChangeViewType: onChangeViewTypeHandler
+    onChangeViewType: onChangeViewTypeHandler,
+    viewType: viewType
   }), /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     loading: loading
   }, okrs.length > 0 && viewType === _header.ViewType.Card && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_list["default"], {

package/package.json

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