Parcourir la source

Merge remote-tracking branch 'origin/v3' into v3

# Conflicts:
#	vite.config.js
wukai il y a 1 an
Parent
commit
f1f7b49985
2 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 2 2
      src/layout/indexCommon.vue
  2. 3 3
      src/views/myfile/MyFile.vue

+ 2 - 2
src/layout/indexCommon.vue

@@ -119,7 +119,7 @@
                     :data-path="item.path"
                     :to="{
                       path: item.path,
-                      query: item.row,
+                      query: item.clickRowId,
                     }"
                     @click="paneClick(item)"
                     class="tags-view-item"
@@ -455,7 +455,7 @@ const addFolderAdd = (data) => {
     editableTabs.value.push({
       label: data.name,
       path: data.path,
-      row: JSON.stringify(data.row),
+      clickRowId: data.row,
     });
     //需要jSON去转 否则页面无变化 离谱得很
     editableTabs.value = JSON.parse(JSON.stringify(editableTabs.value));

+ 3 - 3
src/views/myfile/MyFile.vue

@@ -917,9 +917,9 @@ export default {
                      loadingPreview.value = false
                     addTab(clickRow.value);
                     //    const addData = {
-                    //     path:route.path,
-                    //     name:clickRow.fileName,
-                    //     row:toRaw(clickRow)
+                    //     path:"/fileEdit" + clickRow.value.docId,
+                    //     name:clickRow.value.fileName,
+                    //     row:clickRow.value.docId
                     // }
                     // addFolderAdd(addData)
                     onlyView.value = true