From cbf54a52c0be0717fd8b78a5a776a5c12a4c3cc7 Mon Sep 17 00:00:00 2001 From: Hugh Date: Thu, 11 May 2023 20:21:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=8A=A5=E9=94=99=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=9E=B6=E6=9E=84=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Resume/Template3/index.tsx | 6 ++++++ src/components/index.tsx | 2 +- src/components/types.ts | 2 ++ src/helpers/contant.tsx | 6 ++++++ src/helpers/store-to-local.ts | 2 +- src/hooks/useModeSwitcher/index.tsx | 18 ++++++------------ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/components/Resume/Template3/index.tsx b/src/components/Resume/Template3/index.tsx index fe5c84c..86654dd 100644 --- a/src/components/Resume/Template3/index.tsx +++ b/src/components/Resume/Template3/index.tsx @@ -354,6 +354,12 @@ export const Template3: React.FC = props => { {project.project_desc} +
+ + : + + {project.project_tech} +
: diff --git a/src/components/index.tsx b/src/components/index.tsx index 8ebca19..c0df374 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -187,7 +187,7 @@ export const Page: React.FC = () => { } message.success(intl.formatMessage({ id: '上传配置已应用' })); } catch (err) { - message.error(intl.formatMessage({ id: '上传文件有误,请重新上传' })); + //message.error(intl.formatMessage({ id: '上传文件有误,请重新上传' })); } }; reader.readAsText(file); diff --git a/src/components/types.ts b/src/components/types.ts index 1849537..923e133 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -66,6 +66,8 @@ export type ResumeConfig = { project_role: string; /** 描述 */ project_desc?: string; + /** 技术架构 */ + project_tech?: string; /** 项目内容,负责内容 */ project_content?: string; /** 项目时间 */ diff --git a/src/helpers/contant.tsx b/src/helpers/contant.tsx index 38f82a2..473ed3c 100644 --- a/src/helpers/contant.tsx +++ b/src/helpers/contant.tsx @@ -217,6 +217,12 @@ export const CONTENT_OF_MODULE = ({ intl }) => { displayName: intl.formatMessage({ id: '项目描述' }), cfg: { autoSize: { minRows: 8 }, showCount: true }, }, + { + type: 'textArea', + attributeId: 'project_tech', + displayName: intl.formatMessage({ id: '技术架构' }), + cfg: { autoSize: { minRows: 8 }, showCount: true }, + }, { type: 'textArea', attributeId: 'project_content', diff --git a/src/helpers/store-to-local.ts b/src/helpers/store-to-local.ts index cb3b789..b854161 100644 --- a/src/helpers/store-to-local.ts +++ b/src/helpers/store-to-local.ts @@ -27,7 +27,7 @@ export async function getConfig( } return fetchResume(lang, branch, user).catch(() => { - message.warn(intl.formatMessage({ id: '从模板中获取' }), 1); + //message.warn(intl.formatMessage({ id: '从模板中获取' }), 1); return _.omit( customAssign({}, RESUME_INFO, _.get(RESUME_INFO, ['locales', lang])), ['locales'] diff --git a/src/hooks/useModeSwitcher/index.tsx b/src/hooks/useModeSwitcher/index.tsx index 9955fe5..85314bb 100644 --- a/src/hooks/useModeSwitcher/index.tsx +++ b/src/hooks/useModeSwitcher/index.tsx @@ -20,6 +20,7 @@ export const useModeSwitcher = ({ const query = getSearchObj(); const changeMode = value => { + debugger; if (value === mode) return; const { pathname, @@ -44,18 +45,11 @@ export const useModeSwitcher = ({ )} - {mode === 'edit' && - (canPreview ? ( - }> - - - - - ) : ( - changeMode('read')}> - - - ))} + {mode === 'edit' && ( + changeMode('read')}> + + + )}
, mode, changeMode, From d8b9388fab8493ba6586d7c13cd9cf08996038c3 Mon Sep 17 00:00:00 2001 From: Hugh Date: Thu, 11 May 2023 20:44:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=94=B9=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/index.tsx b/src/components/index.tsx index c0df374..b38726a 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -274,7 +274,7 @@ export const Page: React.FC = () => { )} {mode === 'edit' && (