diff --git a/app/admin/view/common/mdeditor.html b/app/admin/view/common/mdeditor.html index 52cabc1..a04a86e 100644 --- a/app/admin/view/common/mdeditor.html +++ b/app/admin/view/common/mdeditor.html @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html index e051988..87263bd 100644 --- a/app/admin/view/index/main.html +++ b/app/admin/view/index/main.html @@ -5,7 +5,7 @@ .table-title { font-size: 18px; font-weight: 800; - padding: 15px 15px 0; + padding: 12px 12px 0; } .panel-num table { width: 100%; @@ -56,14 +56,15 @@ .panel-more a { color: #0088FF } + .info-td{width:90px; text-align:right; background-color:#f8f8f8; color:#999; padding:5px 3px;} {/block} {block name="body"} -
+
-
+
@@ -93,13 +94,13 @@
注册用户
-
+
文章列表
-
+
@@ -119,53 +120,63 @@ {if condition="($install == true)"} - + {/if} - + - - - + - - - - - - - - - - - - - + - - - + - - + + - - + + - - + + + + + + + + + + + + + + + + + +
提醒：发现app目录下的install文件夹没删除，为了系统的安全,请手动去删除。提醒：发现app目录下的install文件夹没删除，为了系统的安全,请手动去删除。
服务器系统服务器系统 {:get_system_info('os')}
PHP版本PHP版本 {:get_system_info('php')}
勾股CMS版本{:CMS_VERSION}勾股CMS文档
ThinkPHP版本{:TP_VERSION}TP6文档
Layui版本{:LAYUI_VERSION}Layui文档
上传附件限制上传附件限制 {:get_system_info('upload_max_filesize')}
执行时间限制执行时间限制 {:get_system_info('max_execution_time')}
BUG反馈hdm58@qq.com勾股CMS版本{:CMS_VERSION}勾股CMS文档
QQ交流群搜Q群：24641076，或点击 gougucms交流群ThinkPHP版本{:TP_VERSION}TP6文档
同系列开源软件勾股BLOG勾股OALayui版本{:LAYUI_VERSION}Layui文档
BUG反馈hdm58@qq.com
QQ交流群搜Q群：24641076，或点击 gougucms交流群
同系列开源软件勾股BLOG勾股OA勾股DEV
🍗🍗
给作者加鸡腿
🍗🍗		 + +
+
@@ -290,9 +301,9 @@ }); var ops = { title: { - top: '15px', + top: '12px', text: '今日与昨日访问统计', - left: '12px', + left: '10px', textStyle: { fontSize: '18', color: '#333', @@ -300,9 +311,9 @@ }, color: ["#1AAD19", "#1890FF"], grid: { - left: '20px', + left: '16px', right: '30px', - bottom: '15px', + bottom: '12px', top: '60px', containLabel: true }, @@ -320,7 +331,7 @@ }, legend: { data: ["今日", "昨日"], - top: '18px', + top: '16px', }, xAxis: [{ type: "category", @@ -377,9 +388,9 @@ let myChart = echarts.init(document.getElementById('chartYear')); let option = { title: { - top: '15px', + top: '12px', text: '近一年访问统计', - left: '12px', + left: '10px', textStyle: { fontSize: '18', color: '#333', @@ -402,7 +413,7 @@ }, calendar: { top: 75, - left: 52, + left: 50, right: 20, range: getRange(), cellSize: ['auto', 21], @@ -495,9 +506,6 @@ } return dateArray; } - - - } diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css index f27806b..d7982c5 100644 --- a/public/static/admin/css/common.css +++ b/public/static/admin/css/common.css @@ -19,9 +19,9 @@ background-color: #c1c1c1; border-radius: 8px; } - - div.layui-table-main::-webkit-scrollbar{width:15px;height:15px} - div.layui-table-main::-webkit-scrollbar-thumb{min-width:15px;min-height:15px;background-color:rgba(0,0,0,.15);background-clip:content-box;border:2px solid transparent;border-radius:15px} + body.right-open{overflow-y:clip;} + div.layui-table-main::-webkit-scrollbar{width:12px;height:12px} + div.layui-table-main::-webkit-scrollbar-thumb{min-width:12px;min-height:12px;background-color:rgba(0,0,0,.15);background-clip:content-box;border:2px solid transparent;border-radius:12px} div.layui-table-main::-webkit-scrollbar-track{background-color:transparent} div.layui-table-main::-webkit-scrollbar-track:hover{background-color:rgba(0,0,0,.04)} div.layui-table-main::-webkit-scrollbar-thumb:hover{background-color:rgba(0,0,0,.4);border:2px solid transparent} @@ -39,7 +39,8 @@ :-ms-input-placeholder { /* Internet Explorer 10-11 */ color: #aaa; } - .layui-card { box-shadow: 0 1px 3px 0 rgb(5 32 96 / 10%);} + .layui-card { box-shadow: 0 1px 3px 0 rgb(5 32 96 / 10%); margin-bottom:12px!important;} + .layui-card-body{padding: 10px 12px!important;} .layui-table, .layui-table-view{margin:0} .layui-table td,.layui-table th{padding:9px 10px;} .layui-table-cell{padding:0 10px;} @@ -67,8 +68,8 @@ .layui-td-gray4{color:#999; width:150px; text-align:right; background-color:#f8f8f8;} .layui-td-gray font,.layui-td-gray2 font,.layui-td-gray3 font{color:#FF6347; margin-left: 3px;} .main-body{padding:12px;padding-bottom: 0; min-width: 868px;} - .body-content{background-color:#fff; padding:10px 15px;} - .body-table{background-color:#fff; margin-bottom:15px} + .body-content{background-color:#fff; padding:8px 12px;} + .body-table{background-color:#fff; margin-bottom:12px} .h3-title{font-size:18px; height:39px; font-weight:800} .h3-title2{font-size:18px; height:39px; font-weight:800; padding-top:20px} .body-form-btn{padding:10px 0;} @@ -82,7 +83,7 @@ .span-color-6{color:#FF33CC;} .span-color-7{color:#6699FF;} .span-color-8{color:#CC9933;} -.layui-tab-title .layui-this:after {width:calc(100% - 35px );left:15px; min-width:65px;} +.layui-tab-title .layui-this:after {width:calc(100% - 35px );left:12px; min-width:65px;} @keyframes layui-rl{ from{transform:translateX(0px);}to{transform:translateX(-100%);} @@ -108,7 +109,8 @@ .layui-anim-rl.layui-layer-iframe{ overflow:initial!important; } -.right-popup-close{position: absolute;width:50px;height:44px;line-height:44px;text-align:center; left: -52px;right:0; top: 50px;background-color:#FF5722;color:#fff;border-radius:6px 0 0 6px; cursor:pointer; border:2px solid #fff;} +.right-popup-close{position: absolute;width:24px;height:60px; padding:30px 6px; line-height:30px;text-align:center; left: -38px;right:0; top: 20%;background-color:#FF5722;color:#fff;border-radius:6px 0 0 6px; cursor:pointer; border:2px solid #fff; border-right:none; font-weight:600; font-size:14px;} +.right-popup-close:hover{opacity:0.88} .page-content{background-color:#fff;} .layui-form-select dl{ z-index: 1899; } diff --git a/public/static/mdeditor/plugins/paste.upload.img.js b/public/static/mdeditor/plugins/paste.upload.img.js new file mode 100644 index 0000000..dae1238 --- /dev/null +++ b/public/static/mdeditor/plugins/paste.upload.img.js @@ -0,0 +1,67 @@ +function initPasteDragImg(Editor){ + var doc = document.getElementById(Editor.id) + doc.addEventListener('paste', function (event) { + var items = (event.clipboardData || window.clipboardData).items; + var file = null; + if (items && items.length) { + // 搜索剪切板items + for (var i = 0; i < items.length; i++) { + if (items[i].type.indexOf('image') !== -1) { + file = items[i].getAsFile(); + break; + } + } + } else { + console.log("当前浏览器不支持"); + return; + } + if (!file) { + console.log("粘贴内容非图片"); + return; + } + uploadImg(file,Editor); + }); + + var dashboard = document.getElementById(Editor.id) + dashboard.addEventListener("dragover", function (e) { + e.preventDefault() + e.stopPropagation() + }) + dashboard.addEventListener("dragenter", function (e) { + e.preventDefault() + e.stopPropagation() + }) + dashboard.addEventListener("drop", function (e) { + e.preventDefault() + e.stopPropagation() + var files = this.files || e.dataTransfer.files; + uploadImg(files[0],Editor); + }) +} +function uploadImg(file,Editor){ + var formData = new FormData(); + var fileName=new Date().getTime()+"."+file.name.split(".").pop(); + formData.append('editormd-image-file', file, fileName); + $.ajax({ + url: Editor.settings.imageUploadURL, + type: 'post', + data: formData, + processData: false, + contentType: false, + dataType: 'json', + success: function (msg) { + var success=msg['success']; + if(success==1){ + var url=msg["url"]; + if(/\.(png|jpg|jpeg|gif|bmp|ico)$/.test(url)){ + Editor.insertValue("![图片alt]("+msg["url"]+" ''图片title'')"); + }else{ + Editor.insertValue("[下载附件]("+msg["url"]+")"); + } + }else{ + console.log(msg); + alert("上传失败"); + } + } + }); +}