模型基本雏形

This commit is contained in:
2017-06-19 00:09:18 +08:00
parent ac1e6a634f
commit 571b9841b1
13 changed files with 372 additions and 373 deletions

View File

@@ -46,7 +46,17 @@ class Attribute extends Admin {
* @author colin <colin@tensent.cn>
*/
public function index($model_id = null) {
$this->getAttributeList($model_id);
if (!$model_id) {
return $this->error('非法操作!');
}
$list = model('Attribute')->where('model_id', $model_id)->order('id desc')->paginate(25);
$data = array(
'list' => $list,
'model_id' => $model_id,
'page' => $list->render(),
);
$this->assign($data);
$this->setMeta('字段管理');
return $this->fetch();
}
@@ -55,19 +65,15 @@ class Attribute extends Admin {
* 创建字段
* @author colin <colin@tensent.cn>
*/
public function add() {
$model_id = input('model_id', '', 'trim,intval');
public function add($model_id = '') {
if (IS_POST) {
$result = $this->model->change();
if ($result) {
$result = $this->model->validate('attribute.add')->save($this->param);
if (false !== $result) {
return $this->success("创建成功!", url('Attribute/index', array('model_id' => $model_id)));
} else {
return $this->error($this->model->getError());
}
} else {
if (!$model_id) {
return $this->error('非法操作!');
}
$data = array(
'info' => array('model_id' => $model_id),
'fieldGroup' => $this->field,
@@ -82,16 +88,15 @@ class Attribute extends Admin {
* 编辑字段方法
* @author colin <colin@tensent.cn>
*/
public function edit() {
public function edit($id = '', $model_id = '') {
if (IS_POST) {
$result = $this->model->change();
$result = $this->model->validate('attribute.edit')->save($this->param, array('id'=>$id));
if ($result) {
return $this->success("修改成功!", url('Attribute/index', array('model_id' => $_POST['model_id'])));
return $this->success("修改成功!", url('Attribute/index', array('model_id' => $model_id)));
} else {
return $this->error($this->model->getError());
}
} else {
$id = input('id', '', 'trim,intval');
$info = db('Attribute')->find($id);
$data = array(
'info' => $info,
@@ -129,6 +134,7 @@ class Attribute extends Admin {
$model = model('Model')->where('id', $id)->find();
$result = $this->model->generate($model);
if (false !== $result) {
db('Model')->where('id', $id)->setField('table_status', 1);
return $this->success('生成成功!', url('admin/model/index'));
} else {
return $this->error($this->model->getError());
@@ -137,34 +143,7 @@ class Attribute extends Admin {
return $this->error('非法操作!');
}
}
public function insert(\think\Request $request) {
if (IS_POST) {
$model_id = $request->param('id');
$attr = db('Model')->where('id', $model_id)->value('attribute_list');
$attr = explode(',', $attr);
$post = $request->post();
$attribute = array_merge($attr, $post['id']);
$data = array(
'attribute_list' => implode(',', $attribute),
'table_status' => 2,
'status' => 0,
);
$result = db('Model')->where('id', $model_id)->update($data);
if (false !== $result) {
return $this->success('成功导入!');
}else{
return $this->error('导入失败!');
}
} else {
$this->getAttributeList();
$this->assign('id', $request->param('id'));
$this->setMeta('导入字段');
return $this->fetch();
}
}
//字段编辑所需字段
protected function getField() {
return array(
@@ -192,21 +171,4 @@ class Attribute extends Admin {
),
);
}
protected function getAttributeList($model_id = '') {
$map = array();
if ($model_id) {
$attribute = db('Model')->where('id', $model_id)->value('attribute_list');
$map['id'] = array('IN', $attribute);
}
$list = model('Attribute')->where($map)->order('id desc')->paginate(25);
$data = array(
'list' => $list,
'model_id' => $model_id,
'page' => $list->render(),
);
$this->assign($data);
}
}

View File

@@ -22,7 +22,7 @@ class Content extends Admin {
return $this->error("无此模型!");
} else {
$this->modelInfo = $list[$model_id];
$this->model = model('Content')->extend($this->modelInfo['name']);
$this->model = new \app\common\model\Content($this->modelInfo['name']);
}
$this->assign('model_id', $model_id);
@@ -44,7 +44,7 @@ class Content extends Admin {
$field = array_filter($grid_list['fields']);
$list = $this->model->lists($map, $order);
$list = $this->model->where($map)->order($order)->paginate($this->modelInfo['list_row']);
$data = array(
'grid' => $grid_list,
@@ -67,7 +67,7 @@ class Content extends Admin {
*/
public function add() {
if (IS_POST) {
$result = $this->model->change();
$result = $this->model->save($this->param);
if ($result) {
return $this->success("添加成功!", url('admin/content/index', array('model_id' => $this->modelInfo['id'])));
} else {
@@ -98,7 +98,7 @@ class Content extends Admin {
*/
public function edit($id) {
if (IS_POST) {
$result = $this->model->change();
$result = $this->model->save($this->param, array('id'=> $id));
if ($result !== false) {
return $this->success("更新成功!", url('admin/content/index', array('model_id' => $this->modelInfo['id'])));
} else {
@@ -108,7 +108,7 @@ class Content extends Admin {
if (!$id) {
return $this->error("非法操作!");
}
$info = $this->model->detail($id);
$info = $this->model->find($id);
if (!$info) {
return $this->error($this->model->getError());
}
@@ -186,16 +186,9 @@ class Content extends Admin {
* @author molong <ycgpp@126.com>
*/
protected function getField() {
$field_group = parse_config_attr($this->modelInfo['field_group']);
$field_sort = json_decode($this->modelInfo['field_sort'], true);
$field_group = parse_config_attr($this->modelInfo['attribute_group']);
if ($this->modelInfo['extend'] > 1) {
$map['model_id'] = $this->modelInfo['id'];
} else {
$model_id[] = $this->modelInfo['id'];
$model_id[] = 1;
$map['model_id'] = array('IN', $model_id);
}
$map['model_id'] = $this->modelInfo['id'];
if ($this->request->action() == 'add') {
$map['is_show'] = array('in', array('1', '2'));
} elseif ($this->request->action() == 'edit') {
@@ -204,30 +197,13 @@ class Content extends Admin {
//获得数组的第一条数组
$first_key = array_keys($field_group);
$fields = model('Attribute')->getFieldlist($map);
if (!empty($field_sort)) {
foreach ($field_sort as $key => $value) {
foreach ($value as $index) {
if (isset($fields[$index])) {
$groupfield[$key][] = $fields[$index];
unset($fields[$index]);
}
}
$rows = model('Attribute')->where($map)->order('group_id asc, sort asc')->select();
if (!empty($rows)) {
foreach ($rows as $key => $value) {
$fields[$field_group[$value['group_id']]][] = $value;
}
}
//未进行排序的放入第一组中
$fields[] = array('name' => 'model_id', 'type' => 'hidden'); //加入模型ID值
$fields[] = array('name' => 'id', 'type' => 'hidden'); //加入模型ID值
foreach ($fields as $key => $value) {
$groupfield[$first_key[0]][] = $value;
}
foreach ($field_group as $key => $value) {
if ($groupfield[$key]) {
$data[$value] = $groupfield[$key];
}
}
return $data;
return $fields;
}
/**
@@ -253,6 +229,9 @@ class Content extends Admin {
if (isset($map['page'])) {
unset($map['page']);
}
if (isset($map['model_id'])) {
unset($map['model_id']);
}
$this->assign($data);
return $map;
}

View File

@@ -49,6 +49,8 @@ class Model extends Admin {
if (IS_POST) {
$result = $this->model->validate('Model.add')->save($request->post());
if (false !== $result) {
//记录行为
action_log('add_model', 'model', $result, session('auth_user.uid'));
$this->success('创建成功!', url('admin/model/index'));
}else{
return $this->error($this->model->getError());
@@ -67,6 +69,8 @@ class Model extends Admin {
if (IS_POST) {
$result = $this->model->validate('Model.edit')->save($request->post(), array('id'=>$request->post('id')));
if (false !== $result) {
//记录行为
action_log('update_model', 'model', $request->post('id'), session('auth_user.uid'));
$this->success('更新成功!', url('admin/model/index'));
}else{
return $this->error($this->model->getError());
@@ -75,31 +79,11 @@ class Model extends Admin {
$info = $this->model->where('id', $request->param('id'))->find();
//获取字段列表
if ($info['attribute_list']) {
$fields = model('Attribute')->where('id', 'IN', $info['attribute_list'])->where('is_show', 1)->select();
$rows = db('Attribute')->where('model_id', $request->param('id'))->where('is_show', 1)->order('group_id asc, sort asc')->select();
if ($rows) {
// 梳理属性的可见性
foreach ($fields as $key => $field) {
$field['group'] = -1;
$field['sort'] = 0;
$fields_tem[$field['id']] = $field->toArray(); //数据对象转换为数组
}
// 获取模型排序字段
$field_sort = json_decode($info['attribute_sort'], true);//dump($field_sort);exit();
if (!empty($field_sort)) {
foreach ($field_sort as $group => $ids) {
foreach ($ids as $key => $value) {
if (!empty($fields_tem[$value])) {
$fields_tem[$value]['group'] = $group;
$fields_tem[$value]['sort'] = $key;
}
}
}
}
if (isset($fields_tem) && $fields_tem) {
// 模型字段列表排序
$fields = list_sort_by($fields_tem, "sort");
foreach ($rows as $key => $field) {
$fields[$field['group_id']][] = $field;
}
}else{
$fields = array();