fixed 新闻编辑器样式及新增位置问题
This commit is contained in:
parent
f0ef2a827d
commit
c73911eb95
@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.article-action-add{
|
.article-action-add{
|
||||||
@apply text-gray-400 text-sm inline-block bg-[#cce2ff] w-[80px] justify-center flex rounded-xl cursor-pointer hover:bg-blue-300 hover:text-white;
|
@apply text-gray-600 text-sm inline-block bg-[#cce2ff] w-[80px] justify-center flex rounded-xl cursor-pointer hover:bg-blue-300 hover:text-white;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ type Props = {
|
|||||||
editable?: boolean;
|
editable?: boolean;
|
||||||
onChange?: (blocks: BlockContent[]) => void;
|
onChange?: (blocks: BlockContent[]) => void;
|
||||||
onRemove?: () => void;
|
onRemove?: () => void;
|
||||||
onAdd?: () => void;
|
onAdd?: (index?:number) => void;
|
||||||
errorMessage?: string;
|
errorMessage?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +48,6 @@ export default function ArticleBlock(
|
|||||||
onAdd,
|
onAdd,
|
||||||
onChange,
|
onChange,
|
||||||
index,
|
index,
|
||||||
errorMessage,
|
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const blocks = rebuildBlockArray(defaultBlocks)
|
const blocks = rebuildBlockArray(defaultBlocks)
|
||||||
|
|
||||||
@ -60,7 +59,7 @@ export default function ArticleBlock(
|
|||||||
|
|
||||||
return <div className={`${styles.blockContainer} group`}>
|
return <div className={`${styles.blockContainer} group`}>
|
||||||
{editable && index == 1 && <div className={'divider-container before'}><Divider>
|
{editable && index == 1 && <div className={'divider-container before'}><Divider>
|
||||||
<span onClick={onAdd} className="article-action-add" title="新增分组"><IconAdd style={{fontSize: 24}}/></span>
|
<span onClick={()=>onAdd?.(1)} className="article-action-add" title="新增分组"><IconAdd style={{fontSize: 24}}/></span>
|
||||||
</Divider></div> }
|
</Divider></div> }
|
||||||
<div className={styles.blockInner}>
|
<div className={styles.blockInner}>
|
||||||
<div className={clsx(className || '', styles.block, index == 0 ? styles.blockFist : '', ' hover:bg-blue-10')}>
|
<div className={clsx(className || '', styles.block, index == 0 ? styles.blockFist : '', ' hover:bg-blue-10')}>
|
||||||
@ -85,7 +84,7 @@ export default function ArticleBlock(
|
|||||||
okText="删除"
|
okText="删除"
|
||||||
cancelText="取消"
|
cancelText="取消"
|
||||||
>
|
>
|
||||||
<span className="article-action-icon hidden group-hover:block" title="删除此分组">
|
<span className="article-action-icon hidden group-hover:block ml-1" title="删除此分组">
|
||||||
<IconDelete style={{fontSize: 24}}/>
|
<IconDelete style={{fontSize: 24}}/>
|
||||||
</span>
|
</span>
|
||||||
</Popconfirm> : <span></span>
|
</Popconfirm> : <span></span>
|
||||||
@ -94,7 +93,7 @@ export default function ArticleBlock(
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{editable && <div className={'divider-container after'}><Divider>
|
{editable && <div className={'divider-container after'}><Divider>
|
||||||
<span onClick={onAdd} className="article-action-add" title="新增分组"><IconAdd style={{fontSize: 24}}/></span>
|
<span onClick={()=>onAdd?.(index + 1)} className="article-action-add" title="新增分组"><IconAdd style={{fontSize: 24}}/></span>
|
||||||
</Divider></div> }
|
</Divider></div> }
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
@ -128,8 +128,8 @@ export default function ArticleEditModal(props: Props) {
|
|||||||
}} placeholder={'请输入文章标题'}/>
|
}} placeholder={'请输入文章标题'}/>
|
||||||
<div className="text-red-500">{state.msgTitle}</div>
|
<div className="text-red-500">{state.msgTitle}</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="article-body mt-3">
|
<div className="article-body">
|
||||||
<div className="box mt-1">
|
<div className="box">
|
||||||
<ArticleGroup
|
<ArticleGroup
|
||||||
errorMessage={state.msgGroup} editable groups={groups}
|
errorMessage={state.msgGroup} editable groups={groups}
|
||||||
onChange={list => {
|
onChange={list => {
|
||||||
@ -141,11 +141,11 @@ export default function ArticleEditModal(props: Props) {
|
|||||||
{state.error && <div className="text-red-500">{state.error}</div>}
|
{state.error && <div className="text-red-500">{state.error}</div>}
|
||||||
</div>
|
</div>
|
||||||
<div className="modal-control-footer flex justify-end">
|
<div className="modal-control-footer flex justify-end">
|
||||||
<Space>
|
<div className="text-lg flex gap-10 ">
|
||||||
{props.type == 'news' ? <button>生成视频</button> : null}
|
{props.type == 'news' ? <button className="text-gray-400 hover:text-gray-800">生成视频</button> : null}
|
||||||
<button onClick={() => props.onClose?.()}>取消</button>
|
<button className="text-gray-400 hover:text-gray-800" onClick={() => props.onClose?.()}>取消</button>
|
||||||
<button>{props.type == 'news' ? '确定' : '重新生成'}</button>
|
<button className="text-gray-800 hover:text-blue-500">{props.type == 'news' ? '确定' : '重新生成'}</button>
|
||||||
</Space>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Modal>);
|
</Modal>);
|
||||||
}
|
}
|
@ -69,8 +69,8 @@ export default function ArticleGroup({groups, editable, onChange, errorMessage}:
|
|||||||
</div>
|
</div>
|
||||||
<div className={"panel groups-list flex-1"}>
|
<div className={"panel groups-list flex-1"}>
|
||||||
<div className={"area-title"}>
|
<div className={"area-title"}>
|
||||||
<span className="">数字人主播台编辑区</span>
|
<span className="">素材融合呈现编辑区</span>
|
||||||
<span className="text-gray-400">(出现数字人形象)</span>
|
<span className="text-gray-400">(文、图、视频,不出现数字人形象)</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="panel-body py-3">
|
<div className="panel-body py-3">
|
||||||
@ -86,8 +86,8 @@ export default function ArticleGroup({groups, editable, onChange, errorMessage}:
|
|||||||
}}
|
}}
|
||||||
errorMessage={errorMessage}
|
errorMessage={errorMessage}
|
||||||
index={index}
|
index={index}
|
||||||
onAdd={() => {
|
onAdd={(_index) => {
|
||||||
handleAddGroup?.(index + 1)
|
handleAddGroup?.(_index ? _index :index + 1)
|
||||||
}}
|
}}
|
||||||
onRemove={async () => {
|
onRemove={async () => {
|
||||||
if (groups.length == 1) {
|
if (groups.length == 1) {
|
||||||
|
@ -25,7 +25,7 @@ export const LogoText = ({style, className}: { style?: React.CSSProperties, clas
|
|||||||
return (
|
return (
|
||||||
<div className={`flex h-full ${className}`}>
|
<div className={`flex h-full ${className}`}>
|
||||||
<AppLogo style={style}/>
|
<AppLogo style={style}/>
|
||||||
<span className={'ml-2 text-md relative top-1'}>{appName}</span>
|
<span className={'ml-2 text-lg relative top-1'}>{appName}</span>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ export const BaseLayout: React.FC<LayoutProps> = ({children}) => {
|
|||||||
<div className="min-h-screen w-full">
|
<div className="min-h-screen w-full">
|
||||||
<div className="app-header">
|
<div className="app-header">
|
||||||
<div className="logo-container">
|
<div className="logo-container">
|
||||||
<LogoText style={{fontSize: 24}}/>
|
<LogoText style={{fontSize: 30}}/>
|
||||||
</div>
|
</div>
|
||||||
<DashboardNavigation/>
|
<DashboardNavigation/>
|
||||||
<div className="flex items-center">
|
<div className="flex items-center">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user