@titaui/pc 1.9.22 → 1.9.26

package/lib/components/change-okr-modal/Item.js

@@ -15,6 +15,8 @@ var _openData = require("../../utils/open-data");
 
 var _constant = require("./constant");
 
+var _constant2 = require("../../utils/constant");
+
 var _tooltip = _interopRequireDefault(require("../tooltip"));
 
 var _getLocale = require("../../utils/getLocale");
@@ -128,10 +130,10 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           return hzNum[data.yqmnum - 1];
 
         case 3:
-          return (0, _constant.getMonth)()[data.yqmnum - 1];
+          return (0, _constant2.getMonth)()[data.yqmnum - 1];
 
         case 4:
-          return "".concat((0, _constant.getMonth)()[data.yqmnum - 1], "-").concat((0, _constant.getMonth)()[((data.yqmnum + 1) % 12 || 12) - 1], "\u6708");
+          return "".concat((0, _constant2.getMonth)()[data.yqmnum - 1], "-").concat((0, _constant2.getMonth)()[((data.yqmnum + 1) % 12 || 12) - 1], "\u6708");
 
         case 5:
           return data.yqmnum == 1 ? (0, _getLocale.getLocale)('OKR_MyO_Pop_Firsthalf') : (0, _getLocale.getLocale)('OKR_MyO_Pop_Secondhalf');

package/lib/components/change-okr-modal/constant.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getYear = exports.getTypeMap = exports.getStatusType = exports.getPopType = exports.getOkrTypes = exports.getMonthKeyValue = exports.getMonth = exports.getBimonthlyMonthKeyValue = void 0;
+exports.getYear = exports.getTypeMap = exports.getStatusType = exports.getPopType = exports.getOkrTypes = exports.getMonthKeyValue = exports.getBimonthlyMonthKeyValue = void 0;
+
+var _constant = require("../../utils/constant");
 
 var _getLocale = require("../../utils/getLocale");
 
@@ -98,7 +100,7 @@ var getBimonthlyMonthKeyValue = function getBimonthlyMonthKeyValue(startMonth) {
   };
 
   var datas = [];
-  var monthLang = getMonth();
+  var monthLang = (0, _constant.getMonth)();
 
   if (!_getLocale.isEn) {
     datas.push({
@@ -135,14 +137,8 @@ var getBimonthlyMonthKeyValue = function getBimonthlyMonthKeyValue(startMonth) {
 
 exports.getBimonthlyMonthKeyValue = getBimonthlyMonthKeyValue;
 
-var getMonth = function getMonth() {
-  return [(0, _getLocale.getLocale)("Mod_Jan"), (0, _getLocale.getLocale)("Mod_Feb"), (0, _getLocale.getLocale)("Mod_Mar"), (0, _getLocale.getLocale)("Mod_Apr"), (0, _getLocale.getLocale)("Mod_May"), (0, _getLocale.getLocale)("Mod_Jun"), (0, _getLocale.getLocale)("Mod_Jul"), (0, _getLocale.getLocale)("Mod_Aug"), (0, _getLocale.getLocale)("Mod_Sept"), (0, _getLocale.getLocale)("Mod_Oct"), (0, _getLocale.getLocale)("Mod_Nov"), (0, _getLocale.getLocale)("Mod_Dec")];
-};
-
-exports.getMonth = getMonth;
-
 var getMonthKeyValue = function getMonthKeyValue() {
-  var month = getMonth();
+  var month = (0, _constant.getMonth)();
   return [{
     title: month[0],
     value: "3,1"

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 || !!okrInfo.evaluateValue
+    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.toFixed(2),
-    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/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-status-dropdown.js

@@ -72,21 +72,27 @@ var _default = function _default(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-finished",
+    icon: "tu-icon-finished",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-running",
+    icon: "tu-icon-running",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('Per_MyRe_text_Inprogress')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-canceled",
+    icon: "tu-icon-canceled",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Cancelled')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-deferred",
+    icon: "tu-icon-deferred",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Delayed')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-paused",
+    icon: "tu-icon-paused",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Suspended')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     name: "tu-icon-notstart",
+    icon: "tu-icon-notstart",
     exIconClass: "e-node-status-icon"
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_NotStarted'))));
 };

package/lib/components/okr-progress-detail/utils.js

@@ -5,15 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTimeString = exports.getProgressState = void 0;
 
+var _constant = require("../../utils/constant");
+
 var _getLocale = require("../../utils/getLocale");
 
-var _constant = require("./constant");
+var _constant2 = require("./constant");
 
 var getTimeString = function getTimeString(time, nowTime) {
   if (!time) {
     return (0, _getLocale.getLocale)('OKR_MyO_KRP_Notupdated');
   }
 
+  var months = (0, _constant.getMonth)();
   var timeDateObj = new Date(time);
   var timeMilliSecond = timeDateObj.getTime();
   var timeYear = timeDateObj.getFullYear();
@@ -31,30 +34,33 @@ var getTimeString = function getTimeString(time, nowTime) {
   }
 
   if (secondDiff < 60) {
-    return "".concat(secondDiff, "\u79D2\u524D");
+    return "".concat(secondDiff).concat((0, _getLocale.getLocale)('Mood_secago'));
   }
 
   if (secondDiff < 60 * 60) {
-    return "".concat(Math.floor(secondDiff / 60), "\u5206\u949F\u524D");
+    return "".concat(Math.floor(secondDiff / 60)).concat((0, _getLocale.getLocale)('Tasks_Tab_MyS_minuteago'));
   }
 
   if (secondDiff < 60 * 60 * 24) {
-    return "".concat(Math.floor(secondDiff / (60 * 60)), "\u5C0F\u65F6\u524D");
+    return "".concat(Math.floor(secondDiff / (60 * 60))).concat((0, _getLocale.getLocale)('Mood_hoursago'));
   }
 
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return "".concat((0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Yesterday'), " ").concat(timeHours + ':' + timeMinutes);
+    return "".concat((0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Yesterday'), " ").concat(timeHours + ":" + timeMinutes);
   }
 
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return "\u524D\u5929 ".concat(timeHours + ':' + timeMinutes);
+    return "".concat((0, _getLocale.getLocale)('Mood_2daysago'), " ").concat(timeHours + ":" + timeMinutes);
   }
 
   if (timeYear === nowYear) {
-    return "".concat(timeMonth, "\u6708").concat(timeDate, "\u65E5 ").concat(timeHours < 10 ? '0' + timeHours : timeHours, ":").concat(timeMinutes < 10 ? '0' + timeMinutes : timeMinutes);
+    var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
+
+    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
   }
 
-  return "".concat(timeYear, "\u5E74").concat(timeMonth, "\u6708").concat(timeDate, "\u65E5 ").concat(timeHours < 10 ? '0' + timeHours : timeHours, ":").concat(timeMinutes < 10 ? '0' + timeMinutes : timeMinutes);
+  var dateStr = (_getLocale.isEn ? '' : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : '');
+  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
 };
 
 exports.getTimeString = getTimeString;
@@ -64,7 +70,7 @@ var getProgressState = function getProgressState(oStatus, riskLevel) {
   if (oStatus === 2) {
     return 'end';
   } else {
-    return _constant.OkrRiskMapping[riskLevel] ? _constant.OkrRiskMapping[riskLevel] : 'normal';
+    return _constant2.OkrRiskMapping[riskLevel] ? _constant2.OkrRiskMapping[riskLevel] : 'normal';
   }
 };
 

package/lib/components/period-selector/common.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDateRangeByCycle = exports.formatPeriod = exports.dealYearsRange = exports.dealSelectedPeriodData = exports.computeYearIndex = void 0;
 exports.getDefalutCycle = getDefalutCycle;
-exports.getMonth = void 0;
 exports.getQuaterNum = getQuaterNum;
 
 var _getLocale = require("../../utils/getLocale");
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _constant = require("../../utils/constant");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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; }
@@ -20,12 +21,6 @@ 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; }
 
-var getMonth = function getMonth() {
-  return [(0, _getLocale.getLocale)("Mod_Jan"), (0, _getLocale.getLocale)("Mod_Feb"), (0, _getLocale.getLocale)("Mod_Mar"), (0, _getLocale.getLocale)("Mod_Apr"), (0, _getLocale.getLocale)("Mod_May"), (0, _getLocale.getLocale)("Mod_Jun"), (0, _getLocale.getLocale)("Mod_Jul"), (0, _getLocale.getLocale)("Mod_Aug"), (0, _getLocale.getLocale)("Mod_Sept"), (0, _getLocale.getLocale)("Mod_Oct"), (0, _getLocale.getLocale)("Mod_Nov"), (0, _getLocale.getLocale)("Mod_Dec")];
-};
-
-exports.getMonth = getMonth;
-
 var dealSelectedPeriodData = function dealSelectedPeriodData(period) {
   var option = {};
   option.cycleType = period == "-1" ? "-1" : period.substring(0, 1);
@@ -76,7 +71,7 @@ var formatPeriod = function formatPeriod(selected) {
   var quarter = ["", "".concat((0, _getLocale.getLocale)('OKR_MyO_Pop_1stQuarter')), "".concat((0, _getLocale.getLocale)('OKR_MyO_Pop_2ndQuarter')), "".concat((0, _getLocale.getLocale)('OKR_MyO_Pop_3rdQuarter')), "".concat((0, _getLocale.getLocale)('OKR_MyO_Pop_4thQuarter'))];
   var cycleDate = "";
   var annualNum = selected.annualNum == "-1" ? "".concat((0, _getLocale.getLocale)('OKR_MyO_Butt_Allyears')) : selected.annualNum + "".concat(_getLocale.isEn ? '' : '年');
-  var month = getMonth();
+  var month = (0, _constant.getMonth)();
 
   switch ("".concat(selected.cycleType)) {
     case "-1":

package/lib/components/period-selector/components/selector/index.js

@@ -19,6 +19,8 @@ var _style = require("./style");
 
 var _helper = require("../../helper");
 
+var _constant = require("../../../../utils/constant");
+
 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; }
@@ -95,7 +97,7 @@ function getDoubleMonthData(startMonth) {
   };
 
   var datas = [];
-  var monthLang = (0, _common.getMonth)();
+  var monthLang = (0, _constant.getMonth)();
 
   if (!i18nInfo || i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN") {
     datas.push({

package/lib/components/upload-photo-modal/constant.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.List = void 0;
+
+var _getLocale = require("../../utils/getLocale");
+
 var List = [{
   id: 'person',
   accept: '.jpg,.jpeg,.png',
   autoCropArea: 1,
   initialAspectRatio: 1,
-  tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
-  previewTitle: '预览',
+  tips: "".concat((0, _getLocale.getLocale)('Set_PI_Onlyjpgsize'), " 150*150px"),
+  previewTitle: (0, _getLocale.getLocale)('Mod_Preview'),
   minCropBoxHeight: 60,
   minCropBoxWidth: 60
 }, {

package/lib/components/upload-photo-modal/index.js

@@ -23,6 +23,8 @@ var _dialog = _interopRequireDefault(require("../../components/dialog"));
 
 var _constant = require("./constant");
 
+var _getLocale = require("../../utils/getLocale");
+
 require("cropperjs/dist/cropper.css");
 
 require("./index.css");
@@ -198,12 +200,12 @@ var ChangePhoto = function ChangePhoto(props) {
     width: 480,
     mask: true,
     centered: true,
-    title: '上传头像',
+    title: (0, _getLocale.getLocale)('Set_PI_Uploadavatar'),
     noHeadLine: true,
     maskClosable: false,
     onClose: handleCancel,
     onCancel: handleCancel,
-    okText: "\u4FDD\u5B58",
+    okText: (0, _getLocale.getLocale)('Mod_Save'),
     noFooterLine: true,
     onOk: handleSaveInfo
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -223,7 +225,7 @@ var ChangePhoto = function ChangePhoto(props) {
     accept: item === null || item === void 0 ? void 0 : item.accept
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__upload-right-title")
-  }, "\u70B9\u51FB\u4E0A\u4F20"), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Pro_detail_ClickUpload')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__upload-right-tips")
   }, item === null || item === void 0 ? void 0 : item.tips))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__upload-left")
@@ -300,7 +302,7 @@ var ChangePhoto = function ChangePhoto(props) {
     onMouseLeave: handleLeaveAgain
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__title-again"), _defineProperty({}, "".concat(preCls, "__title-again--show"), image), _defineProperty({}, "".concat(preCls, "__title-again--hover"), isEnter))
-  }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+  }, (0, _getLocale.getLocale)('Set_PI_Reupload')), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: type === 'person'
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__title-preview")

package/lib/pages/personal-info/components/base-info/index.js

@@ -112,13 +112,13 @@ var BaseInfo = function BaseInfo() {
     className: "".concat(prefix, "__form")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form-title")
-  }, "\u624B\u673A\u53F7\u7801"), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Set_PI_PhoneNumber')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__form-value")
   }, userInfo.mobile ? userInfo.mobile : (0, _getLocale.getLocale)('Data_Notset'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form-title")
-  }, "\u7535\u5B50\u90AE\u7BB1"), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Set_PI_Email')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__form-value")
   }, userInfo.email ? userInfo.email : (0, _getLocale.getLocale)('Data_Notset'))));
 };

package/lib/pages/personal-info/components/edit-base-info/index.js

@@ -153,7 +153,7 @@ var EditBaseInfo = function EditBaseInfo(props) {
     width: 480,
     mask: true,
     centered: true,
-    title: "基本信息设置",
+    title: (0, _getLocale.getLocale)('Set_PI_BasicInSettings'),
     noHeadLine: true,
     maskClosable: false,
     onClose: function onClose() {
@@ -197,7 +197,7 @@ var EditBaseInfo = function EditBaseInfo(props) {
       tip: (0, _getLocale.getLocale)('OKR_MyO_Ew_Namecant'),
       test: /^[\s\S]+$/
     }, {
-      tip: "姓名只能为中文，英文字母和数字及下划线的组合",
+      tip: (0, _getLocale.getLocale)('Set_PI_Thenameonly'),
       test: /^((?!(\uff08|\uff09)).)*$/g
     }, {
       tip: (0, _i18nFrontTranslate.i18nLimitCharacters)(50),
@@ -208,16 +208,16 @@ var EditBaseInfo = function EditBaseInfo(props) {
   }), /*#__PURE__*/_react["default"].createElement(Fields.Input, {
     name: "phone",
     type: "text",
-    label: "手机号码",
+    label: (0, _getLocale.getLocale)('Set_PI_PhoneNumber'),
     placeholder: (0, _getLocale.getLocale)('Pro_page_Ext_Tab_PhoneNumber'),
     require: true,
     layout: "row",
     value: userInfo.mobile,
     verifies: [{
-      tip: "手机号不能为空",
+      tip: (0, _getLocale.getLocale)('OKR_MyO_Ew_MobileNum'),
       test: /^[\s\S]+$/
     }, {
-      tip: "格式错误，海外手机格式如：(+852)52345678",
+      tip: (0, _getLocale.getLocale)('OKR_MyO_Ew_FormatErr'),
       test: /^1[3456789]\d{9}$/
     }],
     onChange: handlePhoneChange

package/lib/pages/personal-info/components/person-photo/index.css

@@ -1,5 +1,3 @@
-@charset "UTF-8";
-
 .titaui-personal-info-person-photo {
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
@@ -39,6 +37,7 @@
 }
 
 .titaui-personal-info-person-photo__main {
+  position: relative;
   display: flex;
   align-items: center;
 }
@@ -55,6 +54,20 @@
   line-height: 18px;
 }
 
+.titaui-personal-info-person-photo__main-change {
+  position: absolute;
+  bottom: 7px;
+  width: 160px;
+  height: 32px;
+  color: #FFFFFF;
+  font-size: 12px;
+  line-height: 18px;
+  text-align: center;
+  box-sizing: border-box;
+  padding: 7px 0;
+  cursor: pointer;
+}
+
 .titaui-personal-info-person-photo__main-tip {
   margin-left: 32px;
   font-size: 12px;
@@ -83,7 +96,7 @@
   position: absolute;
   bottom: 0;
   display: block;
-  content: "点击修改";
+  content: "";
   width: 160px;
   height: 32px;
   background: rgba(20, 28, 40, 0.5);

package/lib/pages/personal-info/components/person-photo/index.js

@@ -15,6 +15,8 @@ var _avatar = _interopRequireDefault(require("../../../../components/avatar"));
 
 var _uploadPhotoModal = _interopRequireDefault(require("../../../../components/upload-photo-modal"));
 
+var _getLocale = require("../../../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -74,7 +76,7 @@ var PersonPhoto = function PersonPhoto() {
     className: "".concat(prefix, "__header")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__header-title")
-  }, "\u4E0A\u4F20\u5934\u50CF")), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)('Set_PI_Uploadavatar'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__main")
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
     userId: Id,
@@ -87,9 +89,12 @@ var PersonPhoto = function PersonPhoto() {
       fontSize: 24
     },
     onClick: handleChangePhoto
-  }), /*#__PURE__*/_react["default"].createElement("span", {
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__main-change"),
+    onClick: handleChangePhoto
+  }, (0, _getLocale.getLocale)('Set_PI_Clicktomodify')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__main-tip")
-  }, "\u5EFA\u8BAE\u56FE\u7247\u6700\u5C0F\u5C3A\u5BF8 150*150px")), /*#__PURE__*/_react["default"].createElement(_uploadPhotoModal["default"], {
+  }, (0, _getLocale.getLocale)('Set_PI_Suggestedsize'), " 150*150px")), /*#__PURE__*/_react["default"].createElement(_uploadPhotoModal["default"], {
     visible: visible,
     onCancel: handleCancel,
     type: "person",

package/lib/utils/constant.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMonth = void 0;
+
+var _getLocale = require("./getLocale");
+
+var getMonth = function getMonth() {
+  return [(0, _getLocale.getLocale)("Mod_Jan"), (0, _getLocale.getLocale)("Mod_Feb"), (0, _getLocale.getLocale)("Mod_Mar"), (0, _getLocale.getLocale)("Mod_Apr"), (0, _getLocale.getLocale)("Mod_May"), (0, _getLocale.getLocale)("Mod_Jun"), (0, _getLocale.getLocale)("Mod_Jul"), (0, _getLocale.getLocale)("Mod_Aug"), (0, _getLocale.getLocale)("Mod_Sept"), (0, _getLocale.getLocale)("Mod_Oct"), (0, _getLocale.getLocale)("Mod_Nov"), (0, _getLocale.getLocale)("Mod_Dec")];
+};
+
+exports.getMonth = getMonth;

package/lib/utils/format-time.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.timeFormat = exports.showWeekLastDay = exports.showWeekFirstDay = exports.showNextWeekFirstDay = exports.showNextMonthFirstDay = exports.showMonthLastDay = exports.showMonthFirstDay = exports.getTimeString = exports.getNextDayOfYear = exports.getFirstDayOfYear = void 0;
 
+var _constant = require("./constant");
+
 var _getLocale = require("./getLocale");
 
 var getTimeString = function getTimeString(time, nowTime) {
@@ -12,6 +14,7 @@ var getTimeString = function getTimeString(time, nowTime) {
     return (0, _getLocale.getLocale)('OKR_MyO_KRP_Notupdated');
   }
 
+  var months = (0, _constant.getMonth)();
   var timeDateObj = new Date(time);
   var timeMilliSecond = timeDateObj.getTime();
   var timeYear = timeDateObj.getFullYear();
@@ -29,15 +32,15 @@ var getTimeString = function getTimeString(time, nowTime) {
   }
 
   if (secondDiff < 60) {
-    return "".concat(secondDiff, "\u79D2\u524D");
+    return "".concat(secondDiff).concat((0, _getLocale.getLocale)('Mood_secago'));
   }
 
   if (secondDiff < 60 * 60) {
-    return "".concat(Math.floor(secondDiff / 60), "\u5206\u949F\u524D");
+    return "".concat(Math.floor(secondDiff / 60)).concat((0, _getLocale.getLocale)('Tasks_Tab_MyS_minuteago'));
   }
 
   if (secondDiff < 60 * 60 * 24) {
-    return "".concat(Math.floor(secondDiff / (60 * 60)), "\u5C0F\u65F6\u524D");
+    return "".concat(Math.floor(secondDiff / (60 * 60))).concat((0, _getLocale.getLocale)('Mood_hoursago'));
   }
 
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
@@ -45,14 +48,17 @@ var getTimeString = function getTimeString(time, nowTime) {
   }
 
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return "\u524D\u5929 ".concat(timeHours + ":" + timeMinutes);
+    return "".concat((0, _getLocale.getLocale)('Mood_2daysago'), " ").concat(timeHours + ":" + timeMinutes);
   }
 
   if (timeYear === nowYear) {
-    return "".concat(timeMonth, "\u6708").concat(timeDate, "\u65E5 ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
+    var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
+
+    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
   }
 
-  return "".concat(timeYear, "\u5E74").concat(timeMonth, "\u6708").concat(timeDate, "\u65E5 ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
+  var dateStr = (_getLocale.isEn ? '' : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : '');
+  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0" + timeHours : timeHours, ":").concat(timeMinutes < 10 ? "0" + timeMinutes : timeMinutes);
 }; // 日期格式化，返回值形式为yy-mm-dd
 
 

package/package.json

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

package/src/components/change-okr-modal/Item.tsx

@@ -3,7 +3,8 @@ import { ItemWrapper, Radio, Tag, ItemObjectiveContainer, ItemKrContainer, ItemT
 import { OkrData } from './types';
 import { OpenUserName } from '../../utils/open-data';
 import  drawerManager  from '../../components/drawer-manager'
-import { getMonth, getTypeMap } from './constant';
+import { getTypeMap } from './constant';
+import { getMonth }from '../../utils/constant';
 import Tooltip from '../tooltip';
 import { getLocale } from '../../utils/getLocale';
 import { isEn } from '../../utils/getLocale';

package/src/components/change-okr-modal/constant.ts

@@ -1,4 +1,4 @@
-import { getBSGlobal } from "&/utils/bs-global";
+import { getMonth } from "../../utils/constant";
 import { getLocale, isEn } from "../../utils/getLocale";
 
 export const getYear = () => {
@@ -118,22 +118,6 @@ export const getBimonthlyMonthKeyValue = (startMonth) => {
   return datas;
 };
 
-export const getMonth = () => {
-  return [
-    getLocale("Mod_Jan"),
-    getLocale("Mod_Feb"),
-    getLocale("Mod_Mar"),
-    getLocale("Mod_Apr"),
-    getLocale("Mod_May"),
-    getLocale("Mod_Jun"),
-    getLocale("Mod_Jul"),
-    getLocale("Mod_Aug"),
-    getLocale("Mod_Sept"),
-    getLocale("Mod_Oct"),
-    getLocale("Mod_Nov"),
-    getLocale("Mod_Dec"),
-  ];
-};
 
 export const getMonthKeyValue = () => {
   const month = getMonth();

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||!!okrInfo.evaluateValue} />}
+              {(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.toFixed(2),
-    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) {

package/src/components/okr-detail/components/okr-tree/tree-node/e-node/e-status-dropdown.js

@@ -36,12 +36,12 @@ export default props => {
         </span>
       }
     >
-      <IconItem name="tu-icon-finished" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Completed')}</IconItem>
-      <IconItem name="tu-icon-running" exIconClass='e-node-status-icon'>{getLocale('Per_MyRe_text_Inprogress')}</IconItem>
-      <IconItem name="tu-icon-canceled" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Cancelled')}</IconItem>
-      <IconItem name="tu-icon-deferred" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Delayed')}</IconItem>
-      <IconItem name="tu-icon-paused" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Suspended')}</IconItem>
-      <IconItem name="tu-icon-notstart" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_NotStarted')}</IconItem>
+      <IconItem name="tu-icon-finished" icon="tu-icon-finished" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Completed')}</IconItem>
+      <IconItem name="tu-icon-running" icon="tu-icon-running" exIconClass='e-node-status-icon'>{getLocale('Per_MyRe_text_Inprogress')}</IconItem>
+      <IconItem name="tu-icon-canceled" icon="tu-icon-canceled" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Cancelled')}</IconItem>
+      <IconItem name="tu-icon-deferred" icon="tu-icon-deferred" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Delayed')}</IconItem>
+      <IconItem name="tu-icon-paused" icon="tu-icon-paused" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_Suspended')}</IconItem>
+      <IconItem name="tu-icon-notstart" icon="tu-icon-notstart" exIconClass='e-node-status-icon'>{getLocale('OKR_MyO_E_From_NotStarted')}</IconItem>
     </DropSelector>
   </React.Fragment>
 }

package/src/components/okr-progress-detail/utils.ts

@@ -1,46 +1,56 @@
-import { getLocale } from "../../utils/getLocale";
+import { getMonth } from "../../utils/constant";
+import { getLocale, isEn } from "../../utils/getLocale";
 import { OkrRiskMapping } from "./constant";
 
 export const getTimeString = (time: string, nowTime): string => {
   if (!time) {
     return getLocale('OKR_MyO_KRP_Notupdated');
   }
+
+  const months = getMonth();
+
   const timeDateObj = new Date(time);
   const timeMilliSecond = timeDateObj.getTime();
   const timeYear = timeDateObj.getFullYear();
   const timeMonth = timeDateObj.getMonth() + 1;
-  const timeDate = timeDateObj.getDate(); 
+  const timeDate = timeDateObj.getDate();
   const timeHours = timeDateObj.getHours();
   const timeMinutes = timeDateObj.getMinutes();
 
-  const nowMilliSecond  = nowTime.getTime();
+  const nowMilliSecond = nowTime.getTime();
   const nowYear = nowTime.getFullYear();
   const nowDate = nowTime.getDate();
-  
+
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
     return getLocale('Pro_page_Int_Justnow');
   }
   if (secondDiff < 60) {
-    return `${secondDiff}秒前`;
+    return `${secondDiff}${getLocale('Mood_secago')}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}分钟前`;
+    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}小时前`;
+    return `${Math.floor(secondDiff / (60 * 60))}${getLocale('Mood_hoursago')}`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ':' + timeMinutes}`;
+    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `前天 ${timeHours + ':' + timeMinutes}`;
+    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
   }
   if (timeYear === nowYear) {
-    return `${timeMonth}月${timeDate}日 ${timeHours < 10 ? '0' + timeHours : timeHours}:${timeMinutes < 10 ? '0' + timeMinutes : timeMinutes}`;
-  }
-  return `${timeYear}年${timeMonth}月${timeDate}日 ${timeHours < 10 ? '0' + timeHours : timeHours}:${timeMinutes < 10 ? '0' + timeMinutes : timeMinutes}`;
-}
+    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
+    return `${dateStr} ${
+      timeHours < 10 ? "0" + timeHours : timeHours
+    }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
+  }
+  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
+  return `${dateStr} ${
+    timeHours < 10 ? "0" + timeHours : timeHours
+  }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
+};
 
 export const getProgressState = (oStatus, riskLevel) => {
   // 2代表已结束

package/src/components/period-selector/common.ts

@@ -1,21 +1,7 @@
 import { getLocale, isEn } from "../../utils/getLocale";
 import { SelectedInterface, PeriodObj } from "./type";
 import moment from "moment";
-
-export const getMonth = () => [
-  getLocale("Mod_Jan"),
-  getLocale("Mod_Feb"),
-  getLocale("Mod_Mar"),
-  getLocale("Mod_Apr"),
-  getLocale("Mod_May"),
-  getLocale("Mod_Jun"),
-  getLocale("Mod_Jul"),
-  getLocale("Mod_Aug"),
-  getLocale("Mod_Sept"),
-  getLocale("Mod_Oct"),
-  getLocale("Mod_Nov"),
-  getLocale("Mod_Dec"),
-];
+import { getMonth } from "../../utils/constant";
 
 export const dealSelectedPeriodData = (period: string) => {
   let option: any = {};

package/src/components/period-selector/components/selector/index.tsx

@@ -5,12 +5,12 @@ import {
   dealSelectedPeriodData,
   dealYearsRange,
   getDateRangeByCycle,
-  getMonth,
 } from "../../common";
 import { getMockMonth, getMockPeriod, getMockQuarter } from "../../mockData";
 import { PeriodObj, SelectedInterface } from "../../type";
 import { Head, List, Item, Icon, Title, Wrapper, PlaceHolder } from "./style";
 import { getBSGlobal } from "../../helper";
+import { getMonth } from "../../../../utils/constant";
 
 const i18nInfo = getBSGlobal("I18NInfo");
 

package/src/components/upload-photo-modal/constant.ts

@@ -1,12 +1,12 @@
-
+import { getLocale } from "../../utils/getLocale";
 export const List = [
 	{
 		id: 'person',
 		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 1,
-		tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
-		previewTitle: '预览',
+		tips: `${getLocale('Set_PI_Onlyjpgsize')} 150*150px`,
+		previewTitle: getLocale('Mod_Preview'),
     minCropBoxHeight: 60,
     minCropBoxWidth: 60,
 	},

package/src/components/upload-photo-modal/index.tsx

@@ -6,6 +6,7 @@ import ConditionRender from '../condition-render';
 import { saveTenantLogo, saveBrowserIcon, saveUserPhoto } from './request-api';
 import Dialog from '../../components/dialog';
 import { List } from './constant';
+import { getLocale } from '../../utils/getLocale'
 import 'cropperjs/dist/cropper.css';
 import './index.scss';
 
@@ -130,12 +131,12 @@ const ChangePhoto = (props: Props) => {
 			width={480}
 			mask
 			centered
-			title={'上传头像'}
+			title={getLocale('Set_PI_Uploadavatar')}
 			noHeadLine
 			maskClosable={false}
 			onClose={handleCancel}
 			onCancel={handleCancel}
-			okText="保存"
+			okText={getLocale('Mod_Save')}
 			noFooterLine
 			onOk={handleSaveInfo}
 		>
@@ -151,7 +152,7 @@ const ChangePhoto = (props: Props) => {
 									className={`${preCls}__upload-right-input`}
 									accept={item?.accept}
 								/>
-								<span className={`${preCls}__upload-right-title`}>点击上传</span>
+								<span className={`${preCls}__upload-right-title`}>{getLocale('Pro_detail_ClickUpload')}</span>
 								<span className={`${preCls}__upload-right-tips`}>
 									{item?.tips}
 								</span>
@@ -214,7 +215,7 @@ const ChangePhoto = (props: Props) => {
             onMouseLeave={handleLeaveAgain}
 					/>
 					<span className={classNames(`${preCls}__title-again`, { [`${preCls}__title-again--show`]: image },{ [`${preCls}__title-again--hover`]: isEnter })}>
-						重新上传
+						{getLocale('Set_PI_Reupload')}
 					</span>
 					<ConditionRender condition={type === 'person'}>
 						<span className={`${preCls}__title-preview`}>{item?.previewTitle}</span>

package/src/pages/personal-info/components/base-info/index.tsx

@@ -64,13 +64,13 @@ const BaseInfo: FC = () => {
         </span>
       </div>
       <div className={`${prefix}__form`}>
-        <div className={`${prefix}__form-title`}>手机号码</div>
+        <div className={`${prefix}__form-title`}>{getLocale('Set_PI_PhoneNumber')}</div>
         <span className={`${prefix}__form-value`}>
           {userInfo.mobile ? userInfo.mobile : getLocale('Data_Notset')}
         </span>
       </div>
       <div className={`${prefix}__form`}>
-        <div className={`${prefix}__form-title`}>电子邮箱</div>
+        <div className={`${prefix}__form-title`}>{getLocale('Set_PI_Email')}</div>
         <span className={`${prefix}__form-value`}>
           {userInfo.email ? userInfo.email : getLocale('Data_Notset')}
         </span>

package/src/pages/personal-info/components/edit-base-info/index.tsx

@@ -88,7 +88,7 @@ const EditBaseInfo = (props) => {
       width={480}
       mask
       centered
-      title={"基本信息设置"}
+      title={getLocale('Set_PI_BasicInSettings')}
       noHeadLine
       maskClosable={false}
       onClose={() => {
@@ -127,7 +127,7 @@ const EditBaseInfo = (props) => {
                 test: /^[\s\S]+$/,
               },
               {
-                tip: "姓名只能为中文，英文字母和数字及下划线的组合",
+                tip: getLocale('Set_PI_Thenameonly'),
                 test: /^((?!(\uff08|\uff09)).)*$/g,
               },
               {
@@ -141,18 +141,18 @@ const EditBaseInfo = (props) => {
           <Fields.Input
             name="phone"
             type="text"
-            label={"手机号码"}
+            label={getLocale('Set_PI_PhoneNumber')}
             placeholder={getLocale('Pro_page_Ext_Tab_PhoneNumber')}
             require
             layout="row"
             value={userInfo.mobile}
             verifies={[
               {
-                tip: "手机号不能为空",
+                tip: getLocale('OKR_MyO_Ew_MobileNum'),
                 test: /^[\s\S]+$/,
               },
               {
-                tip: "格式错误，海外手机格式如：(+852)52345678",
+                tip: getLocale('OKR_MyO_Ew_FormatErr'),
                 test: /^1[3456789]\d{9}$/,
               },
             ]}

package/src/pages/personal-info/components/person-photo/index.scss

@@ -32,6 +32,7 @@
     }
   }
   &__main {
+    position: relative;
     display: flex;
     align-items: center;
     &-mask {
@@ -41,11 +42,23 @@
       box-sizing: border-box;
       padding: 7px 52px;
       background: rgba(20, 28, 40, 0.5);
-      // filter: blur(4px);
       font-size: 12px;
       color: #FFFFFF;
       line-height: 18px;
     }
+    &-change {
+      position: absolute;
+      bottom: 7px;
+      width: 160px;
+      height: 32px;
+      color: #FFFFFF;
+      font-size: 12px;
+      line-height: 18px;
+      text-align: center;
+      box-sizing: border-box;
+      padding: 7px 0;
+      cursor: pointer;
+    }
     &-tip {
       margin-left: 32px;
       font-size: 12px;
@@ -73,7 +86,7 @@
       position: absolute;
       bottom:0;
       display: block;
-      content: "点击修改";
+      content: "";
       width: 160px;
       height: 32px;
       background: rgba(20, 28, 40, 0.5);

package/src/pages/personal-info/components/person-photo/index.tsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { getUserInfo } from '../../../../utils/bs-global';
 import Avatar from '../../../../components/avatar';
 import ChangePhotoModal from '../../../../components/upload-photo-modal';
+import { getLocale } from '../../../../utils/getLocale';
 import './index.scss';
 
 const prefix = 'titaui-personal-info-person-photo';
@@ -32,7 +33,7 @@ const PersonPhoto = () => {
 	return (
 		<div className={prefix}>
 			<div className={`${prefix}__header`}>
-				<span className={`${prefix}__header-title`}>上传头像</span>
+				<span className={`${prefix}__header-title`}>{getLocale('Set_PI_Uploadavatar')}</span>
 			</div>
 			<div className={`${prefix}__main`}>
 				<Avatar
@@ -47,7 +48,8 @@ const PersonPhoto = () => {
 					}}
           onClick={handleChangePhoto}
 				/>
-        <span className={`${prefix}__main-tip`}>建议图片最小尺寸 150*150px</span>
+        <div className={`${prefix}__main-change`} onClick={handleChangePhoto}>{getLocale('Set_PI_Clicktomodify')}</div>
+        <span className={`${prefix}__main-tip`}>{getLocale('Set_PI_Suggestedsize')} 150*150px</span>
 			</div>
       <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person" handleSuccessUploadPhoto={handleSuccessUploadPhoto}/>
     </div>

package/src/utils/constant.ts

@@ -0,0 +1,18 @@
+import { getLocale } from "./getLocale";
+
+export const getMonth = () => {
+  return [
+    getLocale("Mod_Jan"),
+    getLocale("Mod_Feb"),
+    getLocale("Mod_Mar"),
+    getLocale("Mod_Apr"),
+    getLocale("Mod_May"),
+    getLocale("Mod_Jun"),
+    getLocale("Mod_Jul"),
+    getLocale("Mod_Aug"),
+    getLocale("Mod_Sept"),
+    getLocale("Mod_Oct"),
+    getLocale("Mod_Nov"),
+    getLocale("Mod_Dec"),
+  ];
+};

package/src/utils/format-time.ts

@@ -1,9 +1,13 @@
-import { getLocale } from "./getLocale";
+import { getMonth } from "./constant";
+import { getLocale, isEn } from "./getLocale";
 
 export const getTimeString = (time: string, nowTime): string => {
   if (!time) {
     return getLocale('OKR_MyO_KRP_Notupdated');
   }
+
+  const months = getMonth();
+
   const timeDateObj = new Date(time);
   const timeMilliSecond = timeDateObj.getTime();
   const timeYear = timeDateObj.getFullYear();
@@ -21,26 +25,28 @@ export const getTimeString = (time: string, nowTime): string => {
     return getLocale('Pro_page_Int_Justnow');
   }
   if (secondDiff < 60) {
-    return `${secondDiff}秒前`;
+    return `${secondDiff}${getLocale('Mood_secago')}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}分钟前`;
+    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}小时前`;
+    return `${Math.floor(secondDiff / (60 * 60))}${getLocale('Mood_hoursago')}`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
     return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `前天 ${timeHours + ":" + timeMinutes}`;
+    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
   }
   if (timeYear === nowYear) {
-    return `${timeMonth}月${timeDate}日 ${
+    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
+    return `${dateStr} ${
       timeHours < 10 ? "0" + timeHours : timeHours
     }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
   }
-  return `${timeYear}年${timeMonth}月${timeDate}日 ${
+  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
+  return `${dateStr} ${
     timeHours < 10 ? "0" + timeHours : timeHours
   }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
 };