Commit479bd88

committed

chore: merge branch 'fix/edit-article' into dev

2 parentse7bee13 +0fe3e10 commit479bd88Copy full SHA for 479bd88

File tree

-20

lines changed

-20

lines changed

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,16 +38,6 @@ const View = ({`
`38`	`38`	`mentionList,`
`39`	`39`	`contentDomId,`
`40`	`40`	`})=>{`
`41`		`-if(!editData.body){`
`42`		`-return(`
`43`		`-<React.Fragment>`
`44`		`-<ArticleContentLoading/>`
`45`		`-<br/>`
`46`		`-<ArticleContentLoading/>`
`47`		`-</React.Fragment>`
`48`		`-)`
`49`		`-}`
`50`		`-`
`51`	`41`	`if(curView==='CREATE_VIEW'\|\|curView==='PREVIEW_VIEW'){`
`52`	`42`	`return(`
`53`	`43`	`<React.Fragment>`
`@@ -87,6 +77,10 @@ const JobEditorContainer = ({ jobEditor, attachment }) => {`
`87`	`77`	`contentDomId,`
`88`	`78`	`}=jobEditor`
`89`	`79`
	`80`	`+log('editData in views: ',editData)`
	`81`	`+`
	`82`	`+if(!editData.body)return<ArticleContentLoading/>`
	`83`	`+`
`90`	`84`	`return(`
`91`	`85`	`<Wrapper>`
`92`	`86`	`<HeaderisEdit={isEdit}curView={curView}referUsers={referUsersData}/>`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,6 @@ const View = ({`
`48`	`48`	`mentionList,`
`49`	`49`	`contentDomId,`
`50`	`50`	`})=>{`
`51`		`-if(!editData.body){`
`52`		`-return(`
`53`		`-<React.Fragment>`
`54`		`-<ArticleContentLoading/>`
`55`		`-<br/>`
`56`		`-<ArticleContentLoading/>`
`57`		`-</React.Fragment>`
`58`		`-)`
`59`		`-}`
`60`		`-`
`61`	`51`	`if(curView==='CREATE_VIEW'\|\|curView==='PREVIEW_VIEW'){`
`62`	`52`	`return(`
`63`	`53`	`<React.Fragment>`
`@@ -98,6 +88,10 @@ const PostEditorContainer = ({ postEditor, attachment }) => {`
`98`	`88`	`showRadarNote,`
`99`	`89`	`}=postEditor`
`100`	`90`
	`91`	`+log('editData in views: ',editData)`
	`92`	`+`
	`93`	`+if(!editData.body)return<ArticleContentLoading/>`
	`94`	`+`
`101`	`95`	`return(`
`102`	`96`	`<Wrapper>`
`103`	`97`	`<Modal`

Comments

(0)