gx

@@ -47,7 +47,7 @@ class FileController extends BaseController
      * @time 2023/5/29 11:42
      * @time 2023/5/29 11:42
      */
      */
     public function lists(){
     public function lists(){
-        $files = Upload::lists($this->param['config'] ?? 'default');
+        $files = Upload::lists($this->param['config'] ?? 'default',['png','jpg','jpeg','gif']);
         return $this->success($files);
         return $this->success($files);
     }
     }
 
 

@@ -144,6 +144,31 @@ class TemplateController extends BaseController
         TemplateLogic::instance()->save($data);
         TemplateLogic::instance()->save($data);
         return $this->response('保存成功');
         return $this->response('保存成功');
 
 
+        // 不需要数据id
+        if(in_array($data['data_source'],['index'])){
+            $data['data_source_id'] = 0;
+        }
+        unset($data['source']);
+        unset($data['source_id']);
+        $id = TemplateLogic::instance()->save($data);
+        if($id){
+            $info = TemplateLogic::instance()->getInfo($id['id']);
+            $info['source'] = $info['data_source'];
+            $info['source_id'] = $info['data_source_id'];
+            unset($info['data_source']);
+            unset($info['data_source_id']);
+            unset($info['template_id']);
+            unset($info['created_at']);
+            unset($info['updated_at']);
+            unset($info['css']);
+            unset($info['script']);
+            unset($info['data_ext']);
+
+            return $this->success($info,Code::SUCCESS,'保存成功');
+        }
+
+        return $this->response('保存失败',Code::SYSTEM_ERROR);
+
     }
     }
 
 
     /**
     /**

@@ -37,9 +37,11 @@ class TemplateLogic extends  BaseLogic
         $data = $this->first($param['data_source'],$param['data_source_id']);
         $data = $this->first($param['data_source'],$param['data_source_id']);
         if($data){
         if($data){
             $param['id'] = $data['id'];
             $param['id'] = $data['id'];
+        }else{
+            $param['template_id'] = BSetting::_get($this->user['project_id'])['template_id'];
         }
         }
 
 
-        parent::save($param);
+        return parent::save($param);
 
 
     }
     }
 
 
@@ -83,7 +85,7 @@ class TemplateLogic extends  BaseLogic
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'data_source'  =>  $source,
             'data_source'  =>  $source,
             'data_source_id'  =>  $source_id,
             'data_source_id'  =>  $source_id,
-            'template_id'   => BSetting::_get($this->user['project_id'])
+            'template_id'   => BSetting::_get($this->user['project_id'])['template_id']
         ])->first();
         ])->first();
     }
     }
 
 

@@ -44,7 +44,10 @@ class TemplateChunkRequest extends FormRequest
         ];
         ];
 
 
         // 更新场景
         // 更新场景
-        if(!$this->is('a/template/chunk/update')){
+        if($this->is('a/template/chunk/create')){
+            unset($rule['id']);
+        }
+        if($this->is('b/template/chunk/create')){
             unset($rule['id']);
             unset($rule['id']);
         }
         }
 
 

@@ -43,7 +43,7 @@ class TemplateRequest extends FormRequest
 
 
 
 
         // 删除
         // 删除
-        if(!$this->is('b/template/status')){
+        if($this->is('b/template/status')){
             unset($rule['css']);
             unset($rule['css']);
             unset($rule['script']);
             unset($rule['script']);
             unset($rule['html']);
             unset($rule['html']);

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Facade;
  * @method static array filePut(string $filename, string $content, string|array $config="default")
  * @method static array filePut(string $filename, string $content, string|array $config="default")
  * @method static string url2path(string $url, string|array $disk="upload")
  * @method static string url2path(string $url, string|array $disk="upload")
  * @method static string path2url(string $path, string|array $disk="upload")
  * @method static string path2url(string $path, string|array $disk="upload")
- * @method static array lists(string $config)
+ * @method static array lists(string $config,array $ext=[])
  */
  */
 class Upload extends Facade
 class Upload extends Facade
 {
 {

@@ -279,8 +279,26 @@ class UploadService extends BaseService
      * @author：dc
      * @author：dc
      * @time 2023/5/29 11:49
      * @time 2023/5/29 11:49
      */
      */
-    public function lists($config){
+    public function lists($config,array $ext=[]){
         $this->config($config);
         $this->config($config);
-        return Storage::disk($this->config['disk'])->allFiles();
+        $disk = Storage::disk($this->config['disk']);
+        $lists = $disk->allFiles();
+
+
+        if($ext){
+            foreach ($lists as $k=>$list){
+                $list = explode('.',$list);
+                if(!in_array(end($list),$ext)){
+                    unset($lists[$k]);
+
+                }else{
+                    $lists[$k] = $disk->url($lists[$k]);
+                }
+
+            }
+        }
+
+
+        return $lists;
     }
     }
 }
 }

@@ -233,13 +233,16 @@ Route::middleware(['bloginauth','accesstoken'])->group(function () {
 //        Route::get('/custom-chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'customChunk'])->name('bside_template_custom_chunk');
 //        Route::get('/custom-chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'customChunk'])->name('bside_template_custom_chunk');
         Route::get('/get_type', [\App\Http\Controllers\Bside\TemplateController::class, 'get_type'])->name('bside_template_type');
         Route::get('/get_type', [\App\Http\Controllers\Bside\TemplateController::class, 'get_type'])->name('bside_template_type');
         Route::get('/get_html', [\App\Http\Controllers\Bside\TemplateController::class, 'get_html'])->name('bside_template_get_html');
         Route::get('/get_html', [\App\Http\Controllers\Bside\TemplateController::class, 'get_html'])->name('bside_template_get_html');
-        Route::get('/save_html', [\App\Http\Controllers\Bside\TemplateController::class, 'save_html'])->name('bside_template_save_html');
+        Route::post('/save_html', [\App\Http\Controllers\Bside\TemplateController::class, 'save_html'])->name('bside_template_save_html');
         Route::get('/status', [\App\Http\Controllers\Bside\TemplateController::class, 'status'])->name('bside_template_status');
         Route::get('/status', [\App\Http\Controllers\Bside\TemplateController::class, 'status'])->name('bside_template_status');
 
 
 
 
         // 自定义模板的 块。
         // 自定义模板的 块。
         Route::get('/chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'chunk'])->name('bside_template_chunk');
         Route::get('/chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'chunk'])->name('bside_template_chunk');
 
 
+        Route::post('/chunk/create', [\App\Http\Controllers\Aside\TemplateController::class, 'chunk_save'])->name('admin.template.chunk_create');
+        Route::post('/chunk/update', [\App\Http\Controllers\Aside\TemplateController::class, 'chunk_save'])->name('admin.template.chunk_update');
+        Route::delete('/chunk/delete/{chunk_id}', [\App\Http\Controllers\Aside\TemplateController::class, 'chunk_delete'])->where('chunk_id','\d+')->name('admin.template.chunk_delete');
 
 
 
 
     });
     });