新增修改全屏/确认取消按钮

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -391,8 +391,16 @@
             		shade: 0.3,
             		title: title,
             		content: url,
+            		btn: ['确定', '关闭'],
             		// 弹层外区域关闭
-            		shadeClose: true
+            		shadeClose: true,
+            		yes: function(index, layero) {
+            	        var iframeWin = layero.find('iframe')[0];
+            	        iframeWin.contentWindow.submitHandler();
+            	    },
+            	    cancel: function(index) {
+            	        return true;
+            	    }
             	});
                 layer.full(index);
             },

ruoyi-admin/src/main/resources/templates/system/notice/add.html

@@ -37,12 +37,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
-				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary">提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
-				</div>
-			</div>
 		</form>
 	</div>
     <div th:include="include::footer"></div>
@@ -61,13 +55,16 @@
 				noticeTitle:{
 					required:true,
 				}
-			},
-			submitHandler: function(form) {
-				var sHTML = $('.summernote').code();
-				$("#noticeContent").val(sHTML);
-				$.operate.save(prefix + "/add", $('#form-notice-add').serialize());
 			}
 		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	        	var sHTML = $('.summernote').code();
+				$("#noticeContent").val(sHTML);
+				$.operate.save(prefix + "/add", $('#form-notice-add').serialize());
+	        }
+	    }
 	</script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/notice/edit.html

@@ -38,12 +38,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
-				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary">提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
-				</div>
-			</div>
 		</form>
     </div>
     <div th:include="include::footer"></div>
@@ -66,13 +60,16 @@
 				xxxx:{
 					required:true,
 				},
-			},
-			submitHandler: function(form) {
-				var sHTML = $('.summernote').code();
-				$("#noticeContent").val(sHTML);
-				$.operate.save(prefix + "/edit", $('#form-notice-edit').serialize());
 			}
 		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	        	var sHTML = $('.summernote').code();
+				$("#noticeContent").val(sHTML);
+				$.operate.save(prefix + "/edit", $('#form-notice-edit').serialize());
+	        }
+	    }
 	</script>
 </body>
 </html>