diff --git a/playlet-admin/src/main/resources/static/ajax/libs/layer/css/layer.css b/playlet-admin/src/main/resources/static/ajax/libs/layer/css/layer.css index 0803bbe..a796066 100644 --- a/playlet-admin/src/main/resources/static/ajax/libs/layer/css/layer.css +++ b/playlet-admin/src/main/resources/static/ajax/libs/layer/css/layer.css @@ -18,12 +18,12 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layer-anim{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;} @-webkit-keyframes layer-bounceIn { /* 默认 */ - 0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)} - 100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)} + 0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)} + 100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)} } @keyframes layer-bounceIn { - 0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)} - 100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)} + 0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)} + 100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)} } .layer-anim-00{-webkit-animation-name: layer-bounceIn;animation-name: layer-bounceIn} @@ -44,15 +44,15 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} from { transform: translate3d(0,-100%,0); } to { - transform: translate3d(0,0,0); - } + transform: translate3d(0,0,0); + } } @keyframes layer-slide-down-out { from { transform: translate3d(0,0,0); } to { - transform: translate3d(0,-100%,0); - } + transform: translate3d(0,-100%,0); + } } .layer-anim-slide-down{animation-name: layer-slide-down} .layer-anim-slide-down-out{animation-name: layer-slide-down-out} @@ -62,15 +62,15 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} from { transform: translate3d(100%,0,0); } to { - transform: translate3d(0,0,0); - } + transform: translate3d(0,0,0); + } } @keyframes layer-slide-left-out { from { transform: translate3d(0,0,0); } to { - transform: translate3d(100%,0,0); - } + transform: translate3d(100%,0,0); + } } .layer-anim-slide-left{animation-name: layer-slide-left} .layer-anim-slide-left-out{animation-name: layer-slide-left-out} @@ -80,15 +80,15 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} from { transform: translate3d(0,100%,0); } to { - transform: translate3d(0,0,0); - } + transform: translate3d(0,0,0); + } } @keyframes layer-slide-up-out { from { transform: translate3d(0,0,0); } to { - transform: translate3d(0,100%,0); - } + transform: translate3d(0,100%,0); + } } .layer-anim-slide-up{animation-name: layer-slide-up} .layer-anim-slide-up-out{animation-name: layer-slide-up-out} @@ -98,15 +98,15 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} from { transform: translate3d(-100%,0,0); } to { - transform: translate3d(0,0,0); - } + transform: translate3d(0,0,0); + } } @keyframes layer-slide-right-out { from { transform: translate3d(0,0,0); } to { - transform: translate3d(-100%,0,0); - } + transform: translate3d(-100%,0,0); + } } .layer-anim-slide-right{animation-name: layer-slide-right;} .layer-anim-slide-right-out{animation-name: layer-slide-right-out;} @@ -129,6 +129,10 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;} .layui-layer-setwin .layui-layer-close:hover{opacity:0.7;} .layui-layer-setwin .layui-layer-close2{position:absolute; right: -28px; top: -28px; color: #fff; background-color: #787878; padding: 3px; width: 16px; height: 20px; font-size: 16px; font-weight: bolder; border-radius: 50%; margin-left: 0; *right:-18px; _display:none;} .layui-layer-setwin .layui-layer-close2:hover{opacity: unset; background-color: #3888f6;} +.layui-layer-setwin .layui-layer-min, .layui-layer-setwin .layui-layer-max { + display: none; +} + /* 按钮栏 */ .layui-layer-btn{text-align: right; padding: 0 15px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;} diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html index 0021028..1654d05 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html @@ -317,13 +317,14 @@ language: "zh_CN", //语言类型 content_style: "img {max-width:100%;}", placeholder: '在这里输入文字', - height: 500, + height: 700, + autoresize_min_height: 700, //编辑区域的最小高度 branding: false, //tiny技术支持信息是否显示 plugins: ' preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media code codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount autosave', toolbar: 'fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \ styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ table image media charmap hr pagebreak insertdatetime preview | code selectall searchreplace visualblocks | indent2em lineheight formatpainter axupimgs', - toolbar_mode: 'wrap', + toolbar_mode: 'sliding', paste_data_images: true, //图片是否可粘贴 images_upload_handler: (blobInfo) => { return new Promise(async (resolve, reject) => { diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html index 330108f..46c3a51 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html @@ -248,13 +248,14 @@ language: "zh_CN", //语言类型 content_style: "img {max-width:100%;}", placeholder: '在这里输入文字', - height: 500, + height: 700, + autoresize_min_height: 700, //编辑区域的最小高度 branding: false, //tiny技术支持信息是否显示 plugins: ' preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media code codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount autosave', toolbar: 'fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \ styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ table image media charmap hr pagebreak insertdatetime preview | code selectall searchreplace visualblocks | indent2em lineheight formatpainter axupimgs', - toolbar_mode: 'wrap', + toolbar_mode: 'sliding', paste_data_images: true, //图片是否可粘贴 images_upload_handler: (blobInfo) => { return new Promise(async (resolve, reject) => {