内容模型功能完成

This commit is contained in:
2020-04-01 22:20:11 +08:00
parent 85d33da0d4
commit 9dafceb2eb
32 changed files with 415 additions and 339 deletions

View File

@@ -44,18 +44,16 @@ class Model extends Base {
* @title 新增模型
* @author huajie <banhuajie@163.com>
*/
public function add(\think\Request $request) {
public function add(ModelM $model) {
if ($this->request->isPost()) {
$result = $this->model->validate('Model.add')->save($request->post());
$data = $this->request->post();
$result = $model->save($data);
if (false !== $result) {
//记录行为
action_log('add_model', 'model', $result, session('auth_user.uid'));
$this->success('创建成功!', url('admin/model/index'));
$this->success('创建成功!', url('/admin/model/index'));
} else {
return $this->error($this->model->getError() ? $this->model->getError() : '模型标识为保留名称');
return $this->error('创建失败');
}
} else {
$this->setMeta('新增模型');
return $this->fetch();
}
}
@@ -64,22 +62,22 @@ class Model extends Base {
* @title 编辑模型
* @author molong <molong@tensent.cn>
*/
public function edit(\think\Request $request) {
public function edit(ModelM $model) {
if ($this->request->isPost()) {
$result = $this->model->validate('Model.edit')->save($request->post(), array('id' => $request->post('id')));
$data = $this->request->post();
$result = $model->exists(true)->save($data);
if (false !== $result) {
//记录行为
action_log('update_model', 'model', $request->post('id'), session('auth_user.uid'));
$this->success('更新成功!', url('admin/model/index'));
$this->success('更新成功!', url('/admin/model/index'));
} else {
return $this->error($this->model->getError());
return $this->error('修改失败');
}
} else {
$info = ModelM::find($request->param('id'));
$info = ModelM::find($this->request->param('id'));
$field_group = parse_config_attr($info['attribute_group']);
//获取字段列表
$rows = Attribute::where('model_id', $request->param('id'))->where('is_show', 1)->order('group_id asc, sort asc')->select();
$rows = Attribute::where('model_id', $this->request->param('id'))->where('is_show', 1)->order('group_id asc, sort asc')->select();
if ($rows) {
// 梳理属性的可见性
foreach ($rows as $key => $field) {
@@ -105,11 +103,17 @@ class Model extends Base {
* @author huajie <banhuajie@163.com>
*/
public function del() {
$result = $this->model->del();
$id = $this->request->param('id', 0);
if (!$id) {
return $this->error('非法操作!');
}
$result = ModelM::find($id)->delete();
if ($result) {
return $this->success('删除模型成功!');
} else {
return $this->error($this->mdoel->getError());
return $this->error('删除失败!');
}
}
@@ -126,24 +130,23 @@ class Model extends Base {
* @title 更新数据
* @author colin <colin@tensent.cn>
*/
public function status(\think\Request $request) {
$map['id'] = $request->param('id');
public function status() {
$id = $this->request->param('id', 0);
$status = $this->request->param('status', 0);
$data['status'] = $request->param('status');
if (null == $map['id'] || null == $data['status']) {
return $this->error('参数不正确!');
if (!$id) {
return $this->error('非法操作!');
}
$model = ModelM::where('id', $id)->find();
$model = $this->model->where($map)->find();
if ($model['list_grid'] == '' && $data['status'] == 1) {
if ($model['list_grid'] == '' && $status == 1) {
return $this->error('模型列表未定义');
}
$result = $this->model->where($map)->update($data);
$result = ModelM::update(['status' => $status], ['id'=>$id]);
if (false !== $result) {
return $this->success('状态设置成功!');
} else {
return $this->error($this->model->getError());
return $this->error('操作失败!');
}
}
}