@titaui/pc 1.15.89-beta.17 → 1.15.89-beta.18

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

@@ -51,15 +51,20 @@ var KRWeight = function KRWeight(_ref) {
       onChangeBefore = _ref.onChangeBefore,
       checkError = _ref.checkError;
 
-  var _useState = (0, _react.useState)(''),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      errorMessage = _useState2[0],
-      setErrorMessage = _useState2[1];
+      hasError = _useState2[0],
+      setHasError = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(value + '%'),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
-      inputValue = _useState4[0],
-      setInputValue = _useState4[1];
+      errorMessage = _useState4[0],
+      setErrorMessage = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(value + '%'),
+      _useState6 = _slicedToArray(_useState5, 2),
+      inputValue = _useState6[0],
+      setInputValue = _useState6[1];
 
   var domRef = (0, _react.useRef)(document.createElement('div'));
   var cacheValue = (0, _react.useRef)();
@@ -91,10 +96,14 @@ var KRWeight = function KRWeight(_ref) {
     if (checkError) {
       var _errorMessage = checkError(resultValue);
 
-      if (_errorMessage) {
+      if (_errorMessage !== false) {
+        setHasError(true);
         setErrorMessage(_errorMessage);
         return;
-      } else setErrorMessage('');
+      } else {
+        setErrorMessage('');
+        setHasError(false);
+      }
     }
 
     if (setInput) setInputValue(resultValue + '%');
@@ -113,9 +122,10 @@ var KRWeight = function KRWeight(_ref) {
     e.persist();
     var inputValue = parseFloat(e.target.innerText);
 
-    if (errorMessage) {
+    if (hasError) {
       resetCache();
       setErrorMessage('');
+      setHasError(false);
       return;
     }
 
@@ -200,9 +210,17 @@ var krWeightRenderer = function krWeightRenderer(update) {
       }).reduce(function (pre, cur) {
         return pre + parseFloat(cur) || 0;
       }, 0);
-      return totalWeight > 100 ? (0, _getLocale.getLocale)('OKR_MyO_Pop_Totalkrnot100') : '';
+      return totalWeight > 100 ? (0, _getLocale.getLocale)('OKR_ComAll_Tweighcannot100') : false;
     }, [rootData, rowIdx]);
-    return /*#__PURE__*/_react["default"].createElement(KRWeight, {
+    return isLast ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: (0, _getLocale.getLocale)('OKR_ComAll_SKRChweight'),
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(KRWeight, {
+      value: (data && data.krWeight || 0).toFixed(1),
+      onChange: handleEditKRWeight,
+      disabled: isLast,
+      checkError: onChangeBefore
+    }))) : /*#__PURE__*/_react["default"].createElement(KRWeight, {
       value: (data && data.krWeight || 0).toFixed(1),
       onChange: handleEditKRWeight,
       disabled: isLast,

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

@@ -21,12 +21,26 @@ var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
+var _helper = require("../../../create-okr-modal/utils/helper");
+
 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); }
 
 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 _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."); }
+
+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; }
+
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -91,14 +105,37 @@ var alignOKRRender = function alignOKRRender(update) {
         rootIdx: rootIdx,
         itemData: rootData
       });
-    };
-
+    }; // 上级信息 对齐目标弹层用 【临时解决方案，做对齐目标弹层后在弹层中获取】
+
+
+    var _useState = (0, _react.useState)(),
+        _useState2 = _slicedToArray(_useState, 2),
+        toUser = _useState2[0],
+        setToUser = _useState2[1];
+
+    (0, _react.useEffect)(function () {
+      (0, _helper.taker)((0, _helper.getApiUrl)('org/Get'), 'get').then(function (res) {
+        if (res.Code == 1) {
+          var SuperiorUser = res.Data.SuperiorUser;
+
+          if (SuperiorUser) {
+            setToUser({
+              name: SuperiorUser.Name,
+              userId: SuperiorUser.Id,
+              avatar: SuperiorUser.UserAvatar
+            });
+          } else {
+            setToUser({});
+          }
+        }
+      });
+    }, []);
     var renderAlignObj = (0, _react.useMemo)(function () {
       var _classNames;
 
       if (!parent.parentName) return /*#__PURE__*/_react["default"].createElement("p", {
         className: "".concat(preCls, "__empty")
-      }, (0, _getLocale.getLocale)('Mod_Pleaseselect'));
+      }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Aligneobjective'));
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(preCls, "__okr")
       }, /*#__PURE__*/_react["default"].createElement("i", {
@@ -115,12 +152,12 @@ var alignOKRRender = function alignOKRRender(update) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__okr-wrapper"),
       onClick: onSelectClickHandler
-    }, renderAlignObj), /*#__PURE__*/_react["default"].createElement(_changeOkrModal["default"], {
+    }, renderAlignObj), toUser && /*#__PURE__*/_react["default"].createElement(_changeOkrModal["default"], {
       className: "parent-target-pop-index",
       alilgn: "top",
       eventBridge: "",
       okrPopType: 1,
-      toUser: [] // 这里异步数据
+      toUser: toUser // 这里异步数据
       ,
       ref: parentRef,
       parentId: parent.parentType == 1 ? parent.parentId : parent.parentKrId,

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

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _createCycle = _interopRequireDefault(require("../../../create-okr-modal/createCycle"));
 
 require("./index.css");
@@ -48,11 +46,11 @@ var OKRCycle = function OKRCycle(update) {
         rootData = _ref.rootData;
 
     var _useState = (0, _react.useState)({
-      annualNum: data.annualNum || "".concat(new Date().getFullYear()),
-      cycleType: data.cycleType || '2',
-      yqmNum: data.yqmNum || data.yqMnum || "".concat((0, _moment["default"])().quarter()),
-      startDate: data.startDate || '',
-      endDate: data.endDate || ''
+      annualNum: data.annualNum,
+      cycleType: data.cycleType,
+      yqmNum: data.yqmNum || data.yqMnum,
+      startDate: data.startDate,
+      endDate: data.endDate
     }),
         _useState2 = _slicedToArray(_useState, 2),
         cycle = _useState2[0],

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

@@ -174,9 +174,17 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
 
       if (isO) {
         rootDataRef.current.workName = value.pureText;
+        rootDataRef.current.aiteUsers = value.mentionUsers.map(function (_ref3) {
+          var mentionId = _ref3.mentionId;
+          return mentionId;
+        });
         rootDataRef.current.workNameRichText = value.richText;
       } else {
         rootDataRef.current.krs[rowIdx].mileStoneName = value.pureText;
+        rootDataRef.current.krs[rowIdx].aiteUsers = value.mentionUsers.map(function (_ref4) {
+          var mentionId = _ref4.mentionId;
+          return mentionId;
+        });
         rootDataRef.current.krs[rowIdx].mileStoneNameRichText = value.richText;
       }
 

package/package.json

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