Revert "fix: 保留用户/规则高级设置并增强节点运行时恢复 (#468 )"

This reverts commit 3f374df724.
Revert "feat: 批量设置用户最大连接数"
2026-09-28 15:46:38 +08:00 · 2026-04-25 22:45:27 +08:00 · 2026-04-25 22:45:23 +08:00 · 2026-04-25 22:03:42 +08:00 · 2026-04-25 18:12:13 +08:00 · 2026-04-24 21:56:46 +08:00
3 changed files with 59 additions and 58 deletions
@@ -54,6 +54,7 @@ import { Switch } from "@/shadcn-bridge/heroui/switch";
 import { Alert } from "@/shadcn-bridge/heroui/alert";
 import { Progress } from "@/shadcn-bridge/heroui/progress";
 import { Checkbox } from "@/shadcn-bridge/heroui/checkbox";
+import { Accordion, AccordionItem } from "@/shadcn-bridge/heroui/accordion";
 import {
  createForward,
  getForwardList,
@@ -4729,20 +4730,6 @@ export default function ForwardPage() {
              </ModalHeader>
              <ModalBody>
                <div className="space-y-4 pb-4">
-                  <Input
-                    label="最大连接数"
-                    placeholder="0 或空表示不限制"
-                    type="number"
-                    min="0"
-                    value={form.maxConn === 0 ? "" : String(form.maxConn || "")}
-                    onChange={(e) => {
-                      const value = Math.max(Number(e.target.value) || 0, 0);
-                      setForm((prev) => ({ ...prev, maxConn: value }));
-                    }}
-                    description="此设置优先于用户的全局连接数限制。0 表示不限制。"
-                    variant="bordered"
-                  />
-
                  <Input
                    errorMessage={errors.name}
                    isInvalid={!!errors.name}
@@ -4755,37 +4742,7 @@ export default function ForwardPage() {
                    }
                  />

-                  {isAdmin && (
-                    <Select
-                      label="规则限速"
-                      placeholder="不限速"
-                      selectedKeys={
-                        selectedSpeedId !== null
-                          ? [selectedSpeedId.toString()]
-                          : []
-                      }
-                      variant="bordered"
-                      onSelectionChange={(keys) => {
-                        const selectedKey = Array.from(keys)[0] as
-                          | string
-                          | undefined;
-
-                        setForm((prev) => ({
-                          ...prev,
-                          speedId: selectedKey ? Number(selectedKey) : null,
-                        }));
-                      }}
-                    >
-                      {availableSpeedLimits.map((speedLimit) => (
-                        <SelectItem
-                          key={speedLimit.id.toString()}
-                          textValue={speedLimit.name}
-                        >
-                          {speedLimit.name}
-                        </SelectItem>
-                      ))}
-                    </Select>
-                  )}
+                  

                  <Select
                    description={
@@ -4914,7 +4871,61 @@ export default function ForwardPage() {
                      <SelectItem key="hash">哈希模式 - IP哈希</SelectItem>
                    </Select>
                  )}
-                </div>
+                                  <Accordion className="px-0" variant="light">
+                    <AccordionItem
+                      key="advanced"
+                      aria-label="高级设置"
+                      title={<span className="text-small text-default-500 font-medium">高级设置</span>}
+                    >
+                      <div className="space-y-4 pb-2">
+                        <Input
+                          label="最大连接数"
+                          placeholder="0 或空表示不限制"
+                          type="number"
+                          min="0"
+                          value={form.maxConn === 0 ? "" : String(form.maxConn || "")}
+                          onChange={(e) => {
+                            const value = Math.max(Number(e.target.value) || 0, 0);
+                            setForm((prev) => ({ ...prev, maxConn: value }));
+                          }}
+                          description="此设置优先于用户的全局连接数限制。0 表示不限制。"
+                          variant="bordered"
+                        />
+                        {isAdmin && (
+                          <Select
+                            label="规则限速"
+                            placeholder="不限速"
+                            selectedKeys={
+                              selectedSpeedId !== null
+                                ? [selectedSpeedId.toString()]
+                                : []
+                            }
+                            variant="bordered"
+                            onSelectionChange={(keys) => {
+                              const selectedKey = Array.from(keys)[0] as
+                                | string
+                                | undefined;
+
+                              setForm((prev) => ({
+                                ...prev,
+                                speedId: selectedKey ? Number(selectedKey) : null,
+                              }));
+                            }}
+                          >
+                            {availableSpeedLimits.map((speedLimit) => (
+                              <SelectItem
+                                key={speedLimit.id.toString()}
+                                textValue={speedLimit.name}
+                              >
+                                {speedLimit.name}
+                              </SelectItem>
+                            ))}
+                          </Select>
+                        )}
+                      </div>
+                    </AccordionItem>
+                  </Accordion>
+</div>
              </ModalBody>
              <ModalFooter>
                <Button variant="light" onPress={onClose}>
@@ -1529,17 +1529,6 @@ export default function UserPage() {
                  setUserForm((prev) => ({ ...prev, maxConn: value }));
                }}
              />
-              <Input
-                label="最大连接数"
-                placeholder="0 或空表示不限制"
-                type="number"
-                min="0"
-                value={userForm.maxConn === 0 ? "" : String(userForm.maxConn || "")}
-                onChange={(e) => {
-                  const value = Math.max(Number(e.target.value) || 0, 0);
-                  setUserForm((prev) => ({ ...prev, maxConn: value }));
-                }}
-              />
              <Input
                isRequired
                label="规则数量"
@@ -2,8 +2,9 @@ import { clearSession } from "@/utils/session";

 /**
 * 安全退出登录函数
- * 清除登录相关数据，但保留用户偏好设置（如主题）
+ * 清除登录相关数据，并强制刷新跳转到首页
 */
 export const safeLogout = () => {
  clearSession();
+  window.location.href = "/";
 };
Author	SHA1	Message	Date
sagitchu	a5c33c68d9	Revert "fix: 保留用户/规则高级设置并增强节点运行时恢复 (#468 )" This reverts commit `3f374df724`.	2026-04-25 22:45:27 +08:00
sagitchu	325baa8adc	Revert "feat: 批量设置用户最大连接数" This reverts commit `28568244bb`.	2026-04-25 22:45:23 +08:00
sagitchu	28568244bb	feat: 批量设置用户最大连接数前端: - 用户列表添加 checkbox 多选（表格和网格视图） - 选中用户后显示「批量设置连接数」按钮 - 批量设置对话框，输入连接数后批量应用后端: - 新增 BatchUpdateUserMaxConn repo 方法 - 新增 /api/v1/user/batch-set-max-conn API - 返回成功/失败计数 - 加入 admin-only 路由白名单	2026-04-25 22:03:42 +08:00
sagit	3f374df724	fix: 保留用户/规则高级设置并增强节点运行时恢复 (#468 ) * fix: 用户编辑时 maxConn 字段未正确回填 - User 接口添加 maxConn 类型定义 - handleEdit 中回填 maxConn 值 - normalizeUserItem 添加 maxConn 字段处理解决编辑用户时最大连接数显示为 0 的问题 * fix: 保留转发设置并增强节点运行时恢复	2026-04-25 18:12:13 +08:00
sagit	9b923a2d0b	fix: remove duplicate maxConn input in user form (#467 )	2026-04-24 21:56:46 +08:00
sagit	d9f28f53c7	style: move advanced settings to bottom and optimize UI (#466 )	2026-04-24 19:10:36 +08:00
sagit	1d08a1ccfc	fix: ensure page refresh to login page upon logout (#465 )	2026-04-23 20:43:27 +08:00
sagit	db25ba2cbe	style: move maxConn and speed limit inputs to advanced settings accordion (#464 )	2026-04-23 20:29:52 +08:00