Skip to content

Commit

Permalink
Merge pull request #1134 from merico-dev/1131-tab-list-of-tab-view-co…
Browse files Browse the repository at this point in the history
…uld-be-fixed-to-screen

1131 tab list of tab view could be fixed to screen
  • Loading branch information
GerilLeto authored Aug 17, 2023
2 parents 13f3a02 + 83b2248 commit b01ca42
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/api",
"version": "10.20.0",
"version": "10.20.1",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/dashboard",
"version": "10.20.0",
"version": "10.20.1",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const getStyles = ({ variant, orientation }: ViewTabsConfigInstance) => {
const ret: Record<string, any> = {
root: {
height: '100%',
overflow: 'hidden',
},
tab: {},
panel: {
Expand Down
3 changes: 2 additions & 1 deletion dashboard/src/components/view/view-component/render/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ export const RenderViewTabs = observer(({ view }: { view: ViewMetaInstance }) =>
styles={{
root: {
height: '100%',
overflow: config.orientation === 'horizontal' ? 'hidden' : 'auto',
},
panel: {
padding: config.orientation === 'horizontal' ? '16px 0px' : '0',
padding: config.orientation === 'horizontal' ? '8px 0px 8px' : '0',
height: '100%',
overflow: 'auto',
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/root",
"version": "10.20.0",
"version": "10.20.1",
"private": true,
"workspaces": [
"api",
Expand Down
2 changes: 1 addition & 1 deletion settings-form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/settings-form",
"version": "10.20.0",
"version": "10.20.1",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@devtable/website",
"private": true,
"license": "Apache-2.0",
"version": "10.20.0",
"version": "10.20.1",
"scripts": {
"dev": "vite",
"preview": "vite preview"
Expand Down

0 comments on commit b01ca42

Please sign in to comment.