@titaui/pc 1.9.12 → 1.9.13

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

@@ -100,7 +100,7 @@ var getBimonthlyMonthKeyValue = function getBimonthlyMonthKeyValue(startMonth) {
   var datas = [];
   var monthLang = getMonth();
 
-  if (!_getLocale.isEn) {
+  if (!i18nInfo || i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN") {
     datas.push({
       title: "".concat(start, " - ").concat(getNextMonth(start), "\u6708"),
       value: ["4,".concat(start)]

package/lib/components/create-okr-modal/createCycle.js

@@ -69,7 +69,7 @@ function CreateCycle(_ref) {
   }, []);
 
   var onSelectClickHandler = function onSelectClickHandler() {
-    setSelfCycle(cycle || {});
+    setSelfCycle(cycle);
     popRef.current && popRef.current.show(btnRef.current);
   };
 

package/lib/components/dialog/index.css

@@ -96,7 +96,6 @@
 }
 
 .titaui-dialog__btn-ok:hover {
-  border: 1px solid #5c8eff;
   background: #5c8eff;
   color: #ffffff;
 }

package/lib/components/dynamic/constant.js

@@ -77,7 +77,7 @@ var ObjectType = {
   4: (0, _getLocale.getLocale)('Menu_Title_Projects'),
   5: (0, _getLocale.getLocale)('Mod_sPerformanceForm'),
   6: (0, _getLocale.getLocale)('Mod_sPerformanceGoals'),
-  7: (0, _getLocale.getLocale)('Mod_stasks'),
+  7: (0, _getLocale.getLocale)('Mod_stask'),
   8: (0, _getLocale.getLocale)('Mod_sDailySummary'),
   10: (0, _getLocale.getLocale)('Feed_sFeed'),
   11: (0, _getLocale.getLocale)('Pro_page_Plan'),

package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js

@@ -57,7 +57,7 @@ var DynamicShare = function DynamicShare(_ref) {
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "__operate-desc"
-    }, (0, _getLocale.getLocale)('Mod_sassessment')), /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)('Mod_skeyprogress')), /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "-desc-operate-type",
       style: {
         background: feedTypeColor

package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js

@@ -152,11 +152,11 @@ var DynamicProgress = function DynamicProgress(_ref) {
       }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
         str: relationParentName,
         keyWord: searchKeyWord
-      })), (0, _getLocale.getLocale)('Mod_skeyrprogress'));
+      })), (0, _getLocale.getLocale)('Mod_skeyresspross'));
     }
 
     if (obj && obj.objType === _constant.EObjType.O) {
-      dom = "".concat((0, _getLocale.getLocale)('Mod_Updated')).concat((0, _getLocale.getLocale)('Mod_objectiveprog'));
+      dom = "".concat((0, _getLocale.getLocale)('Mod_Updated')).concat((0, _getLocale.getLocale)('Mod_skeyprogress'));
     }
 
     if (obj && obj.objType === _constant.EObjType.Task) {

package/lib/components/form/form-fields/password/index.css

@@ -55,7 +55,7 @@
 .form-field-input__input {
   display: inline-block;
   padding: 0;
-  width: calc(100% - 20px);
+  width: calc(100% - 12px);
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   font-weight: 400;
@@ -87,7 +87,7 @@
 
 .form-field-input__hide-icon {
   position: absolute;
-  right: 12px;
+  right: 3px;
   top: 10px;
   width: 16px;
   height: 16px;

package/lib/components/grid-layout/words-cloud/index.js

@@ -19,8 +19,6 @@ var _could = _interopRequireDefault(require("../image/could"));
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _bsGlobal = require("../../../utils/bs-global");
-
 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); }
@@ -44,8 +42,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ComponentId = 'Enterprise-Focus-Hotspots';
 
 function WordCloudComponent() {
-  var versionInfo = (0, _bsGlobal.getBSGlobal)("tenantAuthentication");
-
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
       wordsData = _useState2[0],
@@ -85,7 +81,7 @@ function WordCloudComponent() {
     content: (0, _getLocale.getLocale)('HP_Hotcompanies'),
     iconUrl: require("../image/Collaboration.png"),
     tips: (0, _getLocale.getLocale)('HP_Theenterprise')
-  }, versionInfo.Version === 1 && wordsData.length === 0 && /*#__PURE__*/_react["default"].createElement(_commenComponents.Advice, {
+  }, wordsData.length === 0 && /*#__PURE__*/_react["default"].createElement(_commenComponents.Advice, {
     styles: {
       "float": 'right'
     },

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

@@ -179,3 +179,7 @@
 .okr-drawer-header .titaui-period-selector {
   width: auto !important;
 }
+
+.okr-detail-o-score__form {
+  padding: 10px 32px 8px;
+}

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

@@ -25,7 +25,7 @@ var _oCycle = _interopRequireDefault(require("./o-cycle"));
 
 var _editName = _interopRequireDefault(require("./edit-name"));
 
-var _score = _interopRequireDefault(require("../score"));
+var _oScore = _interopRequireDefault(require("./o-score"));
 
 var _progress = _interopRequireDefault(require("../../../progress"));
 
@@ -183,7 +183,9 @@ var Header = function Header(props) {
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
-  }, showOkrEvalute && /*#__PURE__*/_react["default"].createElement(_score["default"], {
+  }, showOkrEvalute && /*#__PURE__*/_react["default"].createElement(_oScore["default"], {
+    editable: editable,
+    okrId: okrInfo.workId,
     score: okrInfo.evaluateValue
   }))), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
     okrInfo: okrInfo,

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

@@ -0,0 +1,159 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _context = require("../../context");
+
+var _score = _interopRequireDefault(require("../score"));
+
+var _toast = _interopRequireDefault(require("../../../toast"));
+
+var _dialog = _interopRequireDefault(require("../../../dialog"));
+
+var _form = _interopRequireDefault(require("../../../form"));
+
+var _requestApis = require("../../request-apis");
+
+require("./index.css");
+
+var _excluded = ["score", "okrId"];
+
+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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+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; }
+
+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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var FormFields = _form["default"].Fields;
+var preCls = "okr-detail-o-score";
+
+var OScore = function OScore(props) {
+  var score = props.score,
+      okrId = props.okrId,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useContext = (0, _react.useContext)(_context.CommonContext),
+      refreshAll = _useContext.refreshAll;
+
+  var _useState3 = (0, _react.useState)({
+    score: score,
+    describe: ""
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      formFiedlsValue = _useState4[0],
+      setFormFiedlsValue = _useState4[1];
+
+  var formContainerRef = (0, _react.useRef)();
+  var formRef = (0, _react.useRef)();
+
+  var changeOScore = function changeOScore() {
+    setVisible(true);
+  };
+
+  var handleCancel = function handleCancel() {
+    setVisible(false);
+  };
+
+  var handleOk = function handleOk() {
+    (0, _requestApis.updateOScore)(formFiedlsValue.score, okrId).then(function (res) {
+      if (!!res.Code) {
+        _toast["default"].Success('修改成功');
+
+        handleCancel();
+        refreshAll();
+      } else {
+        _toast["default"].Error(res.Message || '操作失败');
+      }
+    })["catch"](function (err) {
+      console.log(err);
+
+      _toast["default"].Error('操作失败');
+    });
+  };
+
+  var onFieldsChangeHandler = function onFieldsChangeHandler(fields) {
+    var newFields = _objectSpread({}, fields);
+
+    setFormFiedlsValue(newFields);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_score["default"], _extends({
+    score: score,
+    onClick: changeOScore
+  }, restProps)), /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
+    title: "O \u8BC4\u5206",
+    visible: visible,
+    animation: "slide-fade",
+    maskAnimation: "fade",
+    destroyOnClose: true,
+    width: 538,
+    onClose: handleCancel,
+    onOk: handleOk,
+    onCancel: handleCancel,
+    noHeadLine: true,
+    noFooterLine: true
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    ref: formContainerRef,
+    className: "".concat(preCls, "__form")
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    ref: formRef,
+    getFormContainer: function getFormContainer() {
+      return formContainerRef.current;
+    },
+    onFieldsChange: onFieldsChangeHandler
+  }, /*#__PURE__*/_react["default"].createElement(FormFields.Input, {
+    name: "score",
+    label: "\u8BC4\u5206",
+    className: "".concat(preCls, "__form-item"),
+    placeholder: "\u8BF7\u8F93\u5165\u8BC4\u5206",
+    value: formFiedlsValue.score,
+    require: true,
+    layout: "row",
+    verifies: [{
+      tip: "\u8BC4\u5206\u4E0D\u80FD\u4E3A\u7A7A",
+      test: /^[\s\S]+$/
+    }, {
+      tip: "\u8BF7\u8F93\u51650-1\u95F4\u7684\u6570\u5B57\uFF0C\u652F\u6301\u5C0F\u6570\u70B9\u540E\u4E24\u4F4D",
+      test: /^(1|0(\.\d{1,2})?)$/
+    }]
+  })))));
+};
+
+var _default = OScore;
+exports["default"] = _default;

package/lib/components/okr-detail/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
+exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -542,4 +542,13 @@ var updateChildOkrWeight = function updateChildOkrWeight(data) {
   });
 };
 
-exports.updateChildOkrWeight = updateChildOkrWeight;
+exports.updateChildOkrWeight = updateChildOkrWeight;
+
+var updateOScore = function updateOScore(score, workId) {
+  return (0, _request.rpost)('v2')('work/score', {
+    manualScore: score,
+    workId: workId
+  });
+};
+
+exports.updateOScore = updateOScore;

package/lib/components/okr-progress-modal/index.js

@@ -54,8 +54,7 @@ var ProgressModal = function ProgressModal(props) {
       okrInfo = props.okrInfo,
       onClose = props.onClose,
       onOk = props.onOk,
-      _props$title = props.title,
-      title = _props$title === void 0 ? window.getLocale('OKR_MyO_Prog_Butt_Update') : _props$title,
+      title = props.title,
       visible = props.visible,
       isKr = props.isKr;
   var configure = isKr ? (0, _helper.getKR_SETTING)() : (0, _helper.getO_SETTING)();
@@ -176,7 +175,7 @@ var ProgressModal = function ProgressModal(props) {
       alignSelf: 'flex-start',
       marginTop: '10px'
     }
-  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Progress')), /*#__PURE__*/_react["default"].createElement(_textarea["default"], {
+  }, (0, _getLocale.getLocale)('Feed_Tab_Title_Progress')), /*#__PURE__*/_react["default"].createElement(_textarea["default"], {
     hasError: errorRemark,
     placeholder: (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Pleprogress'),
     style: {
@@ -229,7 +228,7 @@ var ProgressModal = function ProgressModal(props) {
     width: 600
   }, /*#__PURE__*/_react["default"].createElement(_style.List, null, /*#__PURE__*/_react["default"].createElement(_style.Item, null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "auto-update__item-label"
-  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Progresss1')), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Progress')), /*#__PURE__*/_react["default"].createElement("div", {
     className: "auto-update__item-progress"
   }, /*#__PURE__*/_react["default"].createElement(_titaUi.Input, {
     type: "number",
@@ -292,6 +291,7 @@ var ProgressModal = function ProgressModal(props) {
 };
 
 ProgressModal.defaultProps = {
+  title: (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Update'),
   maxLength: 500
 };
 var _default = ProgressModal;

package/lib/pages/like-ranking/filter-buttons/timer.js

@@ -43,7 +43,7 @@ var Timer = function Timer(_ref) {
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
-    format: "YYYY/MM/DD",
+    format: "YYYY-MM-DD",
     controlled: true,
     onConfirm: onStartDateConfirmHandler,
     defaultRange: {

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

@@ -72,11 +72,7 @@
 
 .titaui-personal-info-base-info__form {
   box-sizing: border-box;
-  margin-bottom: 16px;
-}
-
-.titaui-personal-info-base-info__form:last-of-type {
-  margin-bottom: 0;
+  padding: 10px 0;
 }
 
 .titaui-personal-info-base-info__form-title {
@@ -84,6 +80,7 @@
   font-weight: 600;
   color: #141C28;
   line-height: 22px;
+  margin-bottom: 6px;
 }
 
 .titaui-personal-info-base-info__form-value {

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

@@ -95,8 +95,7 @@ var BaseInfo = function BaseInfo() {
   }), /*#__PURE__*/_react["default"].createElement(_editBaseInfo["default"], {
     visible: visible,
     onCancel: handleCancelEdit,
-    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo,
-    info: userInfo
+    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -48,9 +48,8 @@ var prefix = "titaui-edit-personal-info";
 
 var EditBaseInfo = function EditBaseInfo(props) {
   var visible = props.visible,
-      _onCancel = props.onCancel,
-      handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo,
-      info = props.info;
+      onCancel = props.onCancel,
+      handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo;
   var modalRef = (0, _react.useRef)();
   var formContainerRef = (0, _react.useRef)();
   var formRef = (0, _react.useRef)();
@@ -123,8 +122,7 @@ var EditBaseInfo = function EditBaseInfo(props) {
           });
 
           handleSuccessEditBaseInfo(userInfo);
-
-          _onCancel();
+          onCancel();
         } else {
           _toast["default"].Error(resp.Message, {
             canClose: false
@@ -152,24 +150,8 @@ var EditBaseInfo = function EditBaseInfo(props) {
     title: '基本信息设置',
     noHeadLine: true,
     maskClosable: false,
-    onClose: function onClose() {
-      _onCancel();
-
-      setUserInfo({
-        name: info.name,
-        mobile: info.mobile,
-        email: info.email
-      });
-    },
-    onCancel: function onCancel() {
-      _onCancel();
-
-      setUserInfo({
-        name: info.name,
-        mobile: info.mobile,
-        email: info.email
-      });
-    },
+    onClose: onCancel,
+    onCancel: onCancel,
     okText: "\u786E\u5B9A",
     noFooterLine: true,
     onOk: handleSaveUserInfo,

package/lib/utils/format-time.js

@@ -66,7 +66,7 @@ var timeFormat = function timeFormat(NowDate) {
 
   var d = date.getDate(); //日
 
-  return y + "/" + m + "/" + d + " 0:0:0";
+  return y + "-" + m + "-" + d + " 0:0:0";
 }; // 获取当年第一天
 
 
@@ -97,7 +97,7 @@ var showWeekFirstDay = function showWeekFirstDay() {
 
   var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   var M = Number(WeekFirstDay.getMonth()) + 1;
-  return WeekFirstDay.getFullYear() + "/" + M + "/" + WeekFirstDay.getDate() + " 0:0:0";
+  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate() + " 0:0:0";
 }; // 本周最后一天
 
 
@@ -111,7 +111,7 @@ var showWeekLastDay = function showWeekLastDay() {
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate();
+  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate();
 }; // 下周第一天
 
 
@@ -125,7 +125,7 @@ var showNextWeekFirstDay = function showNextWeekFirstDay() {
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate() + " 0:0:0";
+  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate() + " 0:0:0";
 }; // 本月第一天
 
 
@@ -135,7 +135,7 @@ var showMonthFirstDay = function showMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate() + " 0:0:0";
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
 }; // 本月最后一天
 
 
@@ -147,7 +147,7 @@ var showMonthLastDay = function showMonthLastDay() {
 
   var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
   var M = Number(MonthLastDay.getMonth()) + 1;
-  return MonthLastDay.getFullYear() + "/" + M + "/" + MonthLastDay.getDate();
+  return MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
 }; // 下个月第一天
 
 
@@ -157,7 +157,7 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate() + " 0:0:0";
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
 };
 
 exports.showNextMonthFirstDay = showNextMonthFirstDay;

package/package.json

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

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

@@ -1,4 +1,3 @@
-import { getBSGlobal } from "&/utils/bs-global";
 import { getLocale, isEn } from "../../utils/getLocale";
 
 export const getYear = () => {
@@ -88,7 +87,7 @@ export const getBimonthlyMonthKeyValue = (startMonth) => {
     value: string[];
   }[] = [];
   const monthLang = getMonth();
-  if (!isEn) {
+  if (!i18nInfo || (i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN")) {
     datas.push({
       title: `${start} - ${getNextMonth(start)}月`,
       value: [`4,${start}`],

package/src/components/create-okr-modal/createCycle.tsx

@@ -44,7 +44,7 @@ function CreateCycle({ cycle, container, onChange }: Props): ReactElement {
   },[])
 
   const onSelectClickHandler = () => {
-    setSelfCycle(cycle || {});
+    setSelfCycle(cycle);
     popRef.current && popRef.current.show(btnRef.current);
   }
 

package/src/components/dialog/index.scss

@@ -89,7 +89,6 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     color: #ffffff;
     transition: 0.2s all;
     &:hover {
-      border: 1px solid #5c8eff;
       background: #5c8eff;
       color: #ffffff;
     }

package/src/components/dynamic/constant.ts

@@ -60,7 +60,7 @@ export const ObjectType = {
   4: getLocale('Menu_Title_Projects'),
   5: getLocale('Mod_sPerformanceForm'),
   6: getLocale('Mod_sPerformanceGoals'),
-  7: getLocale('Mod_stasks'),
+  7: getLocale('Mod_stask'),
   8: getLocale('Mod_sDailySummary'),
   10: getLocale('Feed_sFeed'),
   11: getLocale('Pro_page_Plan'),

package/src/components/dynamic/dynamic-item/dynamic-assessment/index.tsx

@@ -28,7 +28,7 @@ const DynamicShare: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
   const renderDesc = useMemo(() => {
     return (
       <Fragment>
-        <span className={prefix + "__operate-desc"}>{getLocale('Mod_sassessment')}</span>
+        <span className={prefix + "__operate-desc"}>{getLocale('Mod_skeyprogress')}</span>
         <span
           className={prefix + "-desc-operate-type"}
           style={{ background: feedTypeColor }}

package/src/components/dynamic/dynamic-item/dynamic-progress/index.tsx

@@ -108,12 +108,12 @@ const DynamicProgress: FC<IDynamicItemContentProps> = ({
           >
             <SearchKeyHandle str={relationParentName} keyWord={searchKeyWord} />
           </span>
-          {getLocale('Mod_skeyrprogress')}
+          {getLocale('Mod_skeyresspross')}
         </span>
       );
     }
     if (obj && obj.objType === EObjType.O) {
-      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_objectiveprog')}`;
+      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_skeyprogress')}`;
     }
     if (obj && obj.objType === EObjType.Task) {
       dom = `${getLocale('Mod_Updated')}${getLocale('Data_Taskprogress')}`;

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

@@ -21,7 +21,7 @@ interface Props {
   name: string;
   getContainer?: Function;
   disabled?: boolean;
-  layout?: 'clomn'|'row';
+  layout?: 'column'|'row';
   className?:string;
 }
 interface Error {

package/src/components/form/form-fields/password/index.scss

@@ -51,7 +51,7 @@
   &__input {
     display: inline-block;
     padding: 0;
-    width: calc(100% - 20px);
+    width: calc(100% - 12px);
     font-size: 14px;
     font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
       sans-serif, PingFang SC, Microsoft YaHei;
@@ -80,7 +80,7 @@
   }
   &__hide-icon {
     position: absolute;
-    right: 12px;
+    right: 3px;
     top: 10px;
     width: 16px;
     height: 16px;

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

@@ -19,8 +19,9 @@ interface Props {
   require?: boolean;
   name: string;
   getContainer?: Function;
-  resizeType: 'none' | 'vertical';//不能修改宽度
+  resizeType?: 'none' | 'vertical';//不能修改宽度
   areaHeight: number;
+  layout?:'column'|'row'
 }
 
 interface Error {

package/src/components/grid-layout/words-cloud/index.tsx

@@ -7,7 +7,6 @@ import lvMask from '../image/lv'
 import couldMask from '../image/could'
 import titaMask from '../image/tita-mask'
 import { getLocale } from "../../../utils/getLocale";
-import { getBSGlobal } from "../../../utils/bs-global";
 
 const ComponentId = 'Enterprise-Focus-Hotspots'
 
@@ -15,7 +14,6 @@ const ComponentId = 'Enterprise-Focus-Hotspots'
 
 export default function WordCloudComponent() {
 
-  const versionInfo = getBSGlobal("tenantAuthentication");
   const [wordsData, setWordsData] = useState<WordsData>([])
 
   useEffect(() => {
@@ -42,7 +40,7 @@ export default function WordCloudComponent() {
         iconUrl={require('../image/Collaboration.png')}
         tips={getLocale('HP_Theenterprise')}
       >
-        {versionInfo.Version === 1 && wordsData.length === 0 && (
+        {wordsData.length === 0 && (
           <Advice
             styles={{ float: 'right' }}
             link="https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true"

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

@@ -7,7 +7,7 @@ import OAvatar from "./o-avatar";
 import OType from "../okr-type";
 import OCycle from "./o-cycle";
 import EditNameCmp from "./edit-name";
-import Score from "../score";
+import Score from "./o-score";
 import Progress from "../../../progress";
 import { OkrRiskMapping } from "../../../progress/utils";
 
@@ -115,6 +115,7 @@ const Header = (props) => {
       </span>
     );
   };
+
   return (
     <div className={precls} draggable={false}>
       <div className={`${precls}__avatar`}>
@@ -148,7 +149,7 @@ const Header = (props) => {
               <OCycle editable={editable} okrId={okrInfo.workId} />
             </span>
             <span className={`${precls}__action-item`}>
-              {showOkrEvalute && <Score score={okrInfo.evaluateValue} />}
+              {showOkrEvalute && <Score editable={editable} okrId={okrInfo.workId} score={okrInfo.evaluateValue} />}
             </span>
           </span>
           <OProgressUpdate okrInfo={okrInfo} renderContent={renderContent} />

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

@@ -163,3 +163,8 @@ $lignt-color: #2879ff;
     width: auto!important;
   }
 }
+.okr-detail-o-score{
+  &__form{
+    padding: 10px 32px 8px;
+  }
+}

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

@@ -0,0 +1,111 @@
+import React,{Fragment,useState,useRef,useContext} from "react";
+import { CommonContext, GeneralDataContext } from "../../context";
+import classNames from "classnames";
+import Score from "../score";
+import Toast from "../../../toast"
+import Dialog from "../../../dialog"
+import Form from "../../../form"
+import { updateOScore } from "../../request-apis"
+import { getLocale } from "../../../../utils/getLocale";
+import './index.scss'
+
+const FormFields = Form.Fields;
+const preCls = "okr-detail-o-score"
+
+
+interface IOScoreProps {
+  score:number;
+  okrId:string | number;
+
+}
+interface FormFields {
+  score: string | number;
+  describe: string;
+}
+const OScore = (props: IOScoreProps) => {
+  const { score,okrId, ...restProps } = props;
+  const [visible,setVisible] = useState(false)
+  const { refreshAll } = useContext(CommonContext)
+  const [formFiedlsValue, setFormFiedlsValue] = useState<FormFields>({
+    score: score,
+    describe : "",
+  });
+  const formContainerRef = useRef<any>();
+  const formRef = useRef<any>();
+  const changeOScore = () =>{
+    setVisible(true)
+  }
+
+  const handleCancel = () =>{
+    setVisible(false)
+  }
+
+  const handleOk = () =>{
+    updateOScore(formFiedlsValue.score,okrId).then(res=>{
+      if(!!res.Code){
+        Toast.Success('修改成功')
+        handleCancel()
+        refreshAll()
+      }else{
+        Toast.Error(res.Message||'操作失败')
+      }
+    }).catch(err=>{
+      console.log(err)
+      Toast.Error('操作失败')
+    })
+  }
+
+  const onFieldsChangeHandler = (fields) => {
+    const newFields = { ...fields };
+    setFormFiedlsValue(newFields);
+  };
+
+  return (
+    <Fragment>
+      <Score score={score} onClick={changeOScore} {...restProps} />
+      <Dialog
+          title={`O 评分`}
+          visible={visible}
+          animation="slide-fade"
+          maskAnimation="fade"
+          destroyOnClose={true}
+          width={538}
+          onClose={handleCancel}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          noHeadLine
+          noFooterLine
+        >
+          <div ref={formContainerRef} className={`${preCls}__form`}>
+            <Form
+              ref={formRef}
+              getFormContainer={() => formContainerRef.current}
+              onFieldsChange={onFieldsChangeHandler}
+            >
+              <FormFields.Input
+                name="score"
+                label={`评分`}
+                className={`${preCls}__form-item`}
+                placeholder={`请输入评分`}
+                value={formFiedlsValue.score}
+                require={true}
+                layout="row"
+                verifies={
+                  [{
+                    tip: `评分不能为空`,
+                    test: /^[\s\S]+$/,
+                  },
+                  {
+                    tip: `请输入0-1间的数字，支持小数点后两位`,
+                    test: /^(1|0(\.\d{1,2})?)$/,
+                  },
+                  ]
+                }
+              />
+            </Form>
+          </div>
+        </Dialog>
+    </Fragment>
+  );
+};
+export default OScore;

package/src/components/okr-detail/request-apis.ts

@@ -414,3 +414,10 @@ export const updateChildOkrWeight = (data: { OkrId: number, Weight: number }[])
     "transformRequest": qs.stringify,
   })
 }
+
+export const updateOScore = (score,workId) => {
+  return rpost('v2')('work/score', {
+    manualScore: score,
+    workId:workId
+  })
+}

package/src/components/okr-progress-modal/index.tsx

@@ -11,7 +11,7 @@ import { getLocale } from '../../utils/getLocale';
 import './index.scss';
 
 const ProgressModal: React.FC<IProgressModalProps> = props => {
-  const { maxLength, okrInfo, onClose, onOk, title = window.getLocale('OKR_MyO_Prog_Butt_Update'), visible, isKr } = props;
+  const { maxLength, okrInfo, onClose, onOk, title, visible, isKr } = props;
 
   const configure = isKr ? getKR_SETTING() : getO_SETTING();
 
@@ -70,7 +70,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
       <span
         className='auto-update__item-label'
         style={{ alignSelf: 'flex-start', marginTop: '10px' }}
-      >{getLocale('OKR_MyO_Pop_Upd_Progress')}</span>
+      >{getLocale('Feed_Tab_Title_Progress')}</span>
       <Textarea
         hasError={errorRemark}
         placeholder={getLocale('OKR_MyO_Pop_Upd_Pleprogress')}
@@ -126,7 +126,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
     >
       <List>
         <Item>
-          <span className='auto-update__item-label'>{getLocale('OKR_MyO_Pop_Upd_Progresss1')}</span>
+          <span className='auto-update__item-label'>{getLocale('OKR_MyO_Pop_Upd_Progress')}</span>
           <div className='auto-update__item-progress'>
             <Input
               type='number'
@@ -222,6 +222,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
 };
 
 ProgressModal.defaultProps = {
+  title: getLocale('OKR_MyO_Prog_Butt_Update'),
   maxLength: 500,
 };
 

package/src/pages/like-ranking/filter-buttons/timer.tsx

@@ -20,7 +20,7 @@ const Timer: FC<any> = ({ setParma, parmas,setType }) => {
   return (
     <Fragment>
       <RangePickerPop
-        format="YYYY/MM/DD"
+        format="YYYY-MM-DD"
         controlled
         onConfirm={onStartDateConfirmHandler}
         defaultRange={{

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

@@ -63,15 +63,13 @@
   }
   &__form {
     box-sizing: border-box;
-    margin-bottom: 16px;
-    &:last-of-type {
-      margin-bottom: 0;
-    }
+    padding: 10px 0;
     &-title {
       font-size: 14px;
       font-weight: 600;
       color: #141C28;
       line-height: 22px;
+      margin-bottom: 6px;
     }
     &-value {
       font-size: 12px;

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

@@ -40,7 +40,7 @@ const BaseInfo: FC = () => {
           text={getLocale('Mod_Editor')}
           onClick={handleClickEdit}
         />
-        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo} info={userInfo}/>
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>姓名</div>

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

@@ -10,7 +10,7 @@ const { Fields } = Form;
 const prefix = "titaui-edit-personal-info"
 
 const EditBaseInfo = (props) => {
-	const { visible, onCancel, handleSuccessEditBaseInfo, info } = props;
+	const { visible, onCancel, handleSuccessEditBaseInfo } = props;
 
 	const modalRef = useRef<any>();
   const formContainerRef = useRef<any>();
@@ -89,14 +89,8 @@ const EditBaseInfo = (props) => {
 			title={'基本信息设置'}
 			noHeadLine
 			maskClosable={false}
-			onClose={() => {
-        onCancel();        
-        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
-      }}
-			onCancel={() => {
-        onCancel();
-        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
-      }}
+			onClose={onCancel}
+			onCancel={onCancel}
 			okText="确定"
 			noFooterLine
 			onOk={handleSaveUserInfo}

package/src/utils/format-time.ts

@@ -51,7 +51,7 @@ export const timeFormat = (NowDate) => {
   var y = date.getFullYear(); //年
   var m = date.getMonth() + 1; //月
   var d = date.getDate(); //日
-  return y + "/" + m + "/" + d+" 0:0:0";
+  return y + "-" + m + "-" + d+" 0:0:0";
 };
 
 // 获取当年第一天
@@ -74,7 +74,7 @@ export const showWeekFirstDay = () => {
   // @ts-ignore
   let WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   let M = Number(WeekFirstDay.getMonth()) + 1;
-  return WeekFirstDay.getFullYear() + "/" + M + "/" + WeekFirstDay.getDate()+" 0:0:0";
+  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate()+" 0:0:0";
 };
 
 // 本周最后一天
@@ -86,7 +86,7 @@ export const showWeekLastDay = () => {
   // @ts-ignore
   let WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   let M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate();
+  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate();
 };
 
 // 下周第一天
@@ -98,7 +98,7 @@ export const showNextWeekFirstDay = () => {
   // @ts-ignore
   let WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   let M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate()+" 0:0:0";
+  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate()+" 0:0:0";
 };
 
 // 本月第一天
@@ -106,7 +106,7 @@ export const showMonthFirstDay = () => {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate()+" 0:0:0";
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate()+" 0:0:0";
 };
 
 // 本月最后一天
@@ -120,7 +120,7 @@ export const showMonthLastDay = () => {
   // @ts-ignore
   var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
   var M = Number(MonthLastDay.getMonth()) + 1;
-  return MonthLastDay.getFullYear() + "/" + M + "/" + MonthLastDay.getDate();
+  return MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
 };
 // 下个月第一天
 export const showNextMonthFirstDay = () => {
@@ -131,5 +131,5 @@ export const showNextMonthFirstDay = () => {
     1
   );
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate()+" 0:0:0";
+  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate()+" 0:0:0";
 };