diff --git a/app/admin/view/default/index/index.html b/app/admin/view/default/index/index.html index 720eb4f1f..63fe2783e 100755 --- a/app/admin/view/default/index/index.html +++ b/app/admin/view/default/index/index.html @@ -10,7 +10,9 @@
{{:MyLang('home_title')}}
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index cb76f1dcf..320b13f8a 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -107,7 +107,7 @@ ul {margin-top:0;} .admin-sidebar .am-offcanvas-bar { width: 70%; } } .common-nav-bar {position:fixed;z-index:10;bottom:30px;right:20px;box-shadow: 0 0 10px 2px #c4c4c4;opacity: 0.8;} -.admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:33px;background:#fff;} +.admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:33px;} .admin .am-g {padding-left:0;padding-right:0;} /*---right Content---*/ .content-right > .content {padding:10px 10px 0 10px;} diff --git a/public/static/admin/default/css/index.index.css b/public/static/admin/default/css/index.index.css index 9b32ce8b3..ebba64c56 100644 --- a/public/static/admin/default/css/index.index.css +++ b/public/static/admin/default/css/index.index.css @@ -106,4 +106,117 @@ .header-menu-open-pages-list { display: none; } +} + +/** + * 多屏窗口 + */ +.window-layer { + width: 100%; + height: 100%; +} +.window-layer-tab-bar { + background: #f5f5f5; + height: 35px; + line-height: 35px; + cursor: move; + text-align: left; + font-weight: bold; + padding: 0 5px 0 10px; + display: none; +} +.window-layer-alone-layer { + width: 800px; + height: 500px; + box-shadow: rgb(0 0 0 / 30%) 1px 1px 24px; + border: 1px solid #4386fb; +} +.window-layer-alone-layer .window-layer-tab-bar { + display: block; +} +.window-layer-alone-layer iframe { + height: calc(100% - 35px); +} +.window-layer-alone-layer .window-layer-tab-bar .am-fr span { + color: #a6a6a6; + cursor: pointer; + font-size: 14px; + padding: 2px 8px; + line-height: 0; +} +.window-layer-seat { + position: absolute; + top: 35px; + left: 0; + width: 100%; + height: calc(100% - 35px); + background: transparent; + display: none; +} +.window-layer-resize-bar>[class^=window-layer-resize-item-] { + position: absolute; + z-index: 3; + overflow: hidden; + -ms-touch-action: none; + touch-action: none; +} +.window-layer-resize-item-left { + left: 0; + cursor: w-resize; +} +.window-layer-resize-item-right { + right: 0; + cursor: e-resize; +} +.window-layer-resize-item-left, +.window-layer-resize-item-right { + width: 6px; + top: 6px; + bottom: 6px; +} +.window-layer-resize-item-top { + top: 0; + cursor: n-resize; +} +.window-layer-resize-item-bottom { + bottom: 0; + cursor: s-resize; +} +.window-layer-resize-item-bottom, +.window-layer-resize-item-top { + height: 6px; + left: 6px; + right: 6px; +} +.window-layer-resize-item-left-top { + left: 0; + top: 0; + cursor: nw-resize; +} +.window-layer-resize-item-right-top { + right: 0; + top: 0; + cursor: ne-resize; +} +.window-layer-resize-item-left-bottom { + left: 0; + bottom: 0; + cursor: sw-resize; +} +.window-layer-resize-item-right-bottom { + right: 0; + bottom: 0; + cursor: se-resize; +} +.window-layer-resize-item-left-bottom, +.window-layer-resize-item-left-top, +.window-layer-resize-item-right-bottom, +.window-layer-resize-item-right-top { + width: 6px; + height: 6px; +} +@media only screen and (min-width: 641px) { + .window-layer-alone-layer .window-layer-tab-bar .am-fr span:hover { + color: #666; + } } \ No newline at end of file diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index b1b58b6d0..4f32f167d 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -15,6 +15,33 @@ function HeaderMenuPagesListHandle() } } +/** + * 独立弹窗层级处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-02-15 + * @desc description + * @param {[string]} key [窗口可以] + */ +function LayerPagesLevelHandle(key) +{ + var index = 0; + var $content = $('#ifcontent'); + $content.find('.window-layer-alone-layer').each(function() + { + var temp_index = parseInt($(this).css('z-index') || 0); + if(temp_index > index) + { + index = temp_index + } + }); + $content.find('.window-layer .window-layer-seat').show(); + var $layer = $content.find('.window-layer.iframe-item-key-'+key); + $layer.css({'z-index': index+1, 'position': 'fixed'}); + $layer.find('.window-layer-seat').hide(); +} + $(function() { // 处理顶部导航页面列表宽度 @@ -37,21 +64,45 @@ $(function() var key = $(this).data('key'); if(url != null) { + // 名称 + var name = $(this).data('node-name') || $(this).find('.nav-name').text(); + // 先隐藏所有的iframe // 页面未打开则添加iframe并打开 - if($('#ifcontent iframe.iframe-item-key-'+key).length == 0) + if($('#ifcontent .iframe-item-key-'+key).length == 0) { - $('#ifcontent').append(''); + var html = `