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

src/views/resource/component/preview.vue

@@ -37,7 +37,7 @@
           <share
             class="ml-20"
             :project-id="projectId"
-            :ids="id"
+            :ids="shareId"
             v-if="isAccess === 2"
           />
           <el-button
@@ -94,6 +94,10 @@ export default {
     id: {
       type: String,
       default: null
+    },
+    shareId: {
+      type: String,
+      default: ''
     }
   },
   watch: {

src/views/resource/component/xtable.vue

@@ -58,6 +58,7 @@
                 <div>
                   <preview
                     :id="row.fileId"
+                    :share-id="row.id"
                     :is-access="row.isAccess"
                     :project-id="row.projectId"
                     v-if="row.type === 1"