同步更新

app/admin/controller/File.php

@@ -92,13 +92,17 @@ class File extends Controller
      */
     public function remove()
     {
-        SystemFile::mDelete();
+        if (!AdminService::isSuper()) {
+            $where = ['uuid' => AdminService::getUserId()];
+        }
+        SystemFile::mDelete('', $where ?? []);
     }
 
     /**
      * 清理重复文件
      * @auth true
      * @return void
+     * @throws \think\db\exception\DbException
      */
     public function distinct()
     {

app/admin/controller/api/Upload.php

@@ -193,7 +193,7 @@ class Upload extends Controller
         $extension = strtolower($file->getOriginalExtension());
         $saveFileName = input('key') ?: Storage::name($file->getPathname(), $extension, '', 'md5_file');
         // 检查文件名称是否合法
-        if (strpos($saveFileName, '../') !== false) {
+        if (strpos($saveFileName, '..') !== false) {
             $this->error('文件路径不能出现跳级操作！');
         }
         // 检查文件后缀是否被恶意修改

app/admin/view/api/upload/image.html

@@ -12,8 +12,13 @@
         <div class="image-dialog-item" v-for="x in list" @click="setItem(x)" style="display:none" v-show="show" :class="{'image-dialog-checked':x.checked}">
             <div class="uploadimage" :style="x.style"></div>
             <p class="image-dialog-item-name layui-elip" v-text="x.name"></p>
-            <span class="image-dialog-item-size">{{formatSize(x.size)}}</span>
-            <span class="image-dialog-item-type">{{x.xext.toUpperCase()}}</span>
+            <div class="image-dialog-item-tool">
+                <span class="image-dialog-item-type">{{x.xext.toUpperCase()}}</span>
+                <span class="image-dialog-item-size">{{formatSize(x.size)}}</span>
+                {if auth('admin/file/remove')}
+                <span class="layui-icon layui-icon-close image-dialog-item-close" @click.stop="remove(x)"></span>
+                {/if}
+            </div>
         </div>
     </div>
     <div class="image-dialog-foot">
@@ -57,6 +62,15 @@
                     });
                     this.setInput();
                 },
+                // 删除指定的图片
+                remove: function (x) {
+                    $.msg.confirm('确认要移除这张图片吗？', function () {
+                        $.form.load('{:url("admin/file/remove")}', {id: x.id}, 'POST', function (ret) {
+                            ret.code > 0 ? app.loadPage() : $.msg.error(ret.info);
+                            return app.$forceUpdate(), false;
+                        })
+                    })
+                },
                 // 格式文件大小
                 formatSize: function (size) {
                     return $.formatFileSize(size);

public/static/admin.js

@@ -674,6 +674,7 @@ $(function () {
                 typeof option.success === 'function' && option.success.call(this, res, curr, count);
                 $.form.reInit($table.next()).find('[data-open],[data-load][data-time!="false"],[data-action][data-time!="false"],[data-queue],[data-iframe]').not('[data-table-id]').attr('data-table-id', table.id);
                 (option.loading = this.loading = true) && $table.data('next', this).next().find(cls.join(',')).animate({opacity: 1});
+                setTimeout(() => layui.table.resize(table.id), 10);
             }, option.parseData = function (res) {
                 if (typeof params.filter === 'function') {
                     res.data = params.filter(res.data, res);

public/static/theme/css/_custom.less

@@ -1079,6 +1079,11 @@ button.layui-btn:not([type=button]) {
     margin-bottom: 12px;
     border-radius: @BoxBorderRadius;
 
+    // 显示删除按钮
+    &:hover .image-dialog-item-close {
+      display: block !important;
+    }
+
     .uploadimage {
       margin: 0;
       width: 145px;
@@ -1086,11 +1091,18 @@ button.layui-btn:not([type=button]) {
       background-color: #fff;
     }
 
-    &-type, &-size {
-      top: 2px;
-      color: #FFF;
-      padding: 0 6px;
+    &-tool {
+      top: 0;
+      left: 0;
+      right: 0;
+      padding: 2px;
       position: absolute;
+
+    }
+
+    &-type, &-size, &-close {
+      color: #FAFAFA;
+      padding: 1px 5px;
       font-size: 12px;
       transform: scale(0.9);
       background: rgba(0, 0, 0, 0.6);
@@ -1098,12 +1110,23 @@ button.layui-btn:not([type=button]) {
       border-radius: 18px;
     }
 
-    &-type {
-      left: 1px;
-    }
+    &-close {
+      float: right;
+      width: 22px;
+      height: 22px;
+      cursor: pointer;
+      padding: 0;
+      display: none;
+      font-size: 14px;
+      text-align: center;
+      line-height: 22px;
+      box-sizing: border-box;
+      background: rgba(238, 10, 10, 0.77);
+      font-weight: bold;
 
-    &-size {
-      right: 1px;
+      &:hover {
+        color: #FFF;
+      }
     }
 
     &-name {