更新同步插件代码

app/admin/controller/api/Upload.php

@@ -81,10 +81,10 @@ class Upload extends Controller
 
     /**
      * 文件上传检查
-     * @throws \think\admin\Exception
      */
     public function state()
     {
+        try {
             [$uuid, $unid] = $this->initUnid();
             [$name, $safe] = [input('name'), $this->getSafe()];
             $data = ['uptype' => $this->getType(), 'safe' => intval($safe), 'key' => input('key')];
@@ -152,6 +152,11 @@ class Upload extends Controller
             }
             $file->save(['xurl' => $data['url'], 'isfast' => 0, 'issafe' => $data['safe']]);
             $this->success('获取上传授权参数', array_merge($data, ['id' => $file->id ?? 0]), 404);
+        } catch (HttpResponseException $exception) {
+            throw $exception;
+        } catch (\Exception $exception) {
+            $this->error($exception->getMessage());
+        }
     }
 
     /**

app/admin/view/config/storage-alist.html

@@ -39,12 +39,12 @@
         </div>
 
         <div class="layui-form-item">
-            <label class="layui-form-label" for="storage.alist_userpath">
+            <label class="layui-form-label" for="storage.alist_savepath">
                 <b class="color-green">存储目录</b><br><span class="nowrap color-desc">Directory</span>
             </label>
             <div class="layui-input-block">
-                <input id="storage.alist_userpath" type="text" name="storage.alist_userpath" value="{:sysconf('storage.alist_userpath')}" required vali-name="存储目录" placeholder="请输入 Alist 存储存储目录" class="layui-input">
+                <input id="storage.alist_savepath" type="text" name="storage.alist_savepath" value="{:sysconf('storage.alist_savepath')}" required vali-name="存储目录" placeholder="请输入 Alist 存储目录" class="layui-input">
-                <p class="help-block">请填写 Alist 存储目录 ( 如：/uploads )，填写 / 表示根目录（ 需要拥有读写权限 ）</p>
+                <p class="help-block">请填写 Alist 用户基本目录的相对存储位置，填写 / 表示用户基本目录（ 需要拥有读写权限 ）</p>
             </div>
         </div>
 

app/admin/view/file/index.html

@@ -33,12 +33,15 @@
                 {
                     field: 'xurl', title: '查看文件', width: '7%', align: 'center', templet: function (d) {
                         if (typeof d.mime === 'string' && /^image\//.test(d.mime)) {
-                            return laytpl('<div><a target="_blank" data-tips-hover data-tips-image="{{d.xurl}}"><i class="layui-icon layui-icon-eye"></i></a></div>').render(d)
+                            return laytpl('<div><a target="_blank" data-tips-hover data-tips-image="{{d.xurl}}"><i class="layui-icon layui-icon-picture"></i></a></div>').render(d)
-                        } else if (typeof d.mime === 'string' && /^(video|audio)\//.test(d.mime)) {
-                            return laytpl('<div><a target="_blank" data-iframe="{{d.xurl}}" data-title="查看媒体">查看</a></div>').render(d);
-                        } else {
-                            return laytpl('<div><a target="_blank" href="{{d.xurl}}">查看</a></div>').render(d);
                         }
+                        if (typeof d.mime === 'string' && /^video\//.test(d.mime)) {
+                            return laytpl('<div><a target="_blank" data-video-player="{{d.xurl}}" data-tips-text="播放视频"><i class="layui-icon layui-icon-video"></i></a></div>').render(d);
+                        }
+                        if (typeof d.mime === 'string' && /^audio\//.test(d.mime)) {
+                            return laytpl('<div><a target="_blank" data-video-player="{{d.xurl}}" data-tips-text="播放音频"><i class="layui-icon layui-icon-headset"></i></a></div>').render(d);
+                        }
+                        return laytpl('<div><a target="_blank" href="{{d.xurl}}"  data-tips-text="查看下载"><i class="layui-icon layui-icon-file"></i></a></div>').render(d);
                     }
                 },
                 {

public/static/admin.js

@@ -50,6 +50,7 @@ require.config({
         'echarts': ['plugs/echarts/echarts.min'],
         'ckeditor4': ['plugs/ckeditor4/ckeditor'],
         'ckeditor5': ['plugs/ckeditor5/ckeditor'],
+        'artplayer': ['plugs/jquery/artplayer.min'],
         'filesaver': ['plugs/jquery/filesaver.min'],
         'websocket': ['plugs/socket/websocket'],
         'compressor': ['plugs/jquery/compressor.min'],
@@ -908,6 +909,25 @@ $(function () {
         })
     });
 
+    /*! 注册 data-video-player 事件行为 */
+    onEvent('click', '[data-video-player]', function () {
+        let idx = $.msg.loading(), url = this.dataset.videoPlayer, name = this.dataset.title || '媒体播放器', payer;
+        require(['artplayer'], function () {
+            layer.open({
+                title: name, type: 1, fixed: true, maxmin: false, content: '<div class="data-play-video" style="width:800px;height:450px"></div>',
+                end: () => payer.destroy(), success: ($ele) => {
+                    payer = new Artplayer({
+                        url: url, container: $ele.selector + ' .data-play-video', controls: [
+                            {html: '全屏播放', position: 'right', click: () => payer.fullscreen = !payer.fullscreen},
+                        ],
+                    });
+                    payer.on('ready', () => (payer.autoHeight = payer.autoSize = true) && payer.play());
+                    $.msg.close(idx);
+                }
+            });
+        });
+    });
+
     /*! 注册 data-icon 事件行为 */
     onEvent('click', '[data-icon]', function () {
         var location = tapiRoot + '/api.plugs/icon', field = this.dataset.icon || this.dataset.field || 'icon';

public/static/theme/css/_custom.less

@@ -887,10 +887,12 @@ input:not(.layui-hide,[type=hidden]) {
   margin-right: 10px;
 
   > div {
-    right: 0;
+    top: 4px;
+    left: 50%;
     display: none;
     position: absolute;
-    text-align: right;
+    white-space: nowrap;
+    margin-left: -33px;
 
     a {
       color: #EEE;