Skip to content

Z
zeroing-editor
Commit 0edf8095 authored by 张晨辰's avatar 张晨辰
Browse files
Options

Merge branch 'dev' into feature/20190923-feature

parents 65958437 4121ea7b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
docs/项目拆分.xmind
View file @ 0edf8095
No preview for this file type
src/views/Editor/Assets.vue
View file @ 0edf8095
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
> >
<i class="el-icon-plus file-uploader-icon"></i> <i class="el-icon-plus file-uploader-icon"></i>
</el-upload> </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> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
......
src/views/Editor/Views.vue
View file @ 0edf8095
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<el-dropdown class="more-button" size="mini" trigger="click" <el-dropdown class="more-button" size="mini" trigger="click"
@command="(command)=>{onMoreMenu(command, data, node)}"> @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-menu slot="dropdown">
<el-dropdown-item command="delete">{{$t('Delete')}}</el-dropdown-item> <el-dropdown-item command="delete">{{$t('Delete')}}</el-dropdown-item>
<el-dropdown-item v-for="(type, key, index) in $t('view_node_menu')" <el-dropdown-item v-for="(type, key, index) in $t('view_node_menu')"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment