From 2d3fce1d3e0ce5262b348f885b03479783fe0bac Mon Sep 17 00:00:00 2001
From: wangdan <dan.wang@fit2cloud.com>
Date: Thu, 2 Feb 2023 19:10:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/app-layout/menu/index.scss |  2 +-
 frontend/src/styles/index.scss                | 17 ++++++
 frontend/src/views/app-store/apps/index.vue   | 19 +++++--
 .../src/views/app-store/installed/index.vue   |  2 +-
 .../views/host/terminal/terminal/index.vue    |  8 +--
 .../src/views/login/components/login-form.vue |  2 +-
 .../views/website/website/create/index.vue    | 56 ++++++++++++++-----
 frontend/src/views/website/website/index.vue  |  1 +
 frontend/vite.config.ts                       |  2 +-
 9 files changed, 84 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/app-layout/menu/index.scss b/frontend/src/components/app-layout/menu/index.scss
index 65a461897..303ff80d5 100644
--- a/frontend/src/components/app-layout/menu/index.scss
+++ b/frontend/src/components/app-layout/menu/index.scss
@@ -84,7 +84,7 @@
         }
     }
 
-    :deep .el-sub-menu {
+    :deep(.el-sub-menu) {
         margin: 10px;
 
         span {
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index c71f2856e..ee7858924 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1 +1,18 @@
 @use 'fit2cloud-ui-plus/src/styles/index.scss';
+.search-button {
+    .el-input__wrapper {
+        border-radius: 50px;
+    }
+}
+
+// drawer头部增加按钮
+.drawer-header-button {
+    span {
+        color: currentColor !important;
+        font-size: var(--el-font-size-base) !important;
+    }
+    .active-button {
+        color: var(--el-button-hover-text-color);
+        border-color: var(--el-button-hover-border-color);
+    }
+}
diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index 228a7cc85..4d8881b68 100644
--- a/frontend/src/views/app-store/apps/index.vue
+++ b/frontend/src/views/app-store/apps/index.vue
@@ -3,15 +3,22 @@
         <template #toolbar>
             <el-row :gutter="5">
                 <el-col :span="20">
-                    <el-button @click="changeTag('all')" type="primary" :link="activeTag !== 'all'">
+                    <el-button
+                        class="tag-button"
+                        :class="activeTag === 'all' ? '' : 'no-active'"
+                        @click="changeTag('all')"
+                        :type="activeTag === 'all' ? 'primary' : ''"
+                        :plain="activeTag !== 'all'"
+                    >
                         {{ $t('app.all') }}
                     </el-button>
                     <div v-for="item in tags" :key="item.key" style="display: inline">
                         <el-button
                             class="tag-button"
+                            :class="activeTag === item.key ? '' : 'no-active'"
                             @click="changeTag(item.key)"
-                            type="primary"
-                            :link="activeTag !== item.key"
+                            :type="activeTag === item.key ? 'primary' : ''"
+                            :plain="activeTag !== item.key"
                         >
                             {{ item.name }}
                         </el-button>
@@ -220,6 +227,10 @@ onMounted(() => {
 }
 
 .tag-button {
-    margin-left: 30px;
+    margin-right: 10px;
+    &.no-active {
+        background: none;
+        border: none;
+    }
 }
 </style>
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index f92ee8ef3..f899babfd 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -20,7 +20,7 @@
                     </div>
                 </el-col>
                 <el-col :span="4">
-                    <div style="float: right">
+                    <div style="float: right" class="search-button">
                         <el-input
                             class="table-button"
                             v-model="searchReq.name"
diff --git a/frontend/src/views/host/terminal/terminal/index.vue b/frontend/src/views/host/terminal/terminal/index.vue
index ff2ab5717..9b75fdb83 100644
--- a/frontend/src/views/host/terminal/terminal/index.vue
+++ b/frontend/src/views/host/terminal/terminal/index.vue
@@ -352,23 +352,23 @@ defineExpose({
 
 <style lang="scss" scoped>
 .terminal-tabs {
-    :deep .el-tabs__header {
+    :deep(.el-tabs__header) {
         padding: 0;
         position: relative;
         margin: 0 0 3px 0;
     }
-    ::deep .el-tabs__nav {
+    :deep(.el-tabs__nav) {
         white-space: nowrap;
         position: relative;
         transition: transform var(--el-transition-duration);
         float: left;
         z-index: calc(var(--el-index-normal) + 1);
     }
-    :deep .el-tabs__item {
+    :deep(.el-tabs__item) {
         color: #575758;
         padding: 0 0px;
     }
-    :deep .el-tabs__item.is-active {
+    :deep(.el-tabs__item.is-active) {
         color: #ebeef5;
         background-color: #575758;
     }
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 0800a2973..130090cd7 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -397,7 +397,7 @@ onUnmounted(() => {
             margin-top: 10px;
         }
 
-        & :deep .el-input__inner {
+        &:deep(.el-input__inner) {
             border-radius: 0;
         }
     }
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index c8f7e18bd..d54aa4a5b 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -3,19 +3,34 @@
         <template #header>
             <DrawerHeader :header="$t('website.create')" :back="handleClose">
                 <template #buttons>
-                    <el-button
-                        type="primary"
-                        :plain="website.type !== 'deployment'"
-                        @click="website.type = 'deployment'"
-                    >
-                        {{ $t('website.deployment') }}
-                    </el-button>
-                    <el-button type="primary" :plain="website.type !== 'static'" @click="website.type = 'static'">
-                        {{ $t('website.static') }}
-                    </el-button>
-                    <el-button type="primary" :plain="website.type !== 'proxy'" @click="website.type = 'proxy'">
-                        {{ $t('website.proxy') }}
-                    </el-button>
+                    <span class="drawer-header-button">
+                        <template v-for="item in buttonList" :key="item.value">
+                            <el-button
+                                :class="website.type === item.value ? 'active-button' : ''"
+                                @click="website.type = item.value"
+                                :type="website.type === item.value ? '' : 'info'"
+                                :plain="website.type === item.value"
+                                :text="website.type !== item.value"
+                                :bg="website.type !== item.value"
+                            >
+                                {{ item.label }}
+                            </el-button>
+                        </template>
+
+                        <!-- <el-button
+                            type="primary"
+                            :plain="website.type !== 'deployment'"
+                            @click="website.type = 'deployment'"
+                        >
+                            {{ $t('website.deployment') }}
+                        </el-button>
+                        <el-button type="primary" :plain="website.type !== 'static'" @click="website.type = 'static'">
+                            {{ $t('website.static') }}
+                        </el-button>
+                        <el-button type="primary" :plain="website.type !== 'proxy'" @click="website.type = 'proxy'">
+                            {{ $t('website.proxy') }}
+                        </el-button> -->
+                    </span>
                 </template>
             </DrawerHeader>
         </template>
@@ -180,6 +195,21 @@ import { reactive, ref } from 'vue';
 import Params from '@/views/app-store/detail/params/index.vue';
 import Check from '../check/index.vue';
 
+const buttonList = [
+    {
+        label: i18n.global.t('website.deployment'),
+        value: 'deployment',
+    },
+    {
+        label: i18n.global.t('website.static'),
+        value: 'static',
+    },
+    {
+        label: i18n.global.t('website.proxy'),
+        value: 'proxy',
+    },
+];
+
 const websiteForm = ref<FormInstance>();
 const website = ref({
     primaryDomain: '',
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index a3eb2bd59..33ec2317c 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -48,6 +48,7 @@
             <template v-if="nginxIsExist && !openNginxConfig" #search>
                 <div :class="{ mask: nginxStatus != 'Running' }">
                     <el-select v-model="req.websiteGroupId" @change="search()">
+                        <template #prefix>分组</template>
                         <el-option :label="$t('website.allGroup')" :value="0"></el-option>
                         <el-option
                             v-for="(group, index) in groups"
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index d5c88c83d..ad797d149 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -37,7 +37,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
             open: viteEnv.VITE_OPEN,
             proxy: {
                 '/api/v1': {
-                    target: 'http://127.0.0.1:9999',
+                    target: 'http://47.104.134.163:9999/',
                     changeOrigin: true,
                 },
             },