diff --git a/dashboard/package.json b/dashboard/package.json index 9948926cc..bbc505b33 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,6 +1,6 @@ { "name": "@devtable/dashboard", - "version": "14.58.4", + "version": "14.58.5", "license": "Apache-2.0", "repository": { "url": "https://github.com/merico-dev/table" diff --git a/dashboard/src/components/panel/panel-render/panel-render-base.css b/dashboard/src/components/panel/panel-render/panel-render-base.css index 1ebe726cc..ee539b875 100644 --- a/dashboard/src/components/panel/panel-render/panel-render-base.css +++ b/dashboard/src/components/panel/panel-render/panel-render-base.css @@ -43,6 +43,11 @@ top: 16px; right: 16px; } + +.panel-root .panel-top-right-actions-placeholder { + width: 1px; + height: 24px; +} .panel-root .panel-viz-section { height: 100%; } diff --git a/dashboard/src/components/panel/panel-render/top-right-actions/index.tsx b/dashboard/src/components/panel/panel-render/top-right-actions/index.tsx index fc6db00c0..91dd7cfc7 100644 --- a/dashboard/src/components/panel/panel-render/top-right-actions/index.tsx +++ b/dashboard/src/components/panel/panel-render/top-right-actions/index.tsx @@ -14,22 +14,26 @@ export const PanelTopRightActions = observer(({ dropdownContent, showDropdownMen const showDropdown = withPanelTitle && showDropdownMenu; + const hasTopRightActions = panelAddonSlotId || dropdownContent; return ( - - {/* Panel addons portal target */} - {withAddon && panelAddonSlotId &&
} + <> + {hasTopRightActions &&
} + + {/* Panel addons portal target */} + {withAddon && panelAddonSlotId &&
} - {/* Panel dropdown menu */} - {showDropdown && dropdownContent} -
+ {/* Panel dropdown menu */} + {showDropdown && dropdownContent} +
+ ); }); diff --git a/dashboard/src/dashboard-editor/ui/settings/content/edit-panel/panel-config/title.tsx b/dashboard/src/dashboard-editor/ui/settings/content/edit-panel/panel-config/title.tsx index 746d6380d..dfef76d64 100644 --- a/dashboard/src/dashboard-editor/ui/settings/content/edit-panel/panel-config/title.tsx +++ b/dashboard/src/dashboard-editor/ui/settings/content/edit-panel/panel-config/title.tsx @@ -17,7 +17,6 @@ export const EditTitle = observer(() => { label={t('panel.show_title')} sx={{ userSelect: 'none' }} /> - ); diff --git a/dashboard/src/i18n/en.ts b/dashboard/src/i18n/en.ts index 1c1974dbe..0300e4a78 100644 --- a/dashboard/src/i18n/en.ts +++ b/dashboard/src/i18n/en.ts @@ -403,7 +403,7 @@ export const en = { panel_name: 'Panel Name', panel_description: 'Description', panel_description_click: 'Click to see description', - show_title: 'Show title', + show_title: 'Show as Panel title', use_name_as_title: 'Use name as title', settings: { change_view: 'Move into Another View', diff --git a/dashboard/src/i18n/zh.ts b/dashboard/src/i18n/zh.ts index df2e31c8c..e20377a5a 100644 --- a/dashboard/src/i18n/zh.ts +++ b/dashboard/src/i18n/zh.ts @@ -403,7 +403,7 @@ export const zh = { panel_name: '卡片名', panel_description: '卡片描述', panel_description_click: '点击查看卡片描述', - show_title: '展示卡片标题', + show_title: '作为卡片标题展示', use_name_as_title: '使用卡片名作为标题', settings: { change_view: '移至另一个视图下', diff --git a/settings-form/package.json b/settings-form/package.json index a24fc2e20..d6e448c84 100644 --- a/settings-form/package.json +++ b/settings-form/package.json @@ -1,6 +1,6 @@ { "name": "@devtable/settings-form", - "version": "14.58.4", + "version": "14.58.5", "license": "Apache-2.0", "repository": { "url": "https://github.com/merico-dev/table" diff --git a/website/src/utils/install-dashboard-website-plugin.tsx b/website/src/utils/install-dashboard-website-plugin.tsx index 05899f10a..d13701240 100644 --- a/website/src/utils/install-dashboard-website-plugin.tsx +++ b/website/src/utils/install-dashboard-website-plugin.tsx @@ -1,6 +1,6 @@ import { IPanelAddonRenderProps, pluginManager, useVisibleFilters } from '@devtable/dashboard'; import { ActionIcon, Tooltip } from '@mantine/core'; -import { IconBug, IconCode } from '@tabler/icons-react'; +import { IconCode } from '@tabler/icons-react'; import React from 'react'; export const PrintEChartsOptionAddon = ({ viz, isInEditMode }: IPanelAddonRenderProps) => { @@ -20,22 +20,20 @@ export const PrintEChartsOptionAddon = ({ viz, isInEditMode }: IPanelAddonRender return null; } return ( -
- - { - ev.stopPropagation(); - ev.preventDefault(); - console.log('debug', renderOptions, 'filters', formattedFilters); - }} - size="sm" - variant="white" - color="gray" - > - - - -
+ + { + ev.stopPropagation(); + ev.preventDefault(); + console.log('debug', renderOptions, 'filters', formattedFilters); + }} + variant="subtle" + color="black" + size="md" + > + + + ); }; pluginManager.install({