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

package/lib/components/create-okr-modal/fields/okr-visibility.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = _default;
+exports.visibilityMapText = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -52,6 +53,8 @@ var visibilityMapText = function visibilityMapText() {
   };
 };
 
+exports.visibilityMapText = visibilityMapText;
+
 function _default(_ref) {
   var visibility = _ref.visibility,
       setVisibility = _ref.setVisibility,

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([].concat(result));
+        setRawTreeData(_toConsumableArray(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

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

@@ -11,13 +11,21 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 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 _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; }
+
+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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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 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; }
 
@@ -25,6 +33,27 @@ 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 columnOptionVersion = '1.0.0';
+
+// 判断是否需要重置缓存，避免出现客户端缓存无法失效问题
+function needCoverCache(optionDic, columns) {
+  var cacheVersion = localStorage.getItem('columnOptionVersion'); // 如果版本号不一致
+
+  if (cacheVersion !== columnOptionVersion) {
+    localStorage.setItem('columnOptionVersion', columnOptionVersion);
+    return true;
+  } // 如果 columns 有新增的列时
+
+
+  var newColumn = columns.find(function (item) {
+    return !optionDic[item.field];
+  }); // 这里这么写方便后续扩展
+
+  if (newColumn) return true;
+  return false;
+}
+
 function createDefaultOptions(columns) {
   var optionDic = {};
   columns.forEach(function (item, idx) {
@@ -41,7 +70,7 @@ function createDefaultOptions(columns) {
 function getCacheColumnOptions(columns) {
   var optionStr = localStorage.getItem('cacheOkrColumnOptions') || '{}';
   var optionDic = JSON.parse(optionStr);
-  if (optionStr === '{}') optionDic = createDefaultOptions(columns);
+  if (optionStr === '{}' || needCoverCache(optionDic, columns)) optionDic = createDefaultOptions(columns);
   return optionDic;
 }
 
@@ -61,7 +90,7 @@ function formatColumnsByOption(optionDic, columns) {
       });
     });
   } catch (error) {
-    // 当系统改版，columns 栏目发生变化时，会导致缓存的 options 与 columns 对不上的情况，这里直接将缓存重置
+    // 避免解析过程中发生错误导致列无法展示
     setCacheColumnOptions(createDefaultOptions(columns));
     return columns;
   }
@@ -69,6 +98,72 @@ function formatColumnsByOption(optionDic, columns) {
   return formatColumn;
 }
 
+var defaultColumnCtlData = [{
+  label: '目标',
+  value: 'O',
+  type: 'group',
+  children: [{
+    label: '目标（O）',
+    value: '0,0,目标（O）'
+  }, {
+    label: '类型',
+    value: '0,1,类型'
+  }, {
+    label: '负责人',
+    value: '0,2,负责人'
+  }, {
+    label: '对齐目标',
+    value: '0,3,对齐目标'
+  }, {
+    label: '可见范围',
+    value: '0,4,可见范围'
+  }, {
+    label: '目标完成度',
+    value: '0,5,目标完成度'
+  }, {
+    label: '目标最新进展',
+    value: '0,6,目标最新进展'
+  }]
+}, {
+  label: '关键成果',
+  value: 'KR',
+  type: 'group',
+  children: [{
+    label: '关键成果（KR）',
+    value: '1,0,关键成果（KR）'
+  }, {
+    label: 'KR 负责人',
+    value: '1,1,KR 负责人'
+  }, {
+    label: '信心指数',
+    value: '1,2,信心指数'
+  }, {
+    label: '权重',
+    value: '1,3,权重'
+  }, {
+    label: 'KR 完成度',
+    value: '1,4,KR 完成度'
+  }, {
+    label: 'KR 最新进展',
+    value: '1,5,KR 最新进展'
+  }]
+}]; // 标记展示的列
+
+function formatColumnCtlData(optionDic, columnCtlData) {
+  columnCtlData.map(function (item) {
+    return item.children || [];
+  }).reduce(function (pre, cur) {
+    return [].concat(_toConsumableArray(pre), _toConsumableArray(cur));
+  }).forEach(function (item) {
+    if (optionDic[item.label]) {
+      item.checked = !optionDic[item.label].hide;
+    } else {
+      item.checked = false;
+    }
+  });
+  return columnCtlData;
+}
+
 var useOkrColumns = function useOkrColumns(columns) {
   var _useState = (0, _react.useState)(getCacheColumnOptions(columns)),
       _useState2 = _slicedToArray(_useState, 2),
@@ -76,8 +171,15 @@ var useOkrColumns = function useOkrColumns(columns) {
       setOptionDic = _useState2[1];
 
   var _useState3 = (0, _react.useState)(formatColumnsByOption(optionDic, columns)),
-      _useState4 = _slicedToArray(_useState3, 1),
-      columnDefs = _useState4[0]; // 用于处理列的移动事件，在用户下次访问时保持该顺序
+      _useState4 = _slicedToArray(_useState3, 2),
+      columnDefs = _useState4[0],
+      setColumnDefs = _useState4[1]; // 右上角控制列是否展示的数据
+
+
+  var _useState5 = (0, _react.useState)(formatColumnCtlData(optionDic, defaultColumnCtlData)),
+      _useState6 = _slicedToArray(_useState5, 2),
+      columnCtlData = _useState6[0],
+      setColumnCtlData = _useState6[1]; // 用于处理列的移动事件，在用户下次访问时保持该顺序
 
 
   var onColumnMoved = (0, _react.useCallback)(function (moveField, toIndex) {
@@ -106,10 +208,35 @@ var useOkrColumns = function useOkrColumns(columns) {
     setOptionDic(_objectSpread({}, optionDic));
     setCacheColumnOptions(optionDic);
   }, [optionDic]);
+  var onColumnsHideOrShow = (0, _react.useCallback)(function (value) {
+    var _columnCtlData$level;
+
+    var _ref = value.split(','),
+        _ref2 = _slicedToArray(_ref, 3),
+        level1Idx = _ref2[0],
+        level2Idx = _ref2[1],
+        fieldName = _ref2[2]; // @ts-ignore
+
+
+    var itemChecked = (_columnCtlData$level = columnCtlData[level1Idx]) === null || _columnCtlData$level === void 0 ? void 0 : _columnCtlData$level.children[level2Idx].checked;
+    var checked = !itemChecked; // @ts-ignore
+
+    columnCtlData[level1Idx].children[level2Idx].checked = checked;
+    setColumnCtlData(_toConsumableArray(columnCtlData));
+
+    if (optionDic[fieldName]) {
+      optionDic[fieldName].hide = !checked;
+      setOptionDic(_objectSpread({}, optionDic));
+      setColumnDefs(formatColumnsByOption(optionDic, columns));
+      setCacheColumnOptions(optionDic);
+    }
+  }, [columnCtlData, columns]);
   return {
     columnDefs: columnDefs,
     onColumnMoved: onColumnMoved,
-    onColumnResized: onColumnResized
+    onColumnResized: onColumnResized,
+    columnCtlData: columnCtlData,
+    onColumnsHideOrShow: onColumnsHideOrShow
   };
 };
 

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

@@ -1,3 +1,43 @@
+.tita-okr-excel {
+  position: relative;
+}
+
+.tita-okr-excel__column-ctl {
+  position: absolute;
+  background-color: #F0F4FA;
+  right: 4px;
+  top: 4px;
+  width: 32px;
+  height: 32px;
+  border-radius: 8px;
+  z-index: 3;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 16px;
+  cursor: pointer;
+  transition: background-color .3s;
+}
+
+.tita-okr-excel__column-ctl span {
+  color: #939aa6;
+}
+
+.tita-okr-excel__column-ctl:hover {
+  background-color: #e2e7ec;
+}
+
+.tita-okr-excel__okr-type {
+  display: flex;
+  align-items: center;
+  color: #89919f;
+  font-size: 13px;
+}
+
+.tita-okr-excel__okr-type span {
+  margin-right: 4px;
+}
+
 .tita-okr-excel__okr-name {
   color: #141C28;
   font-size: 14;
@@ -6,12 +46,20 @@
   font-weight: bold;
   cursor: pointer;
   transition: color .3s;
+  flex-wrap: wrap;
 }
 
 .tita-okr-excel__okr-name:hover {
   color: #2879ff;
 }
 
+.tita-okr-excel__okr-icon {
+  color: #2879ff;
+  font-size: 16px;
+  font-weight: 400;
+  margin-right: 8px;
+}
+
 .tita-okr-excel__kr-name {
   white-space: wrap;
   cursor: pointer;

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

@@ -17,6 +17,8 @@ var _tableExcel = _interopRequireDefault(require("../table-excel"));
 
 var _hooks2 = require("../../utils/hooks");
 
+var _popupSelect = _interopRequireDefault(require("../popup-select"));
+
 require("ag-grid-community/styles/ag-grid.css");
 
 require("ag-grid-community/styles/ag-theme-material.css");
@@ -50,6 +52,7 @@ var defaultSpanOption = {
     'cell-span': 'data.rowSpan > 1'
   }
 };
+var preCls = 'tita-okr-excel';
 
 var App = function App(_ref2) {
   var showCycle = _ref2.showCycle,
@@ -60,7 +63,28 @@ var App = function App(_ref2) {
     field: '目标（O）',
     width: 400,
     valueGetter: 'data.workName',
+    // autoHeight: true,
+    wrapText: true,
     cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)
+  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+    field: '类型',
+    valueGetter: 'data.okrType',
+    width: 100,
+    cellRenderer: _renders.okrTypeRenderer
+  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+    field: '负责人',
+    valueGetter: 'data.principalUser.name',
+    width: 100,
+    cellRenderer: _renders.userRenderer
+  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+    field: '对齐目标',
+    valueGetter: 'data.parentPrincipal.principalName',
+    width: 100
+  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+    field: '可见范围',
+    valueGetter: 'data.visibility',
+    width: 100,
+    cellRenderer: _renders.visibilityRenderer
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: '目标完成度',
     valueGetter: 'data.progress',
@@ -69,14 +93,15 @@ var App = function App(_ref2) {
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: '目标最新进展',
     valueGetter: 'data.progressDescription',
+    cellRenderer: _renders.tooltipRenderer,
     width: 200
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: '关键结果（KR）',
+    field: '关键成果（KR）',
     valueGetter: 'data.Kr.mileStoneName',
     width: 400,
     cellRenderer: (0, _renders.krNameRenderer)(onRefresh)
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: '负责人',
+    field: 'KR 负责人',
     valueGetter: 'data.Kr.user.name',
     width: 100,
     cellRenderer: _renders.krUserRenderer
@@ -98,11 +123,14 @@ var App = function App(_ref2) {
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
     field: 'KR 最新进展',
     valueGetter: 'data.Kr.progressDescription',
+    cellRenderer: _renders.tooltipRenderer,
     width: 200
   })]),
       columnDefs = _useOkrColumns.columnDefs,
       onColumnMoved = _useOkrColumns.onColumnMoved,
-      onColumnResized = _useOkrColumns.onColumnResized;
+      onColumnResized = _useOkrColumns.onColumnResized,
+      columnCtlData = _useOkrColumns.columnCtlData,
+      onColumnsHideOrShow = _useOkrColumns.onColumnsHideOrShow;
 
   var onColumnMovedHandler = (0, _react.useCallback)(function (event) {
     var moveField = event.column.colId;
@@ -117,9 +145,21 @@ var App = function App(_ref2) {
   }, {
     wait: 200
   });
+  console.log('data', data);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ag-theme-material tita-okr-excel"
-  }, /*#__PURE__*/_react["default"].createElement(_tableExcel["default"], {
+    className: "ag-theme-material ".concat(preCls)
+  }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
+    menuData: columnCtlData,
+    popupPlacement: "bottomLeft",
+    action: "click",
+    mode: "checkbox",
+    height: 292,
+    onChange: onColumnsHideOrShow
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__column-ctl")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-fenlei"
+  }))), /*#__PURE__*/_react["default"].createElement(_tableExcel["default"], {
     headerHeight: 40,
     rowHeight: 38,
     suppressRowTransform: true,

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.krWeightRenderer = exports.krUserRenderer = exports.krNameRenderer = exports.getStatus = exports.TaskProgressRenderer = exports.OkrNameRenderer = exports.KrProgressRenderer = exports.EObjType = exports.ConfidenceRenderer = void 0;
+exports.visibilityRenderer = exports.userRenderer = exports.tooltipRenderer = exports.okrTypeRenderer = exports.krWeightRenderer = exports.krUserRenderer = exports.krNameRenderer = exports.getStatus = exports.TaskProgressRenderer = exports.OkrNameRenderer = exports.KrProgressRenderer = exports.EObjType = exports.ConfidenceRenderer = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -17,6 +17,10 @@ var _newConfidence = _interopRequireDefault(require("../new-confidence"));
 
 var _drawerManager = _interopRequireDefault(require("../drawer-manager"));
 
+var _openData = require("../../utils/open-data");
+
+var _tooltip = _interopRequireDefault(require("../tooltip"));
+
 var _avatar = _interopRequireDefault(require("../avatar"));
 
 var _periodSelector = _interopRequireDefault(require("../period-selector"));
@@ -25,6 +29,8 @@ var _tag = _interopRequireDefault(require("../tag"));
 
 var _getLocale = require("../../utils/getLocale");
 
+var _okrVisibility = require("../create-okr-modal/fields/okr-visibility");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -50,6 +56,10 @@ function formatCycleData(periodParams, getCycleRange) {
 
 var OkrNameRenderer = function OkrNameRenderer(showCycle, onRefresh) {
   return function (params) {
+    if (!params.data.workId) return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "excel-blank"
+    });
+
     var onOpendrawer = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -87,7 +97,12 @@ var OkrNameRenderer = function OkrNameRenderer(showCycle, onRefresh) {
     return /*#__PURE__*/_react["default"].createElement("p", {
       onClick: onOpendrawer,
       className: "".concat(preCls, "__okr-name")
-    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value), showCycle && /*#__PURE__*/_react["default"].createElement(_tag["default"], {
+    }, /*#__PURE__*/_react["default"].createElement("i", {
+      className: "".concat(preCls, "__okr-icon tu-icon-H5-O-s")
+    }), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: params.value,
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value)), showCycle && /*#__PURE__*/_react["default"].createElement(_tag["default"], {
       backgroundColor: "rgba(40,121,255,.16)",
       color: "#3f4755"
     }, formatCycleData(period, false)), /*#__PURE__*/_react["default"].createElement(_okrTypeIcon["default"], {
@@ -132,7 +147,10 @@ var krNameRenderer = function krNameRenderer(onRefresh) {
       className: "".concat(preCls, "__kr-name")
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__kr-name__index")
-    }, "KR", params.data.Kr.index + 1), ' ', /*#__PURE__*/_react["default"].createElement("span", null, params.value));
+    }, "KR", params.data.Kr.index + 1), ' ', /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: params.value,
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value)));
   };
 };
 
@@ -217,4 +235,83 @@ var krUserRenderer = function krUserRenderer(_ref7) {
   }), value);
 };
 
-exports.krUserRenderer = krUserRenderer;
+exports.krUserRenderer = krUserRenderer;
+
+var userRenderer = function userRenderer(_ref8) {
+  var value = _ref8.value,
+      data = _ref8.data;
+  if (!data.principalUser || !data.workId) return '';
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__kr-user")
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    src: data.principalUser.avatar.small,
+    name: value,
+    color: "#2879ff"
+  }), value);
+};
+
+exports.userRenderer = userRenderer;
+
+var getOkrTypeOption = function getOkrTypeOption(data) {
+  var okrType = data.okrType,
+      departmentId = data.departmentId,
+      departmentName = data.departmentName,
+      groupName = data.groupName;
+  return {
+    1: {
+      icon: 'tu-icon-liebiao-geren',
+      text: (0, _getLocale.getLocale)('OKR_MyO_Pop_Individual')
+    },
+    // 个人目标
+    2: {
+      icon: 'tu-icon-liebiao-xiashu',
+      text: /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+        name: departmentName,
+        id: departmentId
+      })
+    },
+    // 部门级目标
+    3: {
+      icon: 'tu-icon-gong_si',
+      text: (0, _getLocale.getLocale)('OKR_MyO_Pop_Company')
+    },
+    // 公司级目标
+    4: {
+      icon: 'tu-icon-liebiao-tuandui',
+      text: groupName || (0, _getLocale.getLocale)('OKR_MyO_Text_Team')
+    } // 团队目标
+
+  }[okrType];
+};
+
+var okrTypeRenderer = function okrTypeRenderer(_ref9) {
+  var data = _ref9.data;
+  if (!data.workId) return '';
+  var option = getOkrTypeOption(data);
+  return /*#__PURE__*/_react["default"].createElement("p", {
+    className: "".concat(preCls, "__okr-type")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: option.icon
+  }), option.text);
+};
+
+exports.okrTypeRenderer = okrTypeRenderer;
+
+var visibilityRenderer = function visibilityRenderer(_ref10) {
+  var value = _ref10.value,
+      data = _ref10.data;
+  if (!data.workId) return '';
+  var visibilityText = (0, _okrVisibility.visibilityMapText)()[value];
+  return visibilityText;
+};
+
+exports.visibilityRenderer = visibilityRenderer;
+
+var tooltipRenderer = function tooltipRenderer(params) {
+  return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: params.value,
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("p", null, params.value));
+};
+
+exports.tooltipRenderer = tooltipRenderer;

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

@@ -1,20 +1,53 @@
 .titaui-popup-select__menu-list {
-  padding: 16px 0;
+  overflow-y: auto;
+  padding: 16px;
   background-color: #fff;
   border-radius: 12px;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
 }
 
+.titaui-popup-select__menu-list p:first-child {
+  margin-top: 0;
+}
+
+.titaui-popup-select__menu-list__group-title {
+  margin-top: 17px;
+  padding: 0 8px 4px 8px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #6F7886;
+  line-height: 18px;
+}
+
 .titaui-popup-select__menu-list__item {
   min-width: 40px;
   display: flex;
-  justify-content: center;
-  padding: 5px 20px;
+  padding: 0 16px;
+  padding: 5px 8px;
   cursor: pointer;
+  border-radius: 8px;
+  font-size: 14px;
   transition: background-color .3s, color .3s;
 }
 
 .titaui-popup-select__menu-list__item:hover {
-  background-color: #f7f8fa;
+  background: #F7F8FA;
+}
+
+.titaui-popup-select__checkbox {
+  display: flex;
+  font-size: 14px;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.titaui-popup-select__checkbox-icon {
   color: #2879ff;
+  opacity: 0;
+  margin-left: 10px;
+}
+
+.titaui-popup-select__checkbox-icon--checked {
+  opacity: 1;
 }

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

@@ -7,20 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
 require("./index.css");
 
-var _excluded = ["className", "style", "children", "menuData", "onChange", "visable", "action", "onVisableChange"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _excluded = ["className", "style", "children", "menuData", "onChange", "visable", "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); }
 
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -39,8 +41,27 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = 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; }
+
 var preCls = 'titaui-popup-select';
 
+function getItem(item, mode) {
+  switch (mode) {
+    case 'list':
+      return item.label;
+
+    case 'checkbox':
+      return /*#__PURE__*/_react["default"].createElement("p", {
+        className: "".concat(preCls, "__checkbox")
+      }, /*#__PURE__*/_react["default"].createElement("span", null, item.label), /*#__PURE__*/_react["default"].createElement("span", {
+        className: (0, _classnames["default"])("tu-icon-finished ".concat(preCls, "__checkbox-icon"), _defineProperty({}, "".concat(preCls, "__checkbox-icon--checked"), item.checked))
+      }));
+
+    default:
+      return '';
+  }
+}
+
 var PopupSelect = function PopupSelect(_ref) {
   var className = _ref.className,
       style = _ref.style,
@@ -51,6 +72,9 @@ var PopupSelect = function PopupSelect(_ref) {
       _ref$action = _ref.action,
       action = _ref$action === void 0 ? 'click' : _ref$action,
       onVisableChange = _ref.onVisableChange,
+      _ref$mode = _ref.mode,
+      mode = _ref$mode === void 0 ? 'list' : _ref$mode,
+      height = _ref.height,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var _useState = (0, _react.useState)(visable),
@@ -66,15 +90,33 @@ var PopupSelect = function PopupSelect(_ref) {
       if (onChange) onChange(value, item, idx);
     };
 
-    return /*#__PURE__*/_react["default"].createElement("ul", {
-      className: "".concat(preCls, "__menu-list")
-    }, menuData.map(function (item, idx) {
-      return /*#__PURE__*/_react["default"].createElement("li", {
+    var getLi = function getLi(item, idx) {
+      var _item$children;
+
+      if (item.type !== 'group') {
+        return /*#__PURE__*/_react["default"].createElement("li", {
+          key: item.value,
+          onClick: onSelectItem.bind(null, item.value, item, idx),
+          className: "".concat(preCls, "__menu-list__item")
+        }, getItem(item, mode));
+      }
+
+      var liList = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map(getLi);
+
+      var groupTitle = /*#__PURE__*/_react["default"].createElement("p", {
         key: item.value,
-        onClick: onSelectItem.bind(null, item.value, item, idx),
-        className: "".concat(preCls, "__menu-list__item")
+        className: "".concat(preCls, "__menu-list__group-title")
       }, item.label);
-    }));
+
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, groupTitle, liList);
+    };
+
+    return /*#__PURE__*/_react["default"].createElement("ul", {
+      className: "".concat(preCls, "__menu-list"),
+      style: {
+        height: height
+      }
+    }, menuData.map(getLi));
   }, [menuData, onChange]);
   var onPopupVisableChange = (0, _react.useCallback)(function (visable) {
     setSelfVisable(visable);

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

@@ -33,6 +33,10 @@
   color: #89919F;
 }
 
+.titaui-table-excel .ag-header-cell {
+  padding: 0 12px;
+}
+
 .titaui-table-excel .ag-cell {
   padding: 0 12px;
   border-right: var(--ag-borders-row) var(--ag-row-border-color) !important;

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

@@ -34,7 +34,7 @@
   align-items: center;
   background: #fff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
-  width: 36px;
+  min-width: 36px;
   height: 36px;
   border-radius: 18px;
   font-size: 20px;
@@ -45,6 +45,32 @@
   color: #2879ff;
 }
 
+.tita-okr-list-v2__header-icon--view-type {
+  padding: 0 14px;
+  display: flex;
+  box-sizing: border-box;
+  justify-content: center;
+  align-items: center;
+  background: #fff;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  min-width: 36px;
+  height: 36px;
+  border-radius: 18px;
+  font-size: 20px;
+}
+
+.tita-okr-list-v2__header-icon--view-type:hover {
+  cursor: pointer;
+  color: #2879ff;
+}
+
+.tita-okr-list-v2__header-down-icon {
+  font-size: 16px;
+  transform: scale(0.5);
+  margin-left: 4px;
+  color: #6f7886;
+}
+
 .tita-okr-list-v2__header-record {
   display: flex;
   box-sizing: border-box;

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

@@ -275,15 +275,17 @@ function Header(props, ref) {
   }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
     menuData: viewTypeMenuData,
     popupPlacement: "bottom",
-    action: "hover",
+    action: "click",
     onChange: onChangeViewTypeHandler
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(_precls.precls, "__header-icon")
+    className: "".concat(_precls.precls, "__header-icon--view-type")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-yangshi-ditu"
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-caret-down ".concat(_precls.precls, "__header-down-icon")
   })))))), /*#__PURE__*/_react["default"].createElement(_comments["default"], {
     toUserId: toUserId,
     relation: relationShip,

package/package.json

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