Merge branch 'dev' into feature/20190923-feature

src/views/Editor/Assets.vue

@@ -17,7 +17,7 @@
 					>
 						<i class="el-icon-plus file-uploader-icon"></i>
 					</el-upload>
-					<file-item v-for="(file, index) in assets" :data="file" :key="index + '_' + file.url" @show-file-details="showFileDetails"/>
+					<file-item v-for="(file, index) in assets" :data="file" :key="index" @show-file-details="showFileDetails"/>
 				</div>
 			</el-scrollbar>
 		</div>

src/views/Editor/Views.vue

@@ -24,7 +24,7 @@
 
 						<el-dropdown class="more-button" size="mini" trigger="click"
 						             @command="(command)=>{onMoreMenu(command, data, node)}">
-							<el-link icon="el-icon-more" :underline="false"/>
+							<el-link icon="el-icon-more" :underline="false" @click.stop/>
 							<el-dropdown-menu slot="dropdown">
 								<el-dropdown-item command="delete">{{$t('Delete')}}</el-dropdown-item>
 								<el-dropdown-item v-for="(type, key, index) in $t('view_node_menu')"