调整页面按钮布局

src/main/resources/static/route/mail/forward-mail.html

@@ -19,11 +19,8 @@
                 <form class="layui-form layui-form-pane" lay-filter="dataForm">
                     <div class="layui-row" style="padding: 10px;">
                         <div class="layui-col-md6">
-                            <button type="button" class="layui-btn layui-btn-xs" lay-submit lay-filter="submitSend">
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-warm" id="copy-for-btn">添加抄送</a>
-                                <i class="fa fa-lg fa-paper-plane-o"></i> 转发
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-danger" id="secret-btn">添加密送</a>
-                            </button>
-                            <a href="javascript:void(0)" id="copy-for-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">抄送</a>
-                            <a href="javascript:void(0)" id="secret-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">密送</a>
                         </div>
                     </div>
                     <div class="layui-card-body" style="padding: 10px;">
@@ -94,7 +91,7 @@
                                         </div>
                                         {{#    } }}
                                         {{# } }}
-                                        {{# if(d[fileName].length < 1) { }}
+                                        {{# if(d[fileName].length < 9) { }}
                                         <div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
                                             <a href="javascript:void(0);" lay-form-button data-explain="附件" data-name="mailFiles" lay-filter="mailFilesUploadFile">
                                                 <i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
@@ -115,6 +112,15 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <button type="button" class="layui-btn" lay-submit lay-filter="submitSend">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 转发
+                                </button>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>

src/main/resources/static/route/mail/mail-del-list.html

@@ -98,7 +98,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="cursor: pointer; color: #1e88e5;text-decoration: underline;" lay-event="showEvent">' + rowData + '</span>';
                             }
                         },
                         {field: 'delTime', title: '删除时间', width: 170, align:'center',
@@ -247,6 +247,25 @@
                 return;
             }
         });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            if(layEvent === 'showEvent') {
+                layer.open({
+                    type: 2,
+                    title: '查看',
+                    closeBtn: 1,
+                    area: ['95%', '95%'],
+                    shadeClose: false,
+                    anim: 2,
+                    content: top.restAjax.path('route/mail/mail-del-show.html?id={arg}', [obj.data.id]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+                return;
+            }
+        })
     });
 </script>
 </body>

src/main/resources/static/route/mail/mail-del-show.html

@@ -20,7 +20,7 @@
                     <div class="layui-row" style="padding: 10px;">
                         <div class="layui-col-md6">
                             <div>
-                                <button type="button" id="recover-btn" class="layui-btn layui-btn-xs">
+                                <button type="button" id="recover-btn" class="layui-btn layui-btn-sm">
                                     <i class="fa fa-lg fa-paper-plane-o"></i> 恢复邮件
                                 </button>
                             </div>
@@ -105,6 +105,17 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <div>
+                                    <button type="button" id="recover-btn-bottom" class="layui-btn">
+                                        <i class="fa fa-lg fa-paper-plane-o"></i> 恢复邮件
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>
@@ -166,6 +177,15 @@
             });
         });
 
+        $(document).on('click', '#recover-btn-bottom', function(){
+            top.restAjax.get(top.restAjax.path('api/mail/get-recover-del-mail/{ids}', [id]), {}, null, function(code, data) {
+                top.dialog.msg("邮件已恢复");
+                closeBox();
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        });
+
         // 初始化文件列表
         function initFileList(fileName, ids, callback) {
             var dataForm = {};

src/main/resources/static/route/mail/mail-draft-list.html

@@ -95,7 +95,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="cursor: pointer; color: #1e88e5;text-decoration: underline;" lay-event="showEvent">' + rowData + '</span>';
                             }
                         },
                         {field: 'gmtCreate', title: '时间', width: 170, align:'center',
@@ -201,6 +201,25 @@
                 return;
             }
         });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            if(layEvent === 'showEvent') {
+                layer.open({
+                    type: 2,
+                    title: '修改编辑',
+                    closeBtn: 1,
+                    area: ['95%', '95%'],
+                    shadeClose: false,
+                    anim: 2,
+                    content: top.restAjax.path('route/mail/mail-send-draft-edit.html?mailId={arg}', [obj.data.mailId]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+                return;
+            }
+        })
     });
 </script>
 </body>

src/main/resources/static/route/mail/mail-inbox-list.html

@@ -95,7 +95,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="cursor: pointer; color: #1e88e5;text-decoration: underline;" lay-event="showEvent">' + rowData + '</span>';
                             }
                         },
                         {field: 'gmtCreate', title: '时间', width: 170, align:'center',
@@ -209,6 +209,24 @@
                 return;
             }
         });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            if(layEvent === 'showEvent') {
+                layer.open({
+                    type: 2,
+                    title: '收件箱',
+                    closeBtn: 1,
+                    area: ['95%', '95%'],
+                    shadeClose: false,
+                    anim: 2,
+                    content: top.restAjax.path('route/mail/mail-inbox-show.html?id={arg}', [obj.data.id]),
+                    end: function() {
+                    }
+                });
+                return;
+            }
+        })
     });
 </script>
 </body>

src/main/resources/static/route/mail/mail-inbox-show.html

@@ -21,12 +21,6 @@
                         <div class="layui-col-md6">
                             <div>
                                 <span>发件人: <span id="creatorNames" style="margin-left: 5px;"></span></span>
-                                <button type="button" id="reply-btn" class="layui-btn layui-btn-normal layui-btn-xs" style="margin-left: 25px;">
-                                    <i class="fa fa-lg fa-paper-plane-o"></i> 回复
-                                </button>
-                                <button type="button" id="forward-btn" class="layui-btn layui-btn-info layui-btn-xs">
-                                    <i class="fa fa-lg fa-paper-plane-o"></i> 转发
-                                </button>
                             </div>
                         </div>
                     </div>
@@ -109,6 +103,18 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <button type="button" id="reply-btn" class="layui-btn layui-btn-normal">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 回复
+                                </button>
+                                <button type="button" id="forward-btn" class="layui-btn layui-btn-info">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 转发
+                                </button>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>

src/main/resources/static/route/mail/mail-send-draft-edit.html

@@ -20,14 +20,8 @@
                 <form class="layui-form layui-form-pane" lay-filter="dataForm">
                     <div class="layui-row" style="padding: 10px;">
                         <div class="layui-col-md6">
-                            <button type="button" class="layui-btn layui-btn-xs" lay-submit lay-filter="submitSendDraft">
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-warm" id="copy-for-btn">添加抄送</a>
-                                <i class="fa fa-lg fa-paper-plane-o"></i> 发送
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-danger" id="secret-btn">添加密送</a>
-                            </button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-submit lay-filter="submitEditDraft">
-                                <i class="fa fa-lg fa-edit"></i> 保存修改
-                            </button>
-                            <a href="javascript:void(0)" id="copy-for-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">抄送</a>
-                            <a href="javascript:void(0)" id="secret-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">密送</a>
                         </div>
                     </div>
                     <div class="layui-card-body" style="padding: 10px;">
@@ -119,6 +113,19 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <button type="button" class="layui-btn" lay-submit lay-filter="submitSendDraft">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 发送邮件
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="submitEditDraft">
+                                    <i class="fa fa-lg fa-edit"></i> 保存修改
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
                 </form>
             </div>
         </div>

src/main/resources/static/route/mail/mail-send-list.html

@@ -95,7 +95,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="cursor: pointer; color: #1e88e5;text-decoration: underline;" lay-event="showEvent">' + rowData + '</span>';
                             }
                         },
                         {field: 'gmtCreate', title: '时间', width: 170, align:'center',
@@ -201,6 +201,25 @@
                 return;
             }
         });
+
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            if(layEvent === 'showEvent') {
+                layer.open({
+                    type: 2,
+                    title: '查看',
+                    closeBtn: 1,
+                    area: ['95%', '95%'],
+                    shadeClose: false,
+                    anim: 2,
+                    content: top.restAjax.path('route/mail/mail-send-show.html?mailId={arg}', [obj.data.mailId]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+                return;
+            }
+        })
     });
 </script>
 </body>

src/main/resources/static/route/mail/replay-mail.html

@@ -19,11 +19,8 @@
                 <form class="layui-form layui-form-pane" lay-filter="dataForm">
                     <div class="layui-row" style="padding: 10px;">
                         <div class="layui-col-md6">
-                            <button type="button" class="layui-btn layui-btn-xs" lay-submit lay-filter="submitSend">
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-warm" id="copy-for-btn">添加抄送</a>
-                                <i class="fa fa-lg fa-paper-plane-o"></i> 回复
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-danger" id="secret-btn">添加密送</a>
-                            </button>
-                            <a href="javascript:void(0)" id="copy-for-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">抄送</a>
-                            <a href="javascript:void(0)" id="secret-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">密送</a>
                         </div>
                     </div>
                     <div class="layui-card-body" style="padding: 10px;">
@@ -94,7 +91,7 @@
                                         </div>
                                         {{#    } }}
                                         {{# } }}
-                                        {{# if(d[fileName].length < 1) { }}
+                                        {{# if(d[fileName].length < 9) { }}
                                         <div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
                                             <a href="javascript:void(0);" lay-form-button data-explain="附件" data-name="mailFiles" lay-filter="mailFilesUploadFile">
                                                 <i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
@@ -115,6 +112,15 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <button type="button" class="layui-btn" lay-submit lay-filter="submitSend">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 回复
+                                </button>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>

src/main/resources/static/route/mail/send-mail.html

@@ -25,8 +25,8 @@
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" lay-submit lay-filter="submitDraft">
                                 <i class="fa fa-lg fa-edit"></i> 存草稿
                             </button>
-                            <a href="javascript:void(0)" id="copy-for-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 50px;">抄送</a>
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-warm" id="copy-for-btn">添加抄送</a>
-                            <a href="javascript:void(0)" id="secret-btn" style="color: #1e88e5;text-decoration: underline;margin-left: 25px;">密送</a>
+                            <a href="javascript:void(0)" class="layui-btn layui-btn-sm layui-btn-danger" id="secret-btn">添加密送</a>
                         </div>
                     </div>
                     <div class="layui-card-body" style="padding: 10px;">
@@ -97,7 +97,7 @@
                                         </div>
                                         {{#    } }}
                                         {{# } }}
-                                        {{# if(d[fileName].length < 1) { }}
+                                        {{# if(d[fileName].length < 9) { }}
                                         <div class="upload-image-box" style="width: auto; height: auto; padding: 5px;">
                                             <a href="javascript:void(0);" lay-form-button data-explain="附件" data-name="mailFiles" lay-filter="mailFilesUploadFile">
                                                 <i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
@@ -118,6 +118,18 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item layui-layout-admin">
+                        <div class="layui-input-block">
+                            <div class="layui-footer" style="left: 0;">
+                                <button type="button" class="layui-btn" lay-submit lay-filter="submitSend">
+                                    <i class="fa fa-lg fa-paper-plane-o"></i> 发送邮件
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-primary" lay-submit lay-filter="submitDraft">
+                                    <i class="fa fa-lg fa-edit"></i> 存草稿
+                                </button>
+                            </div>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>