From c17890cc922101b0c53d25a44c785b3e662091b4 Mon Sep 17 00:00:00 2001 From: chenlong Date: Sat, 7 Oct 2023 19:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Enums/NotebookEnumMode.php | 55 +++++++++++ Model/Notebook.php | 11 ++- Service/Admin/NotebookService.php | 2 +- View/Admin/Notebook/lists.blade.php | 139 ++++++++++++++++++++++++++-- 4 files changed, 196 insertions(+), 11 deletions(-) create mode 100644 Enums/NotebookEnumMode.php diff --git a/Enums/NotebookEnumMode.php b/Enums/NotebookEnumMode.php new file mode 100644 index 0000000..fdebcf4 --- /dev/null +++ b/Enums/NotebookEnumMode.php @@ -0,0 +1,55 @@ + '读写', + self::ReadOnly => '只读', + self::PrivateWrite => '私有写', + }; + } + + /** + * 转标签 + */ + public function toTag():AbstractHtmlElement + { + return match ($this){ + self::ReadingAndWriting => $this->getTag('success', 'light'), + self::ReadOnly => $this->getTag('warning', 'light'), + self::PrivateWrite => $this->getTag('danger', 'light'), + }; + } +} diff --git a/Model/Notebook.php b/Model/Notebook.php index 29a0196..d702331 100644 --- a/Model/Notebook.php +++ b/Model/Notebook.php @@ -11,7 +11,10 @@ use App\Model\Model; * @property int $id ID * @property string $title 标题 * @property string $content 内容 + * @property string $allow_see 允许查看的人 * @property int $administrators_id 创建人 + * @property int $mode 模式 + * @property string $share_key 分享密钥 * @property int $latest_administrators_id 最后修改人 * @property string $create_time 创建时间 * @property string $update_time 更新时间 @@ -22,13 +25,16 @@ CREATE TABLE `sd_notebook` ( `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', `title` varchar(127) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标题', `content` text COLLATE utf8mb4_general_ci COMMENT '内容', + `allow_see` varchar(255) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '允许查看的人', `administrators_id` int NOT NULL COMMENT '创建人', + `mode` tinyint(1) NOT NULL DEFAULT '1' COMMENT '模式：1=读写，2=只读，3=私有写', + `share_key` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '分享密钥', `latest_administrators_id` int NOT NULL COMMENT '最后修改人', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `delete_time` int DEFAULT NULL COMMENT '删除时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='笔记本' +) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='笔记本' SQL)] class Notebook extends Model { @@ -40,7 +46,7 @@ class Notebook extends Model // 更多casts ]; - protected array $fillable = ["title", "content", "administrators_id", "latest_administrators_id"]; + protected array $fillable = ["title", "content", "allow_see", "administrators_id", "mode", "share_key", "latest_administrators_id"]; public function setAdministratorsIdAttribute($value): int { @@ -52,6 +58,7 @@ class Notebook extends Model return $this->attributes['latest_administrators_id'] = (int)$value; } + public function createAdmin() { return $this->belongsTo(Administrators::class, 'administrators_id'); diff --git a/Service/Admin/NotebookService.php b/Service/Admin/NotebookService.php index 8e36c20..394d2dc 100644 --- a/Service/Admin/NotebookService.php +++ b/Service/Admin/NotebookService.php @@ -33,7 +33,7 @@ class NotebookService extends AbstractAdminService $query = $this->model ->leftJoin('administrators as a1', 'a1.id', '=', 'notebook.administrators_id') ->leftJoin('administrators as a2', 'a2.id', '=', 'notebook.latest_administrators_id') - ->select(["notebook.id","notebook.title","notebook.content","a1.name as create_name","a2.name as latest_name","notebook.create_time","notebook.update_time"]); + ->select(["notebook.id","notebook.title","notebook.content","notebook.mode","notebook.allow_see","notebook.share_key","a1.name as create_name","a2.name as latest_name","notebook.create_time","notebook.update_time"]); return EasySearch::create($query)->getData(); } diff --git a/View/Admin/Notebook/lists.blade.php b/View/Admin/Notebook/lists.blade.php index f8d0750..a1426a0 100644 --- a/View/Admin/Notebook/lists.blade.php +++ b/View/Admin/Notebook/lists.blade.php @@ -80,6 +80,15 @@ .delete{ color: red; } + .share{ + color: #67C23A; + } + .allow-user{ + color: #409EFF; + } + .mode{ + color: #E6A23C; + } #fr-logo{ display: none; } .fr-popup.fr-active{ z-index: 5 !important; } .edit-title{ @@ -152,6 +161,9 @@
创建人：@{{ item.create_name }}
最后更新： @{{ item.latest_name }}
+ +
+
@@ -170,6 +182,62 @@ + + {{-- 分享 --}} + + @{{ shareUrl }} + + + {{-- 模式 --}} + + + @{{ item.label }} + + + + {{-- 允许查看 --}} + +
+ + + + + 添加用户 +
+
+ + + @{{ tag }} + + +
+ + @endsection @section('footer') @@ -185,12 +253,54 @@ VueInit.data.page = 0; VueInit.data.reachBottomDisabled = true; VueInit.data.notNotebook = false; + VueInit.data.shareVisible = false; + VueInit.data.modeVisible = false; + VueInit.data.allowVisible = false; + VueInit.data.modeData = {!! json_encode(\Plugins\Notebook\Enums\NotebookEnumMode::mapping()) !!}; + VueInit.data.adminData = {!! json_encode(\App\Model\Base\Administrators::getSelectData('name')) !!}; + VueInit.data.adminData.push({value:"*",label:'全部用户'}) + VueInit.data.shareUrl = ""; + VueInit.data.updateNotebook = ""; + VueInit.data.allowUserData = []; + VueInit.data.waitAddAllowUser = []; VueInit.methods.searchNotebook = function () { this.page = 1; this.getList(); }; + VueInit.methods.mode = function (item, index) { + if (!item) { + this.update(this.updateNotebook); + this.modeVisible = false; + return; + } + this.modeVisible = true; + this.updateNotebook = item; + }; + + VueInit.methods.allowUser = function (item, index) { + this.allowVisible = true; + this.updateNotebook = item; + if (item.allow_see) { + this.allowUserData = item.allow_see.split(','); + } + console.log(this.allowUserData); + }; + + VueInit.methods.addAllowUser = function () { + if (this.waitAddAllowUser.length > 0) { + console.log(this.waitAddAllowUser); + this.allowUserData.push(...this.waitAddAllowUser); + this.waitAddAllowUser = [] + } + console.log(this.allowUserData, this.waitAddAllowUser, 111) + }; + VueInit.methods.delAllowUser = function (index) { + this.allowUserData.splice(index, 1); + console.log(this.allowUserData) + }; + VueInit.methods.titleChange = function (){ this.noteBookVersion++; } @@ -281,25 +391,33 @@ }); } - VueInit.methods.update = function (){ - let upVersion = this.noteBookVersion; - if(this.noteBookUpVersion === upVersion){ - return; + VueInit.methods.update = function (data){ + let upVersion; + if (!data) { + upVersion = this.noteBookVersion; + if(this.noteBookUpVersion === upVersion){ + return; + } } - this.currentNotebook.update_time = this.toTime(); + + data = data ? data : this.currentNotebook; + data.update_time = this.toTime(); axios({ url: "update", method: 'post', - data: this.currentNotebook + data: data }).then(({ data:res }) => { if(res.code !== 200){ this.$message.warning(res.msg); }else{ - this.currentNotebook.update_time = this.toTime(); + data.update_time = this.toTime(); this.$notify.success("文档已同步"); } }); - this.noteBookUpVersion = upVersion; + + if (upVersion){ + this.noteBookUpVersion = upVersion; + } } VueInit.methods.toTime = function () { var date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000 @@ -367,5 +485,10 @@ }) } + VueInit.methods.share = function (item,index){ + this.shareVisible = true; + this.shareUrl = `http://www.baidu.com/${item.id}`; + } + @endsection \ No newline at end of file