From 58f943acb094766b7d13d264e88a44c1da2a43d6 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Mon, 26 May 2025 15:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=93=8D=E7=9B=98=E6=89=8B=E3=80=91?=
=?UTF-8?q?=20=E6=B5=81=E9=87=8F=E5=88=86=E5=8F=91=20-=20=E5=AF=B9?=
=?UTF-8?q?=E6=8E=A5=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E5=8F=8A=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../traffic-distribution/[id]/edit/page.tsx | 2 +-
.../traffic-distribution/[id]/page.tsx | 2 +-
.../new/components/basic-info-step.tsx | 47 ++--
.../new/components/target-settings-step.tsx | 169 ++++---------
.../new/components/traffic-pool-step.tsx | 2 +-
.../traffic-distribution/new/page.tsx | 103 ++++++--
.../workspace/traffic-distribution/page.tsx | 233 +++++++++++++-----
7 files changed, 325 insertions(+), 233 deletions(-)
diff --git a/Cunkebao/app/workspace/traffic-distribution/[id]/edit/page.tsx b/Cunkebao/app/workspace/traffic-distribution/[id]/edit/page.tsx
index c5eb14c26..9ac8fcb3c 100644
--- a/Cunkebao/app/workspace/traffic-distribution/[id]/edit/page.tsx
+++ b/Cunkebao/app/workspace/traffic-distribution/[id]/edit/page.tsx
@@ -86,4 +86,4 @@ export default function EditTrafficDistributionPage({ params }: { params: { id:
const handleDeviceSelection = (selectedDevices: string[]) => {
setFormData((prev) => ({ ...prev, deviceIds: selectedDevices }))
}
-}
+ }
diff --git a/Cunkebao/app/workspace/traffic-distribution/[id]/page.tsx b/Cunkebao/app/workspace/traffic-distribution/[id]/page.tsx
index 6143065b3..848067ffe 100644
--- a/Cunkebao/app/workspace/traffic-distribution/[id]/page.tsx
+++ b/Cunkebao/app/workspace/traffic-distribution/[id]/page.tsx
@@ -171,7 +171,7 @@ export default function DistributionPlanDetailPage({ params }: { params: { id: s
diff --git a/Cunkebao/app/workspace/traffic-distribution/new/components/basic-info-step.tsx b/Cunkebao/app/workspace/traffic-distribution/new/components/basic-info-step.tsx
index dcf72e12c..d18a396d9 100644
--- a/Cunkebao/app/workspace/traffic-distribution/new/components/basic-info-step.tsx
+++ b/Cunkebao/app/workspace/traffic-distribution/new/components/basic-info-step.tsx
@@ -15,12 +15,12 @@ interface BasicInfoStepProps {
export default function BasicInfoStep({ onNext, initialData = {} }: BasicInfoStepProps) {
const [formData, setFormData] = useState({
- name: initialData.name || `流量分发 ${format(new Date(), "yyyyMMdd HHmm")}`,
- distributionMethod: initialData.distributionMethod || "equal",
- dailyLimit: initialData.dailyLimit || 50,
- timeRestriction: initialData.timeRestriction || "custom",
- startTime: initialData.startTime || "09:00",
- endTime: initialData.endTime || "18:00",
+ name: initialData.name ?? `流量分发 ${format(new Date(), "yyyyMMdd HHmm")}`,
+ distributeType: initialData.distributeType ?? "1",
+ maxPerDay: initialData.maxPerDay ?? 50,
+ timeType: initialData.timeType ?? "2",
+ startTime: initialData.startTime ?? "09:00",
+ endTime: initialData.endTime ?? "18:00",
})
const handleChange = (field: string, value: any) => {
@@ -28,7 +28,14 @@ export default function BasicInfoStep({ onNext, initialData = {} }: BasicInfoSte
}
const handleSubmit = () => {
- onNext(formData)
+ onNext({
+ name: formData.name,
+ distributeType: Number(formData.distributeType),
+ maxPerDay: formData.maxPerDay,
+ timeType: Number(formData.timeType),
+ startTime: formData.timeType == "2" ? formData.startTime : "09:00",
+ endTime: formData.timeType == "2" ? formData.endTime : "21:00",
+ })
}
return (
@@ -52,24 +59,24 @@ export default function BasicInfoStep({ onNext, initialData = {} }: BasicInfoSte
handleChange("distributionMethod", value)}
+ value={String(formData.distributeType)}
+ onValueChange={(value) => handleChange("distributeType", value)}
className="space-y-2"
>
-
+
-
+
-
+
@@ -83,14 +90,14 @@ export default function BasicInfoStep({ onNext, initialData = {} }: BasicInfoSte
每日最大分配量
- {formData.dailyLimit} 人/天
+ {formData.maxPerDay} 人/天
handleChange("dailyLimit", value[0])}
+ onValueChange={(value) => handleChange("maxPerDay", value[0])}
className="py-4"
/>
限制每天最多分配的流量数量
@@ -99,25 +106,25 @@ export default function BasicInfoStep({ onNext, initialData = {} }: BasicInfoSte
handleChange("timeRestriction", value)}
+ value={String(formData.timeType)}
+ onValueChange={(value) => handleChange("timeType", value)}
className="space-y-4"
>
-
+
-
+
- {formData.timeRestriction === "custom" && (
+ {formData.timeType == "2" && (