molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自定义表单功能优化修复

Browse Source
This commit is contained in:
龙渊
2020-04-11 11:52:55 +08:00
parent 4e4aad4f93
commit 31810784ab
10 changed files with 126 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/admin/Content.php
+10 -2
View File
@@ -66,7 +66,12 @@ class Content extends Base {
*/ */
public function add() { public function add() {
if ($this->request->isPost()) { 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) { if ($result) {
return $this->success("添加成功！", url('/admin/'.$this->modelInfo['name'].'/index')); return $this->success("添加成功！", url('/admin/'.$this->modelInfo['name'].'/index'));
} else { } else {
@@ -98,7 +103,10 @@ class Content extends Base {
*/ */
public function edit($id) { public function edit($id) {
if ($this->request->isPost()) { 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) { if ($result !== false) {
return $this->success("更新成功！", url('/admin/'.$this->modelInfo['name'].'/index')); return $this->success("更新成功！", url('/admin/'.$this->modelInfo['name'].'/index'));
} else { } else {
app/controller/admin/Form.php
+24 -10
View File
@@ -8,6 +8,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\controller\admin; namespace app\controller\admin;
use think\facade\Db;
use app\model\Form as FormM; use app\model\Form as FormM;
use app\model\FormAttr; use app\model\FormAttr;
@@ -17,6 +18,15 @@ use app\model\FormAttr;
*/ */
class Form extends Base { 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 表单列表 * @title 表单列表
*/ */
@@ -78,10 +88,15 @@ class Form extends Base {
* @title 删除表单 * @title 删除表单
*/ */
public function del() { public function del() {
$id = $this->getArrayParam('id'); $id = $this->request->param('id', 0);
$result = false;
if (false !== $result) { if (!$id) {
return $this->success('删除成功！'); return $this->error('非法操作！');
}
$result = FormM::find($id)->delete();
if ($result) {
return $this->success('删除模型成功！');
} else { } else {
return $this->error('删除失败！'); return $this->error('删除失败！');
} }
@@ -95,18 +110,17 @@ class Form extends Base {
* @return html 页面 * @return html 页面
*/ */
public function lists($form_id = '') { 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, 'form_id' => $form_id,
'list' => $list, 'list' => $list,
'page' => $list->render() 'page' => $list->render()
); );
$this->assign($data); return $this->fetch();
$this->setMeta('数据列表');
return $this->fetch('list_'.$form['name']);
} }
/** /**
app/http/form/template/select.html
+1 -1
View File
@@ -1,4 +1,4 @@
<select class="form-control selectpicker" name="{$name}" id="{$name}" style="width:auto; min-width: 150px;" {if isset($is_must) && $is_must}data-rule="required"{/if}> <select class="form-control selectpicker" name="{$name}" id="{$name}" style="min-width: 200px;" {if isset($is_must) && $is_must}data-rule="required"{/if}>
{volist name="option" id="item"} {volist name="option" id="item"}
<option value="{$item['key']}" {if $item['key'] == $value}selected{/if}>{$item['label']}</option> <option value="{$item['key']}" {if $item['key'] == $value}selected{/if}>{$item['label']}</option>
{/volist} {/volist}
app/model/Attribute.php
+8 -5
View File
@@ -166,6 +166,9 @@ class Attribute extends \think\Model {
public static function getfieldList(){ public static function getfieldList(){
$config = \think\facade\Cache::get('system_config_data'); $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 [ return [
'基础' => [ '基础' => [
['name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'], ['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' => 'is_must', 'title' => '是否必填', 'help' => '用于自动验证', 'type' => 'select', 'option' => [['key'=>'0', 'label' => '否'], ['key'=>'1', 'label' => '是']]],
], ],
'高级' => [ '高级' => [
['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => [], 'help' => ''], // ['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => $validate_type, 'help' => ''],
['name' => 'validate_rule', 'title' => '验证规则', 'help' => '根据验证方式定义相关验证规则', 'type' => 'text'], ['name' => 'validate_rule', 'title' => '验证规则', 'help' => '使用thinkphp内置验证规则，详情：https://www.kancloud.cn/manual/thinkphp6_0/1037629', 'type' => 'text'],
['name' => 'error_info', 'title' => '出错提示', 'type' => 'text', 'help' => ''], ['name' => 'error_info', 'title' => '出错提示', 'type' => 'text', 'help' => ''],
['name' => 'validate_time', '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' => [], 'help' => ''], ['name' => 'auto_type', 'title' => '自动完成方式', 'help' => '英文字母开头，长度不超过30', 'type' => 'select', 'option' => $auto_type, 'help' => ''],
['name' => 'auto_rule', 'title' => '自动完成规则', 'help' => '根据完成方式订阅相关规则', 'type' => 'text'], ['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],
], ],
]; ];
} }
app/model/Form.php
+60 -67
View File
@@ -10,9 +10,6 @@
namespace app\model; namespace app\model;
use think\facade\Config; 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 = [ public $addField = [
['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''], ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''],
['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''], ['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''],
['name' => 'logo', 'title' => '显示Logo', 'type' => 'images', 'help' => ''], ['name' => 'logo', 'title' => '显示Logo', 'type' => 'image', 'help' => ''],
['name' => 'cover', 'title' => 'banner图片', 'type' => 'images', 'help' => ''], ['name' => 'cover', 'title' => 'banner图片', 'type' => 'image', 'help' => ''],
['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''], ['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''],
['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''],
]; ];
public $editField = [ public $editField = [
['name' => 'id', 'title' => 'ID', 'type' => 'hidden', 'help' => ''], ['name' => 'id', 'title' => 'ID', 'type' => 'hidden', 'help' => ''],
// ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''], // ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''],
['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''], ['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''],
['name' => 'logo', 'title' => '显示Logo', 'type' => 'images', 'help' => ''], ['name' => 'logo', 'title' => '显示Logo', 'type' => 'image', 'help' => ''],
['name' => 'cover', 'title' => 'banner图片', 'type' => 'images', 'help' => ''], ['name' => 'cover', 'title' => 'banner图片', 'type' => 'image', 'help' => ''],
['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''], ['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''],
['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''], ['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''],
]; ];
public static function onAfterInsert($model){ protected static function onBeforeInsert($data){
$data = $model->getData(); if ($data['name'] && $data['title']) {
$mysql = Config::get('database.connections.mysql'); $db = new \com\Datatable();
$tablemodel = (new TableModel())->setCharset('utf8mb4') //设置编码 //检查表是否存在并创建
->setEngine('MyISAM') //设置引擎 if (!$db->CheckTable('form_' . $data['name'])) {
->setTablename($mysql['prefix'] . 'form_' . $data['name']) //设置表名 //创建新表
->setComment($data['title']); //表备注 return $db->initTable('form_' . $data['name'], $data['title'], 'id')->query();
}else{
$id = (new ColumnModel())->setType('int')->setLen(11)->setName('id')->setIsPk(true)->setIncrement(true)->setComment('自增长'); return false;
}
$dbskeleton = Factory::instance('mysql', $mysql['hostname'] . ':' . $mysql['hostport'], $mysql['database'], $mysql['username'], $mysql['password']); }else{
$dbskeleton->createTable($tablemodel, [$id]); return false;
}
$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 init() { public static function onAfterInsert($data){
// self::beforeInsert(function ($event) { $data = $data->toArray();
// $data = $event->toArray(); $fields = [
// $tablename = 'form_' . strtolower($data['name']); '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'],
// $db = new \com\Datatable(); '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'],
// if (!$db->CheckTable($tablename)) { ];
// //创建新表 $result = false;
// return $db->initTable($tablename, $data['title'], 'id')->query(); if (!empty($fields)) {
// } else { foreach ($fields as $key => $value) {
// return false; $fields[$key]['form_id'] = $data['id'];
// } }
// }); $result = (new FormAttr())->saveAll($fields);
// self::afterInsert(function ($event) { }
// $data = $event->toArray(); return $result;
}
// $fields = include (APP_PATH . 'admin/fields.php'); protected static function onAfterDelete($data){
// if (!empty($fields)) { $data = $data->toArray();
// foreach ($fields as $key => $value) { (new FormAttr())->where('form_id', $data['id'])->delete();
// if (in_array($key, array('uid', 'status', 'view', 'create_time', 'update_time'))) { $db = new \com\Datatable();
// $fields[$key]['form_id'] = $data['id']; $result = false;
// } else { if ($db->CheckTable('form_' . $data['name'])) {
// unset($fields[$key]); $result = $db->delTable('form_' . $data['name'])->query();
// } }
// } return $result;
// 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);
// // if (!empty($attribute_sort)) { public function getGridListAttr($value, $data){
// // foreach ($attribute_sort as $key => $value) { $list = [];
// // db('FormAttr')->where('id', 'IN', $value)->setField('group_id', $key); if ($data['list_grid'] !== '') {
// // foreach ($value as $k => $v) { $row = explode(PHP_EOL, $data['list_grid']);
// // db('FormAttr')->where('id', $v)->setField('sort', $k); foreach ($row as $r) {
// // } list($field, $title) = explode(":", $r);
// // } $list[$field] = ['field' => $field, 'title' => $title];
// // } if (strrpos($title, "|")) {
// // } $title = explode("|", $title);
// // return true; $list[$field] = ['field' => $field, 'title' => $title[0], 'format' => $title[1]];
// // }); }
// } }
}
return $list;
}
public function getStatusTextAttr($value, $data) { public function getStatusTextAttr($value, $data) {
$status = array( $status = array(
app/model/FormAttr.php
+5 -9
View File
@@ -10,10 +10,6 @@ namespace app\model;
use think\facade\Cache; use think\facade\Cache;
use think\facade\Config; 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(); $data = $data->toArray();
if ($data['form_id']) { if ($data['form_id']) {
$db = new \com\Datatable(); $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'); $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(); return $db->columField('form_' . strtolower($name), $data)->query();
} }
@@ -43,10 +39,10 @@ class FormAttr extends \think\Model{
protected static function onAfterUpdate($data){ protected static function onAfterUpdate($data){
$data = $data->toArray(); $data = $data->toArray();
if (isset($data['form_id']) && isset($data['name'])) { 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(); $db = new \com\Datatable();
if ($db->CheckField('form_' . $tablename, $data['name'])) { if ($db->CheckField(strtolower('form_' . $tablename), $data['name'])) {
$data['action'] = 'CHANGE'; $data['action'] = 'CHANGE';
} }
$data['after'] = self::where('name', '<>', $data['name'])->where('form_id', $data['form_id'])->order('sort asc, id asc')->value('name'); $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){ protected static function onAfterDelete($data){
$data = $data->toArray(); $data = $data->toArray();
if ($data['model_id']) { if ($data['form_id']) {
$tablename = FormModel::where('id', $data['model_id'])->value('name'); $tablename = Form::where('id', $data['form_id'])->value('name');
//删除模型表中字段 //删除模型表中字段
$db = new \com\Datatable(); $db = new \com\Datatable();
public/static/admin/css/style.css
+4 -1
View File
@@ -21,4 +21,7 @@
font-size:0.875em; font-size:0.875em;
font-style:italic; font-style:italic;
} }
.tabs-wrapper .nav-tabs{margin-bottom: 15px;} .tabs-wrapper .nav-tabs{margin-bottom: 15px;}
.fixed .main-footer{position: fixed; bottom: 0; left: 0; right: 0;}
.fixed .content-wrapper{padding-bottom: 30px;}
view/admin/form/index.html
+1 -1
View File
@@ -48,7 +48,7 @@
</td> </td>
<td> <td>
<a href="{:url('/admin/form/attr', ['form_id' => $item['id']])}">字段</a> <a href="{:url('/admin/form/attr', ['form_id' => $item['id']])}">字段</a>
<a href="{:url('/admin/form/status', ['form_id' => $item['id'], 'status' => abs(1-$item['status'])])}" class="ajax-get">{$item['status_text']}</a> <a href="{:url('/admin/form/status', ['form_id' => $item['id'], 'status' => abs(1-$item['status'])])}" class="ajax-get">{$item['status'] ? '禁用' : '启用'}</a>
<a href="{:url('/admin/form/edit', ['id'=>$item['id']])}">编辑</a> <a href="{:url('/admin/form/edit', ['id'=>$item['id']])}">编辑</a>
<a href="{:url('/admin/form/del', ['id'=>$item['id']])}" class="confirm ajax-get">删除</a> <a href="{:url('/admin/form/del', ['id'=>$item['id']])}" class="confirm ajax-get">删除</a>
<a href="{:url('/admin/form/lists', ['form_id'=>$item['id']])}">数据</a> <a href="{:url('/admin/form/lists', ['form_id'=>$item['id']])}">数据</a>
view/admin/form/lists.html
+12
View File
@@ -0,0 +1,12 @@
{extend name="admin/public/base"/}
{block name="body"}
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{$meta_title}</h3>
<div class="box-tools pull-right">
<a class="btn btn-warning" href="{:url('/admin/form/lists')}"><i class="fa fa-reply"></i> 导出</a>
</div>
</div>
<div class="box-body"></div>
</div>
{/block}
view/upload/index.html
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="queueList"> <div class="queueList">
<div id="dndArea" class="placeholder"> <div id="dndArea" class="placeholder">
<div id="filePicker"></div> <div id="filePicker"></div>
<p>或将照片拖到这里，单次最多可选300张</p> <p>或将{if $param['type'] == 'image'}图片{else/}文件{/if}拖到这里，单次最多可选300张</p>
</div> </div>
</div> </div>
<div class="statusBar" style="display:none;"> <div class="statusBar" style="display:none;">