From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js b/cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js
index bd120e8..c620371 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js
@@ -1,15 +1,22 @@
/**
* 初始化通知详情对话框
*/
-var language =$("#language").val()
+var language =1
var NoticeInfoDlg = {
noticeInfoData: {},
editor: null,
validateFields: {
- title: {
+ name: {
validators: {
notEmpty: {
- message: '标题不能为空'
+ message: '公告名称不能为空'
+ }
+ }
+ },
+ sort: {
+ validators: {
+ notEmpty: {
+ message: '排序不能为空'
}
}
}
@@ -55,7 +62,7 @@
* 收集数据
*/
NoticeInfoDlg.collectData = function () {
- this.noticeInfoData['content'] = NoticeInfoDlg.editor.txt.html();
+ this.noticeInfoData['content'] = NoticeInfoDlg.editor.txt;
this.set('id').set('title');
}
@@ -74,14 +81,19 @@
NoticeInfoDlg.addSubmit = function () {
this.clearData();
- this.collectData();
if (!this.validate()) {
return;
}
+ let text = NoticeInfoDlg.editor.getContent();
+ console.log(text)
+ if(text==""){
+ Feng.info("请输入公告内容")
+ return;
+ }
//提交信息
- var ajax = new $ax(Feng.ctxPath + "/notice/add", function (data) {
+ var ajax = new $ax(Feng.ctxPath + "/tNotice/add", function (data) {
Feng.success("添加成功!");
window.parent.Notice.table.refresh();
NoticeInfoDlg.close();
@@ -89,6 +101,9 @@
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.noticeInfoData);
+ ajax.set("name",$("#name").val());
+ ajax.set("text",text);
+ ajax.set("sort",$("#sort").val());
ajax.start();
}
@@ -103,9 +118,14 @@
if (!this.validate()) {
return;
}
-
+ let text = NoticeInfoDlg.editor.getContent();
+ console.log(text)
+ if(text==""){
+ Feng.info("请输入公告内容")
+ return;
+ }
//提交信息
- var ajax = new $ax(Feng.ctxPath + "/notice/update", function (data) {
+ var ajax = new $ax(Feng.ctxPath + "/tNotice/update", function (data) {
Feng.success("修改成功!");
window.parent.Notice.table.refresh();
NoticeInfoDlg.close();
@@ -113,6 +133,10 @@
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.noticeInfoData);
+ ajax.set("name",$("#name").val());
+ ajax.set("text",text);
+ ajax.set("sort",$("#sort").val());
+ ajax.set("id",$("#id").val());
ajax.start();
}
@@ -120,9 +144,5 @@
Feng.initValidator("noticeInfoForm", NoticeInfoDlg.validateFields);
//初始化编辑器
- var E = window.wangEditor;
- var editor = new E('#editor');
- editor.create();
- editor.txt.html($("#contentVal").val());
- NoticeInfoDlg.editor = editor;
+ NoticeInfoDlg.editor = UE.getEditor('editor');
});
--
Gitblit v1.7.1