diff --git a/src/components/FormCreator/index.tsx b/src/components/FormCreator/index.tsx index b32c23f..670e8a0 100644 --- a/src/components/FormCreator/index.tsx +++ b/src/components/FormCreator/index.tsx @@ -61,9 +61,9 @@ export const FormCreator: React.FC = props => { if ('edu_time' in values && typeof values.edu_time === 'string') { values.edu_time = values.edu_time.split(','); } - if ('work_time' in values) { + /*if ('work_time' in values) { values.work_time = values.work_time.split(','); - } + }*/ props.onChange(values); }; const formProps = { diff --git a/src/components/Resume/Template2/index.less b/src/components/Resume/Template2/index.less index ae08bfa..d53249a 100644 --- a/src/components/Resume/Template2/index.less +++ b/src/components/Resume/Template2/index.less @@ -1,3 +1,10 @@ +.title-hr-addon { + position: relative; + flex: 1 1; + border: none; + border-top: 1px solid rgb(47, 87, 133); +} + // 响应式布局 // 内容 .template2-resume { @@ -23,6 +30,7 @@ // 内容 .template2-resume { + font-size: 18px; // 加点阴影 box-shadow: 0px 2px 4px 1px rgba(0, 0, 0, 0.15); @@ -84,6 +92,8 @@ display: flex; justify-content: space-between; align-items: center; + + -webkit-print-color-adjust:exact; } } diff --git a/src/components/Resume/Template2/index.tsx b/src/components/Resume/Template2/index.tsx index 55fc615..a1f1610 100644 --- a/src/components/Resume/Template2/index.tsx +++ b/src/components/Resume/Template2/index.tsx @@ -28,8 +28,9 @@ const Wrapper = ({ className, title, color, children }) => { return (
- {title} - + {title}   + {/**/} +
{children}
@@ -92,6 +93,24 @@ export const Template2: React.FC = props => { {profile.email} )} + {profile?.positionTitle && ( +
+ + + : {profile.positionTitle} + +
+ )} + {profile?.workPlace && ( +
+ + + : {profile.workPlace} + +
+ )} {profile?.github && (
@@ -130,24 +149,8 @@ export const Template2: React.FC = props => {
)} - {profile?.workPlace && ( -
- - - : {profile.workPlace} - -
- )} - {profile?.positionTitle && ( -
- - - : {profile.positionTitle} - -
- )} + + {/* 头像 */} @@ -241,7 +244,7 @@ export const Template2: React.FC = props => { color={theme.color} > {skillList.map((skill, idx) => { - const skills = _.split(skill.skill_desc, '\n').join(';'); + const skills = _.split(skill.skill_name, '\n').join(';'); return skills ? (