diff --git a/packages/studio-components/src/Icons/FileExport.tsx b/packages/studio-components/src/Icons/FileExport.tsx index 068e74d0..dea67ead 100644 --- a/packages/studio-components/src/Icons/FileExport.tsx +++ b/packages/studio-components/src/Icons/FileExport.tsx @@ -1,8 +1,15 @@ import React from 'react'; export default ({ style }: { style?: Record }) => { - const { color = '#2c2c2c' } = style || { color: '#2c2c2c' }; + const { color = '#2c2c2c', fontSize = '18px' } = style || { color: '#2c2c2c' }; return ( - + = props => { const { style } = props; - const { color } = style as { color: string }; + const { color = '#000', fontSize = '18px' } = style as { color: string; fontSize: string }; return (
- + = props => { const { style } = props; - const { color } = style as { color: string }; + const { color, fontSize = '18px' } = style as { color: string; fontSize: string }; return (
- + = props => { - const { fill = '#000' } = props; + const { style } = props; + const { color = '#000', fontSize = '14px' } = style || {}; return ( - + ); diff --git a/packages/studio-components/src/Icons/Sidebar.tsx b/packages/studio-components/src/Icons/Sidebar.tsx index 1fe2c8ec..c1772f08 100644 --- a/packages/studio-components/src/Icons/Sidebar.tsx +++ b/packages/studio-components/src/Icons/Sidebar.tsx @@ -2,15 +2,15 @@ import React from 'react'; export default ({ style, revert }: { style?: React.CSSProperties; revert?: boolean }) => { // 根据revert属性判断是否需要镜像 const transformStyle = revert ? { ...style, transform: 'scaleX(-1)' } : style; - const { color } = style || { color: '#000' }; + const { color, fontSize = '14px' } = style || { color: '#000' }; return ( { +export default ({ style, disabled }: { style?: React.CSSProperties; disabled?: boolean }) => { + const { color, fontSize = '15px' } = style || {}; return ( diff --git a/packages/studio-components/src/Icons/Unlock.tsx b/packages/studio-components/src/Icons/Unlock.tsx index e9dce035..83eb0a48 100644 --- a/packages/studio-components/src/Icons/Unlock.tsx +++ b/packages/studio-components/src/Icons/Unlock.tsx @@ -1,16 +1,17 @@ import * as React from 'react'; interface IUnlockProps { - fill?: string; + style?: React.CSSProperties; } const Unlock: React.FunctionComponent = props => { - const { fill = '#000' } = props; + const { style } = props; + const { color = '#000', fontSize = '14px' } = style || {}; return ( - + ); diff --git a/packages/studio-components/src/Icons/ZoomFit.tsx b/packages/studio-components/src/Icons/ZoomFit.tsx index a3994d56..93a7a6f8 100644 --- a/packages/studio-components/src/Icons/ZoomFit.tsx +++ b/packages/studio-components/src/Icons/ZoomFit.tsx @@ -6,9 +6,9 @@ interface IZoomFitProps { const ZoomFit: React.FunctionComponent = props => { const { style } = props; - const { color } = style as { color: string }; + const { color, fontSize = '18px' } = style as { color: string; fontSize: string }; return ( - + { +export default ({ style: { color, fontSize = '16px' } }: { style: React.CSSProperties }) => { return ( - + = props => { }); setState(preState => { + // 特殊化处理,切token数据需初始化数据做基础 + storage.set('token', { ...preState.token, ...token }); return { ...preState, components: { ...preState.components, ...components }, diff --git a/packages/studio-importor/src/app/button-controller/clear-canvas.tsx b/packages/studio-importor/src/app/button-controller/clear-canvas.tsx index 15c9b201..0095c0fc 100644 --- a/packages/studio-importor/src/app/button-controller/clear-canvas.tsx +++ b/packages/studio-importor/src/app/button-controller/clear-canvas.tsx @@ -42,7 +42,7 @@ const ClearCanvas: React.FunctionComponent = props => { onClick={handleClear} style={style} type="text" - icon={} + icon={} > ); diff --git a/packages/studio-importor/src/app/graph-canvas/CustomControls.tsx b/packages/studio-importor/src/app/graph-canvas/CustomControls.tsx index 41c63554..deab5580 100644 --- a/packages/studio-importor/src/app/graph-canvas/CustomControls.tsx +++ b/packages/studio-importor/src/app/graph-canvas/CustomControls.tsx @@ -13,9 +13,9 @@ const CustomControls: React.FunctionComponent = props => { const { zoomIn, zoomOut, fitView } = useReactFlow(); const { isLight } = useStudioProvier(); // svg path fill - const fill = !isLight ? '#FFF' : '#000'; + const color = !isLight ? '#FFF' : '#000'; // lock or unlock - const Icon = isLocked ? : ; + const Icon = isLocked ? : ; const background = !isLight ? '#1d1d1d' : '#fff'; return ( <> diff --git a/packages/studio-website/src/pages/setting/International.tsx b/packages/studio-website/src/pages/setting/International.tsx index dfa01314..136d0bf1 100644 --- a/packages/studio-website/src/pages/setting/International.tsx +++ b/packages/studio-website/src/pages/setting/International.tsx @@ -7,7 +7,7 @@ import SettingParcel from '../../components/setting-parcel'; const International: React.FunctionComponent = () => { const { store, updateStore } = useContext(); - const { locale = 'zh-CN' } = store; + const { locale = 'en-US' } = store; const { handleThemeOrLocale } = useStudioProvier(); const handleLocales = (value: ILocaleSwitchProps['value']) => { diff --git a/packages/studio-website/src/pages/setting/primary-color/index.tsx b/packages/studio-website/src/pages/setting/primary-color/index.tsx index 30670c16..0bc40cb6 100644 --- a/packages/studio-website/src/pages/setting/primary-color/index.tsx +++ b/packages/studio-website/src/pages/setting/primary-color/index.tsx @@ -8,11 +8,11 @@ const { useToken } = theme; const PrimaryColor: React.FunctionComponent = () => { const { handleThemeOrLocale } = useStudioProvier(); const { token } = useToken(); - const { borderRadius, colorPrimary } = token; + const { colorPrimary } = token; // Function to handle primary color change const handlePrimaryColor = (color: string) => { - handleThemeOrLocale({ token: { colorPrimary: color, borderRadius } }); + handleThemeOrLocale({ token: { colorPrimary: color } }); }; return ( diff --git a/packages/studio-website/src/pages/setting/rounded-corner.tsx b/packages/studio-website/src/pages/setting/rounded-corner.tsx index 542b283d..b5dee02a 100644 --- a/packages/studio-website/src/pages/setting/rounded-corner.tsx +++ b/packages/studio-website/src/pages/setting/rounded-corner.tsx @@ -10,7 +10,7 @@ const RoundedCorner: React.FunctionComponent = () => { const handleBorderRadiusChange: (newBorderRadius: number | null) => void = newBorderRadius => { //@ts-ignore - handleThemeOrLocale({ token: { ...token, borderRadius: newBorderRadius } }); + handleThemeOrLocale({ token: { borderRadius: newBorderRadius } }); }; return (