Merge branch 'master' of code.gitlink.org.cn:zolo2468216537/coeditor

coeditor_frontend/package.json

@@ -19,7 +19,7 @@
     "html-docx-js-typescript": "^0.1.5",
     "jquery": "^3.7.1",
     "jwt-decode": "^4.0.0",
-    "vue": "^3.2.13",
+    "vue": "^3.5.13",
     "vue-router": "^4.0.3",
     "vuex": "^4.0.0"
   },

coeditor_frontend/src/components/FileFiled.vue

@@ -45,7 +45,7 @@ export default {
     }
 
     const changetitlestate = () => {
-      context.emit('changetitle',props.item);
+      context.emit('changetitlestate',props.item);
     }
 
     const changetitle = (newname) => {

coeditor_frontend/src/components/FileTitle.vue

@@ -1,15 +1,14 @@
 <template>
     <div class="file-item-title" @click.stop="titleclick">
-        <input v-if="item.editable"  @click.stop="" @dblclick.stop="" type="text" v-model="filename"/>
+        <input v-if="item.editable"  @click.stop="" @dblclick.stop="" type="text" v-model="item.name"/>
         <div v-else >
-            {{ filename }}
+            {{ item.name }}
         </div>
     </div>
 </template>
 
 
 <script>
-import { computed, ref } from 'vue';
 
 export default {
   name: 'FileTitle',
@@ -20,13 +19,6 @@ export default {
       }
   },
   setup(props,context){
-      let filename = ref(props.item.name);
-      let d = computed(() => {
-          if (!props.item.editable) {
-              context.emit("changetitle",filename.value);
-          }
-          return false;
-      });
       const titleclick = () => {
           if (props.item.is_selected) {
               context.emit("changetitlestate");
@@ -38,8 +30,6 @@ export default {
 
       return {
           titleclick,
-          filename,
-          d,
       }
   }
 }

coeditor_frontend/src/components/FolderFiled.vue

@@ -5,7 +5,7 @@
     <div class="file-item-icon" >
         <img src="@/assets/folder_icon.png" alt="">
     </div>
-    <FileTitle @leftclick="leftclick" @changetitle="changetitle" :item="item" />
+    <FileTitle @leftclick="leftclick" @changetitlestate="changetitlestate" @changetitle="changetitle" :item="item" />
   </div>
 </template>
 
@@ -47,6 +47,10 @@ export default {
       context.emit('ls');
     }
 
+    const changetitlestate = () => {
+      context.emit('changetitlestate',props.item);
+    }
+
     const changetitle = () => {
       context.emit('changetitle',props.item);
     }
@@ -56,6 +60,7 @@ export default {
         rightclick,
         doubleclick,
         changetitle,
+        changetitlestate,
     }
   }
 }

coeditor_frontend/src/views/HomeView.vue

@@ -2,8 +2,8 @@
   <PathBar @ls="ls" />
   <ContentBase @click="leftclick" @contextmenu.prevent="rightclick($event)">
     <div v-for="item in items" :key="item.name" class="file-item">
-        <FolderFiled @changetitlestate="changetitlestate" @changetitle="changetitle" @select_item='select_item' @filerightclick="filerightclick" @fileleftclick="fileleftclick" @ls="ls" v-if="item.type==='folder'" :item="item" />
-        <FileFiled @changetitlestate="changetitlestate" @changetitle="changetitle" @select_item='select_item' @filerightclick="filerightclick" @fileleftclick="fileleftclick"  @open_file='open_file' v-if="item.type==='file'" :item="item" />
+        <FolderFiled v-model="item.newname" @changetitlestate="changetitlestate" @changetitle="changetitle" @select_item='select_item' @filerightclick="filerightclick" @fileleftclick="fileleftclick" @ls="ls" v-if="item.type==='folder'" :item="item" />
+        <FileFiled v-model="item.newname" @changetitlestate="changetitlestate" @changetitle="changetitle" @select_item='select_item' @filerightclick="filerightclick" @fileleftclick="fileleftclick"  @open_file='open_file' v-if="item.type==='file'" :item="item" />
     </div>
     <RightMenu v-if="menuvisible"  @open_file="open_file" @turn_back="turn_back" :menutype="menutype" :menuposition="menuposition" />
   </ContentBase>
@@ -216,21 +216,6 @@ export default {
     border: 0.1vh solid white;
 }
 
-.file-item-icon > img {
-    width: 6vw;
-    height: 6vw;
-}
-
-
-.file-item-title{
-    width: 6vw;
-    height: 4vw;
-    text-align: center;
-    overflow: hidden;
-    font-size: 1.2vw;
-    word-break: break-all;
-}
-
 .file-item-selected {
   border: 0.1vh solid #99d1ff;
   background: #cce8ff;