@titaui/pc 1.9.4 → 1.9.8

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

@@ -9,6 +9,7 @@
 
 .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

@@ -88,6 +88,7 @@
 .form-field-input__hide-icon {
   position: absolute;
   right: 3px;
+  top: 10px;
   width: 16px;
   height: 16px;
   background: url("./yincang-s.svg") no-repeat;

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

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

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -98,7 +98,7 @@ var SubmitDialog = function SubmitDialog(props) {
     destroyOnClose: true,
     noCloseIcon: true,
     getContainer: function getContainer() {
-      return allViewAreaRef.current;
+      return document.body;
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__submitWindow"

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

@@ -2,7 +2,7 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px 30px 36px;
+  padding: 20px 32px 20px 36px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 
@@ -10,7 +10,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 }
 
 .titaui-personal-info-base-info__header-title {
@@ -70,15 +70,6 @@
   background-color: #2879ff;
 }
 
-.titaui-personal-info-base-info__form {
-  width: 342px;
-}
-
-.titaui-personal-info-base-info__form .form-field-input__border--disabled input:disabled {
-  color: #6F7886;
-  cursor: default;
-}
-
 .titaui-personal-info-base-info .form-field-input__label {
   margin-bottom: 4px;
 }
@@ -102,3 +93,24 @@
 .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;
+}
+
+.titaui-personal-info-base-info__form-title {
+  font-size: 14px;
+  font-weight: normal;
+  color: #141C28;
+  line-height: 22px;
+  margin-bottom: 6px;
+}
+
+.titaui-personal-info-base-info__form-value {
+  font-size: 12px;
+  font-weight: normal;
+  color: #6F7886;
+  line-height: 18px;
+}

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

@@ -9,15 +9,13 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _form = _interopRequireDefault(require("../../../../components/form"));
-
 var _requestApi = require("../../request-api");
 
-var _getLocale = require("../../../../utils/getLocale");
+var _button = require("../../../../components/button");
 
 var _editBaseInfo = _interopRequireDefault(require("../edit-base-info"));
 
-var _button = require("../../../../components/button");
+var _openData = require("../../../../utils/open-data");
 
 require("./index.css");
 
@@ -45,16 +43,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var Fields = _form["default"].Fields;
 var prefix = "titaui-personal-info-base-info";
 
 var BaseInfo = function BaseInfo() {
-  var formRef = (0, _react.useRef)();
-
   var _useState = (0, _react.useState)({
     name: "",
     email: "",
-    mobile: ""
+    mobile: "",
+    id: ''
   }),
       _useState2 = _slicedToArray(_useState, 2),
       userInfo = _useState2[0],
@@ -92,9 +88,9 @@ var BaseInfo = function BaseInfo() {
     className: "".concat(prefix, "__header")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__header-title")
-  }, (0, _getLocale.getLocale)('Per_Ass_New_title_text_BasicIn')), /*#__PURE__*/_react["default"].createElement(_button.RectBtn, {
+  }, getLocale('Per_Ass_New_title_text_BasicIn')), /*#__PURE__*/_react["default"].createElement(_button.RectBtn, {
     type: "primary",
-    text: (0, _getLocale.getLocale)('Mod_Editor'),
+    text: getLocale('Mod_Editor'),
     onClick: handleClickEdit
   }), /*#__PURE__*/_react["default"].createElement(_editBaseInfo["default"], {
     visible: visible,
@@ -102,33 +98,26 @@ var BaseInfo = function BaseInfo() {
     handleSuccessEditBaseInfo: handleSuccessEditBaseInfo
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")
-  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
-    ref: formRef
-  }, /*#__PURE__*/_react["default"].createElement(Fields.Input, {
-    name: "name",
-    label: (0, _getLocale.getLocale)('Mod_UserName'),
-    placeholder: "未设置",
-    type: "text",
-    verifies: [],
-    value: userInfo.name,
-    disabled: true
-  }), /*#__PURE__*/_react["default"].createElement(Fields.Input, {
-    name: "phone",
-    type: "text",
-    label: "手机号码",
-    placeholder: "未设置",
-    value: userInfo.mobile,
-    verifies: [],
-    disabled: true
-  }), /*#__PURE__*/_react["default"].createElement(Fields.Input, {
-    name: "email",
-    type: "text",
-    label: "电子邮箱",
-    value: userInfo.email,
-    placeholder: "未设置",
-    verifies: [],
-    disabled: true
-  }))));
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__form-title")
+  }, "\u59D3\u540D"), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__form-value")
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    id: userInfo.id,
+    name: userInfo.name
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__form")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__form-title")
+  }, "\u624B\u673A\u53F7\u7801"), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__form-value")
+  }, userInfo.mobile ? userInfo.mobile : "未设置")), /*#__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", {
+    className: "".concat(prefix, "__form-value")
+  }, userInfo.email ? userInfo.email : "未设置")));
 };
 
 var _default = BaseInfo;

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

@@ -109,7 +109,7 @@ var EditBaseInfo = function EditBaseInfo(props) {
   };
 
   var handleSaveUserInfo = function handleSaveUserInfo() {
-    if (!userInfo.email || !userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
+    if (!userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
       setIsDisable(true);
       return;
     } else {

package/package.json

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

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

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

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

@@ -81,6 +81,7 @@
   &__hide-icon {
     position: absolute;
     right: 3px;
+    top: 10px;
     width: 16px;
     height: 16px;
     background: url('./yincang-s.svg') no-repeat;

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, visible, isKr } = props;
+  const { maxLength, okrInfo, onClose, onOk, title = window.getLocale('OKR_MyO_Prog_Butt_Update'), 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('Feed_Tab_Title_Progress')}</span>
+      >{getLocale('OKR_MyO_Pop_Upd_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_Progress')}</span>
+          <span className='auto-update__item-label'>{getLocale('OKR_MyO_Pop_Upd_Progresss1')}</span>
           <div className='auto-update__item-progress'>
             <Input
               type='number'
@@ -222,7 +222,6 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
 };
 
 ProgressModal.defaultProps = {
-  title: getLocale('OKR_MyO_Prog_Butt_Update'),
   maxLength: 500,
 };
 

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -44,7 +44,7 @@ export const SubmitDialog = (props: Props1) => {
 
 
   return (
-    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => allViewAreaRef.current}>
+    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body}>
       <div className="okr-cases-library__submitWindow">
         <img src={require('../image/submit小驴.svg')} />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />

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

@@ -2,14 +2,14 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px 30px 36px;
+  padding: 20px 32px 20px 36px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
     sans-serif, PingFang SC, Microsoft YaHei;
   &__header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     &-title {
       font-size: 16px;
       font-weight: 600;
@@ -61,13 +61,6 @@
       }
     }
   }
-  &__form {
-    width: 342px;
-    .form-field-input__border--disabled input:disabled {
-      color: #6F7886;
-      cursor: default;
-    }
-  }
   .form-field-input__label {
     margin-bottom: 4px;
   }
@@ -87,4 +80,22 @@
   .form-field-input__border--disabled input:disabled {
     background-color: #fff;
   }
+  &__form {
+    height: 66px;
+    box-sizing: border-box;
+    padding: 10px 0;
+    &-title {
+      font-size: 14px;
+      font-weight: normal;
+      color: #141C28;
+      line-height: 22px;
+      margin-bottom: 6px;
+    }
+    &-value {
+      font-size: 12px;
+      font-weight: normal;
+      color: #6F7886;
+      line-height: 18px;
+    }
+  }
 }

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

@@ -1,17 +1,14 @@
-import React, { FC, useState, useRef, useEffect } from "react";
-import Form from "../../../../components/form";
-import { getUserInfoFun } from "../../request-api";
-import { getLocale } from "../../../../utils/getLocale";
-import EditModle from '../edit-base-info'
+import React, { FC, useState, useEffect } from "react";
+import { getUserInfoFun } from '../../request-api';
 import { RectBtn } from "../../../../components/button";
+import EditModle from '../edit-base-info';
+import {OpenUserName} from '../../../../utils/open-data'
 import "./index.scss";
 
-const {Fields} = Form
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const formRef = useRef<any>();
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "" });
+  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", id: '' });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
@@ -46,35 +43,16 @@ const BaseInfo: FC = () => {
         <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
-        <Form ref={formRef}>
-          <Fields.Input
-            name="name"
-            label={getLocale('Mod_UserName')}
-            placeholder={"未设置"}
-            type="text"
-            verifies={[]}
-            value={userInfo.name}
-            disabled
-          />
-          <Fields.Input
-            name="phone"
-            type="text"
-            label={"手机号码"}
-            placeholder={"未设置"}
-            value={userInfo.mobile}
-            verifies={[]}
-            disabled
-          />
-          <Fields.Input
-            name="email"
-            type="text"
-            label={"电子邮箱"}
-            value={userInfo.email}
-            placeholder={"未设置"}
-            verifies={[]}
-            disabled
-          />
-        </Form>
+        <div className={`${prefix}__form-title`}>姓名</div>
+        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.id} name={userInfo.name} /></span>
+      </div>
+      <div className={`${prefix}__form`}>
+        <div className={`${prefix}__form-title`}>手机号码</div>
+        <span className={`${prefix}__form-value`}>{userInfo.mobile ? userInfo.mobile : "未设置"}</span>
+      </div>
+      <div className={`${prefix}__form`}>
+        <div className={`${prefix}__form-title`}>电子邮箱</div>
+        <span className={`${prefix}__form-value`}>{userInfo.email ? userInfo.email : "未设置"}</span>
       </div>
     </div>
   );

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

@@ -55,7 +55,7 @@ const EditBaseInfo = (props) => {
 	};
 
 	const handleSaveUserInfo = () => {
-		if (!userInfo.email || !userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
+		if (!userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
       setIsDisable(true);
 			return;
 		} else {