upp

package.json

@@ -16,6 +16,7 @@
     "axios": "^1.1.3",
     "braft-editor": "^2.3.9",
     "braft-utils": "^3.0.12",
+    "dayjs": "^1.11.10",
     "echarts": "^5.5.0",
     "js-base64": "^3.7.3",
     "react": "^18.2.0",

src/assets/styles/base.css

@@ -12,11 +12,6 @@ body {
   height: 100%;
   color: black;
 }
-a {
-  text-decoration: none;
-  color: black;
-  outline: none;
-}
 i {
   font-style: normal;
 }
@@ -69,6 +64,11 @@ textarea {
   /* antd图片预览组件 */
   /* antd表格居中 */
 }
+#root a {
+  text-decoration: none;
+  color: black;
+  outline: none;
+}
 #root .iconHoverTit {
   display: flex;
   align-items: center;

src/assets/styles/base.less

@@ -16,11 +16,7 @@ body {
   color: black;
 }
 
-a {
-  text-decoration: none;
-  color: black;
-  outline: none;
-}
+
 
 i {
   font-style: normal;
@@ -50,7 +46,7 @@ textarea {
 
 /* 主题色 */
 :root {
-  --themeColor:  #9d4f0b;
+  --themeColor: #9d4f0b;
   --themeColor2: #e2d2a9;
 }
 
@@ -83,12 +79,19 @@ textarea {
   overflow: auto;
   overflow-y: overlay;
 
+  a {
+    text-decoration: none;
+    color: black;
+    outline: none;
+  }
+
   // ？的提示
   .iconHoverTit {
     display: flex;
     align-items: center;
     justify-content: center;
   }
+
   .iconHoverTitTxt {
     background-color: var(--themeColor);
     color: #fff;

src/components/ZRichText/index.module.scss

@@ -1,8 +1,11 @@
 .ZRichText {
   width: 1000px;
+  height: 100%;
+
   :global {
     .txtBox {
       width: 100%;
+      height: 100%;
       border: 1px solid #ccc;
 
       // 隐藏媒体功能
@@ -10,10 +13,17 @@
         display: none;
       }
 
+      .bf-container {
+        height:100%;
+      }
+
       .bf-content {
         height: calc(100% - 92px);
+        padding-bottom: 0px;
       }
 
+
+
       .bf-controlbar {
         position: relative;
 
@@ -23,7 +33,7 @@
           right: 15px;
           cursor: pointer;
           color: var(--themeColor);
-          display: none;
+          // display: none;
         }
 
         .upImgBoxNo {
@@ -52,11 +62,13 @@
       display: block;
       margin: 10px auto;
       text-align: center;
+
       // 不让拖动放大缩小图片（会报错）
-      .bf-csize-icon{
+      .bf-csize-icon {
         display: none !important;
       }
-      img{
+
+      img {
         max-width: 500px;
         max-height: 300px;
       }

src/components/ZRichText/index.tsx

@@ -46,7 +46,7 @@ function ZRichText({ check, dirCode, isLook, myUrl, full }: Props, ref: any) {
         myInput.current?.click();
       };
       dom.appendChild(div);
-    }, 200);
+    }, 20);
 
     // 监听 富文本 的 class 变化，在全屏的时候会 富文本会添加上 fullscreen 的类
     // 修复顶部样式冲突问题
@@ -72,11 +72,15 @@ function ZRichText({ check, dirCode, isLook, myUrl, full }: Props, ref: any) {
   }, []);
 
   useEffect(() => {
-    const testDom = document.querySelector(".upImgBox") as HTMLDivElement;
-    if (testDom) {
-      isLook
-        ? (testDom.style.display = "none")
-        : (testDom.style.display = "block");
+    const controlbarDom = document.querySelectorAll(".txtBox .bf-controlbar ");
+    const contentDom = document.querySelectorAll(".txtBox .bf-content ");
+    if (controlbarDom) {
+      controlbarDom.forEach((v: any) => {
+        v.style.display = isLook ? "none" : "block";
+      });
+      contentDom.forEach((v: any) => {
+        v.style.height = isLook ? "100%" : "";
+      });
     }
   }, [isLook]);
 
@@ -165,10 +169,7 @@ function ZRichText({ check, dirCode, isLook, myUrl, full }: Props, ref: any) {
   }));
 
   return (
-    <div
-      className={styles.ZRichText}
-      style={{ width: full ? "100%" : "", height: full ? "100%" : "" }}
-    >
+    <div className={styles.ZRichText} style={{ width: full ? "100%" : "" }}>
       <input
         id="upInput"
         type="file"
@@ -177,7 +178,7 @@ function ZRichText({ check, dirCode, isLook, myUrl, full }: Props, ref: any) {
         onChange={(e) => handeUpPhoto(e)}
       />
 
-      <div className="txtBox" style={{ height: full ? "100%" : "" }}>
+      <div className="txtBox">
         <BraftEditor
           readOnly={isLook}
           placeholder="请输入内容"
@@ -198,6 +199,4 @@ function ZRichText({ check, dirCode, isLook, myUrl, full }: Props, ref: any) {
   );
 }
 
-// const MemoZRichText = React.memo(ZRichText);
-
 export default forwardRef(ZRichText);

src/components/ZupOne/index.tsx

@@ -264,7 +264,7 @@ function ZupOne(
       ) : null}
 
       <div className="fileBoxRow_r_tit" hidden={isLook}>
-        支持{formatTxt}格式；最大支持{size}M。{upTxt}
+        格式要求：支持{formatTxt}格式；最大支持{size}M。{upTxt}
         <br />
         <div
           className={classNames(

src/pages/A1survey/index.module.scss

@@ -12,7 +12,7 @@
       .A1L1{
         font-size: 16px;
         width: 100%;
-        height: calc(100% - 220px);
+        height: calc(100% - 180px);
         display: flex;
         .A1L1_1{
           width: 80px;
@@ -26,7 +26,7 @@
       }
       .A1L2{
         margin-top: 20px;
-        height: 200px;
+        height: 160px;
       }
     }
 

src/pages/A1survey/index.tsx

@@ -11,6 +11,8 @@ function A1survey() {
   // 是否是查看
   const [isLook, setIsLook] = useState(true);
 
+  const [dirCode,setDirCode] =useState('')
+
   // 组件的ref
   const ZRichTextRef = useRef<any>(null);
   const ZupVideosRef = useRef<any>(null);
@@ -22,6 +24,7 @@ function A1survey() {
   const getInfoFu = useCallback(async () => {
     const res = await A1_APIgetInfo();
     if (res.code === 0) {
+      setDirCode(res.data.dirCode)
       setText(res.data.rtf);
       ZRichTextRef.current?.ritxtShowFu(res.data.rtf);
       setFileList(res.data.files || []);
@@ -31,6 +34,7 @@ function A1survey() {
 
   useEffect(() => {
     getInfoFu();
+    setDirCode(Date.now()+'')
   }, [getInfoFu]);
 
   // 点击取消
@@ -51,9 +55,10 @@ function A1survey() {
     if (res.code === 0) {
       MessageFu.success("修改成功!");
       setIsLook(true);
+      getInfoFu()
       // console.log(123, res);
     }
-  }, []);
+  }, [getInfoFu]);
 
   return (
     <div className={styles.A1survey}>
@@ -64,7 +69,7 @@ function A1survey() {
           <div className="A1L1_2">
             <ZRichText
               check={false}
-              dirCode="A1survey"
+              dirCode={dirCode}
               isLook={isLook}
               ref={ZRichTextRef}
               myUrl="cms/overview/upload"
@@ -79,7 +84,7 @@ function A1survey() {
               isLook={isLook}
               size={500}
               fileNum={5}
-              dirCode="A1surveyVideo"
+              dirCode={dirCode}
               myUrl="cms/overview/upload"
               upTxt="；数量不超过5个。"
               ref={ZupVideosRef}

src/pages/A2dynamic/A2edit/index.module.scss

@@ -0,0 +1,51 @@
+.A2edit {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 12;
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 24px;
+
+  :global {
+    .A2eMain {
+      width: 100%;
+      height: 100%;
+      overflow-y: auto;
+
+      .ant-form {
+        width: 800px;
+        // .ant-input-affix-wrapper{
+        //   width: 800px;
+        // }
+        .formRow {
+          display: flex;
+
+          .formLeft {
+            position: relative;
+            top: 3px;
+            width: 100px;
+            text-align: right;
+
+            &>span {
+              color: #ff4d4f;
+            }
+          }
+
+          .formRight {
+            width: calc(100% - 100px);
+          }
+        }
+        .A2Ebtn {
+          position: absolute;
+          z-index: 10;
+          left: 1200px;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+      }
+    }
+  }
+}

src/pages/A2dynamic/A2edit/index.tsx

@@ -0,0 +1,242 @@
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import styles from "./index.module.scss";
+import { Button, DatePicker, Form, FormInstance, Input } from "antd";
+import { A2_APIgetInfo, A2_APIsave } from "@/store/action/A2dynamic";
+import dayjs from "dayjs";
+import { useDispatch, useSelector } from "react-redux";
+import { Z0_APIgetList } from "@/store/action/Z0column";
+import { RootState } from "@/store";
+import { Select } from "antd/lib";
+import TextArea from "antd/es/input/TextArea";
+import MyPopconfirm from "@/components/MyPopconfirm";
+import ZRichText from "@/components/ZRichText";
+import ZupOne from "@/components/ZupOne";
+import ZupVideos from "@/components/ZupVideos";
+import { MessageFu } from "@/utils/message";
+
+type Props = {
+  editId: number;
+  addTableFu: () => void;
+  editTableFu: () => void;
+  closeFu: () => void;
+};
+
+function A2edit({ editId, addTableFu, editTableFu, closeFu }: Props) {
+  const [dirCode, setDirCode] = useState("");
+
+  const dispatch = useDispatch();
+  // 获取所属栏目列表，用于下拉框
+  useEffect(() => {
+    dispatch(Z0_APIgetList());
+  }, [dispatch]);
+
+  const { dynamic } = useSelector(
+    (state: RootState) => state.Z0column.tableInfo
+  );
+
+  // 表单的ref
+  const FormBoxRef = useRef<FormInstance>(null);
+
+  // 封面图的ref
+  const ZupThumbRef = useRef<any>(null);
+  // 富文本的ref
+  const ZRichTextRef = useRef<any>(null);
+  //  视频的ref
+  const ZupVideosRef = useRef<any>(null);
+
+  const getInfoFu = useCallback(async (id: number) => {
+    const res = await A2_APIgetInfo(id);
+    if (res.code === 0) {
+      const data = res.data;
+
+      setDirCode(data.dirCode);
+
+      ZRichTextRef.current?.ritxtShowFu(data.rtf);
+
+      FormBoxRef.current?.setFieldsValue({
+        ...data,
+        myTime: dayjs(data.publishDate),
+      });
+
+      // 设置封面图
+      ZupThumbRef.current?.setFileComFileFu({
+        fileName: "",
+        filePath: data.thumb,
+      });
+
+      // 设置附件视频
+      ZupVideosRef.current?.setFileComFileFu(res.data.files || []);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (editId > 0) {
+      setDirCode(Date.now() + "");
+      getInfoFu(editId);
+    } else {
+      FormBoxRef.current?.setFieldsValue({
+        myTime: dayjs(Date.now()),
+      });
+    }
+  }, [editId, getInfoFu]);
+
+  // 附件 是否 已经点击过确定
+  const [fileCheck, setFileCheck] = useState(false);
+
+  // 没有通过校验
+  const onFinishFailed = useCallback(() => {
+    setFileCheck(true);
+  }, []);
+
+  // 待完善 type 所属栏目
+
+  //  通过校验点击确定
+  const onFinish = useCallback(
+    async (values: any) => {
+      setFileCheck(true);
+
+      const coverUrl1 = ZupThumbRef.current?.fileComFileResFu();
+      // 没有传 封面图
+      if (!coverUrl1.filePath) return;
+      // 发布日期
+      const publishDate = dayjs(values.myTime).format("YYYY-MM-DD");
+
+      const rtf = ZRichTextRef.current?.fatherBtnOkFu();
+
+      const flieList = ZupVideosRef.current?.fileComFileResFu() || [];
+
+      const obj = {
+        ...values,
+        id: editId > 0 ? editId : null,
+        publishDate,
+        thumb: coverUrl1.filePath,
+        rtf: rtf.val,
+        fileIds: flieList.map((v: any) => v.id).join(","),
+      };
+
+      const res = await A2_APIsave(obj);
+
+      if (res.code === 0) {
+        MessageFu.success(editId > 0 ? "编辑成功!" : "新增成功!");
+        editId > 0 ? editTableFu() : addTableFu();
+        closeFu();
+      }
+    },
+    [addTableFu, closeFu, editId, editTableFu]
+  );
+  return (
+    <div className={styles.A2edit}>
+      <div className="A2eMain">
+        <Form
+          ref={FormBoxRef}
+          name="basic"
+          labelCol={{ span: 3 }}
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+          autoComplete="off"
+          scrollToFirstError
+        >
+          <Form.Item
+            label="标题"
+            name="name"
+            rules={[{ required: true, message: "请输入标题!" }]}
+            getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
+          >
+            <Input maxLength={30} showCount placeholder="请输入内容" />
+          </Form.Item>
+
+          <Form.Item
+            label="发布日期"
+            name="myTime"
+            rules={[{ required: true, message: "请选择发布日期!" }]}
+          >
+            <DatePicker />
+          </Form.Item>
+
+          <Form.Item
+            label="所属栏目"
+            name="type"
+            rules={[{ required: true, message: "请选择发布日期!" }]}
+          >
+            <Select
+              placeholder="请选择"
+              style={{ width: 200 }}
+              options={dynamic.map((v) => ({ value: v.id, label: v.name }))}
+            />
+          </Form.Item>
+
+          {/* 封面 */}
+          <div className="formRow">
+            <div className="formLeft">
+              <span>* </span>
+              封面图：
+            </div>
+            <div className="formRight">
+              <ZupOne
+                ref={ZupThumbRef}
+                isLook={false}
+                fileCheck={fileCheck}
+                size={5}
+                dirCode={dirCode}
+                myUrl="cms/news/upload"
+                format={["image/jpeg", "image/png"]}
+                formatTxt="png、jpg和jpeg"
+                checkTxt="请上传封面图!"
+                upTxt="最多1张"
+                myType="thumb"
+              />
+            </div>
+          </div>
+
+          {/* 视频 */}
+          <div className="formRow">
+            <div className="formLeft">视频：</div>
+            <div className="formRight">
+              <ZupVideos
+                isLook={false}
+                size={500}
+                fileNum={5}
+                dirCode={dirCode}
+                myUrl="cms/overview/upload"
+                upTxt="；数量不超过5个。"
+                ref={ZupVideosRef}
+              />
+            </div>
+          </div>
+
+          <Form.Item label="摘要" name="description">
+            <TextArea maxLength={200} showCount placeholder="请输入内容" />
+          </Form.Item>
+
+          {/* 富文本 */}
+          <div className="formRow">
+            <div className="formLeft">正文：</div>
+            <div className="formRight" style={{height:450}}>
+              <ZRichText
+                check={false}
+                dirCode={dirCode}
+                isLook={false}
+                ref={ZRichTextRef}
+                myUrl="cms/news/upload"
+              />
+            </div>
+          </div>
+
+          {/* 确定和取消按钮 */}
+          <Form.Item className="A2Ebtn">
+            <Button type="primary" htmlType="submit">
+              提交
+            </Button>
+            <br />
+            <br />
+            <MyPopconfirm txtK="取消" onConfirm={closeFu} />
+          </Form.Item>
+        </Form>
+      </div>
+    </div>
+  );
+}
+
+const MemoA2edit = React.memo(A2edit);
+
+export default MemoA2edit;

src/pages/A2dynamic/index.module.scss

@@ -1,5 +1,20 @@
 .A2dynamic{
+  position: relative;
   :global{
-    
+    .A2top {
+      padding: 15px 24px;
+      border-radius: 10px;
+      background-color: #fff;
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .A2tableBox {
+      border-radius: 10px;
+      overflow: hidden;
+      margin-top: 15px;
+      height: calc(100% - 77px);
+      background-color: #fff;
+    }
   }
 }

src/pages/A2dynamic/index.tsx

@@ -1,9 +1,149 @@
-import React from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import styles from "./index.module.scss";
+import { useDispatch, useSelector } from "react-redux";
+import { A2_APIdel, A2_APIgetList } from "@/store/action/A2dynamic";
+import { RootState } from "@/store";
+import { A2tableType } from "@/types";
+import { Button, Input } from "antd";
+import MyTable from "@/components/MyTable";
+import { A2tableC } from "@/utils/tableData";
+import MyPopconfirm from "@/components/MyPopconfirm";
+import { MessageFu } from "@/utils/message";
+import A2edit from "./A2edit";
 function A2dynamic() {
+  const dispatch = useDispatch();
+
+  const [fromData, setFromData] = useState({
+    pageNum: 1,
+    pageSize: 10,
+    searchKey: "",
+  });
+
+  const getListFu = useCallback(() => {
+    dispatch(A2_APIgetList(fromData));
+  }, [dispatch, fromData]);
+
+  useEffect(() => {
+    getListFu();
+  }, [getListFu]);
+
+  const [inputKey, setInputKey] = useState(1);
+
+  // 标题的输入
+  const timeRef = useRef(-1);
+  const fromKeyChangeFu = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>, key: "searchKey") => {
+      clearTimeout(timeRef.current);
+      timeRef.current = window.setTimeout(() => {
+        setFromData({ ...fromData, [key]: e.target.value, pageNum: 1 });
+      }, 500);
+    },
+    [fromData]
+  );
+
+  // 点击重置
+  const resetSelectFu = useCallback(() => {
+    setInputKey(Date.now());
+    setFromData({
+      pageNum: 1,
+      pageSize: 10,
+      searchKey: "",
+    });
+  }, []);
+
+  const tableInfo = useSelector(
+    (state: RootState) => state.A2dynamic.tableInfo
+  );
+
+  const delTableFu = useCallback(
+    async (id: number) => {
+      const res = await A2_APIdel(id);
+      if (res.code === 0) {
+        MessageFu.success("删除成功!");
+        getListFu();
+      }
+    },
+    [getListFu]
+  );
+
+  // 新增和编辑
+  const [editId, setEditId] = useState(0);
+
+  const tableLastBtn = useMemo(() => {
+    return [
+      {
+        title: "操作",
+        render: (item: A2tableType) => (
+          <>
+            <Button size="small" type="text" onClick={() => setEditId(item.id)}>
+              编辑
+            </Button>
+            <MyPopconfirm txtK="删除" onConfirm={() => delTableFu(item.id)} />
+          </>
+        ),
+      },
+    ];
+  }, [delTableFu]);
+
   return (
     <div className={styles.A2dynamic}>
-      <div className="pageTitle">宁博动态</div>
+      <div className="pageTitle">
+        宁博动态{editId > 0 ? " - 编辑" : editId < 0 ? " - 新增" : ""}
+      </div>
+
+      {/* 顶部筛选 */}
+      <div className="A2top">
+        <div>
+          <span>昵称：</span>
+          <Input
+            key={inputKey}
+            maxLength={10}
+            showCount
+            style={{ width: 300 }}
+            placeholder="请输入"
+            allowClear
+            onChange={(e) => fromKeyChangeFu(e, "searchKey")}
+          />
+        </div>
+        <div>
+          <Button onClick={resetSelectFu}>重置</Button>&emsp;
+          <Button type="primary" onClick={() => setEditId(-1)}>
+            新增
+          </Button>
+        </div>
+      </div>
+
+      {/* 表格主体 */}
+      <div className="A2tableBox">
+        <MyTable
+          yHeight={625}
+          list={tableInfo.list}
+          columnsTemp={A2tableC}
+          lastBtn={tableLastBtn}
+          pageNum={fromData.pageNum}
+          pageSize={fromData.pageSize}
+          total={tableInfo.total}
+          onChange={(pageNum, pageSize) =>
+            setFromData({ ...fromData, pageNum, pageSize })
+          }
+        />
+      </div>
+
+      {/* 新增和编辑 */}
+      {editId ? (
+        <A2edit
+          editId={editId}
+          closeFu={() => setEditId(0)}
+          addTableFu={resetSelectFu}
+          editTableFu={getListFu}
+        />
+      ) : null}
     </div>
   );
 }

src/store/action/A2dynamic.ts

@@ -0,0 +1,40 @@
+import http from "@/utils/http";
+import { AppDispatch } from "..";
+
+/**
+ * 获取宁博动态列表
+ */
+
+export const A2_APIgetList = (data: any): any => {
+  return async (dispatch: AppDispatch) => {
+    const res = await http.post("cms/news/pageList", data);
+    if (res.code === 0) {
+      const obj = {
+        list: res.data.records,
+        total: res.data.total,
+      };
+      dispatch({ type: "A2/getList", payload: obj });
+    }
+  };
+};
+
+/**
+ * 宁博动态删除
+ */
+export const A2_APIdel = (id: number) => {
+  return http.get(`cms/news/removes/${id}`);
+};
+
+/**
+ * 宁博动态-获取详情
+ */
+export const A2_APIgetInfo = (id: number) => {
+  return http.get(`cms/news/detail/${id}`);
+};
+
+/**
+ * 宁博动态-新增、编辑
+ */
+export const A2_APIsave = (data: any) => {
+  return http.post("cms/news/save", data);
+};

src/store/reducer/A2dynamic.ts

@@ -0,0 +1,28 @@
+import { A2tableType } from "@/types";
+
+// 初始化状态
+const initState = {
+  // 列表数据
+  tableInfo: {
+    list: [] as A2tableType[],
+    total: 0,
+  },
+};
+
+// 定义 action 类型
+type Props = {
+  type: "A2/getList";
+  payload: { list: A2tableType[]; total: number };
+};
+
+// reducer
+export default function Reducer(state = initState, action: Props) {
+  switch (action.type) {
+    // 获取列表数据
+    case "A2/getList":
+      return { ...state, tableInfo: action.payload };
+
+    default:
+      return state;
+  }
+}

src/store/reducer/index.ts

@@ -3,6 +3,7 @@ import { combineReducers } from "redux";
 
 // 导入 登录 模块的 reducer
 import A0Layout from "./layout";
+import A2dynamic from "./A2dynamic";
 import Z0column from "./Z0column";
 import Z1user from "./Z1user";
 import Z2log from "./Z2log";
@@ -10,6 +11,7 @@ import Z2log from "./Z2log";
 // 合并 reducer
 const rootReducer = combineReducers({
   A0Layout,
+  A2dynamic,
   Z0column,
   Z1user,
   Z2log,

src/types/api/A2dynamic.d.ts

@@ -0,0 +1,14 @@
+export type A2tableType = {
+  createTime: string;
+  creatorName: string;
+  description: string;
+  dirCode: string;
+  fileIds: string;
+  id: number;
+  name: string;
+  publishDate: string;
+  rtf: string;
+  thumb: string;
+  type: string;
+  updateTime: string;
+};

src/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api/layot'
 export * from './api/Z0column'
+export * from './api/A2dynamic'
 export * from './api/Z1user'
 export * from './api/Z2log'

src/utils/tableData.ts

@@ -11,9 +11,18 @@
 //     ["txt", "标题", "name"],
 //     ["img", type === "video" ? "视频封面" : "海报", "thumb"],
 //     ["txtChange", "自动播放", "display", { 0: "否", 1: "是" }],
-//     ["text", "创建日期", 50],
+//     ["text", "创建日期",'description', 50],
 //   ];
 // };
+
+export const A2tableC = [
+  ["txt", "标题", "name"],
+  ["img", "封面", "thumb"],
+  ["txt", "发布日期", "publishDate"],
+  ["txt", "所属栏目", "type"],
+  ["text", "摘要", "description", 50],
+];
+
 export const Z0tableC = [
   ["txt", "栏目名称", "name"],
   ["text", "说明", "rtf", 50],