fix: copy clients modal not opening

web/controller/inbound.go

@@ -56,8 +56,8 @@ func (a *InboundController) initRouter(g *gin.RouterGroup) {
 }
 
 type CopyInboundClientsRequest struct {
-	SourceInboundID int      `json:"sourceInboundId"`
+	SourceInboundID int      `form:"sourceInboundId" json:"sourceInboundId"`
-	ClientEmails    []string `json:"clientEmails"`
+	ClientEmails    []string `form:"clientEmails" json:"clientEmails"`
 }
 
 // getInbounds retrieves the list of inbounds for the logged-in user.
@@ -275,7 +275,7 @@ func (a *InboundController) copyInboundClients(c *gin.Context) {
 	}
 
 	req := &CopyInboundClientsRequest{}
-	err = c.ShouldBindJSON(req)
+	err = c.ShouldBind(req)
 	if err != nil {
 		jsonMsg(c, I18nWeb(c, "somethingWentWrong"), err)
 		return

web/html/inbounds.html

@@ -788,8 +788,10 @@
   ok-text='{{ i18n "pages.client.copySelected" }}'
   cancel-text='{{ i18n "close" }}'
   :class="themeSwitcher.currentTheme"
-  @ok="copyClientsModal.ok"
+  :closable="true"
-  @cancel="copyClientsModal.close"
+  :mask-closable="false"
+  @ok="() => copyClientsModal.ok()"
+  @cancel="() => copyClientsModal.close()"
   width="900px">
   <a-space direction="vertical" style="width: 100%;">
     <div>
@@ -797,7 +799,7 @@
       <a-select v-model="copyClientsModal.sourceInboundId"
         style="width: 100%;"
         :dropdown-class-name="themeSwitcher.currentTheme"
-        @change="copyClientsModal.onSourceChange">
+        @change="id => copyClientsModal.onSourceChange(id)">
         <a-select-option v-for="item in copyClientsModal.sources"
           :key="item.id"
           :value="item.id">
@@ -805,10 +807,10 @@
         </a-select-option>
       </a-select>
     </div>
-    <div v-if="copyClientsModal.sourceInboundId > 0">
+    <div v-if="copyClientsModal.sourceInboundId">
       <a-space style="margin-bottom: 10px;">
-        <a-button size="small" @click="copyClientsModal.selectAll">{{ i18n "pages.client.selectAll" }}</a-button>
+        <a-button size="small" @click="() => copyClientsModal.selectAll()">{{ i18n "pages.client.selectAll" }}</a-button>
-        <a-button size="small" @click="copyClientsModal.clearAll">{{ i18n "pages.client.clearAll" }}</a-button>
+        <a-button size="small" @click="() => copyClientsModal.clearAll()">{{ i18n "pages.client.clearAll" }}</a-button>
       </a-space>
       <a-table :columns="copyClientsColumns"
         :data-source="copyClientsModal.sourceClients"
@@ -847,7 +849,7 @@
     title: '',
     targetInboundId: 0,
     targetInboundRemark: '',
-    sourceInboundId: 0,
+    sourceInboundId: undefined,
     sources: [],
     sourceClients: [],
     selectedEmails: [],
@@ -859,54 +861,59 @@
           const clients = app.getInboundClients(row) || [];
           return { id: row.id, label: `${row.remark} (${row.protocol}, ${clients.length})` };
         });
-      this.targetInboundId = targetDbInbound.id;
+      copyClientsModal.targetInboundId = targetDbInbound.id;
-      this.targetInboundRemark = targetDbInbound.remark;
+      copyClientsModal.targetInboundRemark = targetDbInbound.remark;
-      this.title = `{{ i18n "pages.client.copyToInbound" }} ${targetDbInbound.remark}`;
+      copyClientsModal.title = `{{ i18n "pages.client.copyToInbound" }} ${targetDbInbound.remark}`;
-      this.sources = sources;
+      copyClientsModal.sources = sources;
-      this.sourceInboundId = 0;
+      copyClientsModal.sourceInboundId = undefined;
-      this.sourceClients = [];
+      copyClientsModal.sourceClients = [];
-      this.selectedEmails = [];
+      copyClientsModal.selectedEmails = [];
-      this.confirmLoading = false;
+      copyClientsModal.confirmLoading = false;
-      this.visible = true;
+      copyClientsModal.visible = true;
     },
     close() {
-      this.visible = false;
+      copyClientsModal.visible = false;
-      this.confirmLoading = false;
+      copyClientsModal.confirmLoading = false;
     },
     onSourceChange(sourceInboundId) {
-      const sourceInbound = app.dbInbounds.find(row => row.id === sourceInboundId);
+      copyClientsModal.selectedEmails = [];
+      const sourceInbound = app.dbInbounds.find(row => row.id === Number(sourceInboundId));
       if (!sourceInbound) {
-        this.sourceClients = [];
+        copyClientsModal.sourceClients = [];
-        this.selectedEmails = [];
         return;
       }
       const sourceClients = app.getInboundClients(sourceInbound) || [];
-      this.sourceClients = sourceClients.map(client => {
+      copyClientsModal.sourceClients = sourceClients.map(client => {
         const stats = app.getClientStats(sourceInbound, client.email);
-        const used = stats ? (stats.up + stats.down) : 0;
+        const used = stats ? ((stats.up || 0) + (stats.down || 0)) : 0;
+        let expiryLabel = '{{ i18n "unlimited" }}';
+        if (client.expiryTime > 0) {
+          expiryLabel = IntlUtil.formatDate(client.expiryTime);
+        } else if (client.expiryTime < 0) {
+          expiryLabel = `${-client.expiryTime / 86400000}d`;
+        }
         return {
           email: client.email,
           trafficLabel: SizeFormatter.sizeFormat(used),
-          expiryLabel: client.expiryTime > 0 ? IntlUtil.formatDate(client.expiryTime) : '{{ i18n "unlimited" }}',
+          expiryLabel,
         };
       });
-      this.selectedEmails = [];
     },
     toggleEmail(email, checked) {
-      const selected = this.selectedEmails.slice();
+      const selected = copyClientsModal.selectedEmails.slice();
       if (checked) {
         if (!selected.includes(email)) selected.push(email);
       } else {
         const idx = selected.indexOf(email);
         if (idx >= 0) selected.splice(idx, 1);
       }
-      this.selectedEmails = selected;
+      copyClientsModal.selectedEmails = selected;
     },
     selectAll() {
-      this.selectedEmails = this.sourceClients.map(item => item.email);
+      copyClientsModal.selectedEmails = copyClientsModal.sourceClients.map(item => item.email);
     },
     clearAll() {
-      this.selectedEmails = [];
+      copyClientsModal.selectedEmails = [];
     },
     async ok() {
       if (!copyClientsModal.sourceInboundId) {
@@ -918,9 +925,9 @@
         sourceInboundId: copyClientsModal.sourceInboundId,
         clientEmails: copyClientsModal.selectedEmails,
       };
+      try {
         const msg = await HttpUtil.post(`/panel/api/inbounds/${copyClientsModal.targetInboundId}/copyClients`, payload);
-      copyClientsModal.confirmLoading = false;
+        if (!msg || !msg.success) return;
-      if (!msg.success) return;
         const obj = msg.obj || {};
         const addedCount = (obj.added || []).length;
         const skippedCount = (obj.skipped || []).length;
@@ -928,6 +935,9 @@
         app.$message.success(`{{ i18n "pages.client.copyResult" }}: +${addedCount}, ~${skippedCount}, !${errorCount}`);
         copyClientsModal.close();
         await app.getDBInbounds();
+      } finally {
+        copyClientsModal.confirmLoading = false;
+      }
     },
   };