fix bug - deleteBalancer

MHSanaei · Mar 12, 2024 · c74efa1 · c74efa1
1 parent 18af704
commit c74efa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
@@ -81,7 +81,7 @@
                 <template slot="title">
                     <span>{{ i18n "pages.inbounds.IPLimitlogDesc" }}</span>
                 </template>
-                    <span>{{ i18n "pages.inbounds.IPLimitlog" }}</span>
+                    <span>{{ i18n "pages.inbounds.IPLimitlog" }} </span>
                 <a-icon type="question-circle"></a-icon>
             </a-tooltip>
         </template>

diff --git a/web/html/xui/inbound_client_table.html b/web/html/xui/inbound_client_table.html
@@ -19,7 +19,7 @@
             :overlay-class-name="themeSwitcher.currentTheme"
             ok-text='{{ i18n "reset"}}'
             cancel-text='{{ i18n "cancel"}}'>
-            <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: #3c89e8' : 'color: blue'"></a-icon>
+            <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: var(--color-primary-100)' : 'color: var(--color-primary-100)'"></a-icon>
             <a-icon style="font-size: 24px; cursor: pointer;" class="normal-icon" type="retweet" v-if="client.email.length > 0"></a-icon>
         </a-popconfirm>
     </a-tooltip>

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
@@ -1182,7 +1182,7 @@
                 });
             },
             deleteBalancer(index) {
-                newTemplateSettings = this.templateSettings;
+                let newTemplateSettings = { ...this.templateSettings };
 
                 // Remove from balancers
                 const removedBalancer = this.balancersData.splice(index, 1)[0];
@@ -1192,9 +1192,12 @@
                 newTemplateSettings.routing.balancers.splice(realIndex, 1);
 
                 // Remove related routing rules
-                let rules = newTemplateSettings.routing.rules.filter((r) => !r.balancerTag || r.balancerTag !== removedBalancer.tag);
-                newTemplateSettings.routing.rules = rules;
-
+                newTemplateSettings.routing.rules.forEach((rule) => {
+                    if (rule.balancerTag === removedBalancer.tag) {
+                        delete rule.balancerTag;
+                    }
+                });
+
                 // Update balancers property to an empty array if there are no more balancers
                 if (newTemplateSettings.routing.balancers.length === 0) {
                     delete newTemplateSettings.routing.balancers;