修改模式

Enums/NotebookEnumMode.php

@@ -13,19 +13,14 @@ enum NotebookEnumMode :int
     use EnumStatusTrait;
 
     /**
-    * 读写
+    * 公开
     */
-    case ReadingAndWriting = 1;
+    case Public = 1;
 
     /**
-    * 只读
+    * 私有
     */
-    case ReadOnly = 2;
-
-    /**
-    * 私有写
-    */
-    case PrivateWrite = 3;
+    case Private = 2;
 
     /**
      * 获取描述
@@ -35,9 +30,8 @@ enum NotebookEnumMode :int
     public function getDes(): string
     {
         return match ($this) {
-            self::ReadingAndWriting => '读写',
-            self::ReadOnly          => '只读',
-            self::PrivateWrite      => '私有写',
+            self::Public  => '公开',
+            self::Private => '私有',
         };
     }
 
@@ -47,9 +41,8 @@ enum NotebookEnumMode :int
     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'),
+            self::Public  => $this->getTag('success', 'light'),
+            self::Private => $this->getTag('warning', 'light'),
         };
     }
 }

Enums/NotebookUserEnumMode.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Plugins\Notebook\Enums;
+
+use App\Enums\EnumStatusTrait;
+use Sc\Util\HtmlElement\ElementType\AbstractHtmlElement;
+
+/**
+ * 笔记协作人员 : 权限
+ */
+enum NotebookUserEnumMode :int
+{
+    use EnumStatusTrait;
+
+    /**
+    * 只读
+    */
+    case ReadOnly = 1;
+
+    /**
+    * 读写
+    */
+    case ReadingAndWriting = 2;
+
+    /**
+     * 获取描述
+     *
+     * @return string
+     */
+    public function getDes(): string
+    {
+        return match ($this) {
+            self::ReadOnly          => '只读',
+            self::ReadingAndWriting => '读写',
+        };
+    }
+
+    /**
+     * 转标签
+     */
+    public function toTag():AbstractHtmlElement
+    {
+        return match ($this){
+            self::ReadOnly          => $this->getTag('success', 'light'),
+            self::ReadingAndWriting => $this->getTag('warning', 'light'),
+        };
+    }
+}

Enums/NotebookUserEnumStatus.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Plugins\Notebook\Enums;
+
+use App\Enums\EnumStatusTrait;
+use Sc\Util\HtmlElement\ElementType\AbstractHtmlElement;
+
+/**
+ * 笔记协作人员 : 状态
+ */
+enum NotebookUserEnumStatus :int
+{
+    use EnumStatusTrait;
+
+    /**
+    * 正常
+    */
+    case Normal = 1;
+
+    /**
+    * 剔除
+    */
+    case Eliminate = 2;
+
+    /**
+     * 获取描述
+     *
+     * @return string
+     */
+    public function getDes(): string
+    {
+        return match ($this) {
+            self::Normal            => '正常',
+            self::Eliminate         => '剔除',
+        };
+    }
+
+    /**
+     * 转标签
+     */
+    public function toTag():AbstractHtmlElement
+    {
+        return match ($this){
+            self::Normal            => $this->getTag('success', 'light'),
+            self::Eliminate         => $this->getTag('warning', 'light'),
+        };
+    }
+}

Model/Notebook.php

@@ -11,7 +11,6 @@ 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                分享密钥
@@ -25,9 +24,8 @@ 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=私有写',
+  `mode` tinyint(1) NOT NULL DEFAULT '1' COMMENT '模式：1=公开，2=私有',
   `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 '创建时间',
@@ -46,7 +44,7 @@ class Notebook extends Model
         // 更多casts
     ];
 
-    protected array $fillable = ["title", "content", "allow_see", "administrators_id", "mode", "share_key", "latest_administrators_id"];
+    protected array $fillable = ["title", "content", "administrators_id", "mode", "share_key", "latest_administrators_id"];
 
     public function setAdministratorsIdAttribute($value): int
     {
@@ -58,7 +56,6 @@ class Notebook extends Model
         return $this->attributes['latest_administrators_id'] = (int)$value;
     }
 
-
     public function createAdmin()
     {
         return $this->belongsTo(Administrators::class, 'administrators_id');
@@ -68,5 +65,10 @@ class Notebook extends Model
     {
         return $this->belongsTo(Administrators::class, 'latest_administrators_id');
     }
+
+    public function user()
+    {
+        return $this->hasMany(NotebookUser::class);
+    }
 }
 

Model/NotebookUser.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Plugins\Notebook\Model;
+
+use App\Model\Attribute\CreateSql;
+use App\Model\Model;
+
+/**
+ * 笔记协作人员
+ * @property int    $id                ID
+ * @property int    $notebook_id       笔记
+ * @property int    $administrators_id 管理员
+ * @property int    $mode              权限
+ * @property int    $status            状态
+ * @property string $create_time       
+ * @property string $update_time       
+ * @property int    $delete_time       
+ */
+#[CreateSql(<<<SQL
+CREATE TABLE `sd_notebook_user` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `notebook_id` int NOT NULL DEFAULT '0' COMMENT '笔记',
+  `administrators_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
+  `mode` tinyint(1) NOT NULL DEFAULT '1' COMMENT '权限：1=只读，2=读写',
+  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：1=正常，2=剔除',
+  `create_time` datetime NOT NULL,
+  `update_time` datetime NOT NULL,
+  `delete_time` int DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='笔记协作人员'
+SQL)]
+class NotebookUser extends Model
+{
+    protected ?string $table = 'notebook_user';
+
+    protected array $casts = [
+        ...self::DEFAULT_CASTS,
+        
+        // 更多casts
+    ];
+
+    protected array $fillable = ["notebook_id", "administrators_id", "mode", "status"];
+
+    public function setNotebookIdAttribute($value): int
+    {
+        return $this->attributes['notebook_id'] = (int)$value;
+    }
+
+    public function setAdministratorsIdAttribute($value): int
+    {
+        return $this->attributes['administrators_id'] = (int)$value;
+    }
+}
+

Service/Admin/NotebookService.php

@@ -33,7 +33,8 @@ 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","notebook.mode","notebook.allow_see","notebook.share_key","a1.name as create_name","a2.name as latest_name","notebook.create_time","notebook.update_time"]);
+            ->with(['user'])
+            ->select(["notebook.id","notebook.title","notebook.content","notebook.mode","notebook.share_key","a1.name as create_name","a2.name as latest_name","notebook.create_time","notebook.update_time"]);
 
         return EasySearch::create($query)->getData();
     }

View/Admin/Notebook/lists.blade.php

@@ -214,29 +214,24 @@
                 />
             </el-select>
 
-            <el-button @click="addAllowUser">添加用户</el-button>
+            <el-button style="margin-left: 10px" @click="addAllowUser">添加用户</el-button>
         </div>
-        <div>
+        <div style="margin: 10px 0">
             <el-tag
                     v-for="(tag, index) in allowUserData"
                     :key="tag"
                     class="mx-1"
                     closable
                     @close="delAllowUser(index)"
+                    style="margin:3px 5px"
             >
-            <span v-for="items in adminData" v-if="items.value == tag">
-                @{{ tag }}
-            </span>
+                <template v-for="items in adminData">
+                     <span v-if="items.value == tag">
+                        @{{ items.label }}
+                     </span>
+                </template>
             </el-tag>
         </div>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="allowVisible = false">取消</el-button>
-            <el-button type="primary" @click="mode()">
-              确认修改
-            </el-button>
-          </span>
-        </template>
     </el-dialog>
 @endsection
 
@@ -285,20 +280,26 @@
             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 = []
+                let isPure = true;
+                this.waitAddAllowUser.map(v =>{
+                    if (!this.allowUserData.includes(v)) {
+                        this.allowUserData.push(v);
+                        isPure = false;
+                    }
+                })
+                this.waitAddAllowUser = [];
+                if (!isPure) {
+                    this.updateNotebook.allow_see = this.allowUserData.join(',');
+                    this.update(this.updateNotebook);
+                }
             }
-            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 (){