diff --git a/application/common/model/Attribute.php b/application/common/model/Attribute.php
index 415c9eee..c7d53100 100644
--- a/application/common/model/Attribute.php
+++ b/application/common/model/Attribute.php
@@ -59,7 +59,7 @@ class Attribute extends Base{
public function getFieldlist($map,$index='id'){
$list = array();
- $row = db('Attribute')->field('*,remark as help,type,extra as "option"')->where($map)->select();
+ $row = db('Attribute')->field('*,remark as help,type,extra as "option"')->where($map)->order('group_id asc, sort asc')->select();
foreach ($row as $key => $value) {
if (in_array($value['type'],array('checkbox','radio','select','bool'))) {
$value['option'] = parse_field_attr($value['extra']);
diff --git a/application/common/model/Model.php b/application/common/model/Model.php
index 275afbc4..c4d89461 100644
--- a/application/common/model/Model.php
+++ b/application/common/model/Model.php
@@ -15,7 +15,7 @@ namespace app\common\model;
class Model extends Base {
protected $auto = ['update_time'];
- protected $insert = ['name', 'create_time', 'status' => 1, 'list_grid'=>'id:ID'];
+ protected $insert = ['name', 'create_time', 'status' => 1, 'list_grid'=>"id:ID\r\ntitle:标题\r\ncreate_time:添加时间|time_format\r\nupdate_time:更新时间|time_format"];
protected $type = array(
'id' => 'integer',
'create_time' => 'integer',
@@ -32,7 +32,22 @@ class Model extends Base {
if (!$db->CheckTable($tablename)) {
//创建新表
return $db->initTable($tablename, $data['title'], 'id')->query();
- };
+ }else{
+ return false;
+ }
+ });
+ self::afterInsert(function($event){
+ $data = $event->toArray();
+ if ($data['is_doc']) {
+ $fields = include(APP_PATH.'admin/fields.php');
+ if (!empty($fields)) {
+ foreach ($fields as $key => $value) {
+ $fields[$key]['model_id'] = $data['id'];
+ }
+ model('Attribute')->saveAll($fields);
+ }
+ }
+ return true;
});
self::beforeUpdate(function($event){
$data = $event->toArray();
@@ -76,12 +91,13 @@ class Model extends Base {
$db = new \com\Datatable();
if ($db->CheckTable($tablename)) {
//检测表是否存在
- $result = $db->del_table($tablename)->query();
+ $result = $db->delTable($tablename)->query();
if (!$result) {
return false;
$this->error = "数据表删除失败！";
}
}
+ db('Attribute')->where('model_id', $id)->delete(); //删除字段信息
$result = $this->where('id', $id)->delete();
if ($result) {
return true;
diff --git a/application/common/validate/Attribute.php b/application/common/validate/Attribute.php
index aeaf1f99..8f2f34c4 100644
--- a/application/common/validate/Attribute.php
+++ b/application/common/validate/Attribute.php
@@ -20,7 +20,6 @@ class Attribute extends Base {
'type' => 'require',
'length' => 'requireIn:type,textarea,editor|integer',
'remark' => 'require',
- 'value' => 'requireIf:is_must,1'
);
protected $message = array(
@@ -30,7 +29,6 @@ class Attribute extends Base {
'title.require' => '字段标题不能为空！',
'type.require' => '类型不能为空！',
'remark.require' => '描述不能为空！',
- 'value' => '必填字段默认值必须！'
);
protected $scene = array(
diff --git a/application/index/controller/Content.php b/application/index/controller/Content.php
index 45d96739..100f80e5 100644
--- a/application/index/controller/Content.php
+++ b/application/index/controller/Content.php
@@ -58,20 +58,21 @@ class Content extends Fornt {
}
$cate = $this->getCategory($id);
-
- if ($this->modelInfo['extend'] == 1) {
- //获得当前栏目的所有子栏目
+ $map = array();
+ $attr = db('Attribute')->where('model_id', $this->modelInfo['id'])->column('name');
+ if (in_array('category_id', $attr)) {
$ids = get_category_child($id);
$map['category_id'] = array('IN', $ids);
- $map['model_id'] = $this->modelInfo['id'];
+ }
+ if (in_array('status', $attr)) {
$map['status'] = array('GT', 0);
}
-
- if ($this->modelInfo['extend'] > 1) {
- $order = "id desc";
- } else {
+ if (in_array('is_top', $attr)) {
$order = "is_top desc,id desc";
+ }else{
+ $order = "id desc";
}
+
$list = $this->model->where($map)->order($order)->paginate(15);
$data = array(
diff --git a/core/extend/com/Datatable.php b/core/extend/com/Datatable.php
index b2090fe3..1b6b98a5 100644
--- a/core/extend/com/Datatable.php
+++ b/core/extend/com/Datatable.php
@@ -60,24 +60,13 @@ class Datatable {
* @param string $table 表名
* @return void 空
*/
- public function initTable($table = '', $comment = '', $pk = '', $time = true) {
+ public function initTable($table = '', $comment = '', $pk = 'id') {
$this->table = $this->getTablename($table, true);
- if ($pk) {
- $sql[] = $this->generateField('id', 'int', 11, '', '主键', true);
- }
- if ($time) {
- //初始化表内含创建时间和更新时间两个字段
- $sql[] = $this->generateField('create_time', 'int', 11, 0, '创建时间', false);
- $sql[] = $this->generateField('update_time', 'int', 11, 0, '创建时间', false);
- }
+ $sql = $this->generateField($pk, 'int', 11, '', '主键', true);
$primary = $pk ? "PRIMARY KEY (`" . $pk . "`)" : '';
- if ($primary) {
- $generatesql = implode(',', $sql) . ',';
- } else {
- $generatesql = implode(',', $sql);
- }
+ $generatesql = $sql . ',';
$create = "CREATE TABLE IF NOT EXISTS `" . $this->table . "`("
. $generatesql
@@ -122,7 +111,7 @@ class Datatable {
$field_attr['length'] = "";
}
$field_attr['is_null'] = $attr['is_must'] ? 'NOT NULL' : 'NULL';
- $field_attr['default'] = $attr['value'] != '' ? 'DEFAULT "' . $attr['default'] . '"' : 'DEFAULT null';
+ $field_attr['default'] = $attr['value'] != '' ? 'DEFAULT "' . $attr['value'] . '"' : '';
$field_attr['comment'] = (isset($attr['remark']) && $attr['remark']) ? $attr['remark'] : $attr['title'];
$field_attr['after'] = (isset($attr['after']) && $attr['after']) ? ' AFTER `' . $attr['after'] . '`' : ' AFTER `id`';
diff --git a/template/default/content/article/detail.html b/template/default/content/article/detail.html
index 60f001c2..43f7d70b 100644
--- a/template/default/content/article/detail.html
+++ b/template/default/content/article/detail.html
@@ -14,7 +14,7 @@
{$info['title']}
发布时间：{$info['create_time']|date='Y-m-d H:i:s',###}
- 访问量：{$info['view']}
+ 访问量：{$info['view']|default=0}
diff --git a/template/default/content/article/list.html b/template/default/content/article/list.html
index 44cb213c..b6c3a3e6 100644
--- a/template/default/content/article/list.html
+++ b/template/default/content/article/list.html
@@ -22,14 +22,14 @@