This is an automated email from the ASF dual-hosted git repository. songjian pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel-web.git
The following commit(s) were added to refs/heads/main by this push: new a51089ed [Feat][UI] Complete style writing. (#24) a51089ed is described below commit a51089ed93dfbbbd5df3eb6e8589b0d9e16debf6 Author: tungl <1778651...@qq.com> AuthorDate: Mon Feb 20 20:46:41 2023 +0800 [Feat][UI] Complete style writing. (#24) * [Feat][UI] Complete style writing. * [Feat][UI] Complete style writing. --- seatunnel-ui/src/components/modal/index.tsx | 1 + seatunnel-ui/src/layouts/dashboard/index.tsx | 8 +++-- seatunnel-ui/src/themes/modules/light.ts | 52 +++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/seatunnel-ui/src/components/modal/index.tsx b/seatunnel-ui/src/components/modal/index.tsx index 4bf22cb8..6d3d0eed 100644 --- a/seatunnel-ui/src/components/modal/index.tsx +++ b/seatunnel-ui/src/components/modal/index.tsx @@ -98,6 +98,7 @@ const Modal = defineComponent({ onClick={onConfirm} disabled={confirmDisabled} loading={confirmLoading} + type='primary' > {this.confirmText || t('modal.confirm')} </NButton> diff --git a/seatunnel-ui/src/layouts/dashboard/index.tsx b/seatunnel-ui/src/layouts/dashboard/index.tsx index 2a0c2458..16050a59 100644 --- a/seatunnel-ui/src/layouts/dashboard/index.tsx +++ b/seatunnel-ui/src/layouts/dashboard/index.tsx @@ -26,11 +26,13 @@ const Dashboard = defineComponent({ render() { return ( <NLayout> - <NLayoutHeader> + <NLayoutHeader bordered> <Header /> </NLayoutHeader> - <NLayoutContent> - <router-view class='px-32 py-12' /> + <NLayoutContent style={{ height: 'calc(100vh - 65px)' }}> + <NLayout position='absolute' native-scrollbar={false}> + <router-view class='px-32 py-12' /> + </NLayout> </NLayoutContent> </NLayout> ) diff --git a/seatunnel-ui/src/themes/modules/light.ts b/seatunnel-ui/src/themes/modules/light.ts index 4986ed2c..aa0f52d2 100644 --- a/seatunnel-ui/src/themes/modules/light.ts +++ b/seatunnel-ui/src/themes/modules/light.ts @@ -19,15 +19,49 @@ import type { GlobalThemeOverrides } from 'naive-ui' const light: GlobalThemeOverrides = { common: { - primaryColor: '#1890ff', - primaryColorHover: '#40a9ff', - primaryColorPressed: '#096dd9', - primaryColorSuppl: '#1890ff', - - infoColor: '#1890ff', - successColor: '#52c41a', - warningColor: '#faad14', - errorColor: '#ff4d4f' + primaryColor: '#614bdd', + primaryColorHover: '#7d68de', + primaryColorSuppl: '#7d68de', + primaryColorPressed: '#513ac2', + + infoColor: '#614bdd', + infoColorHover: '#7d68de', + infoColorSuppl: '#7d68de', + infoColorPressed: '#513ac2', + + errorColor: '#db2777', + errorColorHover: '#d64687', + errorColorSuppl: '#d64687', + errorColorPressed: '#c60165', + + successColor: '#04beca', + successColorHover: '#69c8d5', + successColorSuppl: '#69c8d5', + successColorPressed: '#04a6ae', + + warningColor: '#eab308', + warningColorHover: '#e5cb41', + warningColorSuppl: '#e5cb41', + warningColorPressed: '#b38706', + + textColorBase: '#151666', + textColor1: '#242660', + textColor2: '#313377', + textColor3: '#9096b8', + + bodyColor: '#f7f8fa', + borderRadius: '15px', + tableHeaderColor: '#614bdd' + }, + Layout: { + headerColor: '#fff' + }, + DataTable: { + thTextColor: '#fff', + tdColorHover: '#f2f2fa' + }, + Space: { + gapLarge: '28px 32px' } }