From 2156485cc44aaad91888b5d54ece696ff1f8e3d9 Mon Sep 17 00:00:00 2001 From: ZackYoung Date: Tue, 19 Nov 2024 12:45:27 +0800 Subject: [PATCH] [BugFix][Web]Fix datastudio footer state (#3927) Co-authored-by: zackyoungh --- .../src/components/Icons/CodeLanguageIcon.tsx | 227 ++++++++++++------ .../DataStudio/FooterContainer/index.tsx | 22 +- .../JobModal/components/TemplateSelect.tsx | 2 +- .../DataStudio/Toolbar/Project/function.tsx | 4 +- .../pages/DataStudio/css/imgs/close-dark.svg | 6 + .../pages/DataStudio/css/imgs/close-light.svg | 6 + dinky-web/src/pages/DataStudio/css/index.less | 23 +- dinky-web/src/pages/DataStudio/index.tsx | 8 +- 8 files changed, 185 insertions(+), 113 deletions(-) create mode 100644 dinky-web/src/pages/DataStudio/css/imgs/close-dark.svg create mode 100644 dinky-web/src/pages/DataStudio/css/imgs/close-light.svg diff --git a/dinky-web/src/components/Icons/CodeLanguageIcon.tsx b/dinky-web/src/components/Icons/CodeLanguageIcon.tsx index fb3d4ef728..11592c1343 100644 --- a/dinky-web/src/components/Icons/CodeLanguageIcon.tsx +++ b/dinky-web/src/components/Icons/CodeLanguageIcon.tsx @@ -34,7 +34,7 @@ export const FileIcon = () => { return ( <> ( { * @constructor */ export const JavaSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> { * @constructor */ export const YAMLSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> { return ( <> ( { export const ZipSvg = () => { return ( ( @@ -219,7 +219,7 @@ export const ZipSvg = () => { export const ConfigSvg = () => { return ( ( { return ( <> ( { return ( <> ( { * @constructor */ export const ShellSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> @@ -343,7 +343,7 @@ export const ShellSvg = (props: { size?: number }) => { * @constructor */ export const XMLSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> { * @constructor */ export const MarkDownSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> { ); }; export const FlinkSQLSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( ( - + + d='M821.76 870.4s-5.12 33.28 5.12 48.64l43.52 30.72-2.56 10.24v15.36l10.24 2.56 15.36-2.56 2.56 5.12 7.68 10.24h10.24l10.24-23.04v-10.24l10.24-2.56s69.12-23.04 53.76-48.64l-5.12-2.56s-30.72 12.8-43.52 10.24c0 0-58.88 2.56-87.04-17.92l-30.72-25.6z' + fill='#D77083' + p-id='6265' + > + d='M837.12 849.92s-28.16 0-10.24 28.16c0 0 28.16 30.72 81.92 38.4 0 0 79.36 0 84.48-25.6 0 0-2.56-30.72-25.6-28.16-23.04 7.68-130.56-12.8-130.56-12.8z' + fill='#733D48' + p-id='6266' + > + d='M960 768s35.84 38.4 20.48 97.28c0 0-2.56 25.6-23.04 33.28 0 0-38.4 7.68-48.64 2.56 0 0-48.64-2.56-64-28.16 0 0-20.48-20.48-2.56-43.52 0 0 35.84-15.36 43.52-38.4 0 0 12.8-10.24 28.16-7.68 15.36 2.56 28.16 10.24 28.16 10.24s23.04-17.92 17.92-25.6z' + fill='#D59D52' + p-id='6267' + > + d='M865.28 798.72s17.92 38.4 61.44 40.96c0 0 40.96 0 58.88-25.6l-15.36-38.4-28.16-7.68s-74.24-23.04-76.8 30.72z' + fill='#DBAE62' + p-id='6268' + > + + + d='M954.88 803.84m-5.12 0a5.12 5.12 0 1 0 10.24 0 5.12 5.12 0 1 0-10.24 0Z' + fill='#FFFFFF' + p-id='6271' + > + + - - + d='M35.84 563.2s15.36 125.44 112.64 207.36l115.2-99.84L435.2 665.6l220.16-125.44s133.12-84.48 128-179.2c0 0-145.92 66.56-179.2 46.08L547.84 435.2 486.4 478.72l-89.6 7.68-12.8 15.36-166.4 51.2s-23.04-71.68 53.76-192l25.6-40.96-110.08 51.2-2.56-25.6-12.8 2.56-20.48 64-23.04 7.68-64 110.08-7.68-17.92h-10.24v51.2h-10.24z' + fill='#947BB0' + p-id='6274' + > + d='M757.76 460.8l23.04-7.68 28.16-40.96h10.24l17.92 2.56 7.68 15.36 15.36 15.36 28.16 7.68 25.6 10.24 23.04 20.48 10.24 15.36 12.8 23.04 10.24 35.84 7.68 25.6 5.12 17.92 5.12 15.36-2.56 23.04-7.68 17.92-10.24 12.8-25.6 7.68-7.68 7.68-33.28 5.12h-23.04l-15.36 10.24 2.56 12.8h15.36l28.16-7.68 28.16 2.56 17.92 15.36 7.68 7.68 2.56 17.92v25.6l-17.92 15.36-17.92-2.56-12.8-5.12-23.04 2.56-7.68 10.24-15.36 15.36-28.16 15.36-25.6 5.12-38.4 5.12-2.56 10.24v10.24l-5.12 20.48-15.36 20.48-15.36 23.04 30.72 2.56 28.16 5.12 12.8 15.36 5.12 15.36-5.12 12.8-17.92 15.36-40.96 2.56H384s-204.8 0-289.28-148.48-53.76-243.2-53.76-243.2l5.12-23.04s33.28 117.76 89.6 176.64l15.36 17.92s10.24-2.56 17.92-43.52c0 0 17.92-84.48 227.84-84.48l87.04-46.08 87.04-25.6 64-15.36 51.2-25.6 71.68-69.12z' + fill='#D77083' + p-id='6275' + > + d='M870.4 555.52s15.36-23.04 46.08-7.68c0 0 30.72 17.92 10.24 58.88 0 0-12.8-2.56-23.04 0-2.56 0-61.44 2.56-33.28-51.2z' + p-id='6276' + > + d='M880.64 581.12s-7.68-7.68-2.56-17.92l-7.68-7.68s-12.8 15.36 10.24 33.28c0 0 10.24 7.68 33.28 7.68 0 0 7.68 2.56 7.68 5.12v-20.48s-5.12 12.8-12.8 12.8c0 0-17.92-2.56-28.16-12.8z' + fill='#FFFFFF' + p-id='6277' + > + d='M901.12 568.32m-15.36 0a15.36 15.36 0 1 0 30.72 0 15.36 15.36 0 1 0-30.72 0Z' + fill='#D19B52' + p-id='6278' + > - - + d='M888.32 558.08m-7.68 0a7.68 7.68 0 1 0 15.36 0 7.68 7.68 0 1 0-15.36 0Z' + fill='#FFFFFF' + p-id='6279' + > + d='M312.32 153.6l2.56-25.6 66.56-48.64 30.72-15.36s40.96-35.84 99.84-35.84l71.68 7.68 51.2 17.92 38.4 23.04 30.72 15.36 38.4 25.6-7.68 46.08-7.68 33.28 10.24 46.08-15.36 23.04s-7.68 20.48-48.64 53.76l-23.04 43.52-40.96 51.2L537.6 460.8l-61.44 17.92-48.64 5.12L250.88 537.6l-33.28 15.36s-20.48-110.08 53.76-192l46.08-40.96s30.72-25.6 35.84-66.56l28.16 48.64 20.48-43.52c0-2.56 2.56-112.64-89.6-104.96z' + fill='#E7DFAB' + p-id='6280' + > + d='M765.44 99.84L742.4 128l-7.68 25.6-5.12 58.88-7.68 53.76s-30.72 48.64-43.52 43.52l-10.24 23.04-5.12 17.92 40.96-35.84 53.76-23.04 30.72-12.8 12.8-25.6-12.8-48.64-2.56-30.72-15.36-5.12s-7.68-40.96 5.12-56.32l-10.24-12.8z' + fill='#D19456' + p-id='6281' + > + d='M642.56 373.76s51.2-61.44 115.2-89.6v15.36l64-35.84h15.36l-5.12 33.28-17.92 23.04-20.48 33.28-33.28 23.04-69.12 25.6-66.56 15.36 17.92-43.52z' + fill='#D77083' + p-id='6282' + > + d='M396.8 174.08s84.48-23.04 112.64 0c28.16 23.04 104.96-5.12 104.96-5.12l69.12 40.96-5.12 97.28s-7.68-64-81.92-71.68-71.68-20.48-117.76-43.52-35.84 2.56-81.92-17.92z' + fill='#D89E52' + p-id='6283' + > + d='M396.8 174.08s10.24 30.72 61.44 33.28 215.04 87.04 151.04 156.16c0 0-10.24 76.8-74.24 94.72 0 0 51.2-66.56 17.92-138.24 0 0-7.68-58.88-79.36-76.8 2.56 0-43.52-20.48-76.8-69.12z' + fill='#D89E52' + p-id='6284' + > + d='M445.44 273.92s25.6 79.36 69.12 92.16c0 0 51.2 46.08 5.12 79.36l-92.16 38.4-158.72 40.96-56.32 20.48s64-81.92 107.52-102.4c0 0 76.8-20.48 110.08-102.4l15.36-66.56z' + fill='#D89E52' + p-id='6285' + > + d='M371.2 273.92s-17.92 76.8-94.72 151.04C238.08 460.8 230.4 506.88 222.72 540.16c0 0 20.48-71.68 76.8-117.76 33.28-28.16 69.12-71.68 71.68-148.48z' + fill='#814879' + p-id='6286' + > + d='M437.76 496.64s48.64 2.56 66.56 17.92c0 0-15.36-12.8-28.16-17.92 0 0 76.8 10.24 107.52 23.04 0 0 35.84 7.68 56.32 0 0 0-56.32-2.56-79.36-17.92 0 0-46.08-17.92-74.24-15.36l-48.64 10.24z' + fill='#785085' + p-id='6287' + > + d='M601.6 437.76s23.04-5.12 53.76 0c0 0 48.64 25.6 104.96-12.8 0 0-43.52 53.76-79.36 46.08 0 0-99.84-17.92-120.32-10.24 2.56 2.56 33.28-7.68 40.96-23.04z' + fill='#E1CAC9' + p-id='6288' + > + d='M378.88 156.16s35.84-30.72 51.2-35.84c0 0 69.12-17.92 40.96 0l-12.8 15.36s25.6-12.8 53.76-10.24l-12.8 10.24s43.52-7.68 48.64 0c0 0 17.92 20.48 35.84 10.24 0 0-7.68 20.48-51.2-2.56 0 0-30.72 0 0 12.8-2.56 0-84.48-20.48-153.6 0z' + fill='#FFFFFF' + p-id='6289' + > + d='M345.6 709.12s-35.84 5.12-35.84 58.88c0 0 7.68 43.52 40.96 56.32 0 0-15.36-66.56 7.68-112.64l-12.8-2.56z' + fill='#A04F5D' + p-id='6290' + > + d='M675.84 724.48s-5.12 89.6 30.72 128c0 0 30.72 30.72 71.68 25.6 0 0 23.04-38.4-23.04-40.96 0 0-46.08-10.24-58.88-56.32-2.56 2.56-7.68-51.2-20.48-56.32z' + fill='#9A505E' + p-id='6291' + > + d='M714.24 642.56s-17.92 71.68 58.88 92.16c0 0 61.44 7.68 79.36-25.6 0 0-64 12.8-97.28-20.48-2.56 0-38.4-25.6-40.96-46.08zM824.32 427.52s-48.64 30.72-12.8 64c0 0 7.68-35.84 15.36-46.08 10.24-10.24-2.56-17.92-2.56-17.92z' + fill='#A04F5E' + p-id='6292' + > + d='M819.2 450.56s-12.8 28.16-7.68 38.4c0 0 7.68 17.92 12.8 15.36 0 0-12.8-25.6 2.56-48.64 0 0 12.8-17.92 0-43.52 0 2.56 5.12 20.48-7.68 38.4zM844.8 501.76s30.72-17.92 10.24-46.08c0 0 5.12 25.6-10.24 46.08zM714.24 640c0-2.56 0 0 0 0zM714.24 640c10.24 74.24 89.6 69.12 89.6 69.12-79.36-15.36-89.6-66.56-89.6-69.12z' + p-id='6293' + > + d='M985.6 591.36s-10.24-35.84-10.24-53.76c0 0-17.92-94.72-115.2-99.84 0 0-10.24-30.72-40.96-30.72 0 0-17.92 2.56-46.08 38.4-5.12 5.12-5.12-2.56-5.12-2.56 5.12-5.12 5.12-10.24 5.12-10.24 17.92-20.48 28.16-64 33.28-81.92 10.24-7.68 17.92-17.92 25.6-28.16l10.24-33.28s-5.12 0-10.24 7.68 17.92-40.96 10.24-53.76c0 0-30.72 15.36-33.28 23.04 0 0-7.68-46.08-17.92-69.12 0 0 0-33.28 10.24-38.4 0 0-10.24-12.8-25.6 10.24 0 0-17.92-17.92 7.68-66.56 0 0 5.12-10.24-20.48-2.56 0 0-20.48 20.48-23.04 25.6 0 0-10.24-12.8-15.36-28.16 0 0-2.56-2.56-5.12 0 0 0-5.12 7.68-7.68-7.68 0 0-10.24-17.92-15.36-17.92 0 0 2.56 12.8 0 12.8 0 0-2.56 0-10.24-5.12 0 0-38.4-25.6-97.28-38.4 0 0-12.8-5.12-17.92-7.68 0 0-2.56 0-5.12 2.56 0 0-10.24 0-17.92-2.56-28.16-12.8-40.96 0-40.96 0-145.92 0-192 94.72-192 94.72-15.36 15.36-2.56 25.6-2.56 25.6h23.04c97.28 61.44 35.84 120.32 35.84 120.32l-10.24-33.28c-23.04-23.04-15.36 0-15.36 0 7.68 35.84-17.92 58.88-17.92 58.88-76.8 23.04-133.12 56.32-133.12 56.32-15.36-2.56 7.68-25.6-10.24-23.04s-28.16 48.64-28.16 48.64C107.52 417.28 66.56 486.4 51.2 512c0-5.12-2.56-38.4-2.56-56.32 0 0-17.92 43.52-7.68 89.6 0 0-7.68 20.48-12.8 46.08 0 0 0 5.12-2.56 10.24v33.28c0 40.96 2.56 102.4 28.16 153.6 0 0 38.4 120.32 197.12 186.88 0 0 64 23.04 120.32 23.04h384s53.76 0 61.44-28.16c7.68-30.72-10.24-61.44-61.44-53.76 0 0-15.36 2.56 5.12-12.8 0 0 17.92-15.36 17.92-48.64 0 0-7.68-12.8 17.92-10.24 0 0 17.92 0 28.16-2.56 0 0 48.64-10.24 66.56-51.2 0 0 17.92-7.68 28.16 0 0 0 20.48 10.24 25.6 2.56 0 0 2.56-2.56 15.36-10.24 0 0 5.12 2.56 10.24-35.84 0 0 0-15.36-10.24-23.04 0 0-5.12-7.68-7.68-12.8 0 0-12.8-17.92-56.32-10.24 0 0-23.04 15.36-28.16 7.68-5.12-7.68 7.68-7.68 7.68-7.68s51.2-2.56 71.68-17.92c0 0 33.28-2.56 35.84-38.4 2.56-5.12 23.04-23.04 2.56-53.76z m-220.16-168.96c-46.08 94.72-135.68 122.88-135.68 122.88-46.08 0-56.32 2.56-56.32 2.56 33.28 5.12 25.6 10.24 25.6 10.24-71.68 7.68-97.28 20.48-97.28 20.48-94.72-15.36-145.92-5.12-145.92-5.12-115.2 20.48-163.84 74.24-163.84 74.24 102.4-58.88 171.52-64 171.52-64 112.64-7.68 120.32 0 120.32 0-30.72 5.12-69.12 33.28-69.12 33.28-17.92 12.8-97.28 25.6-97.28 25.6-28.16 2.56-79.36 17.92-79.36 17.92-79.36 25.6-79.36 97.28-79.36 97.28-25.6-28.16-23.04-76.8-23.04-76.8l-2.56-2.56c2.56-10.24 7.68-20.48 17.92-43.52 23.04-53.76 38.4-56.32 79.36-81.92s192-53.76 192-53.76c148.48-17.92 189.44-71.68 189.44-71.68 2.56-2.56 7.68-7.68 15.36-12.8h2.56s87.04-2.56 156.16-48.64c-2.56 23.04-20.48 56.32-20.48 56.32z m64-153.6s-5.12 43.52-38.4 71.68c0 0-48.64 48.64-153.6 66.56l-5.12 2.56c7.68-10.24 17.92-17.92 17.92-17.92 84.48-12.8 135.68-74.24 135.68-74.24-74.24 53.76-130.56 64-130.56 64 7.68-10.24 12.8-23.04 20.48-35.84 10.24-7.68 43.52-35.84 71.68-43.52 0 0-12.8 23.04-28.16 33.28 0 0 23.04-2.56 61.44-38.4-2.56-5.12 28.16-28.16 48.64-28.16z m-92.16-94.72c5.12-43.52 28.16-64 28.16-64 10.24 7.68 0 15.36 0 15.36-7.68 25.6-2.56 58.88-2.56 58.88l-25.6 58.88c0-2.56-5.12-25.6 0-69.12z m-381.44 92.16c33.28 43.52-20.48 115.2-20.48 115.2 92.16-71.68 71.68-138.24 71.68-138.24 0-66.56-53.76-87.04-53.76-87.04-28.16-5.12-23.04-15.36-23.04-15.36 76.8-87.04 148.48-71.68 148.48-71.68 0-12.8-53.76-5.12-53.76-5.12 17.92-25.6 79.36-20.48 79.36-20.48 10.24 2.56 33.28 12.8 33.28 12.8l-10.24-20.48c7.68 2.56 12.8 5.12 17.92 7.68 5.12 2.56 10.24 2.56 10.24 2.56 7.68 0 17.92 2.56 33.28 2.56 0 0 15.36 2.56 28.16 28.16 0 0-2.56-15.36-5.12-20.48 0 0 17.92 10.24 25.6 23.04 0 0 2.56-2.56 0-12.8 0 0 33.28 15.36 46.08 35.84 0 0 2.56 2.56 2.56-5.12 0 0 2.56-15.36 7.68 0 0 0-2.56 15.36 2.56 12.8 0 0 5.12-5.12 5.12-12.8 0 0 5.12-2.56 5.12 5.12 0 0 5.12 5.12 10.24 0 0 0 5.12 5.12 7.68 15.36 2.56 10.24 7.68 17.92 7.68 17.92s-10.24 25.6-7.68 53.76c0 0 0 71.68-10.24 84.48 0 0 30.72-12.8 43.52-66.56 0 0 17.92-46.08 20.48-17.92 0 0-5.12 12.8 0 28.16 0 0-7.68 30.72-15.36 35.84 0 0 15.36-10.24 23.04-23.04 0 0 7.68 25.6-5.12 33.28 0 0-35.84 23.04-69.12 30.72 0 0-23.04 12.8-30.72 28.16l-5.12 7.68c12.8-30.72 20.48-61.44 20.48-61.44 12.8-10.24 17.92-30.72 17.92-30.72-5.12 0-15.36 12.8-15.36 12.8-10.24 10.24-5.12-17.92-5.12-17.92 5.12-7.68 10.24-20.48 10.24-20.48 0-10.24-10.24 2.56-10.24 2.56-10.24 5.12-5.12-12.8-5.12-12.8 7.68-15.36 2.56-20.48 2.56-20.48-5.12 0-12.8 23.04-12.8 23.04-2.56 15.36-15.36-15.36-15.36-15.36-12.8-10.24-10.24-35.84-10.24-35.84-2.56-15.36-5.12 0-5.12 0-2.56 17.92-5.12 7.68-5.12 7.68 0-12.8-2.56-23.04-2.56-23.04v20.48c-5.12 7.68-10.24-10.24-10.24-10.24-2.56-17.92-7.68-15.36-7.68-15.36-2.56 10.24 2.56 15.36 0 17.92-2.56 2.56-10.24-7.68-10.24-17.92 0-10.24-7.68-5.12-7.68-5.12 0 17.92-5.12 10.24-5.12 10.24-133.12-58.88-189.44-12.8-189.44-12.8 122.88-51.2 232.96 69.12 232.96 69.12-17.92-7.68-48.64-2.56-48.64-2.56-35.84 15.36-56.32 5.12-56.32 5.12 12.8 15.36 64 7.68 64 7.68 20.48-7.68 38.4 2.56 38.4 2.56 23.04 20.48-5.12 20.48-5.12 20.48 25.6 10.24 33.28 48.64 33.28 48.64-7.68 104.96-117.76 158.72-117.76 158.72 53.76-81.92 20.48-130.56 20.48-130.56-17.92-40.96-92.16-58.88-92.16-58.88 74.24 33.28 79.36 76.8 79.36 76.8 7.68 76.8-35.84 122.88-35.84 122.88l-25.6 10.24c17.92-23.04 15.36-64 15.36-64-12.8 53.76-64 79.36-64 79.36 17.92-28.16 15.36-53.76 15.36-53.76-5.12 25.6-46.08 56.32-46.08 56.32-17.92 23.04-135.68 51.2-145.92 51.2-5.12 0-30.72 7.68-46.08 15.36-28.16-81.92 81.92-199.68 81.92-199.68 38.4-25.6 48.64-74.24 48.64-74.24z m-220.16 161.28c-12.8 145.92 35.84 143.36 35.84 143.36-56.32-38.4-5.12-199.68-5.12-199.68 15.36-38.4 17.92 0 17.92 0-23.04 43.52-15.36 84.48-15.36 84.48 12.8-102.4 107.52-115.2 107.52-115.2-69.12 99.84-64 204.8-64 204.8h2.56c-7.68 0-10.24 2.56-10.24 2.56-20.48-56.32 0-130.56 0-130.56-35.84 38.4-15.36 156.16-15.36 156.16-2.56 7.68-12.8 2.56-12.8 2.56-10.24 0-28.16 38.4-28.16 38.4-5.12 0-12.8-17.92-12.8-17.92-5.12 12.8 0 17.92 0 17.92 5.12 30.72 2.56 25.6 2.56 25.6-5.12 2.56-10.24-15.36-10.24-15.36-7.68 15.36 2.56 33.28 2.56 33.28l-2.56 15.36s-46.08-64-66.56-130.56c20.48-56.32 74.24-115.2 74.24-115.2z m-87.04 92.16s-5.12 33.28 79.36 168.96c0 15.36 0 30.72 2.56 46.08 0 0-61.44-56.32-76.8-158.72 0 0-7.68-48.64-5.12-56.32z m934.4 115.2s-17.92-20.48-23.04-10.24l17.92 15.36s0 30.72-35.84 33.28c0 0-12.8 17.92-53.76 17.92 0 0-25.6 2.56-33.28 10.24 0 0-10.24 7.68-46.08 5.12 0 0 10.24 5.12 30.72 5.12 0 0 12.8-2.56 15.36 2.56 0 0 20.48 7.68 20.48 10.24s53.76-30.72 74.24 0c0 0 5.12 10.24 10.24 10.24 0 0 2.56 12.8 0 15.36s-10.24-7.68-10.24 0c0 0 17.92 2.56 10.24 23.04 0 0-15.36 23.04-35.84 5.12 0 0-28.16 5.12-35.84 0 0 0-23.04 74.24-138.24 53.76 0 0-46.08-10.24-66.56-76.8 0 0-28.16-120.32-140.8-89.6 0 0 71.68-5.12 104.96 40.96 0 0 25.6 20.48 40.96 81.92 0 0 17.92 43.52 64 51.2 0 0 33.28 2.56 10.24 46.08 0 0-12.8 20.48-40.96 35.84 0 0-10.24 5.12-7.68 12.8 0 0-2.56 15.36 12.8 2.56 0 0 58.88-33.28 76.8 12.8 0 0 5.12 10.24 0 12.8 0 0-5.12 0-7.68-5.12 0 0-5.12-12.8-12.8-10.24 0 0 15.36 10.24 10.24 30.72 0 0-12.8 15.36-17.92 0 0 0 5.12-28.16-15.36-23.04 0 0 20.48 15.36 5.12 30.72 0 0-7.68 5.12-23.04 2.56 0 0-7.68-10.24-46.08 0h-332.8s-174.08-2.56-276.48-156.16c0 0-46.08-84.48-48.64-140.8L76.8 742.4l-33.28-81.92v-56.32c0-10.24 2.56-20.48 2.56-25.6 2.56-10.24 12.8 79.36 89.6 176.64 10.24 40.96 30.72 66.56 30.72 66.56-20.48 0-48.64-28.16-48.64-28.16 30.72 48.64 76.8 61.44 76.8 61.44 61.44 51.2 122.88 64 122.88 64-43.52-10.24-92.16-51.2-92.16-51.2-46.08-35.84-69.12-94.72-69.12-94.72 0-20.48 23.04-56.32 23.04-56.32 30.72-46.08 110.08-58.88 110.08-58.88 46.08-2.56 102.4-12.8 102.4-12.8-12.8 5.12-30.72 43.52-30.72 43.52-2.56 5.12-23.04 7.68-23.04 7.68C248.32 706.56 230.4 742.4 230.4 742.4c15.36-12.8 43.52-23.04 43.52-23.04 15.36-7.68 71.68-10.24 71.68-10.24-23.04 87.04 10.24 156.16 10.24 156.16-30.72-94.72 12.8-163.84 12.8-163.84 56.32-84.48 148.48-102.4 148.48-102.4 33.28-10.24 115.2-30.72 115.2-30.72 56.32-20.48 84.48-58.88 84.48-58.88 12.8-20.48 40.96-33.28 51.2-38.4 0 7.68 5.12 15.36 12.8 20.48 0 0 10.24 2.56 5.12-15.36 0 0-10.24-10.24 5.12-33.28 0 0 17.92-20.48 30.72-23.04 0 0 23.04 17.92 25.6 35.84 0 0 97.28 15.36 110.08 99.84 0 0 2.56 15.36 2.56 20.48 0 0 0 10.24 10.24 25.6 5.12-5.12 20.48 20.48 12.8 33.28z' + p-id='6294' + > )} /> ); }; export const FlinkSQLEnvSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( ( @@ -547,7 +614,7 @@ export const FlinkSQLEnvSvg = (props: { size?: number }) => { }; export const FlinkJarSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( { }; export const LogSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> ( { }; export const ScalaSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> { }; export const PythonSvg = (props: { size?: number }) => { - const {size = 16} = props; + const { size = 16 } = props; return ( <> void; }; -const FooterContainer = (props: { - token: GlobalToken; - centerContent?: DataStudioState['centerContent']; -}) => { +export default (props: { token: GlobalToken; centerContent: DataStudioState['centerContent'] }) => { const { token, centerContent } = props; const [memDetailInfo, setMemDetailInfo] = useState('0/0M'); const { subscribeTopic } = useModel('UseWebSocketModel', (model: any) => ({ @@ -53,7 +49,6 @@ const FooterContainer = (props: { ); }); }, []); - const route: ButtonRoute[] = [ { text: ( @@ -98,9 +93,7 @@ const FooterContainer = (props: { )); }; const renderFooterLastUpdate = () => { - const currentTab = centerContent?.tabs.find( - (item, index) => item.id === centerContent?.activeTab - ); + const currentTab = centerContent?.tabs.find((item) => item.id === centerContent?.activeTab); if (currentTab && currentTab.tabType === 'task') { return (
@@ -139,10 +132,3 @@ const FooterContainer = (props: { ); }; - -export default connect( - ({ DataStudio }: { DataStudio: DataStudioState }) => ({ - centerContent: DataStudio.centerContent - }), - mapDispatchToProps -)(FooterContainer); diff --git a/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx index 8c12d9f90f..83af9f179f 100644 --- a/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx +++ b/dinky-web/src/pages/DataStudio/Toolbar/Project/JobModal/components/TemplateSelect.tsx @@ -37,7 +37,7 @@ const TemplateSelect: React.FC<{ type: string; onChange: (v: string) => void }> const renderItem = (item: Document) => { return ( -
+
- {getTabIcon(item.type, 20)} - + {getTabIcon(item.type, 20)} ), value: item.id, path: currentPath, diff --git a/dinky-web/src/pages/DataStudio/css/imgs/close-dark.svg b/dinky-web/src/pages/DataStudio/css/imgs/close-dark.svg new file mode 100644 index 0000000000..bc79198519 --- /dev/null +++ b/dinky-web/src/pages/DataStudio/css/imgs/close-dark.svg @@ -0,0 +1,6 @@ + + + diff --git a/dinky-web/src/pages/DataStudio/css/imgs/close-light.svg b/dinky-web/src/pages/DataStudio/css/imgs/close-light.svg new file mode 100644 index 0000000000..dcb49437a5 --- /dev/null +++ b/dinky-web/src/pages/DataStudio/css/imgs/close-light.svg @@ -0,0 +1,6 @@ + + + diff --git a/dinky-web/src/pages/DataStudio/css/index.less b/dinky-web/src/pages/DataStudio/css/index.less index e2031f6909..bb5509c98d 100644 --- a/dinky-web/src/pages/DataStudio/css/index.less +++ b/dinky-web/src/pages/DataStudio/css/index.less @@ -11,6 +11,7 @@ --text-color: #424242; --panel-extra-btn-color: #000000; --scroll-bg-color: #daecff; + --close-btn-img: url('./imgs/close-light.svg'); } .dark-theme { @@ -26,6 +27,7 @@ --text-color: #fafafa; --panel-extra-btn-color: #fafafa; --scroll-bg-color: #4d4e51; + --close-btn-img: url('./imgs/close-dark.svg'); } .page-container { @@ -280,20 +282,29 @@ body > .dragging-layer > div:last-child { .dock-tab-close-btn { position: absolute; cursor: pointer; - font-family: 'Fredoka One', sans-serif; color: var(--text-color); - right: -5px; + right: -7px; font-size: 12px; - width: 16px; + text-align: center; top: 12px; outline: none; transition: all 0.25s ease-in-out; + content: ''; + width: 14px; + height: 14px; + background-image: var(--close-btn-img); + background-position: center; } - .dock-tab-close-btn:before { - content: 'X'; - font-family: emoji; + content: ''; +} +.dock-tab-close-btn:hover { + background-size: 14px; + border: 1px solid #0b7ec4; + border-radius: 50%; + width: 16px; + height: 16px; } .dock-tab-close-btn:hover, diff --git a/dinky-web/src/pages/DataStudio/index.tsx b/dinky-web/src/pages/DataStudio/index.tsx index 07e63c7f35..33dffa9b53 100644 --- a/dinky-web/src/pages/DataStudio/index.tsx +++ b/dinky-web/src/pages/DataStudio/index.tsx @@ -20,7 +20,7 @@ import { DockLayout, TabData } from 'rc-dock'; import React, { lazy, useEffect, useMemo, useRef, useState } from 'react'; import { PageContainer } from '@ant-design/pro-layout'; -import { Col, ConfigProvider, Row, Space, Spin, theme as antdTheme } from 'antd'; +import { Col, ConfigProvider, Row, Spin, theme as antdTheme } from 'antd'; import Toolbar from '@/pages/DataStudio/Toolbar'; import { DataStudioActionType, RightContextMenuState } from '@/pages/DataStudio/data.d'; import { @@ -30,8 +30,6 @@ import { handleRightClick, InitContextMenuPosition } from '@/pages/DataStudio/function'; -// import 'rc-dock/dist/rc-dock.css'; -// import 'rc-dock/dist/rc-dock-dark.css'; import RightContextMenu, { useRightMenuItem } from '@/pages/DataStudio/RightContextMenu'; import { MenuInfo } from 'rc-menu/es/interface'; import { lazyComponent, ToolbarRoutes } from '@/pages/DataStudio/Toolbar/ToolbarRoute'; @@ -326,7 +324,7 @@ const DataStudio: React.FC = (props: any) => { return { id, group, title }; }; const loadTab = (tab: TabData) => { - const { id, title, group } = tab; + const { id, group } = tab; if (group !== 'centerContent') { const route = ToolbarRoutes.find((x) => x.key === id) as ToolbarRoute; const content = ToolbarRoutes.find((item) => item.key === route.key)!!.content(); @@ -641,7 +639,7 @@ const DataStudio: React.FC = (props: any) => { - + {/* 边缘区域布局右键菜单*/}