Merge branch 'dev' of github.com:dataease/dataease into dev

This commit is contained in:
taojinlong 2021-08-13 11:23:37 +08:00
commit db3e6fe7b5
4 changed files with 4 additions and 1 deletions

View File

@ -11,7 +11,7 @@
<el-dropdown-item icon="el-icon-download" @click.native="bottomComponent">{{ $t('panel.bottomComponent') }}</el-dropdown-item> <el-dropdown-item icon="el-icon-download" @click.native="bottomComponent">{{ $t('panel.bottomComponent') }}</el-dropdown-item>
<el-dropdown-item icon="el-icon-arrow-up" @click.native="upComponent">{{ $t('panel.upComponent') }}</el-dropdown-item> <el-dropdown-item icon="el-icon-arrow-up" @click.native="upComponent">{{ $t('panel.upComponent') }}</el-dropdown-item>
<el-dropdown-item icon="el-icon-arrow-down" @click.native="downComponent">{{ $t('panel.downComponent') }}</el-dropdown-item> <el-dropdown-item icon="el-icon-arrow-down" @click.native="downComponent">{{ $t('panel.downComponent') }}</el-dropdown-item>
<el-dropdown-item icon="el-icon-link" @click.native="linkageSetting">联动设置</el-dropdown-item> <el-dropdown-item v-if="'view'===curComponent.type" icon="el-icon-link" @click.native="linkageSetting">{{ $t('panel.linkage_setting') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>

View File

@ -1144,6 +1144,7 @@ export default {
bottomComponent: 'Bottom Component', bottomComponent: 'Bottom Component',
upComponent: 'Up One Level', upComponent: 'Up One Level',
downComponent: 'Down One Level', downComponent: 'Down One Level',
linkage_setting: 'Linkage Setting',
open_aided_design: 'Open Component Aided Design', open_aided_design: 'Open Component Aided Design',
close_aided_design: 'Close Component Aided Design', close_aided_design: 'Close Component Aided Design',
open_style_design: 'Open Style Design', open_style_design: 'Open Style Design',

View File

@ -1144,6 +1144,7 @@ export default {
bottomComponent: '置底', bottomComponent: '置底',
upComponent: '上移', upComponent: '上移',
downComponent: '下移', downComponent: '下移',
linkage_setting: '联动设置',
open_aided_design: '打開組件輔助設計', open_aided_design: '打開組件輔助設計',
close_aided_design: '關閉組件輔助設計', close_aided_design: '關閉組件輔助設計',
open_style_design: '打開樣式設計', open_style_design: '打開樣式設計',

View File

@ -1146,6 +1146,7 @@ export default {
bottomComponent: '置底', bottomComponent: '置底',
upComponent: '上移', upComponent: '上移',
downComponent: '下移', downComponent: '下移',
linkage_setting: '联动设置',
open_aided_design: '打开组件辅助设计', open_aided_design: '打开组件辅助设计',
close_aided_design: '关闭组件辅助设计', close_aided_design: '关闭组件辅助设计',
open_style_design: '打开样式设计', open_style_design: '打开样式设计',