blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

fix: 处理冲突

Browse Source
This commit is contained in:
奔跑的面条 2024-04-10 11:49:55 +08:00
parent 092af3df2a
commit cd4ce6bafa
5 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/chart/ContentEdit/components/EditRange/index.vue
View File

@ -55,10 +55,6 @@ const rangeModelStyle = computed(() => {
position: relative; position: relative;
transform-origin: left top; transform-origin: left top;
background-size: cover; background-size: cover;
<<<<<<< HEAD
border-radius: 10px;
=======
>>>>>>> dev
overflow: hidden; overflow: hidden;
@include fetch-border-color('hover-border-color'); @include fetch-border-color('hover-border-color');
@include fetch-bg-color('background-color2'); @include fetch-bg-color('background-color2');

13
src/views/chart/ContentEdit/components/EditSelect/index.vue
View File

@ -93,33 +93,20 @@ watch(
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
<<<<<<< HEAD
border-radius: 5px;
=======
>>>>>>> dev
overflow: hidden; overflow: hidden;
} }
.select-border { .select-border {
left: 0; left: 0;
top: 0; top: 0;
<<<<<<< HEAD
opacity: 0.5;
border-width: 2px;
=======
opacity: 1; opacity: 1;
border-width: 1px; border-width: 1px;
>>>>>>> dev
border-style: solid; border-style: solid;
border-color: v-bind('themeColor'); border-color: v-bind('themeColor');
} }
.select-background { .select-background {
top: 2px; top: 2px;
left: 2px; left: 2px;
<<<<<<< HEAD
opacity: 0.2;
=======
opacity: 0.08; opacity: 0.08;
>>>>>>> dev
background-color: v-bind('themeColor'); background-color: v-bind('themeColor');
} }
} }

4
src/views/chart/ContentEdit/components/EditShapeBox/index.vue
View File

@ -139,11 +139,7 @@ const hide = computed(() => {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
<<<<<<< HEAD
border-radius: 10px;
=======
border-radius: 4px; border-radius: 4px;
>>>>>>> dev
} }
.shape-modal-select { .shape-modal-select {

11
src/views/chart/ContentEdit/components/EditTools/index.vue
View File

@ -182,21 +182,13 @@ const btnList: BtnListType[] = [
key: 'import', key: 'import',
type: TypeEnum.IMPORTUPLOAD, type: TypeEnum.IMPORTUPLOAD,
name: '导入', name: '导入',
<<<<<<< HEAD
icon: ShareIcon icon: ShareIcon
=======
icon: DownloadIcon
>>>>>>> dev
}, },
{ {
key: 'export', key: 'export',
type: TypeEnum.BUTTON, type: TypeEnum.BUTTON,
name: '导出', name: '导出',
<<<<<<< HEAD
icon: DownloadIcon, icon: DownloadIcon,
=======
icon: ShareIcon,
>>>>>>> dev
handle: exportHandle handle: exportHandle
}, },
{ {
@ -239,11 +231,8 @@ $asideBottom: 70px;
border: 1px solid; border: 1px solid;
@include fetch-border-color('hover-border-color-shallow'); @include fetch-border-color('hover-border-color-shallow');
&.aside { &.aside {
<<<<<<< HEAD
=======
display: flex; display: flex;
justify-content: center; justify-content: center;
>>>>>>> dev
flex-direction: column-reverse; flex-direction: column-reverse;
height: auto; height: auto;
right: 20px; right: 20px;

4
src/views/chart/ContentEdit/index.vue
View File

@ -193,10 +193,6 @@ onMounted(() => {
@include background-image('background-point'); @include background-image('background-point');
@include goId('chart-edit-content') { @include goId('chart-edit-content') {
<<<<<<< HEAD
border-radius: 10px;
=======
>>>>>>> dev
overflow: hidden; overflow: hidden;
@extend .go-transition; @extend .go-transition;
@include fetch-theme('box-shadow'); @include fetch-theme('box-shadow');