提交 e7cb8e63 authored 作者: wangjiahao's avatar wangjiahao

refactor: 矩阵按钮修改 文案修改

上级 a50747c8
...@@ -1682,7 +1682,7 @@ export default { ...@@ -1682,7 +1682,7 @@ export default {
} }
}, },
startMoveIn() { startMoveIn() {
if (this.dragComponentInfo.auxiliaryMatrix) { if (this.$store.state.dragComponentInfo.auxiliaryMatrix) {
const moveInItemInfo = this.$store.state.dragComponentInfo const moveInItemInfo = this.$store.state.dragComponentInfo
this.addItemBox(moveInItemInfo) this.addItemBox(moveInItemInfo)
// console.log('startMoveIn:') // console.log('startMoveIn:')
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
</span> </span>
</div> </div>
<div v-else class="toolbar"> <div v-else class="toolbar">
<!-- <div class="canvas-config" style="margin-right: 10px">-->
<!-- <el-tooltip :content="$t('panel.new_element_distribution')">--> <!-- <span>{{ $t('panel.new_element_distribution') }}:</span>-->
<!-- <el-switch--> <!-- <el-switch-->
<!-- v-model="canvasStyleData.auxiliaryMatrix"--> <!-- v-model="canvasStyleData.auxiliaryMatrix"-->
<!-- :width="35"--> <!-- :width="35"-->
...@@ -22,19 +22,33 @@ ...@@ -22,19 +22,33 @@
<!-- :active-text="$t('panel.matrix')"--> <!-- :active-text="$t('panel.matrix')"-->
<!-- :inactive-text="$t('panel.suspension')"--> <!-- :inactive-text="$t('panel.suspension')"-->
<!-- />--> <!-- />-->
<!-- </el-tooltip>--> <!-- </div>-->
<!-- <div class="canvas-config" style="margin-right: 10px" @click.stop="auxiliaryMatrixChange">-->
<div class="canvas-config" style="margin-right: 10px"> <!-- <span>{{ $t('panel.new_element_distribution.matrix_design') }}:</span>-->
<el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" /> <!-- <span v-if="curComponent.auxiliaryMatrix">-->
<span>{{ $t('panel.matrix_design') }}</span> <!-- <i class="icon iconfont icon-shujujuzhen" />-->
</div> <!-- {{ $t('panel.matrix_design') }}-->
<!-- </span>-->
<!-- <span v-if="!curComponent.auxiliaryMatrix">-->
<!-- <i class="icon iconfont icon-xuanfuanniu" />-->
<!-- {{ $t('panel.suspension') }}-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="canvas-config" style="margin-right: 10px">--> <!-- <div class="canvas-config" style="margin-right: 10px">-->
<!-- <span> {{ $t('panel.canvas_scale') }} </span>--> <!-- <span> {{ $t('panel.canvas_scale') }} </span>-->
<!-- <input v-model="scale" @input="handleScaleChange"> %--> <!-- <input v-model="scale" @input="handleScaleChange"> %-->
<!-- </div>--> <!-- </div>-->
<el-tooltip v-if="!canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.suspension')">
<el-button class="icon iconfont-tb icon-xuanfuanniu" size="mini" circle @click="auxiliaryMatrixChange" />
</el-tooltip>
<el-tooltip v-if="canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.matrix')">
<el-button class="icon iconfont-tb icon-shujujuzhen" size="mini" circle @click="auxiliaryMatrixChange" />
</el-tooltip>
<el-tooltip :content="$t('panel.style')"> <el-tooltip :content="$t('panel.style')">
<el-button :class="styleButtonActive?'button-show':'button-closed'" class="el-icon-magic-stick" size="mini" circle @click="showPanel" /> <el-button class="el-icon-magic-stick" size="mini" circle @click="showPanel" />
<!-- <el-button :class="styleButtonActive?'button-show':'button-closed'" class="el-icon-magic-stick" size="mini" circle @click="showPanel" />-->
</el-tooltip> </el-tooltip>
<!-- <el-tooltip v-if="!aidedButtonActive" :content="$t('panel.open_aided_design') ">--> <!-- <el-tooltip v-if="!aidedButtonActive" :content="$t('panel.open_aided_design') ">-->
...@@ -372,6 +386,9 @@ export default { ...@@ -372,6 +386,9 @@ export default {
}, },
cancelLinkageSettingStatus() { cancelLinkageSettingStatus() {
this.$store.commit('clearLinkageSettingInfo') this.$store.commit('clearLinkageSettingInfo')
},
auxiliaryMatrixChange() {
this.canvasStyleData.auxiliaryMatrix = !this.canvasStyleData.auxiliaryMatrix
} }
} }
} }
...@@ -382,7 +399,7 @@ export default { ...@@ -382,7 +399,7 @@ export default {
float: right; float: right;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
min-width: 500px; min-width: 400px;
/*background: #fff;*/ /*background: #fff;*/
/*border-bottom: 1px solid #ddd;*/ /*border-bottom: 1px solid #ddd;*/
...@@ -390,7 +407,6 @@ export default { ...@@ -390,7 +407,6 @@ export default {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
font-size: 14px; font-size: 14px;
color: #606266;
input { input {
width: 50px; width: 50px;
...@@ -398,7 +414,6 @@ export default { ...@@ -398,7 +414,6 @@ export default {
outline: none; outline: none;
padding: 0 5px; padding: 0 5px;
border: 1px solid #ddd; border: 1px solid #ddd;
color: #606266;
} }
span { span {
...@@ -413,7 +428,7 @@ export default { ...@@ -413,7 +428,7 @@ export default {
cursor: pointer; cursor: pointer;
background: #FFF; background: #FFF;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
color: #606266; color: var(--TextPrimary, #606266);
-webkit-appearance: none; -webkit-appearance: none;
text-align: center; text-align: center;
box-sizing: border-box; box-sizing: border-box;
...@@ -460,4 +475,12 @@ export default { ...@@ -460,4 +475,12 @@ export default {
margin-bottom: 2px; margin-bottom: 2px;
} }
.iconfont-tb {
font-family: "iconfont" !important;
font-size: 12px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</style> </style>
...@@ -1320,7 +1320,7 @@ export default { ...@@ -1320,7 +1320,7 @@ export default {
no_drill_field: '缺少關聯字段', no_drill_field: '缺少關聯字段',
matrix: '矩阵', matrix: '矩阵',
suspension: '悬浮', suspension: '悬浮',
new_element_distribution: '新元素分布方式', new_element_distribution: '当前元素移入分布方式',
subject_no_edit: '系统主题不能修改', subject_no_edit: '系统主题不能修改',
subject_name_not_null: '主题名称需要1~20字符' subject_name_not_null: '主题名称需要1~20字符'
}, },
......
...@@ -1325,7 +1325,7 @@ export default { ...@@ -1325,7 +1325,7 @@ export default {
no_drill_field: '缺少关联字段', no_drill_field: '缺少关联字段',
matrix: '矩阵', matrix: '矩阵',
suspension: '悬浮', suspension: '悬浮',
new_element_distribution: '新元素分布方式', new_element_distribution: '当前元素移入分布方式',
subject_no_edit: '系统主题不能修改', subject_no_edit: '系统主题不能修改',
subject_name_not_null: '主题名称需要1~20字符' subject_name_not_null: '主题名称需要1~20字符'
}, },
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
@mousedown="handleMouseDown" @mousedown="handleMouseDown"
@mouseup="deselectCurComponent" @mouseup="deselectCurComponent"
> >
<Editor ref="canvasEditor" v-if="!previewVisible" :out-style="outStyle" @canvasScroll="canvasScroll" /> <Editor v-if="!previewVisible" ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
</div> </div>
</de-main-container> </de-main-container>
<!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">--> <!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
...@@ -455,7 +455,9 @@ export default { ...@@ -455,7 +455,9 @@ export default {
const self = evt.target.closest('.el-drawer__wrapper') const self = evt.target.closest('.el-drawer__wrapper')
// 点击样式按钮 排除 // 点击样式按钮 排除
const stick = evt.target.closest('.el-icon-magic-stick') const stick = evt.target.closest('.el-icon-magic-stick')
if (!parent && !self && !stick) { const xuanfuanniu = evt.target.closest('.icon-xuanfuanniu')
const shujujuzhen = evt.target.closest('.icon-shujujuzhen')
if (!parent && !self && !stick && !xuanfuanniu && !shujujuzhen) {
this.show = false this.show = false
window.removeEventListener('click', this.closeSidebar) window.removeEventListener('click', this.closeSidebar)
this.showIndex = -1 this.showIndex = -1
......
...@@ -798,11 +798,11 @@ export default { ...@@ -798,11 +798,11 @@ export default {
} }
</script> </script>
<style scoped> <style lang='scss' scoped>
.header-title { .header-title {
font-size: 14px; font-size: 14px;
flex: 1; flex: 1;
color: #606266; color: var(--TextPrimary, #606266);
font-weight: bold; font-weight: bold;
display: block; display: block;
height: 100%; height: 100%;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论