Skip to content

style: Optimize page styles. #8436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Apr 21, 2025
Merged

style: Optimize page styles. #8436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/apps/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</template>
<template #main>
<div>
<MainDiv :heightDiff="350">
<MainDiv :heightDiff="300">
<el-alert type="info" :title="$t('app.appHelper')" :closable="false" />
<el-row :gutter="5">
<el-col
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code change suggests reducing the heightDiff property from 350 to 300 in the <MainDiv> component. This adjustment appears minor and should not introduce major issues unless there are specific reasons requiring this change, such as adjusting space available for other UI elements within the container that wraps <MainDiv>.

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/installed/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</template>
<template #main>
<div>
<MainDiv :heightDiff="mode === 'upgrade' ? 320 : 350">
<MainDiv :heightDiff="mode === 'upgrade' ? 270 : 300">
<el-alert
type="info"
:title="$t('app.upgradeHelper')"
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there is a difference of -10 pixels between 320 and 270. This might impact the layout slightly depending on how you've adjusted it elsewhere in your codebase or how responsive it should be. It's best to ensure that this value fits within your design requirements without disrupting functionality or user experience.

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/file-management/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
:data="data"
@search="search"
@sort-change="changeSort"
:heightDiff="350"
:heightDiff="300"
>
<el-table-column type="selection" width="30" />
<el-table-column
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/process/network/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
@sort-change="changeSort"
@filter-change="changeFilter"
ref="tableRef"
:heightDiff="300"
:heightDiff="220"
>
<el-table-column :label="$t('commons.table.type')" fix prop="type"></el-table-column>
<el-table-column :label="'PID'" fix prop="PID" max-width="60px" sortable></el-table-column>
Expand Down
34 changes: 17 additions & 17 deletions frontend/src/views/host/process/process/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,42 +37,43 @@
@sort-change="changeSort"
@filter-change="changeFilter"
ref="tableRef"
:heightDiff="300"
:heightDiff="220"
>
<el-table-column :label="'PID'" fix prop="PID" max-width="60px" sortable></el-table-column>
<el-table-column
:label="$t('commons.table.name')"
fix
prop="name"
min-width="120px"
></el-table-column>
<el-table-column :label="'PID'" prop="PID" max-width="60px" sortable></el-table-column>
<el-table-column :label="$t('commons.table.name')" prop="name" min-width="120px"></el-table-column>
<el-table-column
:label="$t('process.ppid')"
min-width="120px"
fix
max-width="60px"
prop="PPID"
sortable
></el-table-column>
<el-table-column :label="$t('process.numThreads')" fix prop="numThreads"></el-table-column>
<el-table-column :label="$t('commons.table.user')" fix prop="username"></el-table-column>
<el-table-column
:label="$t('process.numThreads')"
max-width="60px"
prop="numThreads"
></el-table-column>
<el-table-column
:label="$t('commons.table.user')"
max-width="60px"
prop="username"
></el-table-column>
<el-table-column
:label="'CPU'"
fix
max-width="60px"
prop="cpuValue"
:formatter="cpuFormatter"
sortable
></el-table-column>
<el-table-column
:label="$t('process.memory')"
fix
max-width="60px"
prop="rssValue"
:formatter="memFormatter"
sortable
></el-table-column>
<el-table-column :label="$t('process.numConnections')" fix prop="numConnections"></el-table-column>
<el-table-column :label="$t('process.numConnections')" prop="numConnections"></el-table-column>
<el-table-column
:label="$t('commons.table.status')"
fix
prop="status"
column-key="status"
:filters="[
Expand All @@ -93,7 +94,6 @@
</el-table-column>
<el-table-column
:label="$t('process.startTime')"
fix
prop="startTime"
min-width="140px"
></el-table-column>
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes provided have only minor adjustments to the column widths and labels without introducing any major issues or optimizations:

  1. In lines 39-42, the heightDiff value has been changed from 300 to 220. This adjustment is within typical range for table height settings but doesn't significantly impact functionality.

  2. The columns 'CPU' and 'Memory' previously had both fix properties set, while now they each individually have one. This could be intentional to prevent them from being fixed at specific positions, which may lead to better horizontal scrolling behavior if there are many columns or small screens. However, it might also introduce edge cases where the headers overlap with content on larger screens.

  3. Labels and descriptions (like "CPU", "Memory") appear consistent and clear. If these texts need translations using $t(), ensure that all necessary translations are available and correctly used throughout your application.

In summary, this change-set is generally clean and functional, aligning well with current practices in Vue.js components with Element UI libraries.

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/ssh/ssh/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<LayoutContent>
<template #main>
<MainDiv :heightDiff="3200">
<MainDiv :heightDiff="320">
<el-radio-group v-model="confShowType" @change="changeMode">
<el-radio-button value="base">{{ $t('database.baseConf') }}</el-radio-button>
<el-radio-button value="all">{{ $t('database.allConf') }}</el-radio-button>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/dotnet/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="dotnet-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/go/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="go-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="350">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/java/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="java-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="350">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/node/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="node-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="350">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/php/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="php-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="350">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/python/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TableSetting title="python-runtime-refresh" @search="search()" />
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="350">
<ComplexTable :pagination-config="paginationConfig" :data="items" @search="search()" :heightDiff="260">
<el-table-column
:label="$t('commons.table.name')"
fix
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/website/ssl/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
v-loading="loading"
:columns="columns"
localKey="sslColumn"
:height-diff="260"
>
<el-table-column type="selection" width="30" />
<el-table-column
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/website/config/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</el-button>
</template>
<template #main>
<MainDiv :heightDiff="320">
<MainDiv :heightDiff="260">
<Basic :website="website" v-if="index === 'basic'" :heightDiff="320"></Basic>
<Log :id="id" v-if="index === 'log'"></Log>
<Resource :id="id" v-if="index === 'resource'"></Resource>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/website/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
@sort-change="changeSort"
@search="search()"
:class="{ mask: nginxStatus != 'Running' }"
:heightDiff="370"
:heightDiff="310"
:columns="columns"
localKey="websiteColumn"
>
Expand Down
Loading