diff --git a/src/components/article/article.module.scss b/src/components/article/article.module.scss index e0f801f..77236ae 100644 --- a/src/components/article/article.module.scss +++ b/src/components/article/article.module.scss @@ -15,7 +15,7 @@ } } .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; } } } diff --git a/src/components/article/block.tsx b/src/components/article/block.tsx index 99d2766..64c30bf 100644 --- a/src/components/article/block.tsx +++ b/src/components/article/block.tsx @@ -16,7 +16,7 @@ type Props = { editable?: boolean; onChange?: (blocks: BlockContent[]) => void; onRemove?: () => void; - onAdd?: () => void; + onAdd?: (index?:number) => void; errorMessage?: string; } @@ -48,7 +48,6 @@ export default function ArticleBlock( onAdd, onChange, index, - errorMessage, }: Props) { const blocks = rebuildBlockArray(defaultBlocks) @@ -60,7 +59,7 @@ export default function ArticleBlock( return
{editable && index == 1 &&
- + onAdd?.(1)} className="article-action-add" title="新增分组">
}
@@ -85,7 +84,7 @@ export default function ArticleBlock( okText="删除" cancelText="取消" > - + : @@ -94,7 +93,7 @@ export default function ArticleBlock(
{editable &&
- + onAdd?.(index + 1)} className="article-action-add" title="新增分组">
}
} \ No newline at end of file diff --git a/src/components/article/edit-modal.tsx b/src/components/article/edit-modal.tsx index 834baa3..64cb2c8 100644 --- a/src/components/article/edit-modal.tsx +++ b/src/components/article/edit-modal.tsx @@ -128,8 +128,8 @@ export default function ArticleEditModal(props: Props) { }} placeholder={'请输入文章标题'}/>
{state.msgTitle}
-
-
+
+
{ @@ -141,11 +141,11 @@ export default function ArticleEditModal(props: Props) { {state.error &&
{state.error}
}
- - {props.type == 'news' ? : null} - - - +
+ {props.type == 'news' ? : null} + + +
); } \ No newline at end of file diff --git a/src/components/article/group.tsx b/src/components/article/group.tsx index 5125af6..1f75d22 100644 --- a/src/components/article/group.tsx +++ b/src/components/article/group.tsx @@ -69,8 +69,8 @@ export default function ArticleGroup({groups, editable, onChange, errorMessage}:
- 数字人主播台编辑区 - (出现数字人形象) + 素材融合呈现编辑区 + (文、图、视频,不出现数字人形象)
@@ -86,8 +86,8 @@ export default function ArticleGroup({groups, editable, onChange, errorMessage}: }} errorMessage={errorMessage} index={index} - onAdd={() => { - handleAddGroup?.(index + 1) + onAdd={(_index) => { + handleAddGroup?.(_index ? _index :index + 1) }} onRemove={async () => { if (groups.length == 1) { diff --git a/src/components/icons/logo.tsx b/src/components/icons/logo.tsx index 3159d98..fe00238 100644 --- a/src/components/icons/logo.tsx +++ b/src/components/icons/logo.tsx @@ -25,7 +25,7 @@ export const LogoText = ({style, className}: { style?: React.CSSProperties, clas return (
- {appName} + {appName}
) } diff --git a/src/routes/layout/dashboard-layout.tsx b/src/routes/layout/dashboard-layout.tsx index 1d23b09..3fbf55a 100644 --- a/src/routes/layout/dashboard-layout.tsx +++ b/src/routes/layout/dashboard-layout.tsx @@ -52,7 +52,7 @@ export const BaseLayout: React.FC = ({children}) => {
- +