1Panel-dev · f2c-ci-robot · Jul 3, 2024 · Jul 3, 2024
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
@@ -1746,7 +1746,6 @@ const message = {
         check: '查看',
         acmeAccountManage: 'Acme 賬戶',
         email: '郵箱',
-        addAccount: '創建賬戶',
         acmeAccount: 'Acme 賬戶',
         provider: '驗證方式',
         dnsManual: '手動解析',
@@ -1874,8 +1873,6 @@ const message = {
         proxyPath: '前端請求路徑',
         proxyPass: '後端代理地址',
         cache: '緩存',
-        createProxy: '創建反向代理',
-        editProxy: '編輯反向代理',
         cacheTime: '緩存時間',
         enableCache: '開啟緩存',
         proxyHost: '後端域名',
@@ -2025,7 +2022,6 @@ const message = {
         getDnsResolve: '正在取得 DNS 解析值,請稍後 ...',
         selfSigned: '自簽證書',
         ca: '證書頒發機構',
-        createCA: '創建機構',
         commonName: '憑證主體名稱(CN)',
         caName: '機構名稱',
         company: '公司/組織',

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -1747,7 +1747,6 @@ const message = {
         check: '查看',
         acmeAccountManage: 'Acme 账户',
         email: '邮箱',
-        addAccount: '创建账户',
         acmeAccount: 'Acme 账户',
         provider: '验证方式',
         dnsManual: '手动解析',
@@ -1875,8 +1874,6 @@ const message = {
         proxyPath: '前端请求路径',
         proxyPass: '后端代理地址',
         cache: '缓存',
-        createProxy: '创建反向代理',
-        editProxy: '编辑反向代理',
         cacheTime: '缓存时间',
         enableCache: '开启缓存',
         proxyHost: '后端域名',
@@ -2026,7 +2023,6 @@ const message = {
         getDnsResolve: '正在获取 DNS 解析值,请稍后 ...',
         selfSigned: '自签证书',
         ca: '证书颁发机构',
-        createCA: '创建机构',
         commonName: '证书主体名称(CN)',
         caName: '机构名称',
         company: '公司/组织',

diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue
@@ -117,7 +117,7 @@
                         :label="$t('container.source')"
                         show-overflow-tooltip
                         prop="resource"
-                        min-width="100"
+                        min-width="120"
                     >
                         <template #default="{ row }">
                             <div v-if="row.hasLoad">

diff --git a/frontend/src/views/container/image/index.vue b/frontend/src/views/container/image/index.vue
@@ -60,7 +60,7 @@
                     >
                         <template #default="{ row }">
                             <el-tag
-                                style="margin-left: 5px"
+                                class="ml-2.5"
                                 v-for="(item, index) of row.tags"
                                 :key="index"
                                 :title="item"
@@ -78,7 +78,7 @@
                         :formatter="dateFormat"
                     />
                     <fu-table-operations
-                        width="200px"
+                        width="250px"
                         :ellipsis="10"
                         :buttons="buttons"
                         :label="$t('commons.table.operate')"

diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue
@@ -13,7 +13,7 @@
                 <el-row>
                     <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
                         <el-button type="primary" @click="onOpenDialog('create')">
-                            {{ $t('commons.button.create') }}{{ $t('cronjob.cronTask') }}
+                            {{ $t('commons.button.create') }} {{ $t('cronjob.cronTask') }}
                         </el-button>
                         <el-button-group class="ml-4">
                             <el-button plain :disabled="selects.length === 0" @click="onBatchChangeStatus('enable')">

diff --git a/frontend/src/views/database/mysql/index.vue b/frontend/src/views/database/mysql/index.vue
@@ -10,7 +10,7 @@
                 </div>
             </el-card>
         </div>
-        <LayoutContent :title="(currentDB?.type === 'mysql' ? 'MySQL ' : 'MariaDB ') + $t('menu.database')">
+        <LayoutContent :title="currentDB?.type === 'mysql' ? 'MySQL ' : 'MariaDB '">
             <template #app v-if="currentDB?.from === 'local'">
                 <AppStatus
                     :app-key="appKey"

diff --git a/frontend/src/views/database/postgresql/index.vue b/frontend/src/views/database/postgresql/index.vue
@@ -8,7 +8,7 @@
                 </div>
             </el-card>
         </div>
-        <LayoutContent :title="'PostgreSQL ' + $t('menu.database')">
+        <LayoutContent :title="'PostgreSQL'">
             <template #app v-if="currentDB?.from === 'local'">
                 <AppStatus
                     :app-key="appKey"

diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
@@ -284,6 +284,7 @@
                         :label="$t('commons.table.operate')"
                         :min-width="mobile ? 'auto' : 200"
                         :fixed="mobile ? false : 'right'"
+                        width="300"
                         fix
                     />
                 </ComplexTable>

diff --git a/frontend/src/views/host/firewall/forward/index.vue b/frontend/src/views/host/firewall/forward/index.vue
@@ -22,7 +22,7 @@
                         <el-row>
                             <el-col :span="16">
                                 <el-button type="primary" @click="onOpenDialog('create')">
-                                    {{ $t('commons.button.create') }}{{ $t('firewall.forwardRule') }}
+                                    {{ $t('commons.button.create') }} {{ $t('firewall.forwardRule') }}
                                 </el-button>
                                 <el-button @click="onDelete(null)" plain :disabled="selects.length === 0">
                                     {{ $t('commons.button.delete') }}

diff --git a/frontend/src/views/host/firewall/port/index.vue b/frontend/src/views/host/firewall/port/index.vue
@@ -43,13 +43,7 @@
                                 <el-option :label="$t('firewall.unUsed')" value="free"></el-option>
                                 <el-option :label="$t('firewall.used')" value="used"></el-option>
                             </el-select>
-                            <el-select
-                                v-model="searchStrategy"
-                                style="margin-left: 10px"
-                                @change="search()"
-                                clearable
-                                class="p-w-200"
-                            >
+                            <el-select v-model="searchStrategy" @change="search()" clearable class="p-w-200 ml-2.5">
                                 <template #prefix>{{ $t('firewall.strategy') }}</template>
                                 <el-option :label="$t('commons.table.all')" value=""></el-option>
                                 <el-option :label="$t('firewall.accept')" value="accept"></el-option>
@@ -61,7 +55,7 @@
                         <el-row>
                             <el-col :span="16">
                                 <el-button type="primary" @click="onOpenDialog('create')">
-                                    {{ $t('commons.button.create') }}{{ $t('firewall.portRule') }}
+                                    {{ $t('commons.button.create') }} {{ $t('firewall.portRule') }}
                                 </el-button>
                                 <el-button @click="onDelete(null)" plain :disabled="selects.length === 0">
                                     {{ $t('commons.button.delete') }}

diff --git a/frontend/src/views/host/terminal/command/index.vue b/frontend/src/views/host/terminal/command/index.vue
@@ -6,7 +6,7 @@
             </template>
             <template #toolbar>
                 <el-button type="primary" @click="onCreate()">
-                    {{ $t('commons.button.create') }}{{ $t('terminal.quickCommand') }}
+                    {{ $t('commons.button.create') }} {{ $t('terminal.quickCommand') }}
                 </el-button>
                 <el-button type="primary" plain @click="onOpenGroupDialog()">
                     {{ $t('terminal.group') }}

diff --git a/frontend/src/views/website/runtime/node/index.vue b/frontend/src/views/website/runtime/node/index.vue
@@ -82,7 +82,7 @@
                     />
                     <fu-table-operations
                         :ellipsis="10"
-                        width="300px"
+                        width="350px"
                         :buttons="buttons"
                         :label="$t('commons.table.operate')"
                         fixed="right"

diff --git a/frontend/src/views/website/ssl/acme-account/create/index.vue b/frontend/src/views/website/ssl/acme-account/create/index.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog
         v-model="open"
-        :title="$t('website.addAccount')"
+        :title="$t('commons.button.create')"
         :close-on-click-modal="false"
         width="30%"
         :before-close="handleClose"

diff --git a/frontend/src/views/website/ssl/acme-account/index.vue b/frontend/src/views/website/ssl/acme-account/index.vue
@@ -8,7 +8,7 @@
         </div>
         <ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()" v-loading="loading">
             <template #toolbar>
-                <el-button type="primary" @click="openCreate">{{ $t('website.addAccount') }}</el-button>
+                <el-button type="primary" @click="openCreate">{{ $t('commons.button.create') }}</el-button>
             </template>
             <el-table-column
                 :label="$t('website.email')"

diff --git a/frontend/src/views/website/ssl/ca/create/index.vue b/frontend/src/views/website/ssl/ca/create/index.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog
         v-model="open"
-        :title="$t('ssl.createCA')"
+        :title="$t('commons.button.create')"
         :close-on-click-modal="false"
         width="40%"
         :before-close="handleClose"

diff --git a/frontend/src/views/website/ssl/ca/index.vue b/frontend/src/views/website/ssl/ca/index.vue
@@ -11,7 +11,7 @@
         </template>
         <ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()" v-loading="loading">
             <template #toolbar>
-                <el-button type="primary" @click="openCreate">{{ $t('ssl.createCA') }}</el-button>
+                <el-button type="primary" @click="openCreate">{{ $t('commons.button.create') }}</el-button>
             </template>
             <el-table-column :label="$t('commons.table.name')" show-overflow-tooltip prop="name"></el-table-column>
             <el-table-column :label="$t('website.keyType')" show-overflow-tooltip prop="keyType">

diff --git a/frontend/src/views/website/ssl/dns-account/create/index.vue b/frontend/src/views/website/ssl/dns-account/create/index.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog
         v-model="open"
-        :title="$t('website.addAccount')"
+        :title="$t('commons.button.create')"
         :destroy-on-close="true"
         :close-on-click-modal="false"
         width="40%"

diff --git a/frontend/src/views/website/ssl/dns-account/index.vue b/frontend/src/views/website/ssl/dns-account/index.vue
@@ -6,7 +6,7 @@
         <ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()">
             <template #toolbar>
                 <el-button type="primary" @click="openCreate">
-                    {{ $t('website.addAccount') }}
+                    {{ $t('commons.button.create') }}
                 </el-button>
             </template>
             <el-table-column :label="$t('commons.table.name')" fix show-overflow-tooltip prop="name"></el-table-column>

diff --git a/frontend/src/views/website/ssl/index.vue b/frontend/src/views/website/ssl/index.vue
@@ -44,13 +44,7 @@
                         show-overflow-tooltip
                         prop="domains"
                     ></el-table-column>
-                    <el-table-column
-                        :label="$t('ssl.applyType')"
-                        fix
-                        show-overflow-tooltip
-                        prop="provider"
-                        width="100px"
-                    >
+                    <el-table-column :label="$t('ssl.applyType')" fix show-overflow-tooltip prop="provider">
                         <template #default="{ row }">{{ getProvider(row.provider) }}</template>
                     </el-table-column>
                     <el-table-column
@@ -114,7 +108,7 @@
                             </fu-read-write-switch>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('ssl.autoRenew')" fix width="100px">
+                    <el-table-column :label="$t('ssl.autoRenew')" fix>
                         <template #default="{ row }">
                             <el-switch
                                 :disabled="row.provider === 'dnsManual' || row.provider === 'manual'"
@@ -128,12 +122,14 @@
                         :label="$t('website.expireDate')"
                         :formatter="dateFormat"
                         show-overflow-tooltip
+                        width="200px"
                     />
                     <fu-table-operations
                         :ellipsis="3"
                         :buttons="buttons"
                         :label="$t('commons.table.operate')"
                         :fixed="mobile ? false : 'right'"
+                        width="300px"
                         fix
                     />
                 </ComplexTable>

diff --git a/frontend/src/views/website/website/config/basic/auth-basic/create/index.vue b/frontend/src/views/website/website/config/basic/auth-basic/create/index.vue
@@ -7,10 +7,7 @@
         :before-close="handleClose"
     >
         <template #header>
-            <DrawerHeader
-                :header="$t('commons.button.' + authBasic.operate) + $t('website.basicAuth')"
-                :back="handleClose"
-            />
+            <DrawerHeader :header="$t('commons.button.' + authBasic.operate)" :back="handleClose" />
         </template>
         <el-row v-loading="loading">
             <el-col :span="22" :offset="1">

diff --git a/frontend/src/views/website/website/config/basic/auth-basic/index.vue b/frontend/src/views/website/website/config/basic/auth-basic/index.vue
@@ -5,7 +5,7 @@
     <ComplexTable :data="data" @search="search" v-loading="loading">
         <template #toolbar>
             <el-button type="primary" plain @click="openCreate">
-                {{ $t('commons.button.create') + $t('website.basicAuth') }}
+                {{ $t('commons.button.create') }}
             </el-button>
         </template>
         <el-table-column :label="$t('commons.login.username')" prop="username"></el-table-column>

diff --git a/frontend/src/views/website/website/config/basic/https/index.vue b/frontend/src/views/website/website/config/basic/https/index.vue
@@ -23,7 +23,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item :label="'HSTS'" prop="hsts">
-                        <el-checkbox v-model="form.hsts">{{ $t('commons.button.start') }}</el-checkbox>
+                        <el-checkbox v-model="form.hsts">{{ $t('commons.button.enable') }}</el-checkbox>
                         <span class="input-help">{{ $t('website.hstsHelper') }}</span>
                     </el-form-item>
                     <el-form-item :label="$t('website.sslConfig')" prop="type">

diff --git a/frontend/src/views/website/website/config/basic/proxy/create/index.vue b/frontend/src/views/website/website/config/basic/proxy/create/index.vue
@@ -7,7 +7,7 @@
         :before-close="handleClose"
     >
         <template #header>
-            <DrawerHeader :header="$t('website.' + proxy.operate + 'Proxy')" :back="handleClose" />
+            <DrawerHeader :header="$t('commons.button.' + proxy.operate)" :back="handleClose" />
         </template>
         <el-row v-loading="loading">
             <el-col :span="22" :offset="1">

diff --git a/frontend/src/views/website/website/config/basic/proxy/index.vue b/frontend/src/views/website/website/config/basic/proxy/index.vue
@@ -1,7 +1,7 @@
 <template>
     <ComplexTable :data="data" @search="search" v-loading="loading">
         <template #toolbar>
-            <el-button type="primary" plain @click="openCreate">{{ $t('website.createProxy') }}</el-button>
+            <el-button type="primary" plain @click="openCreate">{{ $t('commons.button.create') }}</el-button>
         </template>
         <el-table-column :label="$t('commons.table.name')" prop="name"></el-table-column>
         <el-table-column :label="$t('website.proxyPath')" prop="match"></el-table-column>

diff --git a/frontend/src/views/website/website/config/basic/redirect/create/index.vue b/frontend/src/views/website/website/config/basic/redirect/create/index.vue
@@ -7,10 +7,7 @@
         :before-close="handleClose"
     >
         <template #header>
-            <DrawerHeader
-                :header="$t('commons.button.' + redirect.operate) + $t('website.redirect')"
-                :back="handleClose"
-            />
+            <DrawerHeader :header="$t('commons.button.' + redirect.operate)" :back="handleClose" />
         </template>
         <el-row v-loading="loading">
             <el-col :span="22" :offset="1">

diff --git a/frontend/src/views/website/website/config/basic/redirect/index.vue b/frontend/src/views/website/website/config/basic/redirect/index.vue
@@ -2,7 +2,7 @@
     <ComplexTable :data="data" @search="search" v-loading="loading">
         <template #toolbar>
             <el-button type="primary" plain @click="openCreate">
-                {{ $t('commons.button.create') + $t('website.redirect') }}
+                {{ $t('commons.button.create') }}
             </el-button>
         </template>
         <el-table-column :label="$t('commons.table.name')" prop="name" min-width="60px" show-overflow-tooltip />