s

Controller/Admin/NotebookController.php

@@ -87,9 +87,11 @@ class NotebookController extends AbstractController
     #[Middlewares([ValidationMiddleware::class])]
     public function update(NotebookRequest $notebookRequest): ResponseInterface
     {
-        NotebookService::aop()->update($notebookRequest->post());
+        $data = NotebookService::aop()->update($notebookRequest->post());
 
-        return Response::json()->success();
+        return Response::json()->success([
+            'update_time' => $data->update_time
+        ]);
     }
 
     /**

Service/Admin/NotebookUserService.php

@@ -32,8 +32,10 @@ class NotebookUserService extends AbstractAdminService
      */
     public function lists(): array
     {
-        $query = $this->model->select(["notebook_user.id","notebook_user.notebook_id","notebook_user.administrators_id","notebook_user.mode","notebook_user.status","notebook_user.create_time"]);
-
+        $query = $this->model->join('administrators', 'administrators.id', '=', "notebook_user.administrators_id")
+            ->select([
+                "notebook_user.id","notebook_user.notebook_id","notebook_user.administrators_id","notebook_user.mode","notebook_user.status","notebook_user.create_time","administrators.name as user"
+            ]);
         if (Hy::request()->query('notebook_id')) {
             $query->where("notebook_user.notebook_id", Hy::request()->query('notebook_id'));
         }

View/Admin/Notebook/lists.blade.php

@@ -225,10 +225,10 @@
     </el-dialog>
     {{--  协作用户  --}}
     <el-dialog v-model="allowVisible" width="500px" title="协作人员">
-        <div>
-            <el-select v-model="waitAddAllowUser" filterable multiple clearable placeholder="请选择">
+        <div style="display:flex;">
+            <el-select style="flex: 1" v-model="waitAddAllowUser" :remote-method="userSearch" remote filterable multiple clearable placeholder="请选择">
                 <el-option
-                        v-for="item in adminData"
+                        v-for="item in adminDataOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -282,7 +282,7 @@
         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.unshift({value:"*",label:'全部用户'})
+        VueInit.data.adminDataOptions = []
         VueInit.data.shareUrl = "";
         VueInit.data.updateNotebook = "";
         VueInit.data.allowUserData = [];
@@ -295,7 +295,9 @@
 
         VueInit.methods.mode = function (item, index) {
             if (!item) {
-                this.update(this.updateNotebook);
+                this.update(this.updateNotebook, (res) =>{
+                    this.updateNotebook.update_time = this.toTime();
+                });
                 this.modeVisible = false;
                 return;
             }
@@ -400,6 +402,20 @@
             this.allowUserData.splice(index, 1);
         };
 
+        VueInit.methods.userSearch = function (query){
+            let list = [];
+            if (query) {
+                this.adminData.map(v => {
+                    console.log(v);
+                    console.log(v.label.includes(query));
+
+                    v.label.indexOf(query) >= 0 && list.push(v);
+                });
+            }
+
+            this.adminDataOptions = list;
+        }
+
         VueInit.methods.titleChange = function (){
             this.noteBookVersion++;
         }
@@ -439,6 +455,7 @@
 
         VueInit.methods.notebookToggle = function (index){
             this.active = index;
+            this.currentNotebook.update_time = this.toTime();
             this.update();
             this.currentNotebook = this.notebook[index];
             this.noteBookVersion = 0;
@@ -492,21 +509,22 @@
             });
         }
 
-        VueInit.methods.update = function (data){
+        VueInit.methods.update = function (data, call){
             let upVersion;
             if (!data) {
                 upVersion = this.noteBookVersion;
                 if(this.noteBookUpVersion === upVersion){
+                    call && call();
                     return;
                 }
             }
 
             data = data ? data : this.currentNotebook;
             if (data.user_mode === 'read') {
+                call && call();
                 return;
             }
 
-            data.update_time = this.toTime();
             axios({
                 url: "update",
                 method: 'post',
@@ -515,9 +533,9 @@
                 if(res.code !== 200){
                     this.$message.warning(res.msg);
                 }else{
-                    data.update_time = this.toTime();
                     this.$notify.success("文档已同步");
                 }
+                call && call(res);
             });
 
             if (upVersion){
@@ -536,10 +554,18 @@
         }
 
         VueInit.event.addHandler('created:updateRegularly', function (){
-            setInterval(() => {
-                this.update();
-                setTimeout(() => this.getLatest(), 1000);
-            }, 2000);
+            let t = setTimeout(() => {
+                this.update(null, (res) => {
+                    if(res && res.code === 200){
+                        this.currentNotebook.update_time = res.data.update_time;
+                    }
+                    this.$nextTick(() => {
+                        this.getLatest();
+                    })
+                    clearTimeout(t);
+                    this.updateRegularly();
+                });
+            }, 3000);
         });
 
         VueInit.methods.getLatest = function (){