lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-05-20 08:47:18 +08:00
Code Issues Projects Releases Wiki Activity

bugfix--大屏表格背景色冲突

Browse Source
This commit is contained in:
qianming
2024-08-13 11:50:43 +08:00
parent 174546d330
commit 65ff28d3d5
2 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-table.js
View File

@@ -22,6 +22,10 @@ export const widgetTable = {
placeholder: '',
value: '表格',
},
[
{
name: '表格设置',
list: [
{
type: 'el-input-number',
label: '显示行数',
@@ -38,7 +42,40 @@ export const widgetTable = {
placeholder: '',
value: '50'
},
[
{
type: 'vue-color',
label: '背景色',
name: 'tableBgColor',
require: false,
placeholder: '',
value: '',
},
{
type: 'el-switch',
label: '边框线',
name: 'isLine',
required: false,
placeholder: '',
value: false
},
{
type: 'el-input-number',
label: '边框宽度',
name: 'borderWidth',
required: false,
placeholder: '',
value: 1
},
{
type: 'vue-color',
label: '边框颜色',
name: 'borderColor',
required: false,
placeholder: '',
value: '#fff'
},
]
},
{
name: '表头设置',
list: [
@@ -122,7 +159,7 @@ export const widgetTable = {
},
{
type: 'vue-color',
label: '表头背景色',
label: '背景色',
name: 'headBackColor',
require: false,
placeholder: '',
@@ -203,14 +240,6 @@ export const widgetTable = {
],
value: 'sans-serif'
},
{
type: 'vue-color',
label: '表体背景色',
name: 'tableBgColor',
require: false,
placeholder: '',
value: '',
},
{
type: 'vue-color',
label: '奇行颜色',
@@ -229,7 +258,9 @@ export const widgetTable = {
}
],
},
],
{
name: '动画设置',
list: [
{
type: 'el-switch',
label: '开启滚动',
@@ -274,30 +305,9 @@ export const widgetTable = {
placeholder: '',
value: 1
},
{
type: 'el-switch',
label: '边框线',
name: 'isLine',
required: false,
placeholder: '',
value: false
},
{
type: 'el-input-number',
label: '边框宽度',
name: 'borderWidth',
required: false,
placeholder: '',
value: 1
},
{
type: 'vue-color',
label: '边框颜色',
name: 'borderColor',
required: false,
placeholder: '',
value: '#fff'
},
]
}
],
{
type: 'dynamic-add-table',
label: '',

1
report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetTable.vue
View File

@@ -106,7 +106,6 @@ export default {
"border-width": bodyStyle.borderWidth + "px",
"border-color": bodyStyle.borderColor,
"color": bodyStyle.bodyColor,
"background-color": bodyStyle.tableBgColor
};
}
},