center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #925 from dataease/v1.3

Browse Source 
V1.3
This commit is contained in:
王嘉豪 2021-10-13 14:31:12 +08:00 committed by GitHub
commit d602cc1589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/canvas/index.vue
View File

@ -35,7 +35,7 @@ import Toolbar from '@/components/Toolbar'
import { deepCopy } from '@/utils/utils' import { deepCopy } from '@/utils/utils'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import generateID from '@/utils/generateID' import generateID from '@/utils/generateID'
import { listenGlobalKeyDown } from '@/utils/shortcutKey' // import { listenGlobalKeyDown } from '@/utils/shortcutKey'
export default { export default {
// eslint-disable-next-line vue/no-unused-components // eslint-disable-next-line vue/no-unused-components

10
frontend/src/views/panel/edit/index.vue
View File

@ -104,8 +104,9 @@
@dragover="handleDragOver" @dragover="handleDragOver"
@mousedown="handleMouseDown" @mousedown="handleMouseDown"
@mouseup="deselectCurComponent" @mouseup="deselectCurComponent"
@scroll="canvasScroll"
> >
<Editor ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" /> <Editor ref="canvasEditor" :out-style="outStyle" />
</div> </div>
</de-main-container> </de-main-container>
<!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">--> <!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
@ -188,7 +189,7 @@ import bus from '@/utils/bus'
import Editor from '@/components/canvas/components/Editor/index' import Editor from '@/components/canvas/components/Editor/index'
import { deepCopy } from '@/components/canvas/utils/utils' import { deepCopy } from '@/components/canvas/utils/utils'
import componentList from '@/components/canvas/custom-component/component-list' // 左侧列表数据 import componentList from '@/components/canvas/custom-component/component-list' // 左侧列表数据
import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey' // import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { uuid } from 'vue-uuid' import { uuid } from 'vue-uuid'
import Toolbar from '@/components/canvas/components/Toolbar' import Toolbar from '@/components/canvas/components/Toolbar'
@ -345,7 +346,7 @@ export default {
this.init(this.$store.state.panel.panelInfo.id) this.init(this.$store.state.panel.panelInfo.id)
// this.restore() // this.restore()
// 全局监听按键事件 // 全局监听按键事件
listenGlobalKeyDown() // listenGlobalKeyDown()
this.$store.commit('setCurComponent', { component: null, index: null }) this.$store.commit('setCurComponent', { component: null, index: null })
this.$store.commit('clearLinkageSettingInfo', false) this.$store.commit('clearLinkageSettingInfo', false)
@ -654,7 +655,8 @@ export default {
const canvasHeight = document.getElementById('canvasInfo').offsetHeight const canvasHeight = document.getElementById('canvasInfo').offsetHeight
const canvasWidth = document.getElementById('canvasInfo').offsetWidth const canvasWidth = document.getElementById('canvasInfo').offsetWidth
this.outStyle.height = canvasHeight this.outStyle.height = canvasHeight
this.outStyle.width = canvasWidth // 临时处理 确保每次restore 有会更新
this.outStyle.width = canvasWidth + (Math.random() * 0.000001)
// console.log(canvasHeight + '--' + canvasWidth) // console.log(canvasHeight + '--' + canvasWidth)
}) })
} }