@titaui/pc 1.9.11 → 1.9.15

package/lib/components/dialog/index.css

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

package/lib/components/dynamic/dynamic-item/dynamic-reward/index.css

@@ -17,7 +17,6 @@
   color: #3f4755;
   line-height: 22px;
   display: flex;
-  margin-top: 12px;
 }
 
 .titaui-dynamic-reward-item__description-quoto {
@@ -33,6 +32,7 @@
 .titaui-dynamic-reward-item__description-quoto--right {
   margin-left: 8px;
   margin-top: 4px;
+  margin-right: 12px;
 }
 
 .titaui-dynamic-reward-item__status-left {
@@ -48,6 +48,8 @@
   padding: 1px 12px;
   font-size: 12px;
   line-height: 18px;
+  border-radius: 12px;
+  margin-right: 8px;
 }
 
 .titaui-dynamic-reward-item__operate-desc {

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

@@ -102,7 +102,7 @@ var DynamicReward = function DynamicReward(_ref) {
 
   var renderTitle = (0, _react.useMemo)(function () {
     if (!obj) {
-      return;
+      return "";
     }
 
     var objType = obj.objType,
@@ -117,15 +117,15 @@ var DynamicReward = function DynamicReward(_ref) {
     }
 
     if (objType === _constant.EObjType.Task) {
-      return "".concat((0, _getLocale.getLocale)('Mod_Tasks'), "\uFF1A") + objName;
+      return "".concat((0, _getLocale.getLocale)("Mod_Tasks"), "\uFF1A") + objName;
     }
 
     if (objType === _constant.EObjType.Project) {
-      return "".concat((0, _getLocale.getLocale)('Mod_Project'), "\uFF1A") + objName;
+      return "".concat((0, _getLocale.getLocale)("Mod_Project"), "\uFF1A") + objName;
     }
 
     if (objType === _constant.EObjType.Assess) {
-      return "".concat((0, _getLocale.getLocale)('Mod_Performance'), "\uFF1A") + objName;
+      return "".concat((0, _getLocale.getLocale)("Mod_Performance"), "\uFF1A") + objName;
     }
 
     return "";
@@ -162,7 +162,7 @@ var DynamicReward = function DynamicReward(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: rewardUser.name,
       id: rewardUser.userId
-    })), (0, _getLocale.getLocale)('OKR_MyO_E_Reward'))), /*#__PURE__*/_react["default"].createElement("span", {
+    })), (0, _getLocale.getLocale)("OKR_MyO_E_Reward"))), /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "-desc-operate-type",
       style: {
         background: feedTypeColor
@@ -179,12 +179,15 @@ var DynamicReward = function DynamicReward(_ref) {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__title"
-  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
+  }, renderTitle && /*#__PURE__*/_react["default"].createElement(_title["default"], {
     content: renderTitle,
     onClickTitle: handleClickTitle,
     suffixContent: Classify
   })), rewardContent && /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix + "__description"
+    className: prefix + "__description",
+    style: {
+      marginTop: renderTitle ? '12px' : '0'
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])(prefix + "__description-quoto", prefix + "__description-quoto--left"),
     src: _dynamicLeftQuoto["default"]

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

@@ -9,7 +9,6 @@
 
 .form-field-input-row .form-field-input__border {
   margin-left: 16px;
-  border: 1px solid #DFE3EA;
   flex: 1;
 }
 

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% - 12px);
+  width: calc(100% - 20px);
   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: 3px;
+  right: 12px;
   top: 10px;
   width: 16px;
   height: 16px;

package/lib/components/grid-layout/personal-info/index.js

@@ -125,6 +125,8 @@ function PersonalInfoComponent() {
     setUserRoles(userRoleList.slice(0, 2)); //请求获取信息
 
     (0, _network["default"])(ComponentId).then(function (res) {
+      var _item$componentData$, _item$componentData$$, _item$componentData$2, _item$componentData$3, _item$componentData$4, _item$componentData$5, _item$componentData$6, _item$componentData$7, _item$componentData$8, _item$componentData$9, _item$componentData$10, _item$componentData$11, _item$componentData$12, _item$componentData$13, _item$componentData$14, _item$componentData$15, _item$componentData$16, _item$componentData$17, _item$componentData$18, _item$componentData$19, _item$componentData$20, _item$componentData$21, _item$componentData$22;
+
       var _iterator = _createForOfIteratorHelper(res),
           _step;
 
@@ -134,33 +136,33 @@ function PersonalInfoComponent() {
 
           switch (_item.componentDataProp) {
             case 'myInfo':
-              setAvatarUrl(_item.componentData[0].simpleUserModelV2.avatar.large);
+              setAvatarUrl(_item === null || _item === void 0 ? void 0 : _item.componentData[0].simpleUserModelV2.avatar.large);
               setUserName({
-                name: _item.componentData[0].simpleUserModelV2.name,
-                userId: _item.componentData[0].simpleUserModelV2.userId
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$ = _item.componentData[0]) === null || _item$componentData$ === void 0 ? void 0 : (_item$componentData$$ = _item$componentData$.simpleUserModelV2) === null || _item$componentData$$ === void 0 ? void 0 : _item$componentData$$.name,
+                userId: _item === null || _item === void 0 ? void 0 : (_item$componentData$2 = _item.componentData[0]) === null || _item$componentData$2 === void 0 ? void 0 : (_item$componentData$3 = _item$componentData$2.simpleUserModelV2) === null || _item$componentData$3 === void 0 ? void 0 : _item$componentData$3.userId
               });
               setDepartment({
-                name: _item.componentData[0].simpleUserModelV2.departmentName,
-                departmentId: _item.componentData[0].simpleUserModelV2.departmentId
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$4 = _item.componentData[0]) === null || _item$componentData$4 === void 0 ? void 0 : (_item$componentData$5 = _item$componentData$4.simpleUserModelV2) === null || _item$componentData$5 === void 0 ? void 0 : _item$componentData$5.departmentName,
+                departmentId: _item === null || _item === void 0 ? void 0 : (_item$componentData$6 = _item.componentData[0]) === null || _item$componentData$6 === void 0 ? void 0 : (_item$componentData$7 = _item$componentData$6.simpleUserModelV2) === null || _item$componentData$7 === void 0 ? void 0 : _item$componentData$7.departmentId
               });
-              setAvatarColor(_item.componentData[0].simpleUserModelV2.avatar.color);
+              setAvatarColor(_item === null || _item === void 0 ? void 0 : (_item$componentData$8 = _item.componentData[0]) === null || _item$componentData$8 === void 0 ? void 0 : (_item$componentData$9 = _item$componentData$8.simpleUserModelV2) === null || _item$componentData$9 === void 0 ? void 0 : (_item$componentData$10 = _item$componentData$9.avatar) === null || _item$componentData$10 === void 0 ? void 0 : _item$componentData$10.color);
               break;
 
             case 'myFollowInfo':
-              setFansNum(_item.componentData[0].total);
+              setFansNum(_item === null || _item === void 0 ? void 0 : (_item$componentData$11 = _item.componentData[0]) === null || _item$componentData$11 === void 0 ? void 0 : _item$componentData$11.total);
               break;
 
             case 'myPraiseInfo':
-              setLikeNum(_item.componentDataCount);
+              setLikeNum(_item === null || _item === void 0 ? void 0 : _item.componentDataCount);
               break;
 
             case 'latelyFPInfo':
               _item.componentData[0] && setScrollMessage({
-                name: _item.componentData[0].simpleUserModelV2.name,
-                date: _item.componentData[0].folowPariseDate,
-                userId: _item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: _item.componentData[0].simpleUserModelV2.avatar.large,
-                avatarColor: _item.componentData[0].simpleUserModelV2.avatar.color
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$12 = _item.componentData[0]) === null || _item$componentData$12 === void 0 ? void 0 : (_item$componentData$13 = _item$componentData$12.simpleUserModelV2) === null || _item$componentData$13 === void 0 ? void 0 : _item$componentData$13.name,
+                date: _item === null || _item === void 0 ? void 0 : (_item$componentData$14 = _item.componentData[0]) === null || _item$componentData$14 === void 0 ? void 0 : _item$componentData$14.folowPariseDate,
+                userId: _item === null || _item === void 0 ? void 0 : (_item$componentData$15 = _item.componentData[0]) === null || _item$componentData$15 === void 0 ? void 0 : (_item$componentData$16 = _item$componentData$15.simpleUserModelV2) === null || _item$componentData$16 === void 0 ? void 0 : _item$componentData$16.userId,
+                avatarSrc: _item === null || _item === void 0 ? void 0 : (_item$componentData$17 = _item.componentData[0]) === null || _item$componentData$17 === void 0 ? void 0 : (_item$componentData$18 = _item$componentData$17.simpleUserModelV2) === null || _item$componentData$18 === void 0 ? void 0 : (_item$componentData$19 = _item$componentData$18.avatar) === null || _item$componentData$19 === void 0 ? void 0 : _item$componentData$19.large,
+                avatarColor: _item === null || _item === void 0 ? void 0 : (_item$componentData$20 = _item.componentData[0]) === null || _item$componentData$20 === void 0 ? void 0 : (_item$componentData$21 = _item$componentData$20.simpleUserModelV2) === null || _item$componentData$21 === void 0 ? void 0 : (_item$componentData$22 = _item$componentData$21.avatar) === null || _item$componentData$22 === void 0 ? void 0 : _item$componentData$22.color
               });
               break;
           }

package/lib/components/grid-page/personal-info/index.js

@@ -125,6 +125,8 @@ function PersonalInfoComponent() {
     setUserRoles(userRoleList.slice(0, 2)); //请求获取信息
 
     (0, _network["default"])(ComponentId).then(function (res) {
+      var _item$componentData$, _item$componentData$$, _item$componentData$2, _item$componentData$3, _item$componentData$4, _item$componentData$5, _item$componentData$6, _item$componentData$7, _item$componentData$8, _item$componentData$9, _item$componentData$10, _item$componentData$11, _item$componentData$12, _item$componentData$13, _item$componentData$14, _item$componentData$15, _item$componentData$16, _item$componentData$17, _item$componentData$18, _item$componentData$19, _item$componentData$20, _item$componentData$21, _item$componentData$22;
+
       var _iterator = _createForOfIteratorHelper(res),
           _step;
 
@@ -134,33 +136,33 @@ function PersonalInfoComponent() {
 
           switch (_item.componentDataProp) {
             case 'myInfo':
-              setAvatarUrl(_item.componentData[0].simpleUserModelV2.avatar.large);
+              setAvatarUrl(_item === null || _item === void 0 ? void 0 : _item.componentData[0].simpleUserModelV2.avatar.large);
               setUserName({
-                name: _item.componentData[0].simpleUserModelV2.name,
-                userId: _item.componentData[0].simpleUserModelV2.userId
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$ = _item.componentData[0]) === null || _item$componentData$ === void 0 ? void 0 : (_item$componentData$$ = _item$componentData$.simpleUserModelV2) === null || _item$componentData$$ === void 0 ? void 0 : _item$componentData$$.name,
+                userId: _item === null || _item === void 0 ? void 0 : (_item$componentData$2 = _item.componentData[0]) === null || _item$componentData$2 === void 0 ? void 0 : (_item$componentData$3 = _item$componentData$2.simpleUserModelV2) === null || _item$componentData$3 === void 0 ? void 0 : _item$componentData$3.userId
               });
               setDepartment({
-                name: _item.componentData[0].simpleUserModelV2.departmentName,
-                departmentId: _item.componentData[0].simpleUserModelV2.departmentId
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$4 = _item.componentData[0]) === null || _item$componentData$4 === void 0 ? void 0 : (_item$componentData$5 = _item$componentData$4.simpleUserModelV2) === null || _item$componentData$5 === void 0 ? void 0 : _item$componentData$5.departmentName,
+                departmentId: _item === null || _item === void 0 ? void 0 : (_item$componentData$6 = _item.componentData[0]) === null || _item$componentData$6 === void 0 ? void 0 : (_item$componentData$7 = _item$componentData$6.simpleUserModelV2) === null || _item$componentData$7 === void 0 ? void 0 : _item$componentData$7.departmentId
               });
-              setAvatarColor(_item.componentData[0].simpleUserModelV2.avatar.color);
+              setAvatarColor(_item === null || _item === void 0 ? void 0 : (_item$componentData$8 = _item.componentData[0]) === null || _item$componentData$8 === void 0 ? void 0 : (_item$componentData$9 = _item$componentData$8.simpleUserModelV2) === null || _item$componentData$9 === void 0 ? void 0 : (_item$componentData$10 = _item$componentData$9.avatar) === null || _item$componentData$10 === void 0 ? void 0 : _item$componentData$10.color);
               break;
 
             case 'myFollowInfo':
-              setFansNum(_item.componentData[0].total);
+              setFansNum(_item === null || _item === void 0 ? void 0 : (_item$componentData$11 = _item.componentData[0]) === null || _item$componentData$11 === void 0 ? void 0 : _item$componentData$11.total);
               break;
 
             case 'myPraiseInfo':
-              setLikeNum(_item.componentDataCount);
+              setLikeNum(_item === null || _item === void 0 ? void 0 : _item.componentDataCount);
               break;
 
             case 'latelyFPInfo':
-              _item.componentData[0] && setScrollMessage({
-                name: _item.componentData[0].simpleUserModelV2.name,
-                date: _item.componentData[0].folowPariseDate,
-                userId: _item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: _item.componentData[0].simpleUserModelV2.avatar.large,
-                avatarColor: _item.componentData[0].simpleUserModelV2.avatar.color
+              (_item === null || _item === void 0 ? void 0 : _item.componentData[0]) && setScrollMessage({
+                name: _item === null || _item === void 0 ? void 0 : (_item$componentData$12 = _item.componentData[0]) === null || _item$componentData$12 === void 0 ? void 0 : (_item$componentData$13 = _item$componentData$12.simpleUserModelV2) === null || _item$componentData$13 === void 0 ? void 0 : _item$componentData$13.name,
+                date: _item === null || _item === void 0 ? void 0 : (_item$componentData$14 = _item.componentData[0]) === null || _item$componentData$14 === void 0 ? void 0 : _item$componentData$14.folowPariseDate,
+                userId: _item === null || _item === void 0 ? void 0 : (_item$componentData$15 = _item.componentData[0]) === null || _item$componentData$15 === void 0 ? void 0 : (_item$componentData$16 = _item$componentData$15.simpleUserModelV2) === null || _item$componentData$16 === void 0 ? void 0 : _item$componentData$16.userId,
+                avatarSrc: _item === null || _item === void 0 ? void 0 : (_item$componentData$17 = _item.componentData[0]) === null || _item$componentData$17 === void 0 ? void 0 : (_item$componentData$18 = _item$componentData$17.simpleUserModelV2) === null || _item$componentData$18 === void 0 ? void 0 : (_item$componentData$19 = _item$componentData$18.avatar) === null || _item$componentData$19 === void 0 ? void 0 : _item$componentData$19.large,
+                avatarColor: _item === null || _item === void 0 ? void 0 : (_item$componentData$20 = _item.componentData[0]) === null || _item$componentData$20 === void 0 ? void 0 : (_item$componentData$21 = _item$componentData$20.simpleUserModelV2) === null || _item$componentData$21 === void 0 ? void 0 : (_item$componentData$22 = _item$componentData$21.avatar) === null || _item$componentData$22 === void 0 ? void 0 : _item$componentData$22.color
               });
               break;
           }

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

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.List = void 0;
 var List = [{
   id: 'person',
-  accept: '.jpg,.jpeg,.gif,.png',
+  accept: '.jpg,.jpeg,.png',
   autoCropArea: 1,
   initialAspectRatio: 1,
-  tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
+  tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
   previewTitle: '预览',
   minCropBoxHeight: 60,
   minCropBoxWidth: 60
 }, {
   id: 'enterprise',
-  accept: '.jpg,.jpeg,.gif,.png',
+  accept: '.jpg,.jpeg,.png',
   autoCropArea: 1,
   initialAspectRatio: 5,
-  tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
+  tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、png 格式',
   previewTitle: 'logo 预览',
   minCropBoxHeight: 20,
   minCropBoxWidth: 20

package/lib/pages/new-okr-list/header/comments.js

@@ -40,7 +40,14 @@ var Comments = function Comments(props) {
       yqmNum = _useContext.yqmNum;
 
   var openComments = function openComments() {
-    pushRef.current && pushRef.current.show();
+    pushRef.current && pushRef.current.show(); // @ts-ignore
+
+    window.titaTracker && // @ts-ignore
+    window.titaTracker('action').record({
+      actionName: 'OKR__点击图标【沟通】',
+      actionGroup: 'OKR-沟通',
+      productName: 'OKR'
+    });
   };
 
   if (!toUserId && relation != 1) return null;

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

@@ -70,42 +70,20 @@
   background-color: #2879ff;
 }
 
-.titaui-personal-info-base-info .form-field-input__label {
-  margin-bottom: 4px;
-}
-
-.titaui-personal-info-base-info .form-field-input__border {
-  padding: 0;
-  border: none;
-  background-color: #fff;
-}
-
-.titaui-personal-info-base-info .form-field-input__label-text {
-  font-weight: 600;
-}
-
-.titaui-personal-info-base-info .form-field-input__input {
-  font-size: 12px;
-  line-height: 18px;
-  background-color: #fff;
-}
-
-.titaui-personal-info-base-info .form-field-input__border--disabled input:disabled {
-  background-color: #fff;
-}
-
 .titaui-personal-info-base-info__form {
-  height: 66px;
   box-sizing: border-box;
-  padding: 10px 0;
+  margin-bottom: 16px;
+}
+
+.titaui-personal-info-base-info__form:last-of-type {
+  margin-bottom: 0;
 }
 
 .titaui-personal-info-base-info__form-title {
   font-size: 14px;
-  font-weight: normal;
+  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

@@ -50,7 +50,7 @@ var BaseInfo = function BaseInfo() {
     name: "",
     email: "",
     mobile: "",
-    id: ''
+    userId: ''
   }),
       _useState2 = _slicedToArray(_useState, 2),
       userInfo = _useState2[0],
@@ -95,7 +95,8 @@ var BaseInfo = function BaseInfo() {
   }), /*#__PURE__*/_react["default"].createElement(_editBaseInfo["default"], {
     visible: visible,
     onCancel: handleCancelEdit,
-    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo
+    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo,
+    info: userInfo
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -103,7 +104,7 @@ var BaseInfo = function BaseInfo() {
   }, "\u59D3\u540D"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__form-value")
   }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    id: userInfo.id,
+    id: userInfo.userId,
     name: userInfo.name
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")

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

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

package/package.json

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

package/src/components/dialog/index.scss

@@ -89,6 +89,7 @@ $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/dynamic-item/dynamic-reward/index.scss

@@ -14,7 +14,6 @@
     color: #3f4755;
     line-height: 22px;
     display: flex;
-    margin-top: 12px;
     &-quoto {
       width: 12px;
       height: 12px;
@@ -26,6 +25,7 @@
     &-quoto--right {
       margin-left: 8px;
       margin-top: 4px;
+      margin-right: 12px;
     }
   }
   &__status-left {
@@ -39,6 +39,8 @@
     padding: 1px 12px;
     font-size: 12px;
     line-height: 18px;
+    border-radius: 12px;
+    margin-right: 8px;
   }
   &__operate-desc {
     font-size: 14px;

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

@@ -64,7 +64,7 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
 
   const renderTitle = useMemo(() => {
     if (!obj) {
-      return;
+      return "";
     }
     const { objType, objName } = obj;
     if (objType === EObjType.Kr) {
@@ -74,13 +74,13 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
       return "O：" + objName;
     }
     if (objType === EObjType.Task) {
-      return `${getLocale('Mod_Tasks')}：` + objName;
+      return `${getLocale("Mod_Tasks")}：` + objName;
     }
     if (objType === EObjType.Project) {
-      return `${getLocale('Mod_Project')}：` + objName;
+      return `${getLocale("Mod_Project")}：` + objName;
     }
     if (objType === EObjType.Assess) {
-      return `${getLocale('Mod_Performance')}：` + objName;
+      return `${getLocale("Mod_Performance")}：` + objName;
     }
     return "";
   }, []);
@@ -122,7 +122,7 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
             >
               <OpenUserName name={rewardUser.name} id={rewardUser.userId} />
             </span>
-            {getLocale('OKR_MyO_E_Reward')}
+            {getLocale("OKR_MyO_E_Reward")}
           </span>
         </span>
         <span
@@ -145,14 +145,16 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
       />
       <div className={prefix + "__content"}>
         <div className={prefix + "__title"}>
-          <DynamicTitle
-            content={renderTitle}
-            onClickTitle={handleClickTitle}
-            suffixContent={Classify}
-          />
+          {renderTitle && (
+            <DynamicTitle
+              content={renderTitle}
+              onClickTitle={handleClickTitle}
+              suffixContent={Classify}
+            />
+          )}
         </div>
         {rewardContent && (
-          <div className={prefix + "__description"}>
+          <div className={prefix + "__description"} style={{marginTop: renderTitle ? '12px' : '0'}}>
             <div>
               <img
                 className={classNames(

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

@@ -7,7 +7,6 @@
     }
     .form-field-input__border{
       margin-left: 16px;
-      border: 1px solid #DFE3EA;
       flex: 1;
     }
   }

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

@@ -51,7 +51,7 @@
   &__input {
     display: inline-block;
     padding: 0;
-    width: calc(100% - 12px);
+    width: calc(100% - 20px);
     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: 3px;
+    right: 12px;
     top: 10px;
     width: 16px;
     height: 16px;

package/src/components/grid-layout/personal-info/index.tsx

@@ -57,35 +57,35 @@ export default function PersonalInfoComponent() {
       for (let item of res) {
         switch (item.componentDataProp) {
           case 'myInfo':
-            setAvatarUrl(item.componentData[0].simpleUserModelV2.avatar.large);
+            setAvatarUrl(item?.componentData[0].simpleUserModelV2.avatar.large);
             setUserName({
-              name: item.componentData[0].simpleUserModelV2.name,
-              userId: item.componentData[0].simpleUserModelV2.userId,
+              name: item?.componentData[0]?.simpleUserModelV2?.name,
+              userId: item?.componentData[0]?.simpleUserModelV2?.userId,
             });
             setDepartment({
-              name: item.componentData[0].simpleUserModelV2.departmentName,
+              name: item?.componentData[0]?.simpleUserModelV2?.departmentName,
               departmentId:
-                item.componentData[0].simpleUserModelV2.departmentId,
+                item?.componentData[0]?.simpleUserModelV2?.departmentId,
             });
             setAvatarColor(
-              item.componentData[0].simpleUserModelV2.avatar.color
+              item?.componentData[0]?.simpleUserModelV2?.avatar?.color
             );
             break;
           case 'myFollowInfo':
-            setFansNum(item.componentData[0].total);
+            setFansNum(item?.componentData[0]?.total);
             break;
           case 'myPraiseInfo':
-            setLikeNum(item.componentDataCount);
+            setLikeNum(item?.componentDataCount);
             break;
           case 'latelyFPInfo':
             item.componentData[0] &&
               setScrollMessage({
-                name: item.componentData[0].simpleUserModelV2.name,
-                date: item.componentData[0].folowPariseDate,
-                userId: item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: item.componentData[0].simpleUserModelV2.avatar.large,
+                name: item?.componentData[0]?.simpleUserModelV2?.name,
+                date: item?.componentData[0]?.folowPariseDate,
+                userId: item?.componentData[0]?.simpleUserModelV2?.userId,
+                avatarSrc: item?.componentData[0]?.simpleUserModelV2?.avatar?.large,
                 avatarColor:
-                  item.componentData[0].simpleUserModelV2.avatar.color,
+                  item?.componentData[0]?.simpleUserModelV2?.avatar?.color,
               });
             break;
         }

package/src/components/grid-page/personal-info/index.tsx

@@ -57,35 +57,35 @@ export default function PersonalInfoComponent() {
       for (let item of res) {
         switch (item.componentDataProp) {
           case 'myInfo':
-            setAvatarUrl(item.componentData[0].simpleUserModelV2.avatar.large);
+            setAvatarUrl(item?.componentData[0].simpleUserModelV2.avatar.large);
             setUserName({
-              name: item.componentData[0].simpleUserModelV2.name,
-              userId: item.componentData[0].simpleUserModelV2.userId,
+              name: item?.componentData[0]?.simpleUserModelV2?.name,
+              userId: item?.componentData[0]?.simpleUserModelV2?.userId,
             });
             setDepartment({
-              name: item.componentData[0].simpleUserModelV2.departmentName,
+              name: item?.componentData[0]?.simpleUserModelV2?.departmentName,
               departmentId:
-                item.componentData[0].simpleUserModelV2.departmentId,
+                item?.componentData[0]?.simpleUserModelV2?.departmentId,
             });
             setAvatarColor(
-              item.componentData[0].simpleUserModelV2.avatar.color
+              item?.componentData[0]?.simpleUserModelV2?.avatar?.color
             );
             break;
           case 'myFollowInfo':
-            setFansNum(item.componentData[0].total);
+            setFansNum(item?.componentData[0]?.total);
             break;
           case 'myPraiseInfo':
-            setLikeNum(item.componentDataCount);
+            setLikeNum(item?.componentDataCount);
             break;
           case 'latelyFPInfo':
-            item.componentData[0] &&
+            item?.componentData[0] &&
               setScrollMessage({
-                name: item.componentData[0].simpleUserModelV2.name,
-                date: item.componentData[0].folowPariseDate,
-                userId: item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: item.componentData[0].simpleUserModelV2.avatar.large,
+                name: item?.componentData[0]?.simpleUserModelV2?.name,
+                date: item?.componentData[0]?.folowPariseDate,
+                userId: item?.componentData[0]?.simpleUserModelV2?.userId,
+                avatarSrc: item?.componentData[0]?.simpleUserModelV2?.avatar?.large,
                 avatarColor:
-                  item.componentData[0].simpleUserModelV2.avatar.color,
+                  item?.componentData[0]?.simpleUserModelV2?.avatar?.color,
               });
             break;
         }

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

@@ -2,20 +2,20 @@
 export const List = [
 	{
 		id: 'person',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 1,
-		tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
+		tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
 		previewTitle: '预览',
     minCropBoxHeight: 60,
     minCropBoxWidth: 60,
 	},
   {
 		id: 'enterprise',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 5,
-		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
+		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、png 格式',
 		previewTitle: 'logo 预览',
     minCropBoxHeight: 20,
     minCropBoxWidth: 20,

package/src/pages/new-okr-list/header/comments.tsx

@@ -13,7 +13,15 @@ const Comments = (props) => {
     Context
   );
   const openComments = () => {
-    pushRef.current && pushRef.current.show();
+    pushRef.current && pushRef.current.show();    
+    // @ts-ignore
+    window.titaTracker &&
+    // @ts-ignore
+    window.titaTracker('action').record({
+    actionName: 'OKR__点击图标【沟通】',
+    actionGroup: 'OKR-沟通',
+    productName: 'OKR',
+  });
   };
 
   if (!toUserId && relation != 1) return null;

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

@@ -61,35 +61,17 @@
       }
     }
   }
-  .form-field-input__label {
-    margin-bottom: 4px;
-  }
-  .form-field-input__border {
-    padding: 0;
-    border: none;
-    background-color: #fff;
-  }
-  .form-field-input__label-text {
-    font-weight: 600;
-  }
-  .form-field-input__input {
-    font-size: 12px;
-    line-height: 18px;
-    background-color: #fff;
-  }
-  .form-field-input__border--disabled input:disabled {
-    background-color: #fff;
-  }
   &__form {
-    height: 66px;
     box-sizing: border-box;
-    padding: 10px 0;
+    margin-bottom: 16px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
     &-title {
       font-size: 14px;
-      font-weight: normal;
+      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

@@ -8,7 +8,7 @@ import "./index.scss";
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", id: '' });
+  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", userId: '' });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
@@ -25,7 +25,7 @@ const BaseInfo: FC = () => {
 
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
-			if (resp.Code === 1 && resp.Data) {
+			if (resp.Code === 1 && resp.Data) {        
 				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
 			}
 		});
@@ -40,11 +40,11 @@ const BaseInfo: FC = () => {
           text={getLocale('Mod_Editor')}
           onClick={handleClickEdit}
         />
-        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo} info={userInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>姓名</div>
-        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.id} name={userInfo.name} /></span>
+        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.userId} name={userInfo.name} /></span>
       </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 } = props;
+	const { visible, onCancel, handleSuccessEditBaseInfo, info } = props;
 
 	const modalRef = useRef<any>();
   const formContainerRef = useRef<any>();
@@ -89,8 +89,14 @@ const EditBaseInfo = (props) => {
 			title={'基本信息设置'}
 			noHeadLine
 			maskClosable={false}
-			onClose={onCancel}
-			onCancel={onCancel}
+			onClose={() => {
+        onCancel();        
+        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
+      }}
+			onCancel={() => {
+        onCancel();
+        setUserInfo({name: info.name, mobile: info.mobile, email:info.email})
+      }}
 			okText="确定"
 			noFooterLine
 			onOk={handleSaveUserInfo}