Merge branch 'main' into 3x-ui

web/html/inbounds.html

@@ -696,12 +696,12 @@
         title: "ID",
         align: 'right',
         dataIndex: "id",
-        width: 30,
+        width: 20,
         responsive: ["xs"],
     }, {
         title: '{{ i18n "pages.inbounds.operate" }}',
         align: 'center',
-        width: 30,
+        width: 20,
         scopedSlots: { customRender: 'action' },
     }, {
         title: '{{ i18n "pages.inbounds.enable" }}',
@@ -711,32 +711,38 @@
     }, {
         title: '{{ i18n "pages.inbounds.remark" }}',
         align: 'center',
-        width: 60,
+        width: 40,
         dataIndex: "remark",
     }, {
         title: '{{ i18n "pages.inbounds.port" }}',
         align: 'center',
         dataIndex: "port",
-        width: 40,
+        width: 30,
     }, {
         title: '{{ i18n "pages.inbounds.protocol" }}',
-        align: 'left',
+        align: 'center',
         width: 70,
         scopedSlots: { customRender: 'protocol' },
     }, {
         title: '{{ i18n "clients" }}',
         align: 'left',
-        width: 50,
+        width: 30,
         scopedSlots: { customRender: 'clients' },
+    }, {
+        title: '{{ i18n "pages.inbounds.deviceLimit" }}',
+        dataIndex: "deviceLimit",
+        align: "center",
+        width: 40,
+        customRender: (text) => (text > 0 ? text : i18n("pages.inbounds.unlimited")),
     }, {
         title: '{{ i18n "pages.inbounds.traffic" }}',
         align: 'center',
-        width: 60,
+        width: 50,
         scopedSlots: { customRender: 'traffic' },
     }, {
         title: '{{ i18n "pages.inbounds.allTimeTraffic" }}',
         align: 'center',
-        width: 60,
+        width: 50,
         scopedSlots: { customRender: 'allTimeInbound' },
     }, {
         title: '{{ i18n "pages.inbounds.expireDate" }}',
@@ -1131,6 +1137,8 @@
                     remark: dbInbound.remark,
                     enable: dbInbound.enable,
                     expiryTime: dbInbound.expiryTime,
+	   // 新增这一行
+                    deviceLimit: dbInbound.deviceLimit,
 
                     listen: inbound.listen,
                     port: inbound.port,
@@ -1155,6 +1163,8 @@
                     remark: dbInbound.remark,
                     enable: dbInbound.enable,
                     expiryTime: dbInbound.expiryTime,
+	   // 新增这一行
+	   deviceLimit: dbInbound.deviceLimit,
 
                     listen: inbound.listen,
                     port: inbound.port,
@@ -1656,4 +1666,4 @@
         },
     });
 </script>
-{{ template "page/body_end" .}}
+{{ template "page/body_end" .}}