feat: 支持公共素材文件

Author: modstart

public/asset/entry/basic.js

@@ -69,14 +69,14 @@
                     <div class="action">
                         <a v-if="permission['Delete']"
                            href="javascript:;" :title="L('Delete')"
-                           :class="{active:listChecked.length>0}"
+                           :class="{active:activeFileOperate}"
                            @click="doFileDelete">
                             <i class="iconfont icon-trash"></i>
                             {{ L('Delete') }}
                         </a>
                         <a v-if="permission['Add/Edit']"
                            href="javascript:;" :title="L('Edit')"
-                           :class="{active:listChecked.length>0}"
+                           :class="{active:activeFileOperate}"
                            @click="doFileEdit">
                             <i class="iconfont icon-sign"></i>
                             {{ L('Edit') }}
@@ -284,20 +284,22 @@ export default {
     watch: {
         categoryFilter(val) {
             this.$refs.$categoryTreeAll.filter(val)
-        }
+        },
     },
     computed: {
         apiUrl() {
             return this.url + '/' + this.category
         },
         listChecked() {
-            return this.records.filter(o => o.checked
-            )
+            return this.records.filter(o => o.checked)
         },
         listCheckedIds() {
             return this.listChecked.map(o => o.id
             )
-        }
+        },
+        activeFileOperate() {
+            return this.listChecked.length > 0 && this.listChecked.filter(f => f.id > 0).length === this.listChecked.length
+        },
     },
     mounted() {
         if ('flat' === this.mode) {
@@ -340,6 +342,9 @@ export default {
             Dialog.tipError(this.L('Select %d item(s) at most', this.max))
         },
         doFileEdit() {
+            if (!this.activeFileOperate) {
+                return
+            }
             this.fileEdit.categoryId = this.currentCategoryId
             this.fileVisible = true
         },
@@ -362,13 +367,12 @@ export default {
             })
         },
         doFileDelete() {
-            const ids = this.listCheckedIds;
-            if (ids.length === 0) {
+            if (!this.activeFileOperate || !this.listCheckedIds.length) {
                 return;
             }
             Dialog.confirm(this.L('Confirm Delete ?'), () => {
                 Dialog.loadingOn()
-                this.$api.post(this.apiUrl, JsonUtil.extend({id: ids.join(',')}, {action: 'fileDelete'}), res => {
+                this.$api.post(this.apiUrl, JsonUtil.extend({id: this.listCheckedIds.join(',')}, {action: 'fileDelete'}), res => {
                     Dialog.loadingOff()
                     Dialog.tipSuccess(this.L('Delete Success'))
                     this.doList(1)

public/asset/entry/dataFileManager.js

@@ -12,10 +12,16 @@
 
 class CRUDUtil
 {
-    public static function copyId()
+    public static function copyId($defaultValue = null)
     {
         $input = InputPackage::buildFromInput();
-        return $input->getInteger('_copyId');
+        return $input->getInteger('_copyId', $defaultValue);
+    }
+
+    public static function scope($defaultValue = null)
+    {
+        $input = InputPackage::buildFromInput();
+        return $input->getTrimString('_scope', $defaultValue);
     }
 
     public static function id()

vendor/modstart/modstart/asset/entry/basic.js

@@ -6,6 +6,7 @@
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Str;
 use ModStart\Core\Assets\AssetsUtil;
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Exception\BizException;
@@ -18,6 +19,7 @@
 use ModStart\Core\Util\TreeUtil;
 use ModStart\Data\Event\DataUploadedEvent;
 use ModStart\Data\Event\DataUploadingEvent;
+use ModStart\Data\Support\FileManagerProvider;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class FileManager
@@ -296,7 +298,21 @@ private static function listExecute(InputPackage $input, $category, $uploadTable
     {
         $page = $input->getPage();
         $pageSize = $input->getPageSize(null, null, null, 24);
-        $categoryId = $input->getInteger('categoryId');
+        $categoryId = $input->getTrimString('categoryId');
+        if (Str::startsWith($categoryId, ':')) {
+            $pcs = explode(':', $categoryId);
+            BizException::throwsIf('Unsupported category id', count($pcs) < 2);
+            $provider = FileManagerProvider::getByName($pcs[1]);
+            BizException::throwsIfEmpty('provider not found', $provider);
+            $categoryId = (isset($pcs[2]) ? trim($pcs[2]) : null);
+            return $provider->listExecute($category, $categoryId, [
+                'uploadTable' => $uploadTable,
+                'uploadCategoryTable' => $uploadCategoryTable,
+                'userId' => $userId,
+                'option' => $option,
+            ]);
+        }
+        $categoryId = intval($categoryId);
         $option = [];
         $option['order'] = ['id', 'desc'];
         $option['where'] = ['userId' => $userId, 'category' => $category];
@@ -405,6 +421,17 @@ private static function categoryExecute(InputPackage $input, $category, $uploadT
                 'id' => -1,
             ]
         ];
+        foreach (FileManagerProvider::listAll() as $provider) {
+            $categoryTree = $provider->getCategoryTree($category, [
+                'uploadTable' => $uploadTable,
+                'uploadCategoryTable' => $uploadCategoryTable,
+                'userId' => $userId,
+                'option' => $option,
+            ]);
+            if (!empty($categoryTree)) {
+                $categoryTreeAll[] = $categoryTree;
+            }
+        }
         $categoryListParent = TreeUtil::treeToListWithIndent($categoryTreeParent, 'id', 'name');
         $categoryListAll = TreeUtil::treeToListWithIndent($categoryTreeAll, 'id', 'name');
         return Response::jsonSuccessData([

vendor/modstart/modstart/asset/entry/dataFileManager.js

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace ModStart\Data\Support;
+
+
+abstract class AbstractFileManager
+{
+    abstract public function name();
+
+    abstract public function title();
+
+    public function getCategoryTree($category, $param = [])
+    {
+        return null;
+    }
+
+    public function listExecute($category, $categoryId, $param = [])
+    {
+        return null;
+    }
+}

vendor/modstart/modstart/resources/asset/src/svue/components/DataSelector.vue

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace ModStart\Data\Support;
+
+
+use ModStart\Core\Provider\ProviderTrait;
+
+/**
+ * @method static AbstractFileManager[] listAll();
+ */
+class FileManagerProvider
+{
+    use ProviderTrait;
+
+    private static $list = [];
+}

vendor/modstart/modstart/src/Core/Util/CRUDUtil.php

@@ -18,9 +18,9 @@ trait HasScopeFilter
     /**
      * Set the scope filter.
      *
-     * @param string $name
-     * @param string $title
-     * @param Closure $callback function(ScopeFilter $filter){ $filter->where('userId','1'); }
+     * @param $name string
+     * @param $title string
+     * @param $callback \Closure function(ScopeFilter $filter){ $filter->where('userId','1'); }
      * @return $this
      */
     public function scopeFilter($name, $title, \Closure $callback = null)