chore: Modify orchestration environment variable style (#11381)

ssongliu · web-flow · commit 7855e89ca9e4 · 2025-12-17T14:20:12.000Z
diff --git a/agent/app/dto/container.go b/agent/app/dto/container.go
@@ -261,7 +261,7 @@ type ComposeInfo struct {
 	Workdir        string             `json:"workdir"`
 	Path           string             `json:"path"`
 	Containers     []ComposeContainer `json:"containers"`
-	Env            []string           `json:"env"`
+	Env            string             `json:"env"`
 }
 type ComposeContainer struct {
 	ContainerID string   `json:"containerID"`
@@ -271,13 +271,13 @@ type ComposeContainer struct {
 	Ports       []string `json:"ports"`
 }
 type ComposeCreate struct {
-	TaskID   string   `json:"taskID"`
-	Name     string   `json:"name"`
-	From     string   `json:"from" validate:"required,oneof=edit path template"`
-	File     string   `json:"file"`
-	Path     string   `json:"path"`
-	Template uint     `json:"template"`
-	Env      []string `json:"env"`
+	TaskID   string `json:"taskID"`
+	Name     string `json:"name"`
+	From     string `json:"from" validate:"required,oneof=edit path template"`
+	File     string `json:"file"`
+	Path     string `json:"path"`
+	Template uint   `json:"template"`
+	Env      string `json:"env"`
 }
 type ComposeOperation struct {
 	Name      string `json:"name" validate:"required"`
@@ -287,10 +287,10 @@ type ComposeOperation struct {
 	Force     bool   `josn:"force"`
 }
 type ComposeUpdate struct {
-	Name    string   `json:"name" validate:"required"`
-	Path    string   `json:"path" validate:"required"`
-	Content string   `json:"content" validate:"required"`
-	Env     []string `json:"env"`
+	Name    string `json:"name" validate:"required"`
+	Path    string `json:"path" validate:"required"`
+	Content string `json:"content" validate:"required"`
+	Env     string `json:"env"`
 }
 type ComposeLogClean struct {
 	Name string `json:"name" validate:"required"`
diff --git a/agent/app/service/container_compose.go b/agent/app/service/container_compose.go
@@ -410,34 +410,22 @@ func loadEnv(list []dto.ComposeInfo) []dto.ComposeInfo {
 		if err != nil {
 			continue
 		}
-		lines := strings.Split(string(file), "\n")
-		for _, line := range lines {
-			lineItem := strings.TrimSpace(line)
-			if len(lineItem) != 0 && !strings.HasPrefix(lineItem, "#") {
-				list[i].Env = append(list[i].Env, lineItem)
-			}
-		}
+		list[i].Env = string(file)
 	}
 	return list
 }
 
-func newComposeEnv(pathItem string, env []string) error {
-	if len(env) == 0 {
-		return nil
-	}
+func newComposeEnv(pathItem string, env string) error {
 	envFilePath := path.Join(path.Dir(pathItem), ".env")
 	file, err := os.OpenFile(envFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, constant.FilePerm)
 	if err != nil {
 		global.LOG.Errorf("failed to create env file: %v", err)
 		return err
 	}
 	defer file.Close()
-	for _, env := range env {
-		envItem := strings.TrimSpace(env)
-		if _, err := file.WriteString(fmt.Sprintf("%s\n", envItem)); err != nil {
-			global.LOG.Errorf("failed to write env to file: %v", err)
-			return err
-		}
+	if _, err := file.WriteString(env); err != nil {
+		global.LOG.Errorf("failed to write env to file: %v", err)
+		return err
 	}
 	return nil
 }
diff --git a/frontend/src/api/interface/container.ts b/frontend/src/api/interface/container.ts
@@ -310,8 +310,7 @@ export namespace Container {
         path: string;
         containers: Array<ComposeContainer>;
         expand: boolean;
-        envStr: string;
-        env: Array<string>;
+        env: string;
     }
     export interface ComposeContainer {
         name: string;
@@ -338,7 +337,7 @@ export namespace Container {
         name: string;
         path: string;
         content: string;
-        env: Array<string>;
+        env: string;
         createdBy: string;
     }
 
diff --git a/frontend/src/components/label/index.vue b/frontend/src/components/label/index.vue
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -1040,7 +1040,6 @@ const message = {
         composeOperatorHelper: '{1} operation will be performed on {0}. Do you want to continue?',
         composeDownHelper:
             'This will stop and remove all containers and networks under the {0} compose. Do you want to continue?',
-        composeEnvHelper1: 'Double-click to edit existing environment variables.',
         composeEnvHelper2:
             'This orchestration was created by the 1Panel App Store. Please modify environment variables in the installed applications.',
 
diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts
@@ -1046,7 +1046,6 @@ const message = {
         composeOperatorHelper: 'La operación {1} se realizará en {0}. ¿Desea continuar?',
         composeDownHelper:
             'Esto detendrá y eliminará todos los contenedores y redes bajo la composición {0}. ¿Desea continuar?',
-        composeEnvHelper1: 'Haga doble clic para editar las variables de entorno existentes.',
         composeEnvHelper2:
             'Esta orquestación fue creada por la Tienda de Aplicaciones 1Panel. Modifique las variables de entorno en las aplicaciones instaladas.',
 
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
@@ -1017,7 +1017,6 @@ const message = {
         composeOperatorHelper: '{1}操作は{0}で実行されます。続けたいですか？',
         composeDownHelper:
             'これにより、{0}構成の下のすべてのコンテナとネットワークが停止して削除されます。続けたいですか？',
-        composeEnvHelper1: '既存の環境変数を編集するにはダブルクリックしてください。',
         composeEnvHelper2:
             'このオーケストレーションは1Panelアプリストアで作成されました。インストール済みアプリケーションで環境変数を変更してください。',
 
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
@@ -1005,7 +1005,6 @@ const message = {
         composeOperatorHelper: '{1} 작업이 {0}에서 수행됩니다. 계속 하시겠습니까?',
         composeDownHelper:
             '이 작업은 {0} 컴포즈 아래의 모든 컨테이너와 네트워크를 중지하고 제거합니다. 계속 하시겠습니까?',
-        composeEnvHelper1: '기존 환경 변수를 편집하려면 더블 클릭하세요.',
         composeEnvHelper2:
             '이 오케스트레이션은 1Panel 앱 스토어에서 생성되었습니다. 설치된 애플리케이션에서 환경 변수를 수정하세요.',
 
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
@@ -1035,7 +1035,6 @@ const message = {
         composeOperatorHelper: 'Operasi {1} akan dilakukan pada {0}. Adakah anda mahu meneruskan?',
         composeDownHelper:
             'Ini akan menghentikan dan menghapuskan semua kontena dan rangkaian di bawah komposisi {0}. Adakah anda mahu meneruskan?',
-        composeEnvHelper1: 'Klik dua kali untuk mengedit pembolehubah persekitaran sedia ada.',
         composeEnvHelper2:
             'Penyelarasan ini dibuat oleh Kedai Apl 1Panel. Sila ubah pembolehubah persekitaran dalam aplikasi yang dipasang.',
 
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
@@ -1032,7 +1032,6 @@ const message = {
         composeOperatorHelper: 'A operação {1} será realizada no {0}. Deseja continuar?',
         composeDownHelper:
             'Isso irá parar e remover todos os containers e redes sob a composição {0}. Deseja continuar?',
-        composeEnvHelper1: 'Clique duas vezes para editar variáveis de ambiente existentes.',
         composeEnvHelper2:
             'Esta orquestração foi criada pela Loja de Aplicativos 1Panel. Modifique as variáveis de ambiente nos aplicativos instalados.',
 
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
@@ -1029,7 +1029,6 @@ const message = {
         composeDetailHelper: 'Compose создан вне 1Panel. Операции запуска и остановки не поддерживаются.',
         composeOperatorHelper: 'Операция {1} будет выполнена для {0}. Хотите продолжить?',
         composeDownHelper: 'Это остановит и удалит все контейнеры и сети под compose {0}. Хотите продолжить?',
-        composeEnvHelper1: 'Дважды щелкните, чтобы редактировать существующие переменные среды.',
         composeEnvHelper2:
             'Эта оркестрация создана Магазином приложений 1Panel. Измените переменные среды в установленных приложениях.',
 
diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts
@@ -1052,7 +1052,6 @@ const message = {
         composeOperatorHelper: '{0} üzerinde {1} işlemi gerçekleştirilecek. Devam etmek istiyor musunuz?',
         composeDownHelper:
             'Bu, {0} compose altındaki tüm konteynerleri ve ağları durduracak ve kaldıracaktır. Devam etmek istiyor musunuz?',
-        composeEnvHelper1: 'Mevcut ortam değişkenlerini düzenlemek için çift tıklayın.',
         composeEnvHelper2:
             'Bu düzenleme 1Panel Uygulama Mağazası tarafından oluşturuldu. Lütfen ortam değişkenlerini yüklü uygulamalarda değiştirin.',
 
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
@@ -989,7 +989,6 @@ const message = {
         composeDetailHelper: '該 compose 為 1Panel 編排外部建立。暫不支援啟停操作。',
         composeOperatorHelper: '將對 {0} 進行 {1} 操作，是否繼續？',
         composeDownHelper: '將停止並刪除 {0} 編排下所有容器及網路，是否繼續？',
-        composeEnvHelper1: '雙擊以編輯現有環境變數。',
         composeEnvHelper2: '該編排為 1Panel 應用商店建立，請在已安裝應用中修改環境變數。',
 
         setting: '配置',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -992,7 +992,6 @@ const message = {
         composeDetailHelper: '该 compose 为 1Panel 编排外部创建。暂不支持启停操作。',
         composeOperatorHelper: '将对 {0} 进行 {1} 操作，是否继续？',
         composeDownHelper: '将停止并删除 {0} 编排下所有容器及网络，是否继续？',
-        composeEnvHelper1: '双击以编辑已有环境变量。',
         composeEnvHelper2: '该编排为 1Panel 应用商店创建，请在已安装应用中修改环境变量。',
 
         setting: '配置',
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue
@@ -233,15 +233,13 @@
                                     placeholder="#Define or paste the content of your docker-compose file here"
                                 />
                                 <span class="envTitle">{{ $t('container.env') }}</span>
-                                <Label v-if="currentCompose.createdBy !== 'Apps'" v-model:labels="envs" />
-                                <el-space wrap v-else>
-                                    <el-button v-for="(env, index) in envs" :key="index" plain>
-                                        {{ env }}
-                                    </el-button>
-                                </el-space>
-                                <span v-if="currentCompose.createdBy !== 'Apps'" class="input-help">
-                                    {{ $t('container.composeEnvHelper1') }}
-                                </span>
+                                <el-input
+                                    placeholder="key=value"
+                                    type="textarea"
+                                    :rows="3"
+                                    :disabled="currentCompose.createdBy === 'Apps'"
+                                    v-model="env"
+                                />
                                 <span v-if="currentCompose.createdBy === 'Apps'" class="input-help">
                                     {{ $t('container.composeEnvHelper2') }}
                                 </span>
@@ -321,10 +319,7 @@
                                     </div>
                                 </el-form-item>
                                 <span class="envTitle">{{ $t('container.env') }}</span>
-                                <Label v-model:labels="form.env" />
-                                <span v-if="currentCompose.createdBy !== 'Apps'" class="input-help">
-                                    {{ $t('container.composeEnvHelper1') }}
-                                </span>
+                                <el-input placeholder="key=value" type="textarea" :rows="3" v-model="form.env" />
                             </el-form>
 
                             <el-button type="primary" class="mt-2" @click="onSubmit(formRef)">
@@ -357,7 +352,6 @@ import CodemirrorPro from '@/components/codemirror-pro/index.vue';
 import ContainerLog from '@/components/log/container/index.vue';
 import TaskLog from '@/components/log/task/index.vue';
 import FileList from '@/components/file-list/index.vue';
-import Label from '@/components/label/index.vue';
 import ContainerInspectDialog from '@/views/container/container/inspect/index.vue';
 import TerminalDialog from '@/views/container/container/terminal/index.vue';
 import ContainerLogDialog from '@/components/log/container-drawer/index.vue';
@@ -398,7 +392,7 @@ const containerLogDialogRef = ref();
 const searchName = ref('');
 const showType = ref('compose');
 const containerStats = ref<any[]>([]);
-const envs = ref([]);
+const env = ref();
 
 const isOnCreate = ref();
 const oldFrom = ref('edit');
@@ -497,7 +491,7 @@ const loadDetail = async (row: Container.ComposeInfo, withRefresh: boolean) => {
     isOnCreate.value = false;
     detailLoading.value = true;
     currentCompose.value = row;
-    envs.value = row.env || [];
+    env.value = row.env || '';
     composeContainers.value = row.containers || [];
     await inspect({ id: currentCompose.value.name, type: 'compose' })
         .then((res) => {
@@ -650,7 +644,7 @@ const onSubmitEdit = async () => {
         path: currentCompose.value.path,
         content: composeContent.value,
         createdBy: currentCompose.value.createdBy,
-        env: envs.value || [],
+        env: env.value || '',
     };
     loading.value = true;
     await composeUpdate(param)
diff --git a/frontend/src/views/host/firewall/port/operate/index.vue b/frontend/src/views/host/firewall/port/operate/index.vue
@@ -88,6 +88,7 @@ const acceptParams = (params: DialogProps): void => {
             dialogData.value.rowData.source = 'address';
         } else {
             dialogData.value.rowData.source = 'anyWhere';
+            dialogData.value.rowData.address = '';
         }
         oldRule.value = deepCopy(params.rowData);
     }
diff --git a/frontend/src/views/terminal/setting/index.vue b/frontend/src/views/terminal/setting/index.vue
@@ -190,11 +190,11 @@ const loadConnShow = async () => {
         } else {
             form.defaultConn = '-';
         }
+        resetConn.value = false;
     });
 };
 
 const changeShow = async () => {
-    resetConn.value = false;
     let op = form.showDefaultConn ? i18n.global.t('xpack.waf.allow') : i18n.global.t('xpack.waf.deny');
     opRef.value.acceptParams({
         title: i18n.global.t('terminal.defaultConn'),
