From e7cb8e63dd1e555b8ac85ae419d4c51d42a16472 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 12 Oct 2021 17:48:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=9F=A9=E9=98=B5=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E4=BF=AE=E6=94=B9=20=E6=96=87=E6=A1=88=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canvas/components/Editor/index.vue | 2 +-
.../components/canvas/components/Toolbar.vue | 49 ++++++++++++++-----
frontend/src/lang/tw.js | 2 +-
frontend/src/lang/zh.js | 2 +-
frontend/src/views/panel/edit/index.vue | 6 ++-
frontend/src/views/panel/list/PanelList.vue | 4 +-
6 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 8e1107895f..e2e7b17f93 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1682,7 +1682,7 @@ export default {
}
},
startMoveIn() {
- if (this.dragComponentInfo.auxiliaryMatrix) {
+ if (this.$store.state.dragComponentInfo.auxiliaryMatrix) {
const moveInItemInfo = this.$store.state.dragComponentInfo
this.addItemBox(moveInItemInfo)
// console.log('startMoveIn:')
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index c400d1f7cc..201da4765e 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -12,8 +12,8 @@
-
-
+
+
@@ -22,19 +22,33 @@
-
-
-
-
- {{ $t('panel.matrix_design') }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -372,6 +386,9 @@ export default {
},
cancelLinkageSettingStatus() {
this.$store.commit('clearLinkageSettingInfo')
+ },
+ auxiliaryMatrixChange() {
+ this.canvasStyleData.auxiliaryMatrix = !this.canvasStyleData.auxiliaryMatrix
}
}
}
@@ -382,7 +399,7 @@ export default {
float: right;
height: 35px;
line-height: 35px;
- min-width: 500px;
+ min-width: 400px;
/*background: #fff;*/
/*border-bottom: 1px solid #ddd;*/
@@ -390,7 +407,6 @@ export default {
display: inline-block;
margin-left: 10px;
font-size: 14px;
- color: #606266;
input {
width: 50px;
@@ -398,7 +414,6 @@ export default {
outline: none;
padding: 0 5px;
border: 1px solid #ddd;
- color: #606266;
}
span {
@@ -413,7 +428,7 @@ export default {
cursor: pointer;
background: #FFF;
border: 1px solid #DCDFE6;
- color: #606266;
+ color: var(--TextPrimary, #606266);
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
@@ -460,4 +475,12 @@ export default {
margin-bottom: 2px;
}
+ .iconfont-tb {
+ font-family: "iconfont" !important;
+ font-size: 12px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index bed0ee3a10..eaecff92fd 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1320,7 +1320,7 @@ export default {
no_drill_field: '缺少關聯字段',
matrix: '矩阵',
suspension: '悬浮',
- new_element_distribution: '新元素分布方式',
+ new_element_distribution: '当前元素移入分布方式',
subject_no_edit: '系统主题不能修改',
subject_name_not_null: '主题名称需要1~20字符'
},
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index ee9515228d..de631ad8e4 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1325,7 +1325,7 @@ export default {
no_drill_field: '缺少关联字段',
matrix: '矩阵',
suspension: '悬浮',
- new_element_distribution: '新元素分布方式',
+ new_element_distribution: '当前元素移入分布方式',
subject_no_edit: '系统主题不能修改',
subject_name_not_null: '主题名称需要1~20字符'
},
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 8e25d43c81..a19bf47284 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -104,7 +104,7 @@
@mousedown="handleMouseDown"
@mouseup="deselectCurComponent"
>
-
+