Unverified 提交 b48f3c0b authored 作者: 王嘉豪's avatar 王嘉豪 提交者: GitHub

Merge pull request #2026 from dataease/pr@dev@refactor-panel-inner-style

refactor: 去掉组件悬浮样式框多余的样式设置
......@@ -244,8 +244,6 @@ export default {
'picture-add': [
'borderStyle',
'borderWidth',
'borderRadius',
'opacity',
'borderColor',
'hyperlinks'
],
......@@ -254,15 +252,12 @@ export default {
'fontSize',
'fontWeight',
'letterSpacing',
'color',
'backgroundColor'
'color'
],
// tab组件显示的属性
'de-tabs': [
'borderStyle',
'borderWidth',
'borderRadius',
'opacity',
'borderColor',
'deTabStyle'
],
......@@ -270,20 +265,14 @@ export default {
'rect-shape': [
'borderStyle',
'borderWidth',
'borderRadius',
'opacity',
'borderColor',
'backgroundColor'
'borderColor'
],
// 时间组件显示的属性
'de-show-date': [
'textAlign',
'fontSize',
'fontWeight',
'opacity',
'borderRadius',
'color',
'backgroundColor',
'date-format',
'time_margin',
'padding'
......@@ -295,10 +284,7 @@ export default {
'fontSize',
'fontWeight',
'letterSpacing',
'opacity',
'borderRadius',
'color',
'backgroundColor',
'hyperlinks'
],
'de-video': [
......@@ -405,9 +391,9 @@ export default {
this.innerOpacity = this.styleInfo['opacity'] * 100
}
if (this.curComponent.type === 'v-text') {
this.mainWidthOffset = 600
this.mainWidthOffset = 400
} else if (this.curComponent.type === 'de-show-date') {
this.mainWidthOffset = 600
this.mainWidthOffset = 350
} else {
this.mainWidthOffset = document.getElementById('main-attr').offsetWidth - 50
}
......
......@@ -208,9 +208,7 @@ const list = [
letterSpacing: 0,
textAlign: 'center',
color: '#000000',
verticalAlign: 'middle',
backgroundColor: '#ffffff',
borderRadius: 0
verticalAlign: 'middle'
},
hyperlinks: HYPERLINKS,
x: 1,
......@@ -255,8 +253,7 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
style: {
width: 300,
height: 200,
borderRadius: ''
height: 200
},
x: 1,
y: 1,
......@@ -296,9 +293,7 @@ const list = [
height: 200,
borderStyle: 'solid',
borderWidth: 0,
borderColor: '#000000',
backgroundColor: '#ffffff',
borderRadius: 0
borderColor: '#000000'
},
x: 1,
y: 1,
......@@ -317,8 +312,7 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
style: {
width: 300,
height: 200,
borderRadius: ''
height: 200
},
x: 1,
y: 36,
......@@ -341,9 +335,7 @@ const list = [
height: 200,
borderStyle: 'solid',
borderWidth: 0,
borderColor: '#000000',
backgroundColor: '#ffffff',
borderRadius: 0
borderColor: '#000000'
},
options: {
tabList: [{
......@@ -377,10 +369,8 @@ const list = [
textAlign: 'center',
color: '#000000',
verticalAlign: 'middle',
backgroundColor: '#ffffff',
borderStyle: 'solid',
borderColor: '#000000',
borderRadius: 0,
time_margin: 0,
padding: 10
},
......@@ -408,8 +398,7 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
style: {
width: 400,
height: 200,
borderRadius: ''
height: 200
},
frameLinks: FRAMELINKS,
x: 1,
......@@ -430,8 +419,7 @@ const list = [
hyperlinks: HYPERLINKS,
style: {
width: 400,
height: 200,
borderRadius: ''
height: 200
},
x: 1,
y: 1,
......@@ -450,8 +438,7 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
style: {
width: 400,
height: 200,
borderRadius: ''
height: 200
},
videoLinks: VIDEOLINKS,
x: 1,
......@@ -471,8 +458,7 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
style: {
width: 400,
height: 200,
borderRadius: ''
height: 200
},
streamMediaLinks: STREAMMEDIALINKS,
x: 1,
......
......@@ -46,7 +46,6 @@
<svg-icon icon-class="panel" class="ds-icon-scene" />
</span>
<span v-else>
<svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" />
<svg-icon :icon-class="data.isPlugin ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
</span>
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论