作者 李宇航

合并分支 'master-lyh-edit' 到 'master'

可视化操作记录



查看合并请求 !545
... ... @@ -34,7 +34,7 @@ class BTemplateLogController extends BaseController
*/
public function lists(BTemplateLog $bTemplateLog){
// unset($this->map['template_id']);
$this->map['project_id'] = $this->user['project_id'];
$this->map['source'] = 1;
$this->map['is_custom'] = 0;
$lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
... ... @@ -53,6 +53,38 @@ class BTemplateLogController extends BaseController
}
/**
* @remark :根据页面数据ID获取当前数据的装修记录
* @name :getSourceLogLists
* @author :lyh
* @method :post
* @time :2024/5/15 9:12
*/
public function getSourceLogLists(BTemplateLog $bTemplateLog){
$this->request->validate([
'source'=>['required'],
'source_id'=>['required'],
],[
'source'=>'对应数据类型不能为空',
'source_id.required' => '当前数据ID不能为空',
]);
$is_custom = $this->param['is_custom'] ?? 0;
$this->map = ['source'=>$this->param['source'],'source_id'=>$this->param['source_id'],'is_custom'=>$is_custom,'project_id'=>$this->user['project_id']];
$lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
if(!empty($lists['list'])){
$templateModel = new Template();
$userModel = new User();
foreach ($lists['list'] as $k => $v){
if(!empty($v['template_id'])){
$v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
}
$v['operator_name'] = $userModel->getName($v['operator_id']);
$lists['list'][$k] = $v;
}
}
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @remark :获取数据详情
* @name :info
* @author :lyh
... ...
... ... @@ -71,7 +71,7 @@ class CustomTemplateLogic extends BaseLogic
if($is_upgrade == 0 || $six_read == 1) {
$this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
if($this->param['url'] == 'news' || $this->param['url'] == 'product' || $this->param['url'] == 'blog'){
$this->fail('不允许创建'.$this->param['news']);
$this->fail('不允许创建'.$this->param['url']);
}
}
$this->editCustomRoute($this->param['url']);
... ...
... ... @@ -381,6 +381,7 @@ Route::middleware(['bloginauth'])->group(function () {
Route::prefix('log')->group(function () {
//获取所有左侧模版
Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'lists'])->name('template_log_lists');
Route::any('/getSourceLogLists', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'getSourceLogLists'])->name('template_log_getSourceLogLists');
Route::any('/info', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'info'])->name('template_log_info');
Route::any('/rollbackVersion', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'rollbackVersion'])->name('template_log_rollbackVersion');
});
... ...