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

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

@@ -11,6 +11,15 @@
   box-sizing: border-box;
 }
 
+.tita-okr-excel-create-kr-weight__error-tip .rc-tooltip-inner {
+  color: #f05e5e;
+  background-color: #fff;
+}
+
+.tita-okr-excel-create-kr-weight__error-tip .rc-tooltip-arrow {
+  border-top-color: #fff;
+}
+
 .tita-okr-excel-create-kr-weight--disabled {
   background: #F0F4FA;
 }

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

@@ -9,6 +9,10 @@ exports["default"] = void 0;
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
+
+var _getLocale = require("../../../../utils/getLocale");
+
 var _react = _interopRequireWildcard(require("react"));
 
 require("./index.css");
@@ -44,12 +48,18 @@ var KRWeight = function KRWeight(_ref) {
       value = _ref$value === void 0 ? 100 : _ref$value,
       onChange = _ref.onChange,
       disabled = _ref.disabled,
-      onChangeBefore = _ref.onChangeBefore;
+      onChangeBefore = _ref.onChangeBefore,
+      checkError = _ref.checkError;
 
-  var _useState = (0, _react.useState)(value + '%'),
+  var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
-      inputValue = _useState2[0],
-      setInputValue = _useState2[1];
+      errorMessage = _useState2[0],
+      setErrorMessage = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(value + '%'),
+      _useState4 = _slicedToArray(_useState3, 2),
+      inputValue = _useState4[0],
+      setInputValue = _useState4[1];
 
   var domRef = (0, _react.useRef)(document.createElement('div'));
   var cacheValue = (0, _react.useRef)();
@@ -74,27 +84,51 @@ var KRWeight = function KRWeight(_ref) {
     }, 0);
   };
 
+  var changeValue = function changeValue(inputValue) {
+    var setInput = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    var resultValue = Number.isNaN(inputValue) ? 0 : inputValue.toFixed(1);
+
+    if (checkError) {
+      var _errorMessage = checkError(resultValue);
+
+      if (_errorMessage) {
+        setErrorMessage(_errorMessage);
+        return;
+      }
+    }
+
+    if (setInput) setInputValue(resultValue + '%');
+    if (onChange) onChange(parseFloat(resultValue));
+  };
+
+  var resetCache = function resetCache() {
+    var _cacheValue$current;
+
+    var value = cacheValue.current ? parseFloat((_cacheValue$current = cacheValue.current) === null || _cacheValue$current === void 0 ? void 0 : _cacheValue$current.toFixed(1)) : 0;
+    setInputValue(value + '%');
+    changeValue(value);
+  };
+
   var handleBlur = function handleBlur(e) {
     e.persist();
     var inputValue = parseFloat(e.target.innerText);
 
+    if (errorMessage) {
+      resetCache();
+      setErrorMessage('');
+      return;
+    }
+
     if (onChangeBefore) {
       var success = onChangeBefore(inputValue);
 
       if (!success) {
-        var _cacheValue$current;
-
-        if (!cacheValue.current) setInputValue('0%');else setInputValue(((_cacheValue$current = cacheValue.current) === null || _cacheValue$current === void 0 ? void 0 : _cacheValue$current.toFixed(1)) + '%');
+        resetCache();
         return;
       }
     }
 
-    var resultValue = Number.isNaN(inputValue) ? 0 : inputValue.toFixed(1);
-    setInputValue(resultValue + '%');
-
-    if (onChange) {
-      onChange(parseFloat(resultValue));
-    }
+    changeValue(inputValue);
   };
 
   var handleKeyUp = function handleKeyUp(e) {
@@ -102,20 +136,29 @@ var KRWeight = function KRWeight(_ref) {
 
     if (e.keyCode === 13) {
       domRef.current.blur();
+    } else {
+      var _inputValue = parseFloat(e.target.innerText);
+
+      changeValue(_inputValue, false);
     }
   };
 
   (0, _react.useEffect)(function () {
     setInputValue(value + '%');
   }, [value]);
-  return /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: errorMessage,
+    placement: "top",
+    visible: !!errorMessage,
+    overlayClassName: "".concat(prefix, "__error-tip")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(prefix, _defineProperty({}, "".concat(prefix, "--disabled"), disabled)),
     contentEditable: !disabled,
     onFocus: handleFocus,
     onBlur: handleBlur,
     onKeyUp: handleKeyUp,
     ref: domRef
-  }, inputValue);
+  }, inputValue));
 };
 
 var krWeightRenderer = function krWeightRenderer(update) {
@@ -157,13 +200,13 @@ var krWeightRenderer = function krWeightRenderer(update) {
       }).reduce(function (pre, cur) {
         return pre + parseFloat(cur) || 0;
       }, 0);
-      return totalWeight <= 100;
+      return totalWeight > 100 ? (0, _getLocale.getLocale)('OKR_MyO_Pop_Totalkrnot100') : '';
     }, [rootData, rowIdx]);
     return /*#__PURE__*/_react["default"].createElement(KRWeight, {
       value: (data && data.krWeight || 0).toFixed(1),
       onChange: handleEditKRWeight,
       disabled: isLast,
-      onChangeBefore: onChangeBefore
+      checkError: onChangeBefore
     });
   };
 };

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

@@ -40,9 +40,9 @@
 }
 
 .tita-okr-excel-create-okr-cycle__cycle-com {
-  border: 0;
+  border: 0 !important;
 }
 
 .tita-okr-excel-create-okr-cycle__cycle-com:hover {
-  border: 0;
+  border: 0 !important;
 }

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

@@ -7,6 +7,10 @@
   background-color: #f0f4fa;
 }
 
+.tita-okr-excel-create--disabled-remove .tita-okr-excel-create-okr-name--isO .tita-okr-excel-create-okr-name__close {
+  display: none;
+}
+
 .tita-okr-excel-create__add-o {
   box-sizing: border-box;
   height: 40px;

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

@@ -43,6 +43,8 @@ require("./index.css");
 
 var _setting = require("./setting");
 
+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); }
@@ -134,6 +136,11 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
       isMax = _useState6[0],
       setIsMax = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      hiddenRemoveIcon = _useState8[0],
+      setHiddenRemoveIcon = _useState8[1];
+
   var update = (0, _react.useCallback)(function (_ref4) {
     var type = _ref4.type,
         rowIdx = _ref4.rowIdx,
@@ -151,12 +158,6 @@ 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;
       });
@@ -167,7 +168,13 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
         data.current.splice(_index, 1);
       }
 
-      setIsMax(data.current.length >= 50);
+      setIsMax(data.current.length >= 50); // 如果只剩最后一个了则隐藏删除按钮
+
+      var effectiveKrs = data.current.filter(function (_ref5) {
+        var isDelete = _ref5.isDelete;
+        return !isDelete;
+      });
+      setHiddenRemoveIcon(effectiveKrs.length <= 1);
     }
 
     if (type === 'removeKr') {
@@ -308,7 +315,13 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
         childs: null
       });
     }));
-    setIsMax(data.current.length >= 50);
+    setIsMax(data.current.length >= 50); // 如果只剩最后一个了则隐藏删除按钮
+
+    var effectiveKrs = data.current.filter(function (_ref8) {
+      var isDelete = _ref8.isDelete;
+      return !isDelete;
+    });
+    setHiddenRemoveIcon(effectiveKrs.length <= 1);
   }; // {/* <PopupSelect
   //   menuData={columnCtlData}
   //   popupPlacement="bottomLeft"
@@ -324,12 +337,11 @@ var OKRExcelCreate = function OKRExcelCreate(_ref3) {
   // </PopupSelect> */}
 
 
+  console.log('hiddenRemoveIcon', hiddenRemoveIcon);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ag-theme-material ".concat(className)
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ag-theme-alpine"
+    className: "".concat(className)
   }, /*#__PURE__*/_react["default"].createElement(_tableExcelV["default"], {
-    className: "".concat(preCls, "__table-excel-v2 ").concat(tableClassName),
+    className: (0, _classnames["default"])("".concat(preCls, "__table-excel-v2 ").concat(tableClassName), _defineProperty({}, "".concat(preCls, "--disabled-remove"), hiddenRemoveIcon)),
     rowKey: "uuid",
     columns: columnsOption,
     dataSource: excelTableData
@@ -338,7 +350,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_Supports50' : '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.13",
+  "version": "1.15.89-beta.16",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",