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

feat:恢复合并冲突

Browse Source
This commit is contained in:
wangjiahao 2021-04-01 11:56:46 +08:00
parent d7d4c77b66
commit eaa4cf9a7f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/canvas/components/Toolbar.vue
View File

@ -34,7 +34,7 @@
</div>
<!-- 预览 -->
<!-- <Preview v-model="isShowPreview" @change="handlePreviewChange" />-->
<!-- <Preview v-model="isShowPreview" @change="handlePreviewChange" />-->
</div>
</template>
@ -42,14 +42,12 @@
import generateID from '@/components/canvas/utils/generateID'
import toast from '@/components/canvas/utils/toast'
import { mapState } from 'vuex'
import Preview from '@/components/canvas/components/Editor/Preview'
import { commonStyle, commonAttr } from '@/components/canvas/custom-component/component-list'
import eventBus from '@/components/canvas/utils/eventBus'
import { deepCopy } from '@/components/canvas/utils/utils'
import { post } from '@/api/panel/panel'
export default {
components: { Preview },
data() {
return {
isShowPreview: false,