@titaui/pc 1.9.21 → 1.9.25

package/lib/components/form/form-fields/input/index.js

@@ -152,8 +152,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
         if (errors.length) {
           setHasError(true);
-          setTip(errors[0].tip);
-          inputRef.current.focus();
+          setTip(errors[0].tip); // inputRef.current.focus();
         }
 
         return errors;

package/lib/components/okr-detail/components/header/index.js

@@ -64,6 +64,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var precls = "okr-drawer-header";
 
 var Header = function Header(props) {
+  var _window, _window$BSGlobal, _window$BSGlobal$OkrA, _window$BSGlobal$OkrA2;
+
   // 外部取到的 headInfo
   var okrInfo = props.okrInfo;
 
@@ -85,7 +87,7 @@ var Header = function Header(props) {
       setGeneralOkrClassify = _useContext.setGeneralOkrClassify,
       showOkrEvalute = _useContext.showOkrEvalute;
 
-  var showOScore = window.BSGlobal.OkrAdvancedSetting.KRSetting.OScore;
+  var showOScore = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$OkrA = _window$BSGlobal.OkrAdvancedSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : (_window$BSGlobal$OkrA2 = _window$BSGlobal$OkrA.KRSetting) === null || _window$BSGlobal$OkrA2 === void 0 ? void 0 : _window$BSGlobal$OkrA2.OScore;
   var _okrInfo$progressGrow = okrInfo.progressGrow,
       progressGrow = _okrInfo$progressGrow === void 0 ? 0 : _okrInfo$progressGrow,
       progress = okrInfo.progress;
@@ -184,11 +186,11 @@ var Header = function Header(props) {
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
-  }, (showOkrEvalute || showOScore) && /*#__PURE__*/_react["default"].createElement(_oScore["default"], {
-    editable: editable,
+  }, (showOkrEvalute || showOScore || okrInfo.manualEvaluateValue) && /*#__PURE__*/_react["default"].createElement(_oScore["default"], {
+    editable: editable && showOScore,
     okrId: okrInfo.workId,
-    score: okrInfo.evaluateValue,
-    isEvaluate: okrInfo.manualEvaluateValue
+    score: showOkrEvalute || okrInfo.manualEvaluateValue ? okrInfo.evaluateValue : 0,
+    isEvaluate: okrInfo.manualEvaluateValue || showOkrEvalute && !!okrInfo.evaluateValue
   }))), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
     okrInfo: okrInfo,
     renderContent: renderContent

package/lib/components/okr-detail/components/header/o-score.js

@@ -75,8 +75,7 @@ var OScore = function OScore(props) {
       refreshAll = _useContext.refreshAll;
 
   var _useState3 = (0, _react.useState)({
-    score: score,
-    describe: ""
+    score: score == 1 ? '1' : Number(score).toFixed(2) * 1
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       formFiedlsValue = _useState4[0],
@@ -84,6 +83,11 @@ var OScore = function OScore(props) {
 
   var formContainerRef = (0, _react.useRef)();
   var formRef = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    setFormFiedlsValue({
+      score: score == 1 ? '1' : Number(score).toFixed(2) * 1
+    });
+  }, [score]);
 
   var changeOScore = function changeOScore() {
     setVisible(true);
@@ -93,7 +97,15 @@ var OScore = function OScore(props) {
     setVisible(false);
   };
 
+  var checkForm = function checkForm() {
+    // @ts-ignore
+    var errors = formRef.current.verifing();
+    if (errors.length) return false;
+    return true;
+  };
+
   var handleOk = function handleOk() {
+    if (!checkForm()) return;
     (0, _requestApis.updateOScore)(formFiedlsValue.score, okrId).then(function (res) {
       if (!!res.Code) {
         _toast["default"].Success("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_Success")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.21",
+  "version": "1.9.25",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/form/form-fields/input/index.tsx

@@ -108,7 +108,7 @@ export default forwardRef((props: Props, ref) => {
       if (errors.length) {
         setHasError(true);
         setTip(errors[0].tip);
-        inputRef.current.focus();
+        // inputRef.current.focus();
       }
       return errors;
     }

package/src/components/okr-detail/components/header/index.js

@@ -34,7 +34,7 @@ const Header = (props) => {
     setGeneralOkrClassify,
     showOkrEvalute,
   } = useContext(GeneralDataContext);
-  const showOScore = window.BSGlobal.OkrAdvancedSetting.KRSetting.OScore
+  const showOScore = window?.BSGlobal?.OkrAdvancedSetting?.KRSetting?.OScore
   const { progressGrow = 0, progress } = okrInfo;
 
   const [auth, setAuth] = useState(false);
@@ -149,7 +149,7 @@ const Header = (props) => {
               <OCycle editable={editable} okrId={okrInfo.workId} />
             </span>
             <span className={`${precls}__action-item`}>
-              {(showOkrEvalute || showOScore) && <Score editable={editable} okrId={okrInfo.workId} score={okrInfo.evaluateValue} isEvaluate={okrInfo.manualEvaluateValue} />}
+              {(showOkrEvalute || showOScore || okrInfo.manualEvaluateValue) && <Score editable={editable&&showOScore} okrId={okrInfo.workId} score={showOkrEvalute || okrInfo.manualEvaluateValue ? okrInfo.evaluateValue:0} isEvaluate={okrInfo.manualEvaluateValue || (showOkrEvalute && !!okrInfo.evaluateValue)} />}
             </span>
           </span>
           <OProgressUpdate okrInfo={okrInfo} renderContent={renderContent} />

package/src/components/okr-detail/components/header/o-score.tsx

@@ -1,4 +1,4 @@
-import React, { Fragment, useState, useRef, useContext } from "react";
+import React, { Fragment, useState, useRef,useEffect, useContext } from "react";
 import { CommonContext } from "../../context";
 import { getLocale } from "../../../../utils/getLocale";
 import Score from "../score";
@@ -18,18 +18,23 @@ interface IOScoreProps {
 }
 interface FormFields {
   score: string | number;
-  describe: string;
 }
 const OScore = (props: IOScoreProps) => {
   const { score, okrId, editable, ...restProps } = props;
   const [visible, setVisible] = useState(false);
   const { refreshAll } = useContext(CommonContext);
   const [formFiedlsValue, setFormFiedlsValue] = useState<FormFields>({
-    score: score,
-    describe: "",
+    score: score == 1 ? '1': Number(score).toFixed(2) * 1
   });
   const formContainerRef = useRef<any>();
   const formRef = useRef<any>();
+
+  useEffect(()=>{
+    setFormFiedlsValue({
+      score: score == 1 ? '1': Number(score).toFixed(2) * 1
+    })
+  },[score])
+
   const changeOScore = () => {
     setVisible(true);
   };
@@ -38,7 +43,15 @@ const OScore = (props: IOScoreProps) => {
     setVisible(false);
   };
 
+  const checkForm = () => {
+    // @ts-ignore
+    const errors = formRef.current.verifing();
+    if (errors.length) return false;
+    return true;
+  };
+
   const handleOk = () => {
+    if (!checkForm()) return;
     updateOScore(formFiedlsValue.score, okrId)
       .then((res) => {
         if (!!res.Code) {