@titaui/pc 1.15.89-beta.10 → 1.15.89-beta.13

package/lib/components/create-okr-modal/createCycle.js

@@ -50,7 +50,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function CreateCycle(_ref) {
   var cycle = _ref.cycle,
       container = _ref.container,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      _ref$className = _ref.className,
+      className = _ref$className === void 0 ? '' : _ref$className,
+      style = _ref.style;
   var popRef = (0, _react.useRef)();
   var btnRef = (0, _react.useRef)();
 
@@ -101,6 +104,8 @@ function CreateCycle(_ref) {
   }
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_style.SelectBtn, {
+    className: className,
+    style: style,
     ref: btnRef,
     onClick: onSelectClickHandler
   }, /*#__PURE__*/_react["default"].createElement("span", null, _periodSelector["default"].formatPeriod(cycle)), /*#__PURE__*/_react["default"].createElement("i", {

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

@@ -38,3 +38,11 @@
   box-sizing: content-box;
   border-radius: 12px;
 }
+
+.tita-okr-excel-create-okr-cycle__cycle-com {
+  border: 0;
+}
+
+.tita-okr-excel-create-okr-cycle__cycle-com:hover {
+  border: 0;
+}

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

@@ -11,9 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
-var _periodSelector = _interopRequireDefault(require("../../../period-selector"));
-
-var _constant = require("../../constant");
+var _createCycle = _interopRequireDefault(require("../../../create-okr-modal/createCycle"));
 
 require("./index.css");
 
@@ -72,26 +70,11 @@ var OKRCycle = function OKRCycle(update) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls)
-    }, /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
-      selected: cycle,
-      yearsRange: [2019, 2030],
-      onChange: function onChange(s) {
-        return handleChangeCycle(s);
-      },
-      noBorder: true,
-      selectorClass: "".concat(preCls, "__period-selector"),
-      className: "".concat(preCls, "__inner"),
-      style: {
-        width: '100%',
-        height: '100%'
-      },
-      showFullCycle: false
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(preCls, "__inner-item"),
-      style: {
-        background: _constant.CycleMapColor[cycle.cycleType]
-      }
-    }, _periodSelector["default"].formatPeriod(cycle))));
+    }, /*#__PURE__*/_react["default"].createElement(_createCycle["default"], {
+      className: "".concat(preCls, "__cycle-com"),
+      onChange: handleChangeCycle,
+      cycle: cycle
+    }));
   };
 };
 

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

@@ -75,7 +75,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var dicData = (0, _hooks.dic)();
 var preCls = 'tita-okr-excel-create';
 
 var getIitDatas = function getIitDatas(props) {
@@ -102,6 +101,15 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       tableClassName = _ref3$tableClassName === void 0 ? '' : _ref3$tableClassName,
       okrData = _ref3.okrData,
       onChange = _ref3.onChange;
+
+  var _useState = (0, _react.useState)({}),
+      _useState2 = _slicedToArray(_useState, 2),
+      dicData = _useState2[0],
+      setDicData = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    setDicData((0, _hooks.dic)());
+  }, []);
   var annualNum = (0, _hooks2["default"])('annualNum');
   var cycleType = (0, _hooks2["default"])('cycleType');
   var yqmNum = (0, _hooks2["default"])('yqmNum');
@@ -116,15 +124,15 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
   };
   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 _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)((0, _utils.formatDataToOKRExcelTableData)(data.current)),
       _useState4 = _slicedToArray(_useState3, 2),
-      isMax = _useState4[0],
-      setIsMax = _useState4[1];
+      excelTableData = _useState4[0],
+      setExcelTableData = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isMax = _useState6[0],
+      setIsMax = _useState6[1];
 
   var update = (0, _react.useCallback)(function (_ref4) {
     var type = _ref4.type,
@@ -143,6 +151,12 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
     }
 
     if (type === 'removeO') {
+      var effectiveKrs = data.current.filter(function (_ref5) {
+        var isDelete = _ref5.isDelete;
+        return !isDelete;
+      });
+      if (effectiveKrs.length <= 1) return;
+
       var _index = data.current.findIndex(function (item) {
         return item.uuid === uuid;
       });
@@ -152,6 +166,8 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       } else {
         data.current.splice(_index, 1);
       }
+
+      setIsMax(data.current.length >= 50);
     }
 
     if (type === 'removeKr') {
@@ -162,26 +178,27 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
         return item.uuid === uuid;
       }); // 重新计算最后一个 kr 的权重
 
-      var effectiveKrs = data.current[rootIndex].krs.filter(function (_ref5) {
-        var isDelete = _ref5.isDelete;
+      var _effectiveKrs = data.current[rootIndex].krs.filter(function (_ref6) {
+        var isDelete = _ref6.isDelete;
         return !isDelete;
       });
-      var averageWeight = parseFloat((100 / effectiveKrs.length).toFixed(1));
+
+      var averageWeight = parseFloat((100 / _effectiveKrs.length).toFixed(1));
       data.current[rootIndex].krs.splice(krIndex, 1); // 是否是均分的
 
-      var isAverage = effectiveKrs.findIndex(function (item) {
+      var isAverage = _effectiveKrs.findIndex(function (item) {
         return item.krWeight !== averageWeight;
       }) === -1;
 
       if (isAverage) {
         data.current[rootIndex].krs = data.current[rootIndex].krs.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
-            krWeight: parseFloat((100 / (effectiveKrs.length - 1)).toFixed(1))
+            krWeight: parseFloat((100 / (_effectiveKrs.length - 1)).toFixed(1))
           });
         });
       } else {
-        var newEffectiveKrs = data.current[rootIndex].krs.filter(function (_ref6) {
-          var isDelete = _ref6.isDelete;
+        var newEffectiveKrs = data.current[rootIndex].krs.filter(function (_ref7) {
+          var isDelete = _ref7.isDelete;
           return !isDelete;
         });
         var totalWeight = newEffectiveKrs.slice(0, newEffectiveKrs.length - 1).reduce(function (pre, cur) {
@@ -227,7 +244,6 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       dataIndex: 'cycle',
       key: 'cycle',
       width: 200,
-      hidden: cycleType !== '-1',
       render: (0, _okrCycle["default"])(update)
     }, {
       title: dicData['对齐目标'],
@@ -281,7 +297,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       hidden: !_setting.showKrConfidence,
       render: (0, _krConfidence["default"])(update)
     }];
-  }, []);
+  }, [dicData]);
 
   var onAddOHandler = function onAddOHandler() {
     if (isMax) return;

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

@@ -434,7 +434,7 @@ function Header(props, ref) {
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: _onSearch
-  }), /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
+  }), relationShip === 1 && /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
     menuData: moreMenuData,
     popupPlacement: "bottomRight",
     action: "click",

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

@@ -104,7 +104,6 @@ function getOkrExcelData(okrData) {
       okrExcelData.push(data);
     });
   });
-  console.log(okrExcelData);
   return okrExcelData;
 }
 
@@ -223,7 +222,6 @@ 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.10",
+  "version": "1.15.89-beta.13",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",