diff --git a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js index 2cebb9f..0ada6e7 100644 --- a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js +++ b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js @@ -14,15 +14,18 @@ const RichTextEditor = ({item, setText}) => { const modules = { toolbar: { container: [ - [{ size: ["small", false, "large", "huge"] }], + [{ header: '1' }, { header: '2' }, { font: [] }], + [{ size: [] }], [{ color: [] }], ["bold", "italic", "underline", "strike", "blockquote"], [ { list: "ordered" }, { list: "bullet" }, + { indent: '-1' }, + { indent: '+1' }, { align: [] } ], - ["image", "video"], + ["link", "image", "video"], ["clean"] ], // handlers: { image: this.imageHandler } diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx index 75a734b..d5e7f50 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupWriter.jsx @@ -133,8 +133,9 @@ function PopupWriter(props) { formData.append(key, popupDetail[key]); } } - + //게시글 내용 + formData.delete("contents"); formData.append("contents", text); if (formValidator(formData)) { diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java new file mode 100644 index 0000000..c08d8ba --- /dev/null +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/model/UpdatePopupVO.java @@ -0,0 +1,31 @@ +package com.dbnt.kcscbackend.admin.contents.popUp.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; + +@ApiModel(value = "CreatePopupVO", description = + "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 팝업을 추가하는 API에 사용된다." + "" +) +@RequiredArgsConstructor +@Getter +@Setter +@ToString +public class CreatePopupVO implements Serializable { + + private static final long serialVersionUID = 719256850119704956L; + + @ApiModelProperty(value = "startDate") + private String startDate; + @ApiModelProperty(value = "endDate") + private String endDate; + @ApiModelProperty(value = "title") + private String title; + @ApiModelProperty(value = "contents") + private String contents; +}