feat: 本次提交更新内容如下

暂存一下
2025-07-23 17:41:52 +08:00
parent 63f95c8bfa
commit 1e94525191
4 changed files with 761 additions and 711 deletions
--- a/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx
+++ b/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx
@@ -238,11 +238,19 @@ const MomentsSync: React.FC = () => {
                      trigger={["click"]}
                      placement="bottomRight"
                    >
-                      <Button
-                        type="text"
-                        icon={<MoreOutlined />}
+                      <button
                        className={style.moreBtn}
-                      />
+                        style={{
+                          background: "none",
+                          border: "none",
+                          padding: 0,
+                          cursor: "pointer",
+                        }}
+                        tabIndex={0}
+                        aria-label="更多操作"
+                      >
+                        <MoreOutlined />
+                      </button>
                    </Dropdown>
                  </div>
                </div>
--- a/nkebao/src/pages/workspace/moments-sync/new/index.module.scss
+++ b/nkebao/src/pages/workspace/moments-sync/new/index.module.scss
@@ -1,7 +1,13 @@
 .formBg {
  padding: 16px;
 }
-
+.formStepBtnRow{
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  margin-top: 32px;
+  padding: 12px;
+}
 .formSteps {
  display: flex;
  justify-content: center;
--- a/nkebao/src/pages/workspace/moments-sync/new/index.tsx
+++ b/nkebao/src/pages/workspace/moments-sync/new/index.tsx
@@ -1,8 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { Button, Input, Switch, message, Spin } from "antd";
-import { ArrowLeftOutlined } from "@ant-design/icons";
-import { NavBar } from "antd-mobile";
+import { MinusOutlined, PlusOutlined } from "@ant-design/icons";

 import Layout from "@/components/Layout/Layout";
 import style from "./index.module.scss";
@@ -15,6 +14,7 @@ import {
 } from "./api";
 import DeviceSelection from "@/components/DeviceSelection";
 import ContentLibrarySelection from "@/components/ContentLibrarySelection";
+import NavCommon from "@/components/NavCommon";

 const steps = [
  { id: 1, title: "基础设置", subtitle: "基础设置" },
@@ -27,10 +27,15 @@ const defaultForm = {
  startTime: "06:00",
  endTime: "23:59",
  syncCount: 5,
-  accountType: "business" as "business" | "personal",
+  syncInterval: 30,
+  syncType: 1, // 1=业务号 2=人设号
+  accountType: "business" as "business" | "personal", // 仅UI用
  enabled: true,
  selectedDevices: [] as string[],
-  selectedLibraries: [] as string[],
+  selectedLibraries: [] as (string | number)[],
+  contentTypes: ["text", "image", "video"],
+  targetTags: [] as string[],
+  filterKeywords: [] as string[],
 };

 const NewMomentsSync: React.FC = () => {
@@ -53,10 +58,15 @@ const NewMomentsSync: React.FC = () => {
          startTime: res.timeRange?.start || "06:00",
          endTime: res.timeRange?.end || "23:59",
          syncCount: res.config?.syncCount || res.syncCount || 5,
+          syncInterval: res.config?.syncInterval || res.syncInterval || 30,
+          syncType: res.accountType === 1 ? 1 : 2,
          accountType: res.accountType === 1 ? "business" : "personal",
          enabled: res.status === 1,
          selectedDevices: res.config?.devices || [],
          selectedLibraries: res.config?.contentLibraryNames || [],
+          contentTypes: res.config?.contentTypes || ["text", "image", "video"],
+          targetTags: res.config?.targetTags || [],
+          filterKeywords: res.config?.filterKeywords || [],
        });
      }
    } catch {
@@ -79,6 +89,15 @@ const NewMomentsSync: React.FC = () => {
    setFormData((prev) => ({ ...prev, ...data }));
  };

+  // UI选择账号类型时同步syncType和accountType
+  const handleAccountTypeChange = (type: "business" | "personal") => {
+    setFormData((prev) => ({
+      ...prev,
+      accountType: type,
+      syncType: type === "business" ? 1 : 2,
+    }));
+  };
+
  // 提交
  const handleSubmit = async () => {
    if (!formData.taskName.trim()) {
@@ -98,13 +117,18 @@ const NewMomentsSync: React.FC = () => {
      const params = {
        name: formData.taskName,
        devices: formData.selectedDevices,
-        contentLibraries: formData.selectedLibraries,
+        contentLibraries: formData.selectedLibraries.map(Number),
+        syncInterval: formData.syncInterval,
        syncCount: formData.syncCount,
+        syncType: formData.syncType, // 账号类型真实传参
+        accountType: formData.accountType === "business" ? 1 : 2, // 也要传
        startTime: formData.startTime,
        endTime: formData.endTime,
-        accountType: formData.accountType === "business" ? 1 : 2,
-        status: formData.enabled ? 1 : 2,
+        contentTypes: formData.contentTypes,
+        targetTags: formData.targetTags,
+        filterKeywords: formData.filterKeywords,
        type: 2,
+        status: formData.enabled ? 1 : 2,
      };
      if (isEditMode && id) {
        await updateMomentsSync({ id, ...params });
@@ -122,7 +146,7 @@ const NewMomentsSync: React.FC = () => {
    }
  };

-  // 步骤内容
+  // 步骤内容（去除按钮）
  const renderStep = () => {
    if (currentStep === 0) {
      return (
@@ -166,7 +190,7 @@ const NewMomentsSync: React.FC = () => {
                  updateForm({ syncCount: Math.max(1, formData.syncCount - 1) })
                }
              >
-                -
+                <MinusOutlined />
              </button>
              <span className={style.counterValue}>{formData.syncCount}</span>
              <button
@@ -175,7 +199,7 @@ const NewMomentsSync: React.FC = () => {
                  updateForm({ syncCount: formData.syncCount + 1 })
                }
              >
-                +
+                <PlusOutlined />
              </button>
              <span className={style.counterUnit}>条朋友圈</span>
            </div>
@@ -186,13 +210,13 @@ const NewMomentsSync: React.FC = () => {
            <div className={style.accountTypeRow}>
              <button
                className={`${style.accountTypeBtn} ${formData.accountType === "business" ? style.accountTypeActive : ""}`}
-                onClick={() => updateForm({ accountType: "business" })}
+                onClick={() => handleAccountTypeChange("business")}
              >
                业务号
              </button>
              <button
                className={`${style.accountTypeBtn} ${formData.accountType === "personal" ? style.accountTypeActive : ""}`}
-                onClick={() => updateForm({ accountType: "personal" })}
+                onClick={() => handleAccountTypeChange("personal")}
              >
                人设号
              </button>
@@ -209,12 +233,6 @@ const NewMomentsSync: React.FC = () => {
              />
            </div>
          </div>
-
-          <div className={style.formStepBtnRow}>
-            <Button type="primary" onClick={next} className={style.nextBtn}>
-              下一步
-            </Button>
-          </div>
        </div>
      );
    }
@@ -231,14 +249,6 @@ const NewMomentsSync: React.FC = () => {
              selectedListMaxHeight={200}
            />
          </div>
-          <div className={style.formStepBtnRow}>
-            <Button onClick={prev} className={style.prevBtn}>
-              上一步
-            </Button>
-            <Button type="primary" onClick={next} className={style.nextBtn}>
-              下一步
-            </Button>
-          </div>
        </div>
      );
    }
@@ -260,8 +270,46 @@ const NewMomentsSync: React.FC = () => {
              </div>
            )}
          </div>
+        </div>
+      );
+    }
+    return null;
+  };
+
+  // 统一底部按钮
+  const renderFooter = () => {
+    if (loading) return null;
+    if (currentStep === 0) {
+      return (
        <div className={style.formStepBtnRow}>
-            <Button onClick={prev} className={style.prevBtn}>
+          <Button
+            type="primary"
+            disabled={!formData.taskName.trim()}
+            onClick={next}
+            className={style.nextBtn}
+            block
+          >
+            下一步
+          </Button>
+        </div>
+      );
+    }
+    if (currentStep === 1) {
+      return (
+        <div className={style.formStepBtnRow}>
+          <Button onClick={prev} className={style.prevBtn} block>
+            上一步
+          </Button>
+          <Button type="primary" onClick={next} className={style.nextBtn} block>
+            下一步
+          </Button>
+        </div>
+      );
+    }
+    if (currentStep === 2) {
+      return (
+        <div className={style.formStepBtnRow}>
+          <Button onClick={prev} className={style.prevBtn} block>
            上一步
          </Button>
          <Button
@@ -269,11 +317,11 @@ const NewMomentsSync: React.FC = () => {
            onClick={handleSubmit}
            loading={loading}
            className={style.completeBtn}
+            block
          >
            完成
          </Button>
        </div>
-        </div>
      );
    }
    return null;
@@ -282,21 +330,9 @@ const NewMomentsSync: React.FC = () => {
  return (
    <Layout
      header={
-        <NavBar
-          back={null}
-          style={{ background: "#fff" }}
-          left={
-            <div className="nav-title">
-              <ArrowLeftOutlined
-                twoToneColor="#1677ff"
-                onClick={() => navigate(-1)}
-              />
-            </div>
-          }
-        >
-          {isEditMode ? "编辑朋友圈同步" : "新建朋友圈同步"}
-        </NavBar>
+        <NavCommon title={isEditMode ? "编辑朋友圈同步" : "新建朋友圈同步"} />
      }
+      footer={renderFooter()}
    >
      <div className={style.formBg}>
        <StepIndicator currentStep={currentStep + 1} steps={steps} />