From 34fc0a23cab89c9521cd7bb4436cb6631cc3d031 Mon Sep 17 00:00:00 2001
From: 0xJacky <me@jackyu.cn>
Date: Tue, 2 Aug 2022 14:15:52 +0800
Subject: [PATCH] Added remove if directive for DirectiveEditor

---
 .../ngx_conf/directive/DirectiveEditor.vue       | 16 ++++++++++------
 frontend/version.json                            |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/domain/ngx_conf/directive/DirectiveEditor.vue b/frontend/src/views/domain/ngx_conf/directive/DirectiveEditor.vue
index 6626a92f..5dc843e8 100644
--- a/frontend/src/views/domain/ngx_conf/directive/DirectiveEditor.vue
+++ b/frontend/src/views/domain/ngx_conf/directive/DirectiveEditor.vue
@@ -43,12 +43,15 @@ function onSave(idx: number) {
     <h2>{{ $gettext('Directives') }}</h2>
 
     <a-form-item v-for="(directive,index) in ngx_directives" @click="current_idx=index">
-        <code-editor v-if="directive.directive === If" v-model:content="directive.params"
-                     defaultHeight="100px"/>
-        <div class="input-wrapper" v-else>
-            <a-input :addon-before="directive.directive" v-model:value="directive.params" @click="current_idx=k"
-            >
-            </a-input>
+
+        <div class="input-wrapper">
+            <code-editor v-if="directive.directive === If" v-model:content="directive.params"
+                         defaultHeight="100px" style="width: 100%;"/>
+
+            <a-input v-else
+                     :addon-before="directive.directive"
+                     v-model:value="directive.params" @click="current_idx=index"/>
+
             <a-popconfirm @confirm="remove(index)"
                           :title="$gettext('Are you sure you want to remove this directive?')"
                           :ok-text="$gettext('Yes')"
@@ -99,5 +102,6 @@ function onSave(idx: number) {
 .input-wrapper {
     display: flex;
     gap: 10px;
+    align-items: center;
 }
 </style>
diff --git a/frontend/version.json b/frontend/version.json
index 1e6e18b3..fe46aca0 100644
--- a/frontend/version.json
+++ b/frontend/version.json
@@ -1 +1 @@
-{"version":"1.5.0","build_id":14,"total_build":84}
\ No newline at end of file
+{"version":"1.5.0","build_id":15,"total_build":85}
\ No newline at end of file