update

admpub · Jan 20, 2024 · f01a711 · f01a711
1 parent 9a63f67
commit f01a711
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 18 deletions.
diff --git a/application/library/modal/modal.go b/application/library/modal/modal.go
@@ -64,6 +64,7 @@ type Button struct {
 type Modal struct {
 	Id          string   //元素id
 	Custom      bool     //是否自定义整个内容区域
+	Full        bool     // 是否铺满整个页面
 	HeadTitle   string   //头部标题
 	Title       string   //内容标题
 	Content     string   //内容

diff --git a/public/assets/backend/css/style.css b/public/assets/backend/css/style.css
@@ -4970,6 +4970,11 @@ button::-moz-focus-inner {
 .md-content .modal-header + .modal-body {
   max-height:calc(100vh - 70px - 80px);
 }
+.md-modal-full,.modal-full{
+  width:100%;max-width:100%;left:0;top:0;transform:none;height:100vh
+}
+.md-modal-full .md-content,
+.modal-full .modal-content{height:100%}
 .colored-header .modal-header {
   padding: 20px;
   border-bottom: 1px solid #1080de !important;

diff --git a/public/assets/backend/css/style.min.css b/public/assets/backend/css/style.min.css
diff --git a/public/assets/backend/js/behaviour/general.js b/public/assets/backend/js/behaviour/general.js
@@ -1740,13 +1740,6 @@ var App = function () {
 				}
 			});
 		},
-		resizeModalHeight: function (el) {
-			var h = $(window).height() - 200;
-			if (h < 200) h = 200;
-			$(el).css({ "max-height": h + 'px' });
-			//var bh = h - 150;
-			//$(el).find('.modal-body').css({ "max-height": bh + 'px' });
-		},
 		switchStatus: function (a, type, editURL, callback) {
 			if (type == null) type = $(a).data('type');
 			var v = $(a).val();

diff --git a/public/assets/backend/js/behaviour/general.min.js b/public/assets/backend/js/behaviour/general.min.js
diff --git a/public/assets/backend/js/behaviour/page/file.js b/public/assets/backend/js/behaviour/page/file.js
@@ -203,7 +203,6 @@ $(function(){
         }
         var modalId=$(this).attr('dropzone-modal');
         if(!modalId) return;
-        dz.on('addedfiles',function(){App.resizeModalHeight(modalId);});
         $(this).on('click',function(event){
             $(modalId).niftyModal('show',{
                 closeOnClickOverlay:false,
@@ -214,12 +213,8 @@ $(function(){
     })
     initCodeMirrorEditor();
     $(window).off().on('resize',function(){
-        $('#file-edit-modal,#file-play-modal').css({height:$(window).height(),width:'100%','max-width':'100%',left:0,top:0,transform:'none'});
         $('#file-edit-form,#file-play-video').css({height:$(window).height()-150,width:'100%','max-width':'100%',overflow:'auto'});
         $('#file-play-video > video').css({height:'100%'});
-        for(var i=0;i<modalIds.length;i++){
-            App.resizeModalHeight(modalIds[i]);
-        }
     });
     $(window).trigger('resize');
     $('#file-rename-modal .modal-footer .btn-primary:last').off().on('click',function(){

diff --git a/public/assets/backend/js/behaviour/page/file.min.js b/public/assets/backend/js/behaviour/page/file.min.js
diff --git a/template/backend/filemanager/file_edit.yaml b/template/backend/filemanager/file_edit.yaml
@@ -1,5 +1,6 @@
 Id        : "file-edit-modal"
 Custom    : true
+Full      : true
 HeadTitle : "编辑文件"
 Title     : ""
 Animate   : "none"

diff --git a/template/backend/filemanager/file_play.yaml b/template/backend/filemanager/file_play.yaml
@@ -1,5 +1,6 @@
 Id : "file-play-modal"
 Custom : true
+Full : true
 HeadTitle : "播放"
 Title : ""
 Animate : "md-dark"

diff --git a/template/backend/modal.html b/template/backend/modal.html
@@ -1,7 +1,7 @@
 {{Strip}}<!-- Modal -->
 {{with $.Data}}
 {{- if not .HeadTitle -}}
-<div class="modal{{if .Animate}} {{.Animate}}{{else}} fade{{end}}" id="{{.Id}}" tabindex="-1" role="dialog">
+<div class="modal{{if .Animate}} {{.Animate}}{{else}} fade{{end}}{{if .Full}} modal-full{{end}}" id="{{.Id}}" tabindex="-1" role="dialog">
 	<div class="modal-dialog">
 	  <div class="modal-content">
 		<div class="modal-header">
@@ -36,13 +36,13 @@
 
 {{- else -}}
 
-<div class="md-modal {{if eq .ContentType "blackform"}}md-dark custom-width{{else}}colored-header{{end}} {{.Type}}{{if .Animate}} {{.Animate}}{{else}} md-effect-10{{end}}" id="{{.Id}}">
+<div class="md-modal {{if eq .ContentType `blackform`}}md-dark custom-width{{else}}colored-header{{end}} {{.Type}}{{if .Animate}} {{.Animate}}{{else}} md-effect-10{{end}}{{if .Full}} md-modal-full{{end}}" id="{{.Id}}">
     <div class="md-content">
       <div class="modal-header">
         <h3>{{.HeadTitle|$.T|ToHTML}}<span class="modal-subtitle"></span></h3>
         <button type="button" class="close md-close" data-dismiss="modal" aria-hidden="true">&times;</button>
       </div>
-      <div class="modal-body{{if or (eq .ContentType "blackform") (eq .ContentType "form")}} form{{end}}">
+      <div class="modal-body{{if eq .ContentType `blackform` `form`}} form{{end}}">
 		{{- if .Custom -}}
             {{.Content|$.T|ToHTML}}
         {{- else -}}