Skip to content

Commit 7e6f4d3

Browse files
committed
refactor: canvas shape style
1 parent cb997d5 commit 7e6f4d3

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ function tabMoveOutCheckSQ() {
10931093
10941094
function tabMoveInCheckSQ() {
10951095
const { cloneItem, moveItem } = infoBox.value
1096-
if (cloneItem && moveItem && moveItem !== 'SQTab') {
1096+
if (cloneItem && moveItem && moveItem.component !== 'SQTab') {
10971097
const width = cloneItem.offsetWidth
10981098
const height = cloneItem.offsetHeight
10991099
const left = cloneItem.offsetLeft

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ const doDeleteComponent = (e: MouseEvent) => {
6060
@click="doPreview"
6161
>{{ t('dashboard.preview') }}</el-dropdown-item
6262
>
63-
<el-dropdown-item divided :icon="icon_delete" @click="doDeleteComponent">{{
64-
t('dashboard.delete')
65-
}}</el-dropdown-item>
63+
<el-dropdown-item
64+
:divided="configItem.component === 'SQView'"
65+
:icon="icon_delete"
66+
@click="doDeleteComponent"
67+
>{{ t('dashboard.delete') }}</el-dropdown-item
68+
>
6669
</el-dropdown-menu>
6770
</template>
6871
</el-dropdown>
@@ -74,10 +77,10 @@ const doDeleteComponent = (e: MouseEvent) => {
7477
.component-bar-main {
7578
height: 20px;
7679
position: absolute;
77-
right: 5px;
78-
top: 5px;
80+
right: 12px;
81+
top: 12px;
7982
display: flex;
80-
z-index: 5;
83+
z-index: 1;
8184
cursor: pointer !important;
8285
}
8386
@@ -93,7 +96,6 @@ const doDeleteComponent = (e: MouseEvent) => {
9396
background: rgba(255, 255, 255, 1);
9497
border: 1px solid rgba(217, 220, 223, 1);
9598
padding: 8px;
96-
9799
&:hover {
98100
background-color: rgba(245, 246, 247, 1);
99101
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const shadowStyle = (size: number, index: number) => {
5454

5555
<style scoped lang="less">
5656
.dragArea {
57-
opacity: 0.05;
57+
opacity: 0;
5858
}
5959
6060
.dragHandle {

frontend/src/views/dashboard/components/sq-tab/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ defineExpose({
279279

280280
<style scoped lang="less">
281281
::v-deep(.ed-tabs__header) {
282-
margin: 0 24px 0 12px !important;
282+
margin: 0 40px 0 12px !important;
283283
}
284284
::v-deep(.ed-tabs__nav-scroll) {
285285
margin: 0 12px !important;

frontend/src/views/dashboard/components/sq-text/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const init = reactive({
5656
plugins: 'link letterspacing', // 插件
5757
// 工具栏
5858
toolbar:
59-
'undo redo | fontfamily fontsize | |forecolor backcolor bold italic letterspacing |underline strikethrough link lineheight| formatselect | alignleft aligncenter alignright |',
59+
'fontfamily fontsize | |forecolor backcolor bold italic letterspacing |underline strikethrough link lineheight| formatselect | alignleft aligncenter alignright |',
6060
toolbar_location: '/',
6161
font_family_formats:
6262
'微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings',

frontend/src/views/dashboard/css/CanvasStyle.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464

6565
.movingItem {
6666
position: absolute;
67-
6867
border: none;
69-
68+
border-radius: 12px;
69+
overflow: hidden;
7070
&:before {
7171
position: absolute;
7272
z-index: 2;

0 commit comments

Comments
 (0)