github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8352 from dataease/pr@dev-v2_bug_fix

Browse Source 
Pr@dev v2 bug fix
This commit is contained in:
dataeaseShu 2024-03-05 17:47:28 +08:00 committed by GitHub
commit 1ea19e78f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/assets/svg/mobile/icon_dashboard_filled.svg
View File

@ -1,3 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.5 8C16.2239 8 16 8.22386 16 8.5V20H14.5V2.5C14.5 2.22386 14.2761 2 14 2H10C9.72386 2 9.5 2.22386 9.5 2.5V20H8V11.5C8 11.2239 7.77614 11 7.5 11H3.5C3.22386 11 3 11.2239 3 11.5V20H1.5C1.22386 20 1 20.2239 1 20.5V21.5C1 21.7761 1.22386 22 1.5 22H22.5C22.7761 22 23 21.7761 23 21.5V20.5C23 20.2239 22.7761 20 22.5 20H21V8.5C21 8.22386 20.7761 8 20.5 8H16.5Z" fill="#3370FF"/>
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M16.5 8C16.2239 8 16 8.22386 16 8.5V20H14.5V2.5C14.5 2.22386 14.2761 2 14 2H10C9.72386 2 9.5 2.22386 9.5 2.5V20H8V11.5C8 11.2239 7.77614 11 7.5 11H3.5C3.22386 11 3 11.2239 3 11.5V20H1.5C1.22386 20 1 20.2239 1 20.5V21.5C1 21.7761 1.22386 22 1.5 22H22.5C22.7761 22 23 21.7761 23 21.5V20.5C23 20.2239 22.7761 20 22.5 20H21V8.5C21 8.22386 20.7761 8 20.5 8H16.5Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 461 B

2
core/core-frontend/src/assets/svg/mobile/icon_home_filled.svg
View File

@ -1,3 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4233 2.68303C11.769 2.43899 12.231 2.43899 12.5767 2.68303L21.0767 8.68303C21.3421 8.87041 21.5 9.17508 21.5 9.5V20.5C21.5 21.0523 21.0523 21.5 20.5 21.5H14V16.5C14 15.3954 13.1046 14.5 12 14.5C10.8954 14.5 10 15.3954 10 16.5V21.5H3.5C2.94772 21.5 2.5 21.0523 2.5 20.5V9.5C2.5 9.17508 2.65786 8.87041 2.92332 8.68303L11.4233 2.68303Z" fill="#3370FF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4233 2.68303C11.769 2.43899 12.231 2.43899 12.5767 2.68303L21.0767 8.68303C21.3421 8.87041 21.5 9.17508 21.5 9.5V20.5C21.5 21.0523 21.0523 21.5 20.5 21.5H14V16.5C14 15.3954 13.1046 14.5 12 14.5C10.8954 14.5 10 15.3954 10 16.5V21.5H3.5C2.94772 21.5 2.5 21.0523 2.5 20.5V9.5C2.5 9.17508 2.65786 8.87041 2.92332 8.68303L11.4233 2.68303Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 481 B

6
core/core-frontend/src/assets/svg/mobile/icon_member_filled.svg
View File

@ -1,4 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15 13H9C6.23858 13 3 14.9315 3 18.4V21.1C3 21.5971 3.44772 22 4 22H20C20.5523 22 21 21.5971 21 21.1V18.4C21 14.9286 17.7614 13 15 13Z" fill="#3370FF"/>
<path d="M7 7C7 9.76142 9.23858 12 12 12C14.7614 12 17 9.76142 17 7C17 4.23858 14.7614 2 12 2C9.23858 2 7 4.23858 7 7Z" fill="#3370FF"/>
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M15 13H9C6.23858 13 3 14.9315 3 18.4V21.1C3 21.5971 3.44772 22 4 22H20C20.5523 22 21 21.5971 21 21.1V18.4C21 14.9286 17.7614 13 15 13Z" />
<path d="M7 7C7 9.76142 9.23858 12 12 12C14.7614 12 17 9.76142 17 7C17 4.23858 14.7614 2 12 2C9.23858 2 7 4.23858 7 7Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 361 B

6
core/core-frontend/src/components/visualization/CanvasOptBar.vue
View File

@ -1,5 +1,9 @@
<template>
<div v-if="existLinkage" class="bar-main-right" :class="{ 'bar-main-edit-right': dvEditMode }">
<div
v-if="existLinkage && !dvMainStore.mobileInPc"
class="bar-main-right"
:class="{ 'bar-main-edit-right': dvEditMode }"
>
<el-button size="mini" type="warning" @click="clearAllLinkage"
><el-icon class="bar-base-icon"> <Icon name="dv-bar-unLinkage"></Icon></el-icon
>{{ $t('visualization.remove_all_linkage') }}</el-button

1
core/core-frontend/src/views/chart/components/views/index.vue
View File

@ -106,7 +106,6 @@ const titleShow = computed(
state.title_show &&
showPosition.value !== 'viewDialog'
)
const snapshotStore = snapshotStoreWithOut()
const state = reactive({

1
core/core-frontend/src/views/common/MultiplexingCanvas.vue
View File

@ -11,6 +11,7 @@
v-if="dialogShow"
ref="multiplexingPreviewShowRef"
class="multiplexing-area"
no-close
show-position="multiplexing"
></dashboard-preview-show>
<template #footer>

7
core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue
View File

@ -38,6 +38,11 @@ const props = defineProps({
required: false,
type: String,
default: 'preview'
},
noClose: {
required: false,
type: Boolean,
default: false
}
})
@ -156,6 +161,7 @@ defineExpose({
<template>
<div class="dv-preview dv-teleport-query">
<ArrowSide
v-if="!noClose"
:style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
@change-side-tree-status="changeSideTreeStatus"
:isInside="!sideTreeStatus"
@ -169,6 +175,7 @@ defineExpose({
:style="{ width: width + 'px' }"
>
<ArrowSide
v-if="!noClose"
:isInside="!sideTreeStatus"
:style="{ left: (sideTreeStatus ? width - 12 : 0) + 'px' }"
@change-side-tree-status="changeSideTreeStatus"

7
core/core-frontend/src/views/mobile/index.vue
View File

@ -90,6 +90,13 @@ onBeforeMount(() => {
bottom: auto;
top: auto;
}
.van-tabbar-item--active {
.van-tabbar-item__icon {
.ed-icon {
color: var(--ed-color-primary, #3370ff);
}
}
}
.van-tabbar-item {
.ed-icon {