forked from github/dataease
fix: 时钟组件边框属性导致背景下移
This commit is contained in:
parent
d90bda5014
commit
e98b09a329
@ -78,12 +78,12 @@
|
||||
<el-input v-model="styleInfo.margin" type="number" size="mini" min="0" max="99" @change="styleChange" />
|
||||
</div>
|
||||
|
||||
<el-tooltip v-if="attrShow('time_margin')" :content="$t('panel.margin')">
|
||||
<el-tooltip v-if="attrShow('padding')" :content="$t('panel.margin')">
|
||||
<i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-margin" />
|
||||
</el-tooltip>
|
||||
|
||||
<div v-if="attrShow('time_margin')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
|
||||
<el-input v-model="styleInfo.time_margin" type="number" size="mini" min="0" max="99" @change="styleChange" />
|
||||
<div v-if="attrShow('padding')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
|
||||
<el-input v-model="styleInfo.padding" type="number" size="mini" min="0" max="99" @change="styleChange" />
|
||||
</div>
|
||||
|
||||
<el-tooltip v-if="attrShow('opacity')" :content="$t('panel.opacity')">
|
||||
@ -268,7 +268,8 @@ export default {
|
||||
'color',
|
||||
'backgroundColor',
|
||||
'date-format',
|
||||
'time_margin'
|
||||
'time_margin',
|
||||
'padding'
|
||||
/* 'margin' */
|
||||
],
|
||||
// 文本组件显示的属性
|
||||
|
@ -307,8 +307,8 @@ const list = [
|
||||
borderStyle: 'solid',
|
||||
borderColor: '#000000',
|
||||
borderRadius: 0,
|
||||
/* margin: 10, */
|
||||
time_margin: 0
|
||||
time_margin: 0,
|
||||
padding: 10
|
||||
},
|
||||
formatInfo: {
|
||||
openMode: '0',
|
||||
|
@ -10,7 +10,8 @@ export function getStyle(style, filter = []) {
|
||||
'borderWidth',
|
||||
'letterSpacing',
|
||||
'borderRadius',
|
||||
'margin'
|
||||
'margin',
|
||||
'padding'
|
||||
]
|
||||
|
||||
const result = {}
|
||||
@ -75,7 +76,7 @@ export function colorRgb(color, opacity) {
|
||||
}
|
||||
// 处理六位的颜色值
|
||||
var sColorChange = []
|
||||
for (var i = 1; i < 7; i += 2) {
|
||||
for (let i = 1; i < 7; i += 2) {
|
||||
sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
|
||||
}
|
||||
if (opacity || opacity === 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user