更新

2020-03-25 17:08:02 +08:00
parent 6b9202d341
commit 0d2ef31222
35 changed files with 1212 additions and 130 deletions
--- a/app/model/Form.php
+++ b/app/model/Form.php
@@ -9,6 +9,11 @@

 namespace app\model;

+use think\facade\Config;
+use phpspirit\dbskeleton\mysql\TableModel;
+use phpspirit\dbskeleton\mysql\ColumnModel;
+use phpspirit\dbskeleton\Factory;
+
 /**
 * 表单
 */
@@ -22,17 +27,40 @@ class Form extends \think\Model {
 		'update_time' => 'integer',
 	);

-	public $addField = array(
-		array('name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''),
-		array('name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''),
-	);
+	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' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''],
+	];

-	public $editField = array(
-		array('name' => 'id', 'title' => 'ID', 'type' => 'hidden', 'help' => ''),
-		array('name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''),
-		array('name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''),
-		array('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' => '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 init() {
 	// 	self::beforeInsert(function ($event) {
--- a/app/model/FormAttr.php
+++ b/app/model/FormAttr.php
@@ -6,51 +6,75 @@
 // +----------------------------------------------------------------------
 // | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
 // +----------------------------------------------------------------------
-
 namespace app\model;

+use think\facade\Config;
+use phpspirit\dbskeleton\mysql\TableModel;
+use phpspirit\dbskeleton\mysql\ColumnModel;
+use phpspirit\dbskeleton\Factory;
+
 /**
 * 设置模型
 */
-class FormAttr {
+class FormAttr extends \think\Model{

 	protected $type = array(
 		'id' => 'integer',
 	);

-	protected static function init() {
-		self::afterInsert(function ($data) {
-			if ($data['form_id']) {
-				$name = db('Form')->where('id', $data['form_id'])->value('name');
-				$db = new \com\Datatable();
-				$attr = $data->toArray();
-				$model_attr = array(
-					'form_id' => $data['form_id'],
-					'attr_id' => $data->id,
-					'group_id' => 0,
-					'is_add_table' => 1,
-					'is_show' => $data['is_show'],
-					'is_must' => $data['is_must'],
-					'sort' => 0,
-				);
-				$attr['after'] = db('FormAttr')->where('name', '<>', $data['name'])->where('form_id', $data['form_id'])->order('id desc')->value('name');
-				return $db->columField('form_' . strtolower($name), $attr)->query();
-			}
-		});
-		self::beforeUpdate(function ($data) {
-			$attr = $data->toArray();
-			$attr['action'] = 'CHANGE';
-			$attr['oldname'] = db('FormAttr')->where('id', $attr['id'])->value('name');
-			if ($attr['id']) {
-				$name = db('Form')->where('id', $attr['form_id'])->value('name');
-				$db = new \com\Datatable();
-				return $db->columField('form_' . strtolower($name), $attr)->query();
-			} else {
-				return false;
-			}
-		});
+	protected static function onAfterInsert($model){
+		$data = $model->getData();
+		$mysql = Config::get('database.connections.mysql');
+		
+		$dbskeleton = Factory::instance('mysql', $mysql['hostname'] . ':' . $mysql['hostport'], $mysql['database'], $mysql['username'], $mysql['password']);
+		$field = (new ColumnModel())->setType('int')
+			->setLen($data['length'])
+			->setName($data['name'])
+			->setComment($data['title']);
+		$dbskeleton->addColumn($tablemodel, );
+
 	}

+	protected static function onBeforeUpdate($model){
+		$data = $model->getData();
+		$mysql = Config::get('database.connections.mysql');
+
+		$dbskeleton = Factory::instance('mysql', $mysql['hostname'] . ':' . $mysql['hostport'], $mysql['database'], $mysql['username'], $mysql['password']);
+	}
+
+	// protected static function init() {
+	// 	self::afterInsert(function ($data) {
+	// 		if ($data['form_id']) {
+	// 			$name = db('Form')->where('id', $data['form_id'])->value('name');
+	// 			$db = new \com\Datatable();
+	// 			$attr = $data->toArray();
+	// 			$model_attr = array(
+	// 				'form_id' => $data['form_id'],
+	// 				'attr_id' => $data->id,
+	// 				'group_id' => 0,
+	// 				'is_add_table' => 1,
+	// 				'is_show' => $data['is_show'],
+	// 				'is_must' => $data['is_must'],
+	// 				'sort' => 0,
+	// 			);
+	// 			$attr['after'] = db('FormAttr')->where('name', '<>', $data['name'])->where('form_id', $data['form_id'])->order('id desc')->value('name');
+	// 			return $db->columField('form_' . strtolower($name), $attr)->query();
+	// 		}
+	// 	});
+	// 	self::beforeUpdate(function ($data) {
+	// 		$attr = $data->toArray();
+	// 		$attr['action'] = 'CHANGE';
+	// 		$attr['oldname'] = db('FormAttr')->where('id', $attr['id'])->value('name');
+	// 		if ($attr['id']) {
+	// 			$name = db('Form')->where('id', $attr['form_id'])->value('name');
+	// 			$db = new \com\Datatable();
+	// 			return $db->columField('form_' . strtolower($name), $attr)->query();
+	// 		} else {
+	// 			return false;
+	// 		}
+	// 	});
+	// }
+
 	protected function getTypeTextAttr($value, $data) {
 		$type = config('config_type_list');
 		$type_text = explode(',', $type[$data['type']]);
--- a/app/model/Member.php
+++ b/app/model/Member.php
@@ -45,7 +45,7 @@ class Member extends Model {
 	}

 	protected function getAccessTokenAttr($value, $data) {
-		$token = ['data' => ['uid' => $data['uid'], 'username' => $data['username'], 'password' => $data['password'], 'department' => $data['department']]];
+		$token = ['data' => ['uid' => $data['uid'], 'username' => $data['username'], 'password' => $data['password']]];
 		return JWTAuth::builder($token); //参数为用户认证的信息，请自行添加
 	}