重构系统附件字段逻辑

修改各模块附件功能

resources/views/attachment/add.blade.php

@@ -1,87 +0,0 @@
-<script type="text/javascript">
-var uploader = {
-    file:function(fileId)
-    {
-        var id = $('#'+fileId).find(".id").val();
-        location.href = '{{url("file/attachment/file")}}?model={{$attachList["model"]}}&id='+id;
-    },
-    cancel:function(fileId)
-    {
-        var id = $('#'+fileId).find(".id").val();
-        if (id > 0) {
-            var name = $('#'+fileId).find(".fileName a").text();
-            $.messager.confirm('操作警告', '确定要删除 <strong>'+name+'</strong> 此文件吗', function(btn) {
-                if (btn == true) {
-                    var url = '{{url("file/attachment/delete")}}';
-                    $.get(url,{model:'{{$attachList["model"]}}',id:id},function(res) {
-                        if (res == 1) {
-                            $('#'+fileId).remove();
-                        }
-                    });
-                }
-            });
-        } else {
-            $('#'+fileId).remove();
-        }
-    },
-    insert:function(fileId)
-    {
-        var id = $('#'+fileId).find(".id").val();
-        var name = $('#'+fileId).find(".file-name a").text();
-        // 检查图片类型
-        if (/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(name)) 
-        {
-            var html = '<img src="{{url("file/attachment/view")}}?model={{$attachList["model"]}}&id='+id+'" title="'+name+'">';
-        } 
-        else
-        {
-            var html = '<a href="{{url("file/attachment/file")}}?model={{$attachList["model"]}}&id='+id+'" title="'+name+'">'+name+'</a>';
-        }
-        UE.getEditor('content').execCommand('insertHtml', html);
-    }
-}
-</script>
-
-<script id="uploader-item-tpl" type="text/html">
-    <div id="file_draft_<%=id%>" class="uploadify-queue-item">
-        <span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('file_draft_<%=id%>');"><%=title%></a></span>
-        <span class="file-size">(<%=size%>)</span>
-        <span class="insert"><a class="option" href="javascript:uploader.insert('file_draft_<%=id%>');">插入编辑器</a></span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_draft_<%=id%>');">删除</a></span>
-        <input type="hidden" class="id" name="attachment[]" value="<%=id%>" />
-    </div>
-    <div class="clear"></div>
-</script>
-
-<a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('file/attachment/uploader', ['model' => $attachList['model'], 'path' => $attachList['path']])}}');"><i class="fa fa-cloud-upload"></i> 文件上传</a>
-<span class="uploader-size">&nbsp;文件大小限制{{$setting['upload_max']}} MB</span>
-
-<div class="clear"></div>
-
-<div id="fileQueue">
-@if($attachList['queue'])
-    @foreach($attachList['queue'] as $n => $v)
-    <div id="file_queue_{{$n}}" class="uploadify-queue-item">
-        <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_queue_{{$n}}');">{{$v['title']}}</a></span>
-        <span class="file-size"> ({{human_filesize($v['size'])}})</span>
-        <span class="insert"><a class="option" href="javascript:uploader.insert('file_queue_{{$n}}');">插入编辑器</a></span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_queue_{{$n}}');">删除</a></span>
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}" />
-    </div><div class="clear"></div>
-    @endforeach
-@endif
-</div>
-
-<div id="fileQueueDraft">
-@if($attachList['draft'])
-    @foreach($attachList['draft'] as $n => $v)
-    <div id="queue_draft_{{$n}}" class="uploadify-queue-item">
-        <span class="file-name"><strong class="red" title="草稿附件">!</strong> <a href="javascript:uploader.file('queue_draft_{{$n}}');">{{$v['title']}}</a></span>
-        <span class="file-size">({{human_filesize($v['size'])}})</span>
-        <span class="insert"><a class="option" href="javascript:uploader.insert('queue_draft_{{$n}}');">插入编辑器</a></span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('queue_draft_{{$n}}');">删除</a></span>
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}" />
-    </div><div class="clear"></div>
-    @endforeach
-@endif
-</div>

resources/views/attachment/create.blade.php

@@ -1,4 +1,4 @@
-<script id="uploader-item-tpl" type="text/html">
+<script id="upload-item-tpl" type="text/html">
     <div id="<%=fileId%>" class="uploadify-queue-item">
         <span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('<%=fileId%>');"><%=name%></a></span>
         <span class="file-size">(<%=size%>)</span>
@@ -10,17 +10,26 @@
 
 <div class="uploadify-queue">
 
-    <a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('index/attachment/uploader', ['path' => Request::module()])}}');"><i class="fa fa-cloud-upload"></i> 文件上传</a>
+    <a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('index/attachment/upload', ['path' => Request::module(), 'table' => $attachment['table'], 'field' => $attachment['field']])}}');"><i class="fa fa-cloud-upload"></i> 文件上传</a>
     <span class="uploader-size">&nbsp;文件大小限制 {{$setting['upload_max']}}MB</span>
     <div class="clear"></div>
 
     <div id="fileQueue" class="uploadify-queue">
     @if($attachment['rows'])
         @foreach($attachment['rows'] as $n => $v)
-        <div id="file_attach_{{$n}}" class="uploadify-queue-item">
-            <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_attach_{{$n}}');">{{$v['name']}}</a></span>
+        <div id="file_queue_{{$n}}" class="uploadify-queue-item">
+            <span class="file-name"><span class="icon icon-paperclip"></span> <a class="option" href="javascript:uploader.file('file_queue_{{$n}}');">{{$v['name']}}</a></span>
             <span class="file-size"> ({{human_filesize($v['size'])}})</span>
-            <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_attach_{{$n}}');">删除</a></span>
+            
+            @if(in_array($v['type'], ['pdf']))
+                <a href="{{$upload_url}}/{{$v['path']}}" class="btn btn-xs btn-default" target="_blank">[预览]</a>
+            @endif
+
+            @if(in_array($v['type'], ['jpg','png','gif','bmp']))
+                <img data-original="{{$upload_url}}/{{$v['path']}}" /><a data-toggle="image-show" class="option">[预览]</a>
+            @endif
+            
+            <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_queue_{{$n}}');">删除</a></span>
             <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}" />
         </div>
         <div class="clear"></div>
@@ -28,11 +37,11 @@
     @endif
     </div>
 
-    <div id="fileQueueDraft">
+    <div id="fileDraft_{{$attachment['table']}}_{{$attachment['field']}}">
     @if($attachment['draft'])
         @foreach($attachment['draft'] as $n => $file)
         <div id="queue_draft_{{$n}}" class="uploadify-queue-item">
-            <span class="file-name"><span class="text-danger" title="草稿附件">!</span> <a href="javascript:uploader.file('queue_draft_{{$n}}');">{{$file['name']}}</a></span>
+            <span class="file-name"><span class="text-danger" title="草稿附件">!</span> <a class="option" href="javascript:uploader.file('queue_draft_{{$n}}');">{{$file['name']}}</a></span>
             <span class="file-size">({{human_filesize($file['size'])}})</span>
             <span class="cancel"><a class="option" href="javascript:uploader.cancel('queue_draft_{{$n}}');">删除</a></span>
             <input type="hidden" class="id" name="attachment[]" value="{{$file['id']}}">
@@ -42,3 +51,16 @@
     @endif     
     </div>
 </div>
+<script>
+(function($) {
+    var galley_id = "fileQueue";
+    var galley = document.getElementById(galley_id);
+    var viewer = new Viewer(galley, {
+        navbar: false,
+        url: "data-original",
+    });
+    $("#" + galley_id).on("click", '[data-toggle="image-show"]', function() {
+        $(this).prev().click();
+    });
+})(jQuery);
+</script>

resources/views/attachment/create2.blade.php

@@ -1,45 +0,0 @@
-<script id="uploader-item-tpl" type="text/html">
-    <div id="<%=fileId%>" class="uploadify-queue-item">
-        <span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('<%=fileId%>');"><%=name%></a></span>
-        <span class="file-size">(<%=size%>)</span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('<%=fileId%>');"><i class="fa fa-fw fa-remove"></i></a></span>
-        <input type="hidden" class="id" name="{{$field}}[]" value="<%=id%>" />
-    </div>
-    <div class="clear"></div>
-</script>
-
-<div class="uploadify-queue">
-
-    <a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('index/attachment/uploader', ['path' => Request::module(), 'key' => $key.'.'.$field])}}');"><i class="fa fa-cloud-upload"></i> 附件</a>
-    <div class="clear"></div>
-
-    <div id="fileQueue_{{$key}}_{{$field}}" class="uploadify-queue">
-    
-        @if($attachments['rows'])
-        @foreach($attachments['rows'] as $n => $file)
-        <div id="file_queue_{{$n}}" class="uploadify-queue-item">
-            <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_queue_{{$n}}');">{{$file['name']}}</a></span>
-            <span class="file-size">({{human_filesize($file['size'])}})</span>
-            <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_queue_{{$n}}');"><i class="fa fa-fw fa-remove"></i></a></span>
-            <input type="hidden" class="id" name="{{$field}}[]" value="{{$file['id']}}">
-        </div>
-        <div class="clear"></div>
-        @endforeach
-        @endif
-
-    </div>
-
-    <div id="fileDraft_{{$key}}_{{$field}}">
-    @if($attachments['draft'])
-        @foreach($attachments['draft'] as $n => $file)
-        <div id="queue_draft_{{$n}}" class="uploadify-queue-item">
-            <span class="file-name"><span class="text-danger" title="草稿附件">!</span> <a href="javascript:uploader.file('queue_draft_{{$n}}');">{{$file['name']}}</a></span>
-            <span class="file-size">({{human_filesize($file['size'])}})</span>
-            <span class="cancel"><a class="option" href="javascript:uploader.cancel('queue_draft_{{$n}}');"><i class="fa fa-remove"></i></a></span>
-            <input type="hidden" class="id" name="{{$field}}[]" value="{{$file['id']}}">
-        </div>
-        <div class="clear"></div>
-        @endforeach
-    @endif     
-    </div>
-</div>

resources/views/attachment/file.blade.php

@@ -1,97 +0,0 @@
-<script type="text/javascript">
-var uploader = {
-    file:function(fileId) {
-        var id = $('#'+fileId).find(".id").val();
-        location.href = '{{url('file/attachment/file')}}?model={{$attach['model']}}&id='+id;
-    },
-    cancel:function(fileId) {
-        var id = $('#'+fileId).find(".id").val();
-        if (id > 0) {
-            var name = $('#'+fileId).find(".fileName a").text();
-            $.messager.confirm('操作警告', '确定要删除 <strong>'+name+'</strong> 此文件吗', function(btn) {
-                if (btn == true) {
-                    var url = "{{url('file/attachment/delete')}}";
-                    $.get(url,{model:"{{$attach['model']}}",id:id},function(res) {
-                        if (res == 1) {
-                            $('#'+fileId).remove();
-                        }
-                    });
-                }
-            });
-        } else {
-            $('#'+fileId).remove();
-        }
-    },
-    copyLink:function() {
-        var clipBoardContent = this.location.href;
-        window.clipboardData.setData("Text", clipBoardContent);
-        alert("复制成功。");
-    }
-}
-</script>
-
-<script id="uploader-item-tpl" type="text/html">
-    <div id="file_draft_<%=id%>" class="uploadify-queue-item">
-        <span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('file_draft_<%=id%>');"><%=title%></a></span>
-        <span class="file-size">(<%=size%>)</span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_draft_<%=id%>');">删除</a></span>
-        <input type="hidden" class="id" name="attachment[]" value="<%=id%>" />
-    </div>
-    <div class="clear"></div>
-</script>
-
-@if($attach['auth']['add'] == true)
-
-    <a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('file/attachment/uploader', ['model' => $attach['model'], 'path' => $attach['path']])}}');"><i class="fa fa-cloud-upload"></i> 文件上传</a>
-    <span class="uploader-size">&nbsp;文件大小限制{{$setting['upload_max']}} MB</span>
-    <!--
-    <input type="file" name="uploadify" id="uploadify">
-    <div class="uploadify-info text-ellipsis">&nbsp;支持{{strtoupper($setting['upload_type'])}}, 不超过{{$setting['upload_max']}}MB</div>
-    <div class="clear"></div>
-    -->
-
-@endif
-
-<div id="fileQueue">
-@if($attach['queue'])
-    @if($attach['queue'])
-    @foreach($attach['queue'] as $v)
-    <div id="file_queue_{{$v['id']}}" class="uploadify-queue-item">
-        <span class="file-name"><a href="javascript:uploader.file('file_queue_{{$v['id']}}');">{{$v['title']}}</a></span>
-        <span class="file-size">(
-            上传者: {{get_user($v['add_user_id'], 'name')}}
-            &nbsp;上传时间: @datetime($v['add_time'])
-            &nbsp;大小: {{human_filesize($v['size'])}}
-        )</span>
-            
-        @if($attach['auth']['add'] == true)
-            <span class="insert"><a class="option" href="javascript:uploader.cancel('file_queue_{{$v['id']}}');">删除</a></span>
-        @endif
-
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}">
-    </div><div class="clearfix"></div>
-    @endforeach
-    @endif
-@endif
-</div>
-
-<div id="fileQueueDraft">
-    @if($attach['draft'])
-    @foreach($attach['draft'] as $k => $v)
-    <div id="queue_draft_{{$v['id']}}" class="uploadify-queue-item">
-        <span class="file-name"><strong class="red" title="草稿附件">!</strong> <a href="javascript:uploader.file('queue_draft_{{$v['id']}}');">{{$v['title']}}</a></span>
-        <span class="file-size">(
-            &nbsp;上传者: {{get_user($v['add_user_id'], 'name')}}
-            &nbsp;上传时间: @datetime($v['add_time'])
-            &nbsp;大小: {{human_filesize($v['size'])}}
-        )</span>
-        
-        @if($attach['auth']['add'] == true)
-            <span class="insert"><a class="option" href="javascript:uploader.cancel('queue_draft_{{$v['id']}}');">删除</a></span>
-        @endif
-
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}">
-    </div><div class="clearfix"></div>
-    @endforeach
-    @endif
-</div>

resources/views/attachment/image.blade.php

@@ -1 +0,0 @@
-<img src="{{$stream}}">

resources/views/attachment/mobile/file.blade.php

@@ -1,90 +0,0 @@
-<script type="text/javascript">
-var uploader = {
-    file:function(fileId) {
-        var id = $('#'+fileId).find(".id").val();
-        location.href = '{{url('file/attachment/file')}}?model={{$attach['model']}}&id='+id;
-    },
-    cancel:function(fileId) {
-        var id = $('#'+fileId).find(".id").val();
-        if (id > 0) {
-            var name = $('#'+fileId).find(".fileName a").text();
-            $.messager.confirm('操作警告', '确定要删除 <strong>'+name+'</strong> 此文件吗', function(btn) {
-                if (btn == true) {
-                    var url = "{{url('file/attachment/delete')}}";
-                    $.get(url,{model:"{{$attach['model']}}",id:id},function(res) {
-                        if(res == 1) {
-                            $('#'+fileId).remove();
-                        }
-                    });
-                }
-            });
-        } else {
-            $('#'+fileId).remove();
-        }
-    },
-    copyLink:function() {
-        var clipBoardContent = this.location.href;
-        window.clipboardData.setData("Text", clipBoardContent);
-        alert("复制成功。");
-    }
-}
-</script>
-
-<!--
-<span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('<%=fileId%>');"><%=title%></a></span> 
--->
-
-<script id="uploader-item-tpl" type="text/html">
-    <div id="<%=fileId%>" class="uploadify-queue-item">
-        <span class="file-name"><span class="text-danger" title="草稿状态">!</span> <a href="javascript:uploader.file('<%=fileId%>');"><%=title%></a></span>
-        <span class="file-size">(<%=size%>)</span>
-        <span class="cancel"><a class="option" href="javascript:uploader.cancel('<%=fileId%>');">删除</a></span>
-        <input type="hidden" class="id" name="attachment[]" value="<%=id%>" />
-    </div>
-    <div class="clear"></div>
-</script>
-
-@if($attach['auth']['add'] == true)
-    <a class="btn btn-sm btn-info" href="javascript:viewBox('reader', '文件上传', '{{url('file/attachment/uploader', ['model' => $attach['model'], 'path' => $attach['path']])}}');"><i class="fa fa-cloud-upload"></i> 文件上传</a>
-    <span class="uploader-size">&nbsp;文件大小限制{{$setting['upload_max']}} MB</span>
-@endif
-
-<div id="fileQueue">
-@if($attach['queue'])
-    @if($attach['queue'])
-    @foreach($attach['queue'] as $v)
-    <div id="file_queue_{{$v['id']}}" class="uploadify-queue-item">
-        <span class="file-name"><a href="javascript:uploader.file('file_queue_{{$v['id']}}');">{{$v['title']}}</a></span>
-        <span class="file-size">(
-            上传者: {{get_user($v['add_user_id'], 'name')}}
-            &nbsp;上传时间: @datetime($v['add_time'])
-            &nbsp;大小: {{human_filesize($v['size'])}}
-        )</span>
-            
-        @if($attach['auth']['add'] == true)
-            <span class="insert"><a class="option" href="javascript:uploader.cancel('file_queue_{{$v['id']}}');">删除</a></span>
-        @endif
-
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}">
-    </div><div class="clearfix"></div>
-    @endforeach
-    @endif
-@endif
-</div>
-<div id="fileQueueDraft">
-    @if($attach['draft'])
-    @foreach($attach['draft'] as $k => $v)
-    <div id="queue_draft_{{$v['id']}}" class="uploadify-queue-item">
-        <span class="file-name"><strong class="red" title="草稿附件">!</strong> <a download="{{$v['title']}}" href="{{$upload_url.'/'.$v['path'].'/'.$v['name']}}">{{$v['title']}}</a> ({{human_filesize($v['size'])}})</span>
-        <span class="file-size">
-            {{get_user($v['add_user_id'], 'name')}} - @datetime($v['add_time'])
-        </span>
-        @if($attach['auth']['add'] == true)
-            <span class="insert"><a class="option" href="javascript:uploader.cancel('queue_draft_{{$v['id']}}');">删除</a></span>
-        @endif
-
-        <input type="hidden" class="id" name="attachment[]" value="{{$v['id']}}">
-    </div><div class="clearfix"></div>
-    @endforeach
-    @endif
-</div>

resources/views/attachment/qrcode.blade.php

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>{{$setting['title']}}</title>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
-    <link href="{{mix('/assets/dist/vendor.min.css')}}" rel="stylesheet" type="text/css">
-    <link href="{{mix('/assets/dist/gdoo.min.css')}}" rel="stylesheet" type="text/css">
-    <script src="{{$asset_url}}/vendor/jquery.js"></script>
-</head>
-<style>
-li { list-style: none; }
-body {
-    margin: 0 auto;
-    text-align: center;
-    width: 80%;
-}
-.header {
-    text-align: center;
-    margin-top: 50px;
-    margin-bottom: 10px;
-}
-.logo img { border-radius: 500px; width:86px; height:86px; }
-.input-group-addon { 
-    background-color: #fff;
-}
-</style>
-<body>
-    <div class="header">
-        <div class="logo">
-            <img class="circle" src="{{$asset_url}}/images/a1.jpg" />
-            <div>{{auth()->user()->name}}</div>
-            <div>欢迎使用{{$setting['title']}} 扫一扫</div>
-            <p class="message text-sm" style="color:red;"></p>
-        </div>
-    </div>
-
-    <form id="fileForm" class="form-horizontal">
-        <div class="form-group input-group">
-            <span class="input-group-addon">单据名称</span>
-            <input id="name" name="name" type="text" value="{{$model['name']}}" class="form-control input-sm" readonly="readonly" />
-        </div>
-
-        <div class="form-group input-group">
-            <span class="input-group-addon">文件名称</span>
-            <input type="text" id="filename" class="form-control input-sm" name="filename" />
-        </div>
-
-        <div class="form-group">
-            <a class="btn btn-info btn-lg btn-block" id="qrcode-btn"><i class="fa fa-qrcode"></i> 扫一扫</a>
-            <span style="display:none;">
-                <input type="file" name="file" id="fileToUpload" capture="camera" accept="image/*" onchange="fileSelected();">
-            </span>
-        </div>
-        <input type="hidden" name="key" value="{{$key}}" />
-        <input type="hidden" name="x-auth-token" value="{{$token}}" />
-    </form>
-</body>
-</html>
-<script>
-
-$(function() {
-    $('#qrcode-btn').on('click', function() {
-        $('#fileToUpload').click();
-    });
-});
-
-var btn = '<i class="fa fa-qrcode"></i> 扫一扫';
-
-function fileSelected() {
-    var formData = new FormData($('#fileForm')[0]);
-    $('.message').html('');
-    $('#fileToUpload').attr('disabled', 'disabled');
-    $.ajax({
-        url: '{{url("uploader")}}',
-        type: 'POST',
-        data: formData,
-        async: false,
-        cache: false,
-        contentType: false,
-        processData: false,
-        xhr: function(){
-            var xhr = $.ajaxSettings.xhr();
-            if (xhr.upload) {
-                $('#qrcode-btn').html('上传中...');
-                // xhr.upload.addEventListener("progress", onprogress, false);
-                return xhr;
-            }
-        },
-        success: function (returndata) {
-            $('#qrcode-btn').html(btn);
-            $('#fileToUpload').removeAttr('disabled');
-            $('#fileToUpload').val('');
-            $('.message').html('上传成功,请在提单界面等待图片出现。');
-        },
-        error: function (returndata) {
-            $('#qrcode-btn').html(btn);
-            $('#fileToUpload').removeAttr('disabled');
-            $('#fileToUpload').val('');
-            $('.message').html('上传失败。');
-        }
-    });
-}
-/*
-function onprogress(evt) {
-    // $(".form-footer>a").html("上传中...");
-}*/
-</script>

resources/views/attachment/show.blade.php

@@ -1,19 +1,35 @@
 <div class="uploadify-queue">
-
     <div id="fileQueue" class="uploadify-queue">
-    
-        @if(count($attachments['main']))
-        @foreach($attachments['main'] as $n => $file)
-        <div id="file_queue_{{$n}}" class="uploadify-queue-item">
-            <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_queue_{{$n}}');">{{$file['name']}}</a></span>
-            <span class="file-size">({{human_filesize($file['size'])}})</span>
-            <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_queue_{{$n}}');"><i class="fa fa-fw fa-remove"></i></a></span>
-            <input type="hidden" class="id" name="{{$field}}[]" value="{{$file['id']}}">
-        </div>
-        <div class="clear"></div>
-        @endforeach
+        @if($attachment['rows'])
+            @foreach($attachment['rows'] as $n => $file)
+            <div id="file_queue_{{$n}}" class="uploadify-queue-item">
+                <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_queue_{{$n}}');">{{$file['name']}}</a></span>
+                <span class="file-size">({{human_filesize($file['size'])}})</span>
+
+                @if(in_array($file['type'], ['pdf']))
+                    <a href="{{$upload_url}}/{{$file['path']}}" class="btn btn-xs btn-default" target="_blank">[预览]</a>
+                @endif
+
+                @if(in_array($file['type'], ['jpg','png','gif','bmp']))
+                    <img data-original="{{$upload_url}}/{{$file['path']}}" /><a data-toggle="image-show" class="option">[预览]</a>
+                @endif
+
+                <div class="clear"></div>
+            </div>
+            @endforeach
         @endif
-
     </div>
-
 </div>
+<script>
+(function($) {
+    var galley_id = "fileQueue";
+    var galley = document.getElementById(galley_id);
+    var viewer = new Viewer(galley, {
+        navbar: false,
+        url: "data-original",
+    });
+    $("#" + galley_id).on("click", '[data-toggle="image-show"]', function() {
+        $(this).prev().click();
+    });
+})(jQuery);
+</script>

resources/views/attachment/show2.blade.php

@@ -1,15 +0,0 @@
-<div class="uploadify-queue">
-    <div id="fileQueue" class="uploadify-queue">
-        @if($attachments['main'])
-            @foreach($attachments['main'] as $n => $file)
-            <div id="file_queue_{{$n}}" class="uploadify-queue-item">
-                <span class="file-name"><span class="icon icon-paperclip"></span> <a href="javascript:uploader.file('file_queue_{{$n}}');">{{$file['name']}}</a></span>
-                <span class="file-size">({{human_filesize($file['size'])}})</span>
-                <span class="cancel"><a class="option" href="javascript:uploader.cancel('file_queue_{{$n}}');"><i class="fa fa-fw fa-remove"></i></a></span>
-                <input type="hidden" class="id" name="{{$field}}[]" value="{{$file['id']}}">
-            </div>
-            <div class="clear"></div>
-            @endforeach
-        @endif
-    </div>
-</div>

resources/views/attachment/upload.blade.php

@@ -20,8 +20,8 @@
 </div>
 
 <script>
-var BASE_URL    = '{{$asset_url}}/vendor/webuploader';
-var SERVER_URL  = '{{$SERVER_URL}}';
+var BASE_URL = '{{$asset_url}}/vendor/webuploader';
+var SERVER_URL = '{{$SERVER_URL}}';
 var UPLOADER_ID = '{{$key}}'.replace('.', '_');
 </script>
 <script type="text/javascript" src="{{$asset_url}}/vendor/webuploader/webuploader.nolog.min.js"></script>

resources/views/attachment/view.blade.php

@@ -1,23 +0,0 @@
-<span class="btn btn-xs btn-info">
-    附件 <span class="badge">{{count($attachment['rows'])}}</span>
-</span>
-
-<div class="uploadify-queue">
-    @foreach($attachment['rows'] as $row)
-    <div class="uploadify-queue-item">
-        <span class="file-name">
-            <span class="text-muted icon icon-paperclip"></span> <a download="aaaa" href="{{url('index/attachment/download',['id'=>$row['id']])}}">{{$row['name']}}</a>
-        </span> 
-        <span class="file-size">&nbsp;({{human_filesize($row['size'])}})</span>
-        &nbsp;
-        @if(in_array(strtolower($row['type']), ['pdf']))
-            <a href="{{URL::to('uploads').'/'.$row['path']}}" class="btn btn-xs btn-default" target="_blank">预览</a>
-        @elseif(in_array(strtolower($row['type']), ['jpg','png','gif','bmp']))
-            <a class="btn btn-xs btn-default" onclick="imageBox('preview', '附件预览', '{{URL::to('uploads').'/'.$row['path']}}');">预览</a>
-        @else
-            <a class="btn btn-xs btn-default" href="{{url('index/attachment/download',['id'=>$row['id']])}}">下载</a>
-        @endif
-        <div class="clear"></div>
-    </div>
-    @endforeach
-</div

resources/views/headers.blade.php

@@ -44,7 +44,9 @@
     @if(isset($access['create']) && $header['create_btn'])
         <a href="javascript:;" data-toggle="{{$header['master_table']}}" data-action="create" class="btn btn-sm btn-success hinted" title="新建{{$header['name']}}"><i class="icon icon-plus"></i> 新建</a>
     @endif
-    
+
+    @yield('left_buttons')
+
     {{:$button_count = 0}}
     @foreach($header['buttons'] as $button)
     @if($button['display'])
@@ -62,10 +64,6 @@
                     <li class="divider"></li>
                 @else
                     @if($button['display'])
-                    <!-- 此处跳过查询子表的删除按钮 -->
-                    @if($header['exist_sub_table'] == 1 && $button['action'] == 'delete')
-                    <?php continue; ?>
-                    @endif
                     <li><a data-toggle="{{$header['master_table']}}" data-action="{{$button['action']}}" href="javascript:;"><i class="fa {{$button['icon']}}"></i> {{$button['name']}}</a></li>
                     @endif
                 @endif
@@ -110,13 +108,6 @@
                 </li>
             </ul>
         </div>
-        <!--
-        @if($header['search_form']['params'])
-            @foreach($header['search_form']['params'] as $key => $param)
-            <input name="{{$key}}" type="hidden" value="{{$param}}"> 
-            @endforeach
-        @endif
-        -->
     </form>
     @else
         <a class="btn btn-sm btn-default" data-toggle="{{$header['master_table']}}" data-action="filter" href="javascript:;"><i class="fa fa-search"></i> 筛选</a>
@@ -147,11 +138,6 @@
                     <li class="@if($header['search_form']['query'][$header['bys']['name']] == $item['value']) active @endif"><a href="{{url('', $params)}}">{{$item['name']}}</a></li>
                 @endif
             @endforeach
-            <!--
-            <li>
-                <a href="javascript:;">添加自定义筛选</a>
-            </li>
-            -->
         </ul>
     </div>
     @endif
@@ -195,14 +181,6 @@
                     @endforeach
                 </div>
             </div>
-            <!--
-            @if($header['search_form']['params'])
-            @foreach($header['search_form']['params'] as $key => $param)
-                <input name="{{$key}}" type="hidden" value="{{$param}}">
-            @endforeach
-            @endif
-            -->
         </form>
     </div>
-
 </div>

resources/views/searchForm.blade.php

@@ -63,6 +63,7 @@
 <div class="btn-group">
     <button id="search-submit" type="submit" class="btn btn-sm btn-default">
         <i class="fa fa-search"></i> 搜索</button>
+        
     @if(is_numeric($search['query']['advanced']))
     <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
         <span class="caret"></span>
@@ -74,6 +75,7 @@
                 <i class="fa fa-search"></i> 高级搜索</a>
         </li>
     </ul>
+
     @endif
 </div>