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

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

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

@@ -75,8 +75,6 @@ var KRWeight = function KRWeight(_ref) {
   };
 
   var handleBlur = function handleBlur(e) {
-    var _e$target$innerText$s, _e$target$innerText$s2;
-
     e.persist();
     var inputValue = parseFloat(e.target.innerText);
 
@@ -91,8 +89,7 @@ var KRWeight = function KRWeight(_ref) {
       }
     }
 
-    var pointNum = ((_e$target$innerText$s = e.target.innerText.split('.')[1]) === null || _e$target$innerText$s === void 0 ? void 0 : _e$target$innerText$s.length) >= 4 ? 4 : ((_e$target$innerText$s2 = e.target.innerText.split('.')[1]) === null || _e$target$innerText$s2 === void 0 ? void 0 : _e$target$innerText$s2.length) || 0;
-    var resultValue = Number.isNaN(inputValue) ? 0 : inputValue.toFixed(pointNum);
+    var resultValue = Number.isNaN(inputValue) ? 0 : inputValue.toFixed(1);
     setInputValue(resultValue + '%');
 
     if (onChange) {
@@ -135,17 +132,16 @@ var krWeightRenderer = function krWeightRenderer(update) {
     }, [rootData]);
 
     var handleEditKRWeight = function handleEditKRWeight(data) {
-      rootDataRef.current.krs[rowIdx].krWeight = parseFloat(data).toFixed(1);
+      rootDataRef.current.krs[rowIdx].krWeight = parseFloat(parseFloat(data).toFixed(1));
       var _rootDataRef$current$ = rootDataRef.current.krs,
           krs = _rootDataRef$current$ === void 0 ? [] : _rootDataRef$current$;
       var lastIndex = krs.length - 1;
       var totalWeight = krs.slice(0, lastIndex).reduce(function (pre, cur) {
         return pre + parseFloat(cur.krWeight);
-      }, 0);
-      console.log('totalWeight', totalWeight); // 自动计算最后一个 kr 的权重
+      }, 0); // 自动计算最后一个 kr 的权重
 
       rootDataRef.current.krs[lastIndex] = _objectSpread(_objectSpread({}, rootDataRef.current.krs[lastIndex]), {}, {
-        krWeight: (100 - totalWeight).toFixed(1)
+        krWeight: parseFloat((100 - totalWeight).toFixed(1))
       });
       update({
         type: 'update',
@@ -161,11 +157,10 @@ var krWeightRenderer = function krWeightRenderer(update) {
       }).reduce(function (pre, cur) {
         return pre + parseFloat(cur) || 0;
       }, 0);
-      console.log('totalWeight', totalWeight);
       return totalWeight <= 100;
     }, [rootData, rowIdx]);
     return /*#__PURE__*/_react["default"].createElement(KRWeight, {
-      value: data.krWeight,
+      value: (data && data.krWeight || 0).toFixed(1),
       onChange: handleEditKRWeight,
       disabled: isLast,
       onChangeBefore: onChangeBefore

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

@@ -9,6 +9,11 @@
   cursor: pointer;
 }
 
+.tita-okr-excel-create-okr-align__empty {
+  font-size: 14px;
+  color: #bfc7d5;
+}
+
 .tita-okr-excel-create-okr-align__okr {
   display: flex;
   align-items: center;
@@ -23,10 +28,6 @@
   padding: 2px 6px;
 }
 
-.tita-okr-excel-create-okr-align__okr--empty {
-  color: #bfc7d5;
-}
-
 .tita-okr-excel-create-okr-align__okr-name {
   overflow: hidden;
   text-overflow: ellipsis;

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

@@ -17,6 +17,8 @@ var _changeOkrModal = _interopRequireDefault(require("../../../change-okr-modal"
 
 var _tooltipText = _interopRequireDefault(require("../../../tooltip/tooltip-text"));
 
+var _getLocale = require("../../../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -94,7 +96,10 @@ var alignOKRRender = function alignOKRRender(update) {
     var renderAlignObj = (0, _react.useMemo)(function () {
       var _classNames;
 
-      return parent.parentName && /*#__PURE__*/_react["default"].createElement("div", {
+      if (!parent.parentName) return /*#__PURE__*/_react["default"].createElement("p", {
+        className: "".concat(preCls, "__empty")
+      }, (0, _getLocale.getLocale)('Mod_Pleaseselect'));
+      return /*#__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))

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

@@ -96,7 +96,7 @@ var Classify = function Classify(_ref) {
   }, OKRClassifyMap[value] ? /*#__PURE__*/_react["default"].createElement("img", {
     className: "".concat(prefix, "__content-img"),
     src: IconMap[value]
-  }) : null, OKRClassifyMap[value] ? OKRClassifyMap[value] : '请选择')));
+  }) : null, OKRClassifyMap[value] ? OKRClassifyMap[value] : (0, _getLocale.getLocale)('Mod_Pleaseselect'))));
 };
 
 var _default = function _default(update) {

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

@@ -11,6 +11,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _richEditor = require("@titaui/rich-editor");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _inputWithErrPopup = _interopRequireDefault(require("../../../create-okr-modal/fields/input-with-err-popup"));
+
 var _getLocale = require("../../../../utils/getLocale");
 
 var _i18nFrontTranslate = require("../../../../utils/i18n-front-translate");
@@ -19,8 +23,6 @@ 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); }
@@ -31,10 +33,6 @@ 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 _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; }
@@ -45,10 +43,24 @@ 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 _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 _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 _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; }
+
 var preCls = 'tita-okr-excel-create-okr-name';
 
 var OkrNameRenderer = function OkrNameRenderer(update, isO) {
   return function (_ref) {
+    var _okrNameData$pureText;
+
     var data = _ref.data,
         rowIdx = _ref.rowIdx,
         rootIdx = _ref.rootIdx,
@@ -65,7 +77,7 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
         // 如果不一致，则新增加的 kr 权重设置为 0
         var preKrWeight = -1;
         var updated = false;
-        rootData.krs.findIndex(function (_ref2) {
+        rootDataRef.current.krs.findIndex(function (_ref2) {
           var krWeight = _ref2.krWeight;
 
           if (preKrWeight === -1) {
@@ -76,13 +88,15 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
           if (preKrWeight !== krWeight) updated = true;
           return updated;
         });
-        rootData.krs.push(_objectSpread(_objectSpread({}, (0, _utils.getKrItemData)()), {}, {
+        rootDataRef.current.krs = [].concat(_toConsumableArray(rootDataRef.current.krs.map(function (item) {
+          return _objectSpread({}, item);
+        })), [_objectSpread(_objectSpread({}, (0, _utils.getKrItemData)()), {}, {
           krWeight: 0
-        }));
+        })]);
 
         if (!updated) {
-          var krWeight = (100 / rootData.krs.length).toFixed(1);
-          rootData.krs = rootData.krs.map(function (item) {
+          var krWeight = parseFloat((100 / rootDataRef.current.krs.length).toFixed(1));
+          rootDataRef.current.krs = rootDataRef.current.krs.map(function (item) {
             return _objectSpread(_objectSpread({}, item), {}, {
               krWeight: krWeight
             });
@@ -92,7 +106,7 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
         update({
           type: 'update',
           rootIdx: rootIdx,
-          itemData: rootData
+          itemData: rootDataRef.current
         });
       };
 
@@ -106,18 +120,13 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
 
     var _useState = (0, _react.useState)({
       richText: '',
+      pureTextExcludeAt: '',
       editorState: 'normal'
     }),
         _useState2 = _slicedToArray(_useState, 2),
         okrNameData = _useState2[0],
         setOkrNameData = _useState2[1];
 
-    (0, _react.useEffect)(function () {
-      setOkrNameData({
-        richText: data.mileStoneNameRichText
-      });
-    }, [data.mileStoneNameRichText]);
-
     var _useState3 = (0, _react.useState)(''),
         _useState4 = _slicedToArray(_useState3, 2),
         errorTip = _useState4[0],
@@ -178,6 +187,7 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
       });
     };
 
+    var length = ((_okrNameData$pureText = okrNameData.pureTextExcludeAt) === null || _okrNameData$pureText === void 0 ? void 0 : _okrNameData$pureText.length) | 0;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(preCls), _defineProperty({}, "".concat(preCls, "--isO"), isO))
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -185,14 +195,18 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
     }, isO ? 'O:' : "KR".concat(rowIdx + 1, ":")), /*#__PURE__*/_react["default"].createElement("span", {
       onClick: onRemoveHanlder,
       className: "".concat(preCls, "__close tu-icon-del")
-    }), /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
+    }), /*#__PURE__*/_react["default"].createElement(_inputWithErrPopup["default"], {
+      strLength: length,
+      maxLength: 500,
+      position: "top"
+    }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
       key: okrNameData.editorState,
       editable: true,
       initialState: JSON.parse(data.workNameRichText || data.mileStoneNameRichText || '{}'),
       onDocChange: onChangeHandler,
       ref: mentionInputRef,
       placeholder: isO ? (0, _getLocale.getLocale)('OKR_MyO_Enteobjname') : (0, _getLocale.getLocale)('OKR_MyO_Pop_FillKeyR')
-    }));
+    })));
   };
 };
 

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

@@ -53,6 +53,14 @@ 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 _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 _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."); }
@@ -125,6 +133,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
         rootUuid = _ref4.rootUuid;
 
     if (type === 'update') {
+      itemData.krs = _toConsumableArray(itemData.krs);
       data.current[rootIdx] = itemData;
     }
 
@@ -146,8 +155,38 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       });
       var krIndex = data.current[rootIndex].krs.findIndex(function (item) {
         return item.uuid === uuid;
+      }); // 重新计算最后一个 kr 的权重
+
+      var effectiveKrs = data.current[rootIndex].krs.filter(function (_ref5) {
+        var isDelete = _ref5.isDelete;
+        return !isDelete;
       });
-      data.current[rootIndex].krs[krIndex].isDelete = true;
+      var averageWeight = parseFloat((100 / effectiveKrs.length).toFixed(1));
+      data.current[rootIndex].krs[krIndex].isDelete = true; // 是否是均分的
+
+      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))
+          });
+        });
+      } else {
+        var newEffectiveKrs = data.current[rootIndex].krs.filter(function (_ref6) {
+          var isDelete = _ref6.isDelete;
+          return !isDelete;
+        });
+        var totalWeight = newEffectiveKrs.slice(0, newEffectiveKrs.length - 1).reduce(function (pre, cur) {
+          return pre + cur.krWeight;
+        }, 0);
+        newEffectiveKrs[newEffectiveKrs.length - 1].krWeight = parseFloat((100 - totalWeight).toFixed(1));
+        data.current[rootIndex].krs = data.current[rootIndex].krs.map(function (item) {
+          return _objectSpread({}, item);
+        });
+      }
     }
 
     if (onChange) onChange(data.current.map(function (item) {
@@ -274,7 +313,7 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
     className: "".concat(preCls, "__add-o")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-add1"
-  }), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)(isMax ? 'OKR_ComAll_AddObjective' : 'OKR_ComAll_AddObjective')))));
+  }), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)(isMax ? 'OKR_ComAll_Supports50' : 'OKR_ComAll_AddObjective')))));
 };
 
 var _default = OKRExcelCreate;

package/package.json

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