diff --git a/app/controller/admin/Content.php b/app/controller/admin/Content.php index 0ebe952f..61b7444a 100644 --- a/app/controller/admin/Content.php +++ b/app/controller/admin/Content.php @@ -66,7 +66,12 @@ class Content extends Base { */ public function add() { if ($this->request->isPost()) { - $result = $this->model->save($this->request->post()); + $data = $this->request->post(); + $data['create_time'] = time(); + $data['update_time'] = time(); + $data['uid'] = session('userInfo.uid'); + + $result = $this->model->save($data); if ($result) { return $this->success("添加成功！", url('/admin/'.$this->modelInfo['name'].'/index')); } else { @@ -98,7 +103,10 @@ class Content extends Base { */ public function edit($id) { if ($this->request->isPost()) { - $result = $this->model->save($this->request->post()); + $data = $this->request->post(); + $data['update_time'] = time(); + + $result = $this->model->save($data); if ($result !== false) { return $this->success("更新成功！", url('/admin/'.$this->modelInfo['name'].'/index')); } else { diff --git a/app/controller/admin/Form.php b/app/controller/admin/Form.php index 8b93cc7d..832bed4f 100644 --- a/app/controller/admin/Form.php +++ b/app/controller/admin/Form.php @@ -8,6 +8,7 @@ // +---------------------------------------------------------------------- namespace app\controller\admin; +use think\facade\Db; use app\model\Form as FormM; use app\model\FormAttr; @@ -17,6 +18,15 @@ use app\model\FormAttr; */ class Form extends Base { + public $modelInfo = []; + public $model = null; + + public function initialize() { + parent::initialize(); + $this->modelInfo = FormM::where('id', $this->request->param('form_id'))->find(); + $this->model = Db::name('Form'.ucfirst($this->modelInfo['name'])); + } + /** * @title 表单列表 */ @@ -78,10 +88,15 @@ class Form extends Base { * @title 删除表单 */ public function del() { - $id = $this->getArrayParam('id'); - $result = false; - if (false !== $result) { - return $this->success('删除成功！'); + $id = $this->request->param('id', 0); + + if (!$id) { + return $this->error('非法操作！'); + } + + $result = FormM::find($id)->delete(); + if ($result) { + return $this->success('删除模型成功！'); } else { return $this->error('删除失败！'); } @@ -95,18 +110,17 @@ class Form extends Base { * @return html 页面 */ public function lists($form_id = '') { - $form = $this->model->where('id', $form_id)->find(); + $form = $this->modelInfo; - $list = M($form['name'], 'form')->order('id desc')->paginate(25); + $list = $this->model->order('id desc')->paginate(25); - $data = array( + $this->data = array( + 'meta_title' => $this->modelInfo['title'] . '列表', 'form_id' => $form_id, 'list' => $list, 'page' => $list->render() ); - $this->assign($data); - $this->setMeta('数据列表'); - return $this->fetch('list_'.$form['name']); + return $this->fetch(); } /** diff --git a/app/http/form/template/select.html b/app/http/form/template/select.html index cb8b8d5c..bf45a346 100644 --- a/app/http/form/template/select.html +++ b/app/http/form/template/select.html @@ -1,4 +1,4 @@ - {volist name="option" id="item"} {/volist} diff --git a/app/model/Attribute.php b/app/model/Attribute.php index eedd4387..f6cf5279 100644 --- a/app/model/Attribute.php +++ b/app/model/Attribute.php @@ -166,6 +166,9 @@ class Attribute extends \think\Model { public static function getfieldList(){ $config = \think\facade\Cache::get('system_config_data'); + $time = [['key'=>1, 'label'=>'新增'],['key'=>2, 'label'=>'编辑'],['key'=>3, 'label'=>'始终']]; + $auto_type = [['key'=>'function', 'label'=>'函数'],['key'=>'field', 'label'=>'字段'],['key'=>'string', 'label'=>'字符串']]; + $validate_type = [['key'=>'thinkphp', 'label'=>'thinkphp内置'],['key'=>'regex', 'label'=>'正则验证']]; return [ '基础' => [ ['name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'], @@ -183,13 +186,13 @@ class Attribute extends \think\Model { ['name' => 'is_must', 'title' => '是否必填', 'help' => '用于自动验证', 'type' => 'select', 'option' => [['key'=>'0', 'label' => '否'], ['key'=>'1', 'label' => '是']]], ], '高级' => [ - ['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => [], 'help' => ''], - ['name' => 'validate_rule', 'title' => '验证规则', 'help' => '根据验证方式定义相关验证规则', 'type' => 'text'], + // ['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => $validate_type, 'help' => ''], + ['name' => 'validate_rule', 'title' => '验证规则', 'help' => '使用thinkphp内置验证规则，详情：https://www.kancloud.cn/manual/thinkphp6_0/1037629', 'type' => 'text'], ['name' => 'error_info', 'title' => '出错提示', 'type' => 'text', 'help' => ''], - ['name' => 'validate_time', 'title' => '验证时间', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => [], 'help' => ''], - ['name' => 'auto_type', 'title' => '自动完成方式', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => [], 'help' => ''], + ['name' => 'validate_time', 'title' => '验证时间', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => $time, 'help' => ''], + ['name' => 'auto_type', 'title' => '自动完成方式', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => $auto_type, 'help' => ''], ['name' => 'auto_rule', 'title' => '自动完成规则', 'help' => '根据完成方式订阅相关规则', 'type' => 'text'], - ['name' => 'auto_time', 'title' => '自动完成时间', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => []], + ['name' => 'auto_time', 'title' => '自动完成时间', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => $time], ], ]; } diff --git a/app/model/Form.php b/app/model/Form.php index ced7f6fe..ad55d638 100644 --- a/app/model/Form.php +++ b/app/model/Form.php @@ -10,9 +10,6 @@ namespace app\model; use think\facade\Config; -use phpspirit\dbskeleton\mysql\TableModel; -use phpspirit\dbskeleton\mysql\ColumnModel; -use phpspirit\dbskeleton\Factory; /** * 表单 @@ -28,85 +25,81 @@ class Form extends \think\Model { public $addField = [ ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''], ['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''], - ['name' => 'logo', 'title' => '显示Logo', 'type' => 'images', 'help' => ''], - ['name' => 'cover', 'title' => 'banner图片', 'type' => 'images', 'help' => ''], + ['name' => 'logo', 'title' => '显示Logo', 'type' => 'image', 'help' => ''], + ['name' => 'cover', 'title' => 'banner图片', 'type' => 'image', 'help' => ''], ['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''], + ['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''], ]; public $editField = [ ['name' => 'id', 'title' => 'ID', 'type' => 'hidden', 'help' => ''], // ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''], ['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''], - ['name' => 'logo', 'title' => '显示Logo', 'type' => 'images', 'help' => ''], - ['name' => 'cover', 'title' => 'banner图片', 'type' => 'images', 'help' => ''], + ['name' => 'logo', 'title' => '显示Logo', 'type' => 'image', 'help' => ''], + ['name' => 'cover', 'title' => 'banner图片', 'type' => 'image', 'help' => ''], ['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''], ['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''], ]; - public static function onAfterInsert($model){ - $data = $model->getData(); - $mysql = Config::get('database.connections.mysql'); - $tablemodel = (new TableModel())->setCharset('utf8mb4') //设置编码 - ->setEngine('MyISAM') //设置引擎 - ->setTablename($mysql['prefix'] . 'form_' . $data['name']) //设置表名 - ->setComment($data['title']); //表备注 - - $id = (new ColumnModel())->setType('int')->setLen(11)->setName('id')->setIsPk(true)->setIncrement(true)->setComment('自增长'); - - $dbskeleton = Factory::instance('mysql', $mysql['hostname'] . ':' . $mysql['hostport'], $mysql['database'], $mysql['username'], $mysql['password']); - $dbskeleton->createTable($tablemodel, [$id]); - - $dbskeleton->addColumn($tablemodel, (new ColumnModel())->setType('int')->setLen(11)->setName('create_time')->setIsPk(false)->setIncrement(false)->setComment('创建时间')); - $dbskeleton->addColumn($tablemodel, (new ColumnModel())->setType('int')->setLen(11)->setName('update_time')->setIsPk(false)->setIncrement(false)->setComment('更新时间')); + protected static function onBeforeInsert($data){ + if ($data['name'] && $data['title']) { + $db = new \com\Datatable(); + //检查表是否存在并创建 + if (!$db->CheckTable('form_' . $data['name'])) { + //创建新表 + return $db->initTable('form_' . $data['name'], $data['title'], 'id')->query(); + }else{ + return false; + } + }else{ + return false; + } } - // protected static function init() { - // self::beforeInsert(function ($event) { - // $data = $event->toArray(); - // $tablename = 'form_' . strtolower($data['name']); - // //实例化一个数据库操作类 - // $db = new \com\Datatable(); - // //检查表是否存在并创建 - // if (!$db->CheckTable($tablename)) { - // //创建新表 - // return $db->initTable($tablename, $data['title'], 'id')->query(); - // } else { - // return false; - // } - // }); - // self::afterInsert(function ($event) { - // $data = $event->toArray(); + public static function onAfterInsert($data){ + $data = $data->toArray(); + $fields = [ + 'uid' => ['name' => 'uid', 'title' => '用户UID', 'type' => 'num', 'length' => 11, 'extra' => '', 'remark' => '用户UID', 'is_show' => 0, 'is_must' => 1, 'value'=>'0'], + 'status' => ['name' => 'status', 'title' => '数据状态', 'type' => 'select', 'length' => 2, 'extra' => "0:禁用\r\n1:正常", 'remark' => '数据状态', 'is_show' => 1, 'is_must' => 1, 'value'=>'1'], + 'update_time' => ['name' => 'update_time', 'title' => '更新时间', 'type' => 'datetime', 'length' => 11, 'extra' => '', 'remark' => '更新时间', 'is_show' => 0, 'is_must' => 1, 'value'=>'0'], + 'create_time' => ['name' => 'create_time', 'title' => '添加时间', 'type' => 'datetime', 'length' => 11, 'extra' => '', 'remark' => '添加时间', 'is_show' => 0, 'is_must' => 1, 'value'=>'0'], + ]; + $result = false; + if (!empty($fields)) { + foreach ($fields as $key => $value) { + $fields[$key]['form_id'] = $data['id']; + } + $result = (new FormAttr())->saveAll($fields); + } + return $result; + } - // $fields = include (APP_PATH . 'admin/fields.php'); - // if (!empty($fields)) { - // foreach ($fields as $key => $value) { - // if (in_array($key, array('uid', 'status', 'view', 'create_time', 'update_time'))) { - // $fields[$key]['form_id'] = $data['id']; - // } else { - // unset($fields[$key]); - // } - // } - // model('FormAttr')->saveAll($fields); - // } - // return true; - // }); - // // self::beforeUpdate(function($event){ - // // $data = $event->toArray(); - // // if (isset($data['attribute_sort']) && $data['attribute_sort']) { - // // $attribute_sort = json_decode($data['attribute_sort'], true); + protected static function onAfterDelete($data){ + $data = $data->toArray(); + (new FormAttr())->where('form_id', $data['id'])->delete(); + $db = new \com\Datatable(); + $result = false; + if ($db->CheckTable('form_' . $data['name'])) { + $result = $db->delTable('form_' . $data['name'])->query(); + } + return $result; + } - // // if (!empty($attribute_sort)) { - // // foreach ($attribute_sort as $key => $value) { - // // db('FormAttr')->where('id', 'IN', $value)->setField('group_id', $key); - // // foreach ($value as $k => $v) { - // // db('FormAttr')->where('id', $v)->setField('sort', $k); - // // } - // // } - // // } - // // } - // // return true; - // // }); - // } + public function getGridListAttr($value, $data){ + $list = []; + if ($data['list_grid'] !== '') { + $row = explode(PHP_EOL, $data['list_grid']); + foreach ($row as $r) { + list($field, $title) = explode(":", $r); + $list[$field] = ['field' => $field, 'title' => $title]; + if (strrpos($title, "|")) { + $title = explode("|", $title); + $list[$field] = ['field' => $field, 'title' => $title[0], 'format' => $title[1]]; + } + } + } + return $list; + } public function getStatusTextAttr($value, $data) { $status = array( diff --git a/app/model/FormAttr.php b/app/model/FormAttr.php index c3aabb37..0d03e770 100644 --- a/app/model/FormAttr.php +++ b/app/model/FormAttr.php @@ -10,10 +10,6 @@ namespace app\model; use think\facade\Cache; use think\facade\Config; -use phpspirit\dbskeleton\mysql\TableModel; -use phpspirit\dbskeleton\mysql\ColumnModel; -use phpspirit\dbskeleton\Factory; -use Form as FormModel; /** * 设置模型 @@ -31,7 +27,7 @@ class FormAttr extends \think\Model{ $data = $data->toArray(); if ($data['form_id']) { $db = new \com\Datatable(); - $name = FormModel::where('id', $data['form_id'])->value('name'); + $name = Form::where('id', $data['form_id'])->value('name'); $data['after'] = self::where('name', '<>', $data['name'])->where('form_id', $data['form_id'])->order('sort asc, id desc')->value('name'); return $db->columField('form_' . strtolower($name), $data)->query(); } @@ -43,10 +39,10 @@ class FormAttr extends \think\Model{ protected static function onAfterUpdate($data){ $data = $data->toArray(); if (isset($data['form_id']) && isset($data['name'])) { - $tablename = FormModel::where('id', $data['form_id'])->value('name'); + $tablename = Form::where('id', $data['form_id'])->value('name'); //删除模型表中字段 $db = new \com\Datatable(); - if ($db->CheckField('form_' . $tablename, $data['name'])) { + if ($db->CheckField(strtolower('form_' . $tablename), $data['name'])) { $data['action'] = 'CHANGE'; } $data['after'] = self::where('name', '<>', $data['name'])->where('form_id', $data['form_id'])->order('sort asc, id asc')->value('name'); @@ -62,8 +58,8 @@ class FormAttr extends \think\Model{ */ protected static function onAfterDelete($data){ $data = $data->toArray(); - if ($data['model_id']) { - $tablename = FormModel::where('id', $data['model_id'])->value('name'); + if ($data['form_id']) { + $tablename = Form::where('id', $data['form_id'])->value('name'); //删除模型表中字段 $db = new \com\Datatable(); diff --git a/public/static/admin/css/style.css b/public/static/admin/css/style.css index 8919fc4b..ec0d560d 100644 --- a/public/static/admin/css/style.css +++ b/public/static/admin/css/style.css @@ -21,4 +21,7 @@ font-size:0.875em; font-style:italic; } -.tabs-wrapper .nav-tabs{margin-bottom: 15px;} \ No newline at end of file +.tabs-wrapper .nav-tabs{margin-bottom: 15px;} + +.fixed .main-footer{position: fixed; bottom: 0; left: 0; right: 0;} +.fixed .content-wrapper{padding-bottom: 30px;} \ No newline at end of file diff --git a/view/admin/form/index.html b/view/admin/form/index.html index 330931c1..a3112fc7 100644 --- a/view/admin/form/index.html +++ b/view/admin/form/index.html @@ -48,7 +48,7 @@ 字段 - {$item['status_text']} + {$item['status'] ? '禁用' : '启用'} 编辑 删除 数据 diff --git a/view/admin/form/lists.html b/view/admin/form/lists.html new file mode 100644 index 00000000..46b7f16a --- /dev/null +++ b/view/admin/form/lists.html @@ -0,0 +1,12 @@ +{extend name="admin/public/base"/} +{block name="body"} +
+
+

{$meta_title}

+
+ 导出 +
+
+
+
+{/block} \ No newline at end of file diff --git a/view/upload/index.html b/view/upload/index.html index a016d0a0..149a6fba 100644 --- a/view/upload/index.html +++ b/view/upload/index.html @@ -14,7 +14,7 @@
-

或将照片拖到这里，单次最多可选300张

+

或将{if $param['type'] == 'image'}图片{else/}文件{/if}拖到这里，单次最多可选300张