From 5ad06f121b4d0cfdbff1aa1b8b1d9f9569b4d4d9 Mon Sep 17 00:00:00 2001
From: CityFun <31820853+zhengkunwang223@users.noreply.github.com>
Date: Tue, 24 Jun 2025 18:39:14 +0800
Subject: [PATCH] fix: fix issue with subsite dir error (#9259)

---
 agent/app/dto/request/website.go              |  2 +
 agent/app/service/website.go                  |  1 +
 .../src/components/card-with-header/index.vue | 62 ++++++++++++-------
 frontend/src/lang/modules/en.ts               |  1 +
 frontend/src/lang/modules/ja.ts               |  1 +
 frontend/src/lang/modules/ko.ts               |  1 +
 frontend/src/lang/modules/ms.ts               |  1 +
 frontend/src/lang/modules/pt-br.ts            |  1 +
 frontend/src/lang/modules/ru.ts               |  1 +
 frontend/src/lang/modules/zh-Hant.ts          |  1 +
 frontend/src/lang/modules/zh.ts               |  1 +
 .../config/basic/site-folder/index.vue        |  2 +-
 12 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/agent/app/dto/request/website.go b/agent/app/dto/request/website.go
index b12c56357..2e8567b2c 100644
--- a/agent/app/dto/request/website.go
+++ b/agent/app/dto/request/website.go
@@ -32,6 +32,8 @@ type WebsiteCreate struct {
 	TaskID          string `json:"taskID"`
 	ParentWebsiteID uint   `json:"parentWebsiteID"`
 
+	SiteDir string `json:"siteDir"`
+
 	RuntimeConfig
 	FtpConfig
 	DataBaseConfig
diff --git a/agent/app/service/website.go b/agent/app/service/website.go
index ff09570ff..cef2d1a1a 100644
--- a/agent/app/service/website.go
+++ b/agent/app/service/website.go
@@ -415,6 +415,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
 			return err
 		}
 		website.ParentWebsiteID = parentWebsite.ID
+		website.SiteDir = create.SiteDir
 	}
 
 	configNginx := func(t *task.Task) error {
diff --git a/frontend/src/components/card-with-header/index.vue b/frontend/src/components/card-with-header/index.vue
index 36b222b36..1f9fa3700 100644
--- a/frontend/src/components/card-with-header/index.vue
+++ b/frontend/src/components/card-with-header/index.vue
@@ -2,12 +2,15 @@
     <div>
         <el-card :style="{ height: height }" class="home-card">
             <div class="header">
-                <span class="header-span">{{ header }}</span>
-                <slot name="header-l" />
-                <slot name="header-r" />
+                <div class="header-left">
+                    <span class="header-span">{{ header }}</span>
+                    <slot name="header-l" />
+                </div>
+                <div class="header-right">
+                    <slot name="header-r" />
+                </div>
             </div>
-
-            <div>
+            <div class="body-content">
                 <slot name="body" />
             </div>
         </el-card>
@@ -25,27 +28,44 @@ defineProps({
 <style scoped lang="scss">
 .home-card {
     .header {
-        .header-span {
-            position: relative;
-            font-size: 16px;
-            font-weight: 500;
-            margin-left: 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .header-left {
             display: flex;
-            &::before {
-                position: absolute;
-                top: 50%;
-                transform: translateY(-50%);
-                left: -13px;
-                width: 4px;
-                height: 14px;
-                content: '';
-                background: $primary-color;
-                border-radius: 10px;
+            align-items: center;
+            gap: 12px;
+
+            .header-span {
+                position: relative;
+                font-size: 16px;
+                font-weight: 500;
+                margin-left: 18px;
+                display: flex;
+                align-items: center;
+
+                &::before {
+                    position: absolute;
+                    top: 50%;
+                    transform: translateY(-50%);
+                    left: -13px;
+                    width: 4px;
+                    height: 14px;
+                    content: '';
+                    background: $primary-color;
+                    border-radius: 10px;
+                }
             }
         }
+
+        .header-right {
+            display: flex;
+            align-items: center;
+        }
     }
 
-    div:nth-child(2) {
+    .body-content {
         margin-top: 20px;
     }
 }
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index bcfcf7256..9e32c6e97 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -3109,6 +3109,7 @@ const message = {
             belongToIpGroup: 'Belongs to IP Group',
             notBelongToIpGroup: 'Does not belong to IP Group',
             unknownWebsiteKey: 'Unknown Domain',
+            special: 'Special',
         },
         monitor: {
             name: 'Website Monitoring',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
index 50c78d395..529dcd162 100644
--- a/frontend/src/lang/modules/ja.ts
+++ b/frontend/src/lang/modules/ja.ts
@@ -2980,6 +2980,7 @@ const message = {
             belongToIpGroup: 'IP グループに属しています',
             notBelongToIpGroup: 'IP グループに属していません',
             unknownWebsiteKey: '未知のドメイン',
+            special: '特別な文字は使用できません',
         },
         monitor: {
             name: 'ウェブサイトモニタリング',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
index 8254dee51..d7f828949 100644
--- a/frontend/src/lang/modules/ko.ts
+++ b/frontend/src/lang/modules/ko.ts
@@ -2930,6 +2930,7 @@ const message = {
             belongToIpGroup: 'IP 그룹에 속함',
             notBelongToIpGroup: 'IP 그룹에 속하지 않음',
             unknownWebsiteKey: '알 수 없는 도메인',
+            special: '특수 문자',
         },
         monitor: {
             name: '웹사이트 모니터링',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
index d2448751c..e937fc6b4 100644
--- a/frontend/src/lang/modules/ms.ts
+++ b/frontend/src/lang/modules/ms.ts
@@ -3045,6 +3045,7 @@ const message = {
             belongToIpGroup: 'Tergolong dalam Kumpulan IP',
             notBelongToIpGroup: 'Tidak tergolong dalam Kumpulan IP',
             unknownWebsiteKey: 'Domain Tidak Diketahui',
+            special: 'Peraturan Khas',
         },
         monitor: {
             name: 'Pemantauan Laman Web',
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
index 0a26ed0ef..a962b0d0f 100644
--- a/frontend/src/lang/modules/pt-br.ts
+++ b/frontend/src/lang/modules/pt-br.ts
@@ -3048,6 +3048,7 @@ const message = {
             belongToIpGroup: 'Pertence ao Grupo de IP',
             notBelongToIpGroup: 'Não pertence ao Grupo de IP',
             unknownWebsiteKey: 'Domínio Desconhecido',
+            special: 'Domínio Especial',
         },
         monitor: {
             name: 'Monitoramento de Websites',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
index a3aec1c6f..ca8129e12 100644
--- a/frontend/src/lang/modules/ru.ts
+++ b/frontend/src/lang/modules/ru.ts
@@ -3040,6 +3040,7 @@ const message = {
             belongToIpGroup: 'Принадлежит к группе IP',
             notBelongToIpGroup: 'Не принадлежит к группе IP',
             unknownWebsiteKey: 'Неизвестный домен',
+            special: 'Специальный',
         },
         monitor: {
             name: 'Мониторинг веб-сайта',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
index f263ceb5c..745c1af6a 100644
--- a/frontend/src/lang/modules/zh-Hant.ts
+++ b/frontend/src/lang/modules/zh-Hant.ts
@@ -2899,6 +2899,7 @@ const message = {
             belongToIpGroup: '屬於 IP 組',
             notBelongToIpGroup: '不屬於 IP 組',
             unknownWebsiteKey: '未知域名',
+            special: '指定',
         },
         monitor: {
             name: '網站監控',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 35365dcf7..b448b1c00 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -2874,6 +2874,7 @@ const message = {
             belongToIpGroup: '属于 IP 组',
             notBelongToIpGroup: '不属于 IP 组',
             unknownWebsiteKey: '未知域名',
+            special: '指定',
         },
         monitor: {
             name: '网站监控',
diff --git a/frontend/src/views/website/website/config/basic/site-folder/index.vue b/frontend/src/views/website/website/config/basic/site-folder/index.vue
index ae05f0411..73cb54bd1 100644
--- a/frontend/src/views/website/website/config/basic/site-folder/index.vue
+++ b/frontend/src/views/website/website/config/basic/site-folder/index.vue
@@ -114,7 +114,7 @@ const search = () => {
             updatePermission.id = website.value.id;
             updatePermission.group = website.value.group === '' ? '1000' : website.value.group;
             updatePermission.user = website.value.user === '' ? '1000' : website.value.user;
-            if (website.value.type === 'static' || website.value.runtimeID > 0) {
+            if ((website.value.type === 'static' || website.value.runtimeID > 0) && website.value.type != 'subsite') {
                 configDir.value = true;
                 getConfig();
             }