@titaui/pc 1.15.45-beta.3 → 1.15.46-beta.2

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

@@ -239,8 +239,11 @@ var useOkrColumns = function useOkrColumns(columns) {
   var _useState3 = (0, _react.useState)(formatColumnsByOption(optionDic, columns)),
       _useState4 = _slicedToArray(_useState3, 2),
       columnDefs = _useState4[0],
-      setColumnDefs = _useState4[1]; // 右上角控制列是否展示的数据
+      setColumnDefs = _useState4[1];
 
+  (0, _react.useEffect)(function () {
+    setColumnDefs(formatColumnsByOption(optionDic, columns));
+  }, [columns]); // 右上角控制列是否展示的数据
 
   var _useState5 = (0, _react.useState)(formatColumnCtlData(optionDic, defaultColumnCtlData())),
       _useState6 = _slicedToArray(_useState5, 2),

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

@@ -8,6 +8,15 @@
   overflow: hidden;
 }
 
+.tita-okr-excel .tita-okr-type-icon {
+  display: inline-block;
+  transform: translateY(4px);
+}
+
+.tita-okr-excel .titaui-tag {
+  transform: translateY(-1px);
+}
+
 .tita-okr-excel__column-ctl {
   position: absolute;
   background-color: #F0F4FA;
@@ -81,6 +90,8 @@
   font-size: 16px;
   font-weight: 400;
   margin-right: 8px;
+  display: inline-block;
+  transform: translateY(2.5px);
 }
 
 .tita-okr-excel__kr-name {

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

@@ -59,82 +59,85 @@ var App = function App(_ref2) {
       data = _ref2.data,
       onRefresh = _ref2.onRefresh;
   var dicData = (0, _hooks.dic)();
-
-  var _useOkrColumns = (0, _hooks.useOkrColumns)([_objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标（O）'],
-    width: 400,
-    valueGetter: 'data.workName',
-    pinned: 'left',
-    // autoHeight: true,
-    wrapText: true,
-    cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['类型'],
-    valueGetter: 'data.okrType',
-    hide: true,
-    width: 100,
-    cellRenderer: _renders.okrTypeRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['负责人'],
-    valueGetter: 'data.principalUser.name',
-    hide: true,
-    width: 100,
-    cellRenderer: _renders.userRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['对齐目标'],
-    valueGetter: 'data.parentPrincipal.principalName',
-    width: 100,
-    hide: true
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['可见范围'],
-    valueGetter: 'data.visibility',
-    width: 100,
-    hide: true,
-    cellRenderer: _renders.visibilityRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标完成度'],
-    valueGetter: 'data.progress',
-    width: 120,
-    cellRenderer: _renders.TaskProgressRenderer
-  }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-    field: dicData['目标最新进展'],
-    valueGetter: 'data.progressDescription',
-    cellRenderer: _renders.tooltipRenderer,
-    width: 200,
-    hide: true
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['关键成果（KR）'],
-    valueGetter: 'data.Kr.mileStoneName',
-    width: 400,
-    cellRenderer: (0, _renders.krNameRenderer)(onRefresh)
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 负责人'],
-    valueGetter: 'data.Kr.user.name',
-    width: 100,
-    hide: true,
-    cellRenderer: _renders.krUserRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['权重'],
-    valueGetter: 'data.Kr.krWeight',
-    width: 80,
-    hide: true,
-    cellRenderer: _renders.krWeightRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['信心指数'],
-    valueGetter: 'data.Kr.confidenceIndex',
-    width: 80,
-    cellRenderer: _renders.ConfidenceRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 完成度'],
-    valueGetter: 'data.Kr.progress',
-    width: 120,
-    cellRenderer: _renders.KrProgressRenderer
-  }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
-    field: dicData['KR 最新进展'],
-    valueGetter: 'data.Kr.progressDescription',
-    cellRenderer: _renders.tooltipRenderer,
-    width: 200
-  })]),
+  var okrColumnOptions = (0, _react.useMemo)(function () {
+    return [_objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标（O）'],
+      width: 400,
+      valueGetter: 'data.workName',
+      pinned: 'left',
+      // autoHeight: true,
+      wrapText: true,
+      cellRenderer: (0, _renders.OkrNameRenderer)(showCycle, onRefresh)
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['类型'],
+      valueGetter: 'data.okrType',
+      hide: true,
+      width: 100,
+      cellRenderer: _renders.okrTypeRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['负责人'],
+      valueGetter: 'data.principalUser.name',
+      hide: true,
+      width: 100,
+      cellRenderer: _renders.userRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['对齐目标'],
+      valueGetter: 'data.parentPrincipal.principalName',
+      width: 100,
+      hide: true
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['可见范围'],
+      valueGetter: 'data.visibility',
+      width: 100,
+      hide: true,
+      cellRenderer: _renders.visibilityRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标完成度'],
+      valueGetter: 'data.progress',
+      width: 120,
+      cellRenderer: _renders.TaskProgressRenderer
+    }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
+      field: dicData['目标最新进展'],
+      valueGetter: 'data.progressDescription',
+      cellRenderer: _renders.tooltipRenderer,
+      width: 200,
+      hide: true
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['关键成果（KR）'],
+      valueGetter: 'data.Kr.mileStoneName',
+      width: 400,
+      cellRenderer: (0, _renders.krNameRenderer)(onRefresh)
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 负责人'],
+      valueGetter: 'data.Kr.user.name',
+      width: 100,
+      hide: true,
+      cellRenderer: _renders.krUserRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['权重'],
+      valueGetter: 'data.Kr.krWeight',
+      width: 80,
+      hide: true,
+      cellRenderer: _renders.krWeightRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['信心指数'],
+      valueGetter: 'data.Kr.confidenceIndex',
+      width: 80,
+      cellRenderer: _renders.ConfidenceRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 完成度'],
+      valueGetter: 'data.Kr.progress',
+      width: 120,
+      cellRenderer: _renders.KrProgressRenderer
+    }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
+      field: dicData['KR 最新进展'],
+      valueGetter: 'data.Kr.progressDescription',
+      cellRenderer: _renders.tooltipRenderer,
+      width: 200
+    })];
+  }, [showCycle]);
+
+  var _useOkrColumns = (0, _hooks.useOkrColumns)(okrColumnOptions),
       columnDefs = _useOkrColumns.columnDefs,
       onColumnMoved = _useOkrColumns.onColumnMoved,
       onColumnResized = _useOkrColumns.onColumnResized,

package/lib/components/okr-type-icon/index.js

@@ -17,27 +17,32 @@ require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var OkrClassifyImgMapping = {
-  1: {
-    icon: _okrClassifyNuoCopy["default"],
-    text: (0, _getLocale.getLocale)('OKR_MyO_Es_Commitment')
-  },
-  2: {
-    icon: _okrClassifyYuanCopy["default"],
-    text: (0, _getLocale.getLocale)('OKR_MyO_Es_Visiontype')
-  }
+var OkrClassifyImgMapping = function OkrClassifyImgMapping(okrClassify) {
+  return {
+    1: {
+      icon: _okrClassifyNuoCopy["default"],
+      text: (0, _getLocale.getLocale)('OKR_MyO_Es_Commitment')
+    },
+    2: {
+      icon: _okrClassifyYuanCopy["default"],
+      text: (0, _getLocale.getLocale)('OKR_MyO_Es_Visiontype')
+    }
+  }[okrClassify];
 };
 
 var OkrTypeIcon = function OkrTypeIcon(_ref) {
   var okrClassify = _ref.okrClassify;
-  return !!okrClassify && /*#__PURE__*/React.createElement(_tooltip["default"], {
-    content: OkrClassifyImgMapping[okrClassify].text
+  if (!okrClassify) return '';
+  var iconConfig = OkrClassifyImgMapping(okrClassify);
+  return /*#__PURE__*/React.createElement(_tooltip["default"], {
+    overlay: iconConfig.text,
+    placement: "top"
   }, /*#__PURE__*/React.createElement("span", {
     className: "tita-okr-type-icon",
     style: {
-      backgroundImage: "url(".concat(OkrClassifyImgMapping[okrClassify].icon, ")")
+      backgroundImage: "url(".concat(iconConfig.icon, ")")
     }
-  })) || '';
+  }));
 };
 
 var _default = OkrTypeIcon;

package/lib/components/picker/range-picker/components/picker-trigger/index.js

@@ -35,6 +35,8 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
   var children = props.children,
       focused = props.focused,
       viewDate = props.viewDate,
+      _props$triggerClassNa = props.triggerClassName,
+      triggerClassName = _props$triggerClassNa === void 0 ? '' : _props$triggerClassNa,
       disabled = props.disabled,
       allowClear = props.allowClear,
       placeholder = props.placeholder,
@@ -77,7 +79,7 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
         return !disabled && _onClick();
       }
     }, children) : /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames)),
+      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames), triggerClassName),
       onClick: function onClick() {
         return !disabled && _onClick();
       }

package/lib/components/tag/index.css

@@ -1,14 +1,14 @@
 .titaui-tag {
   height: 18px;
   margin-left: 6px;
-  padding: 2px 8px;
+  padding: 0 8px;
   font-size: 12px;
-  line-height: 14px;
   border-radius: 9px;
   background: #f7f8fa;
   box-sizing: border-box;
   color: #a4acb9;
-  display: inline-block;
+  display: inline-flex;
+  align-items: center;
   white-space: nowrap;
   font-weight: 400;
 }

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

@@ -87,12 +87,6 @@ var viewConfig = function viewConfig() {
   };
 };
 
-var isSelfTenant = function isSelfTenant() {
-  return ['352728', '564003', '511477', '596303', // 正式环境
-  '500019', '500017', '500011', '500036' // 测试环境
-  ].includes(String((0, _bsGlobal.getBSGlobal)('tenantInfo').Id));
-};
-
 var getTableTip = function getTableTip() {
   return !localStorage.getItem("OkrTableTypeTip_".concat(window.BSGlobal.loginUserInfo.Id));
 };
@@ -101,8 +95,24 @@ var setTableTip = function setTableTip() {
   localStorage.setItem("OkrTableTypeTip_".concat(window.BSGlobal.loginUserInfo.Id), 'true');
 };
 
+var titaTracker = function titaTracker(type) {
+  var name = {
+    card: '卡片',
+    table: '表格',
+    map: '地图'
+  }[type];
+
+  if (window.titaTracker && !localStorage.getItem('titaccc')) {
+    window.titaTracker("action").record({
+      productName: "OKR展示模式",
+      actionGroup: "选择OKR展示模式",
+      actionName: "\u9009\u62E9OKR\u5C55\u793A\u6A21\u5F0F\uFF1A".concat(name)
+    });
+  }
+};
+
 var getViewTypeMenuData = function getViewTypeMenuData(relationShip) {
-  return isSelfTenant() ? [{
+  return [{
     label: /*#__PURE__*/_react["default"].createElement("p", {
       className: "".concat(_precls.precls, "__view-tyoe-list-item")
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -124,21 +134,6 @@ var getViewTypeMenuData = function getViewTypeMenuData(relationShip) {
     }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'))),
     value: 'map',
     visible: relationShip === 1
-  }] : [{
-    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',
-    visible: relationShip === 1
   }];
 };
 
@@ -304,6 +299,8 @@ function Header(props, ref) {
   };
 
   var onChangeViewTypeHandler = (0, _react.useCallback)(function (type) {
+    titaTracker(type);
+
     if (type === ViewType.Map) {
       gotoOkrMap();
       return;

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

@@ -102,7 +102,9 @@ function getOkrExcelData(okrData) {
         })
       });
 
-      if (i === 0) data.rowSpan = okrInfo.Krs.length;
+      if (i === 0) data.rowSpan = okrInfo.Krs.filter(function (kr) {
+        return kr.mileStoneId;
+      }).length;
       okrExcelData.push(data);
     });
   });

package/package.json

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