From edf83149d0f26fb99eb6548d9e68bcc81a8cc893 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 13 十月 2023 17:03:37 +0800
Subject: [PATCH] 10.13bug2

---
 cloud-server-management/src/main/webapp/static/modular/system/notice/notice_info.js |   78 ++++++++++++++++++--------------------
 1 files changed, 37 insertions(+), 41 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 85ee2f9..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,33 +81,29 @@
 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) {
-          if(language==1){
-            Feng.success("添加成功!");
-        }else if(language==2){
-            Feng.success("Successfully added!");
-        }else {
-            Feng.success("Sangat berhasil ditambah!");
-        }
+    var ajax = new $ax(Feng.ctxPath + "/tNotice/add", function (data) {
+          Feng.success("添加成功!");
         window.parent.Notice.table.refresh();
         NoticeInfoDlg.close();
     }, function (data) {
-        if(language==1){
-            Feng.error("添加失败!" + data.responseJSON.message + "!");
-        }else if(language==2){
-            Feng.error("Fail to add!" + data.responseJSON.message + "!");
-        }else {
-            Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
-        }
+        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();
 }
 
@@ -115,28 +118,25 @@
     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) {
-        if(language==1){
-            Feng.success("修改成功!");
-        }else if(language==2){
-            Feng.success("Modify successfully!");
-        }else {
-            Feng.success("Mengubah dengan sukses!");
-        }
+    var ajax = new $ax(Feng.ctxPath + "/tNotice/update", function (data) {
+        Feng.success("修改成功!");
         window.parent.Notice.table.refresh();
         NoticeInfoDlg.close();
     }, function (data) {
-        if(language==1){
-            Feng.error("修改失败!" + data.responseJSON.message + "!");
-        }else if(language==2){
-            Feng.error("Fail to modify!" + data.responseJSON.message + "!");
-        }else {
-            Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
-        }
+        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();
 }
 
@@ -144,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