Skip to content

Commit f93f3f1

Browse files
committed
Merge branch 'main' of https://github.com/dataease/SQLBot
2 parents 70a6a64 + d25f91a commit f93f3f1

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

frontend/src/views/chat/chat-block/ChartBlock.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ const chartObject = computed<{
117117
return {}
118118
})
119119
120-
const currentChartType = ref<ChartTypes | undefined>(undefined)
120+
const currentChartType = ref<ChartTypes | undefined>(
121+
props.chatType ?? chartObject.value.type ?? 'table'
122+
)
121123
122124
const chartType = computed<ChartTypes>({
123125
get() {

frontend/src/views/dashboard/canvas/CanvasCore.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ function removeItemFromPositionBox(item: CanvasItem) {
251251
*/
252252
function recomputeCellWidth() {
253253
if (!containerRef.value) return
254-
maxCell.value = isMainCanvas(props.canvasId)
255-
? Math.floor(containerRef.value.offsetWidth / cellWidth.value)
256-
: Math.round(containerRef.value.offsetWidth / cellWidth.value)
254+
maxCell.value = Math.floor(containerRef.value.offsetWidth / cellWidth.value)
257255
}
258256
259257
function sizeInit() {

frontend/src/views/dashboard/editor/index.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ const baseParams = computed(() => {
9393

9494
<style scoped lang="less">
9595
.editor-content {
96-
padding: 8px;
9796
width: 100vw;
9897
height: 100vh;
9998
background: #fff;
@@ -104,10 +103,8 @@ const baseParams = computed(() => {
104103
padding: 0 !important;
105104
}
106105
.editor-main {
107-
border-radius: 12px;
108106
position: relative;
109107
background: #f5f6f7;
110-
box-shadow: 4px 4px 8px 4px rgba(31, 35, 41, 0.2);
111108
overflow: hidden;
112109
width: 100%;
113110
height: 100%;

0 commit comments

Comments
 (0)