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

package/lib/components/okr-excel-create/components-new/kr-confidence/index.css

@@ -2,12 +2,10 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  position: absolute;
   left: 0;
   top: 0;
   width: 100%;
   height: 100%;
-  padding: 0 12px;
   box-sizing: border-box;
 }
 
@@ -15,4 +13,5 @@
   width: 100%;
   display: flex;
   align-items: center;
+  justify-content: center;
 }

package/lib/components/okr-excel-create/components-new/kr-weight/index.js

@@ -144,7 +144,7 @@ var krWeightRenderer = function krWeightRenderer(update) {
       }, 0);
       console.log('totalWeight', totalWeight); // 自动计算最后一个 kr 的权重
 
-      rootDataRef.current.krs[lastIndex] = _objectSpread(_objectSpread({}, rootDataRef.current.krs[lastIndex].krWeight), {}, {
+      rootDataRef.current.krs[lastIndex] = _objectSpread(_objectSpread({}, rootDataRef.current.krs[lastIndex]), {}, {
         krWeight: (100 - totalWeight).toFixed(1)
       });
       update({
@@ -165,7 +165,7 @@ var krWeightRenderer = function krWeightRenderer(update) {
       return totalWeight <= 100;
     }, [rootData, rowIdx]);
     return /*#__PURE__*/_react["default"].createElement(KRWeight, {
-      value: data.krWeight.toFixed(1),
+      value: data.krWeight,
       onChange: handleEditKRWeight,
       disabled: isLast,
       onChangeBefore: onChangeBefore

package/lib/components/okr-excel-create/components-new/okr-align/index.js

@@ -11,9 +11,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _openData = require("../../../../utils/open-data");
+
 var _changeOkrModal = _interopRequireDefault(require("../../../change-okr-modal"));
 
-var _getLocale = require("../../../../utils/getLocale");
+var _tooltipText = _interopRequireDefault(require("../../../tooltip/tooltip-text"));
 
 require("./index.css");
 
@@ -29,18 +31,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 preCls = 'tita-okr-excel-create-okr-align';
 
 var alignOKRRender = function alignOKRRender(update) {
@@ -58,12 +48,6 @@ var alignOKRRender = function alignOKRRender(update) {
         parentKrId: ((_data$parentRelate4 = data.parentRelate) === null || _data$parentRelate4 === void 0 ? void 0 : _data$parentRelate4.parentKrId) || 0
       };
     }, [data]);
-
-    var _useState = (0, _react.useState)(),
-        _useState2 = _slicedToArray(_useState, 2),
-        parentOKR = _useState2[0],
-        setParentOKR = _useState2[1];
-
     var parentRef = (0, _react.useRef)();
 
     var onSelectClickHandler = function onSelectClickHandler(e) {
@@ -71,8 +55,7 @@ var alignOKRRender = function alignOKRRender(update) {
     };
 
     var onChangeOkrConfirmHandler = function onChangeOkrConfirmHandler(confirm) {
-      var workId = confirm.workId,
-          _okrInfo = confirm._okrInfo;
+      var workId = confirm.workId;
       var parent = {};
 
       if (workId === 0) {
@@ -106,23 +89,22 @@ var alignOKRRender = function alignOKRRender(update) {
         rootIdx: rootIdx,
         itemData: rootData
       });
-      setParentOKR(_okrInfo);
     };
 
     var renderAlignObj = (0, _react.useMemo)(function () {
       var _classNames;
 
-      if (!parentOKR) return /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(preCls, "__okr--empty")
-      }, (0, _getLocale.getLocale)('Mod_Pleaseselect'));
-      return /*#__PURE__*/_react["default"].createElement("div", {
+      return parent.parentName && /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(preCls, "__okr")
       }, /*#__PURE__*/_react["default"].createElement("i", {
         className: (0, _classnames["default"])("".concat(preCls, "__okr-icon"), (_classNames = {}, _defineProperty(_classNames, 'tu-icon-O', parent.parentType === 1), _defineProperty(_classNames, 'tu-icon-KR', parent.parentType !== 1), _classNames))
       }), /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(preCls, "__okr-name")
-      }, parent.parentName));
-    }, [parent, parentOKR]);
+      }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+        text: (0, _openData.parseString)(parent.parentName),
+        isPercent: true
+      })));
+    }, [parent]);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls)
     }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/okr-excel-create/components-new/okr-cycle/index.js

@@ -60,11 +60,7 @@ var OKRCycle = function OKRCycle(update) {
         cycle = _useState2[0],
         setCycle = _useState2[1];
 
-    console.log('周期回显', data);
-    console.log('周期回显', cycle);
-
     var handleChangeCycle = function handleChangeCycle(value) {
-      console.log('周期更新', value);
       setCycle(value);
       rootData = _objectSpread(_objectSpread({}, rootData), value);
       update({

package/lib/components/okr-excel-create/components-new/okr-name/index.css

@@ -54,9 +54,16 @@
   border: 0;
 }
 
+.tita-okr-excel-create-okr-name--isO .tita-rich-editor p {
+  font-weight: 500 !important;
+}
+
 .tita-okr-excel-create-okr-name .tita-rich-editor p {
   padding: 0;
   font-size: 14px;
+  font-weight: 400;
+  color: #141C28;
+  line-height: 22px;
   white-space: pre-wrap;
 }
 

package/lib/components/okr-excel-create/components-new/okr-name/index.js

@@ -19,6 +19,10 @@ var _utils = require("../../utils");
 
 require("./index.css");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -139,13 +143,16 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
       if (isO) {
         update({
           type: 'removeO',
-          rootIdx: rootIdx
+          rootIdx: rootIdx,
+          uuid: data.uuid
         });
       } else {
         update({
           type: 'removeKr',
           rootIdx: rootIdx,
-          rowIdx: rowIdx
+          rowIdx: rowIdx,
+          rootUuid: rootDataRef.current.uuid,
+          uuid: data.uuid
         });
       }
     };
@@ -172,7 +179,7 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(preCls)
+      className: (0, _classnames["default"])("".concat(preCls), _defineProperty({}, "".concat(preCls, "--isO"), isO))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__icon")
     }, isO ? 'O:' : "KR".concat(rowIdx + 1, ":")), /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/okr-excel-create/components-new/okr-visibility/index.js

@@ -131,6 +131,7 @@ var Visibility = function Visibility(_ref) {
       oldSelect.current = data.value;
 
       if (onChangeVisiableLimit) {
+        console.log('data.value', data.value);
         onChangeVisiableLimit(data.value);
       } // @ts-ignore
 
@@ -176,7 +177,6 @@ var Visibility = function Visibility(_ref) {
 
     return result.length > 0 ? result : getVisibilityMapText()[visibilityState];
   }, [visiableLimitState, visibilityState]);
-  console.log('renderText', renderText);
   var renderPopContent = (0, _react.useMemo)(function () {
     var list = getVisibilityList();
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -244,7 +244,7 @@ var _default = function _default(update) {
     return /*#__PURE__*/_react["default"].createElement(Visibility, {
       visibility: data.visibility,
       onChangeVisiableLimit: handleVisibilityChange,
-      visiableLimit: []
+      visiableLimit: data.visibilityScope
     });
   };
 };

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

@@ -13,6 +13,8 @@ var _hooks = require("./hooks");
 
 var _utils = require("./utils");
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _krWeight = _interopRequireDefault(require("./components-new/kr-weight"));
 
 var _okrAlign = _interopRequireDefault(require("./components-new/okr-align"));
@@ -35,6 +37,8 @@ var _tableExcelV = _interopRequireDefault(require("../table-excel-v2"));
 
 var _getLocale = require("../../utils/getLocale");
 
+var _hooks2 = _interopRequireDefault(require("../../utils/hooks"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -43,14 +47,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -71,38 +67,87 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var dicData = (0, _hooks.dic)();
 var preCls = 'tita-okr-excel-create';
-var getIitDatas = [(0, _utils.getIitData)(), (0, _utils.getIitData)(), (0, _utils.getIitData)()];
 
-var OKRExcelCreate = function OKRExcelCreate(_ref) {
-  var _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className,
-      _ref$tableClassName = _ref.tableClassName,
-      tableClassName = _ref$tableClassName === void 0 ? '' : _ref$tableClassName,
-      okrData = _ref.okrData,
-      onChange = _ref.onChange;
-  var data = (0, _react.useRef)(okrData && okrData.length ? okrData : getIitDatas); // const data = useRef<WorkExcelInfo[]>(mockData)
+var getIitDatas = function getIitDatas(props) {
+  return [(0, _utils.getIitData)(props), (0, _utils.getIitData)(props), (0, _utils.getIitData)(props)];
+};
+
+function filterRemoveItem(data) {
+  return data.filter(function (_ref) {
+    var isDelete = _ref.isDelete;
+    return !isDelete;
+  }).map(function (item) {
+    item.krs = item.krs.filter(function (_ref2) {
+      var isDelete = _ref2.isDelete;
+      return !isDelete;
+    });
+    return item;
+  });
+}
+
+var OKRExcelCreate = function OKRExcelCreate(_ref3) {
+  var _ref3$className = _ref3.className,
+      className = _ref3$className === void 0 ? '' : _ref3$className,
+      _ref3$tableClassName = _ref3.tableClassName,
+      tableClassName = _ref3$tableClassName === void 0 ? '' : _ref3$tableClassName,
+      okrData = _ref3.okrData,
+      onChange = _ref3.onChange;
+  var annualNum = (0, _hooks2["default"])('annualNum');
+  var cycleType = (0, _hooks2["default"])('cycleType');
+  var yqmNum = (0, _hooks2["default"])('yqmNum');
+  var cycleData = cycleType !== '-1' && {
+    annualNum: annualNum,
+    cycleType: cycleType,
+    yqmNum: yqmNum
+  } || {
+    annualNum: "".concat(new Date().getFullYear()),
+    cycleType: '2',
+    yqmNum: "".concat((0, _moment["default"])().quarter())
+  };
+  var data = (0, _react.useRef)(okrData && okrData.length ? okrData : getIitDatas(cycleData));
 
   var _useState = (0, _react.useState)((0, _utils.formatDataToOKRExcelTableData)(data.current)),
       _useState2 = _slicedToArray(_useState, 2),
       excelTableData = _useState2[0],
       setExcelTableData = _useState2[1];
 
-  var update = (0, _react.useCallback)(function (_ref2) {
-    var type = _ref2.type,
-        rowIdx = _ref2.rowIdx,
-        rootIdx = _ref2.rootIdx,
-        itemData = _ref2.itemData;
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isMax = _useState4[0],
+      setIsMax = _useState4[1];
+
+  var update = (0, _react.useCallback)(function (_ref4) {
+    var type = _ref4.type,
+        rowIdx = _ref4.rowIdx,
+        rootIdx = _ref4.rootIdx,
+        itemData = _ref4.itemData,
+        uuid = _ref4.uuid,
+        rootUuid = _ref4.rootUuid;
 
     if (type === 'update') {
       data.current[rootIdx] = itemData;
     }
 
     if (type === 'removeO') {
-      data.current.splice(rootIdx, 1);
+      var index = data.current.findIndex(function (item) {
+        return item.uuid === uuid;
+      });
+
+      if (data.current[index].isSaved) {
+        data.current[index].isDelete = true;
+      } else {
+        data.current.splice(index, 1);
+      }
     }
 
     if (type === 'removeKr') {
-      data.current[rootIdx].krs.splice(rowIdx, 1);
+      var rootIndex = data.current.findIndex(function (item) {
+        return item.uuid === rootUuid;
+      });
+      var krIndex = data.current[rootIndex].krs.findIndex(function (item) {
+        return item.uuid === uuid;
+      });
+      data.current[rootIndex].krs[krIndex].isDelete = true;
     }
 
     if (onChange) onChange(data.current.map(function (item) {
@@ -110,7 +155,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
         childs: null
       });
     }));
-    setExcelTableData(_toConsumableArray(data.current));
+    setExcelTableData(filterRemoveItem(data.current));
   }, []);
   var columnsOption = (0, _react.useMemo)(function () {
     return [{
@@ -136,6 +181,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
       dataIndex: 'cycle',
       key: 'cycle',
       width: 200,
+      hidden: cycleType !== '-1',
       render: (0, _okrCycle["default"])(update)
     }, {
       title: dicData['对齐目标'],
@@ -166,14 +212,15 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
       title: dicData['KR 负责人'],
       dataIndex: 'user.name',
       key: 'kr.user.name',
-      width: 100,
+      width: 160,
       level: 2,
       render: (0, _okrPrincipal["default"])(update, false)
     }, {
       title: dicData['KR 权重'],
       dataIndex: 'krWeight',
       key: 'krWeight',
-      width: 80,
+      width: 160,
+      align: 'center',
       level: 2,
       renderFill: true,
       render: (0, _krWeight["default"])(update)
@@ -181,15 +228,23 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
       title: dicData['信心指数'],
       dataIndex: 'confidenceIndex',
       key: 'confidenceIndex',
-      width: 80,
+      width: 160,
+      align: 'center',
       level: 2,
       render: (0, _krConfidence["default"])(update)
     }];
   }, []);
 
   var onAddOHandler = function onAddOHandler() {
-    data.current.push((0, _utils.getIitData)());
+    if (isMax) return;
+    data.current.push((0, _utils.getIitData)(cycleData));
     setExcelTableData((0, _utils.formatDataToOKRExcelTableData)(data.current));
+    if (onChange) onChange(data.current.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        childs: null
+      });
+    }));
+    setIsMax(data.current.length >= 50);
   }; // {/* <PopupSelect
   //   menuData={columnCtlData}
   //   popupPlacement="bottomLeft"
@@ -219,7 +274,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
     className: "".concat(preCls, "__add-o")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-add1"
-  }), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)('OKR_ComAll_AddObjective')))));
+  }), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)(isMax ? 'OKR_ComAll_AddObjective' : 'OKR_ComAll_AddObjective')))));
 };
 
 var _default = OKRExcelCreate;

package/lib/components/okr-excel-create/utils.js

@@ -9,6 +9,8 @@ var _uuid = _interopRequireDefault(require("uuid"));
 
 var _helpers = require("../../utils/helpers");
 
+var _common = require("../period-selector/common");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -102,11 +104,15 @@ var getKrItemData = function getKrItemData() {
 
 exports.getKrItemData = getKrItemData;
 
-var getIitData = function getIitData() {
-  return {
+var getIitData = function getIitData(_ref) {
+  var annualNum = _ref.annualNum,
+      cycleType = _ref.cycleType,
+      yqmNum = _ref.yqmNum;
+  return _objectSpread(_objectSpread({
     uuid: (0, _uuid["default"])(),
     workId: 0,
     workName: '',
+    isSaved: false,
     workNameRichText: '',
     visibility: 1,
     visibilityScope: undefined,
@@ -116,11 +122,16 @@ var getIitData = function getIitData() {
     groupName: '',
     krs: [_objectSpread({}, getKrItemData())],
     okrClassify: 0,
-    cycleType: -1,
-    yqmNum: 1,
+    cycleType: cycleType,
+    yqmNum: yqmNum
+  }, (0, _common.getDateRangeByCycle)({
+    annualNum: annualNum,
+    cycleType: cycleType,
+    yqmNum: yqmNum
+  }, 1) || {}), {}, {
     parentId: 0,
     parentKrId: 0,
-    annualNum: 2022,
+    annualNum: annualNum,
     hasSub: false,
     okrType: 1,
     createUserId: loginUser.Id,
@@ -141,7 +152,7 @@ var getIitData = function getIitData() {
     },
     parentPrincipal: null,
     isShowApprovalOpinion: false
-  };
+  });
 };
 
 exports.getIitData = getIitData;

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

@@ -32,6 +32,18 @@
   transition: background-color .3s;
 }
 
+.titaui-table-excel-v2__header__item--aligin-left {
+  justify-content: flex-start;
+}
+
+.titaui-table-excel-v2__header__item--aligin-center {
+  justify-content: center;
+}
+
+.titaui-table-excel-v2__header__item--aligin-right {
+  justify-content: flex-end;
+}
+
 .titaui-table-excel-v2__header__item:hover {
   background-color: #f2f2f2;
 }
@@ -67,3 +79,15 @@
   min-height: 30px;
   box-sizing: border-box;
 }
+
+.titaui-table-excel-v2__box-content--aligin-left {
+  justify-content: flex-start;
+}
+
+.titaui-table-excel-v2__box-content--aligin-center {
+  justify-content: center;
+}
+
+.titaui-table-excel-v2__box-content--aligin-right {
+  justify-content: flex-end;
+}

package/lib/components/table-excel-v2/index.js

@@ -21,6 +21,8 @@ var _array = require("../../utils/array");
 
 require("./index.css");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _excluded = ["render"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -193,7 +195,11 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     log('_columns update', _columns);
   }, [_columns]);
   (0, _react.useEffect)(function () {
-    var hasSortOrderColumns = columns.map(function (column, i) {
+    var hasSortOrderColumns = columns.filter(function (_ref7) {
+      var _ref7$hidden = _ref7.hidden,
+          hidden = _ref7$hidden === void 0 ? false : _ref7$hidden;
+      return !hidden;
+    }).map(function (column, i) {
       return _objectSpread(_objectSpread({}, column), {}, {
         level: column.level || 1,
         sortOrder: column.sortOrder !== undefined ? column.sortOrder : i
@@ -203,18 +209,18 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     var levelColumnDic = (0, _array.arr2Dic)(hasSortOrderColumns, 'level', {
       alwaysArray: true
     });
-    var levelColumnArr = Object.entries(levelColumnDic).map(function (_ref7) {
-      var _ref8 = _slicedToArray(_ref7, 2),
-          level = _ref8[0],
-          columns = _ref8[1];
+    var levelColumnArr = Object.entries(levelColumnDic).map(function (_ref8) {
+      var _ref9 = _slicedToArray(_ref8, 2),
+          level = _ref9[0],
+          columns = _ref9[1];
 
       return {
         level: level,
         columns: columns
       };
     });
-    var renderColumns = (0, _orderBy["default"])(levelColumnArr, 'level').map(function (_ref9) {
-      var columns = _ref9.columns;
+    var renderColumns = (0, _orderBy["default"])(levelColumnArr, 'level').map(function (_ref10) {
+      var columns = _ref10.columns;
       return columns;
     });
     setRenderColumns(renderColumns);
@@ -241,15 +247,15 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     // 永远是正值
     offsetWidth: 0
   });
-  var moveColBind = (0, _react2.useDrag)(function (_ref10) {
-    var _ref10$movement = _slicedToArray(_ref10.movement, 1),
-        mx = _ref10$movement[0],
-        _ref10$args = _slicedToArray(_ref10.args, 1),
-        colIndex = _ref10$args[0].colIndex,
-        active = _ref10.active,
-        direction = _ref10.direction,
-        first = _ref10.first,
-        down = _ref10.down;
+  var moveColBind = (0, _react2.useDrag)(function (_ref11) {
+    var _ref11$movement = _slicedToArray(_ref11.movement, 1),
+        mx = _ref11$movement[0],
+        _ref11$args = _slicedToArray(_ref11.args, 1),
+        colIndex = _ref11$args[0].colIndex,
+        active = _ref11.active,
+        direction = _ref11.direction,
+        first = _ref11.first,
+        down = _ref11.down;
 
     var isRight = mx > 0;
     var isLeft = mx < 0;
@@ -364,13 +370,13 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
       colSizes = _useSprings4[0],
       colSizesApi = _useSprings4[1];
 
-  var resizeColBind = (0, _react2.useDrag)(function (_ref11) {
-    var _ref11$movement = _slicedToArray(_ref11.movement, 1),
-        mx = _ref11$movement[0],
-        _ref11$args = _slicedToArray(_ref11.args, 1),
-        colIndex = _ref11$args[0],
-        active = _ref11.active,
-        event = _ref11.event;
+  var resizeColBind = (0, _react2.useDrag)(function (_ref12) {
+    var _ref12$movement = _slicedToArray(_ref12.movement, 1),
+        mx = _ref12$movement[0],
+        _ref12$args = _slicedToArray(_ref12.args, 1),
+        colIndex = _ref12$args[0],
+        active = _ref12.active,
+        event = _ref12.event;
 
     event.stopPropagation();
 
@@ -408,20 +414,22 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     });
   };
 
-  var renderRow = (0, _react.useCallback)(function (_ref12) {
-    var data = _ref12.data,
-        rowIdx = _ref12.rowIdx,
-        _ref12$currentLevel = _ref12.currentLevel,
-        currentLevel = _ref12$currentLevel === void 0 ? 1 : _ref12$currentLevel,
-        rootData = _ref12.rootData,
-        rootIdx = _ref12.rootIdx,
-        _ref12$parentColNum = _ref12.parentColNum,
-        parentColNum = _ref12$parentColNum === void 0 ? 0 : _ref12$parentColNum;
+  var renderRow = (0, _react.useCallback)(function (_ref13) {
+    var data = _ref13.data,
+        rowIdx = _ref13.rowIdx,
+        _ref13$currentLevel = _ref13.currentLevel,
+        currentLevel = _ref13$currentLevel === void 0 ? 1 : _ref13$currentLevel,
+        rootData = _ref13.rootData,
+        rootIdx = _ref13.rootIdx,
+        _ref13$parentColNum = _ref13.parentColNum,
+        parentColNum = _ref13$parentColNum === void 0 ? 0 : _ref13$parentColNum;
     if (!renderColumns[currentLevel - 1]) return;
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderColumns[currentLevel - 1].map(function (columnOption, colIdx) {
       var render = columnOption.render,
           dataIndex = columnOption.dataIndex,
-          renderFill = columnOption.renderFill;
+          renderFill = columnOption.renderFill,
+          _columnOption$align = columnOption.align,
+          align = _columnOption$align === void 0 ? 'left' : _columnOption$align;
 
       var content = /*#__PURE__*/_react["default"].createElement(MemoRender, {
         render: render,
@@ -442,7 +450,7 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
           borderLeft: moveInfo.colIdx === index && moveInfo.down && '1px solid #e2e2e2' || undefined
         }, positions[index])
       }, renderFill && content, !renderFill && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(preCls, "__box-content")
+        className: (0, _classnames["default"])("".concat(preCls, "__box-content"), "".concat(preCls, "__box-content--aligin-").concat(align))
       }, content));
     }), renderColumns[currentLevel] && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__childs")
@@ -460,12 +468,14 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     style: style
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__header")
-  }, _columns.map(function (_ref13, i) {
-    var title = _ref13.title,
-        key = _ref13.key;
+  }, _columns.map(function (_ref14, i) {
+    var title = _ref14.title,
+        _ref14$align = _ref14.align,
+        align = _ref14$align === void 0 ? 'left' : _ref14$align,
+        key = _ref14.key;
     return /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
       key: key,
-      className: "".concat(preCls, "__header__item") // {...moveColBind({ colIndex: i })}
+      className: (0, _classnames["default"])("".concat(preCls, "__header__item"), "".concat(preCls, "__header__item--aligin-").concat(align)) // {...moveColBind({ colIndex: i })}
       ,
       style: {
         width: colSizes[i].width,

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

@@ -15,6 +15,8 @@ var _bsGlobal = require("../../../utils/bs-global");
 
 var _precls = require("../precls");
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _keywordSearch = _interopRequireDefault(require("../keyword-search"));
 
 var _createOkr = _interopRequireDefault(require("./create-okr"));
@@ -31,6 +33,8 @@ var _comments = _interopRequireDefault(require("./comments"));
 
 var _operateRecord = _interopRequireDefault(require("./operate-record"));
 
+var _localStorage = require("../../../utils/local-storage");
+
 var _context = require("../context");
 
 var _requestApi = require("../request-api");
@@ -51,6 +55,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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."); }
@@ -342,15 +352,37 @@ function Header(props, ref) {
   var onHideTableTip = (0, _react.useCallback)(function () {
     setTableTip();
     setShowTableTip(false);
-  }, []);
+  }, []); // 设置默认季度
+
+  var useLocalStorage = new _localStorage.LocalStorage();
+  var cacheFilterParams = useLocalStorage.getItem('okr-filter-cycle');
+
+  var _useState15 = (0, _react.useState)(cacheFilterParams || {
+    annualNum: "".concat(new Date().getFullYear()),
+    cycleType: '2',
+    yqmNum: "".concat((0, _moment["default"])().quarter())
+  }),
+      _useState16 = _slicedToArray(_useState15, 2),
+      searchParams = _useState16[0],
+      setSearchParams = _useState16[1];
+
   var onChangeMoreMenuHandler = (0, _react.useCallback)(function (value) {
     if (value === MoreMenuType.Adds) {
-      history.push('/excel-okr-create');
+      var _annualNum = searchParams.annualNum,
+          _cycleType = searchParams.cycleType,
+          _yqmNum = searchParams.yqmNum;
+      history.push("/excel-okr-create?annualNum=".concat(_annualNum, "&cycleType=").concat(_cycleType, "&yqmNum=").concat(_yqmNum));
       return;
     }
 
     setMoreMenuSelectValue(value);
-  }, []);
+  }, [searchParams]);
+
+  var _onSearch = (0, _react.useCallback)(function (params) {
+    setSearchParams(_objectSpread({}, params));
+    if (onSearch) onSearch(params);
+  }, [onSearch, setSearchParams]);
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -401,7 +433,7 @@ function Header(props, ref) {
     relation: relationShip,
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
-    onSearch: onSearch
+    onSearch: _onSearch
   }), /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
     menuData: moreMenuData,
     popupPlacement: "bottomRight",

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

@@ -223,6 +223,7 @@ var NewOkrList = function NewOkrList(props) {
   }, [relation, toUserId, departmentId, query]);
 
   var handleOnSearch = function handleOnSearch(params) {
+    console.log('params', params);
     setQuery(_objectSpread(_objectSpread({}, query), params));
     setPageNum(1);
   };

package/package.json

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