wuguolin
/
smartbi2
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	frontend/src/views/chart/components/table/TableNormal.vue
dev
zhenghuang 4 years ago
parent 0ad6d4eb49 d17733bf83
commit ce49fd603c
10 changed files with 301 additions and 172 deletions
Show Stats Download Patch File Download Diff File

2
frontend/public/link.html
Unescape Escape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico"> <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
<title>Ipsos VIA BIBoard</title> <title>Ipsos BIboard</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div id="link"></div> <div id="link"></div>

2
frontend/public/nolic.html
Unescape Escape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico"> <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
<title>Ipsos VIA BIBoard</title> <title>Ipsos BIboard</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div id="nolic"></div> <div id="nolic"></div>

2
frontend/src/layout/components/Topbar.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<div class="top-nav"> <div class="top-nav">
<div v-loading="!axiosFinished" class="log"> <div v-loading="!axiosFinished" class="log">
<router-link to="/"> <router-link to="/">
<span>Ipsos VIA BIBoard</span> <span>Ipsos BIboard</span>
</router-link> </router-link>
<!-- <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />--> <!-- <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />-->
<!-- <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">--> <!-- <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">-->

2
frontend/src/settings.js
Unescape Escape View File

@ -2,7 +2,7 @@ module.exports = {
TokenKey: 'Authorization', TokenKey: 'Authorization',
RefreshTokenKey: 'refreshauthorization', RefreshTokenKey: 'refreshauthorization',
LinkTokenKey: 'LINK-PWD-TOKEN', LinkTokenKey: 'LINK-PWD-TOKEN',
title: 'Ipsos VIA BIBoard', title: 'Ipsos BIboard',
/* for sso */ /* for sso */
IdTokenKey: 'IdToken', IdTokenKey: 'IdToken',
AccessTokenKey: 'AccessToken', AccessTokenKey: 'AccessToken',

2
frontend/src/styles/deicon/iconfont.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"id": "2459092", "id": "2459092",
"name": "Ipsos VIA BIBoard", "name": "Ipsos BIboard",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",

328
frontend/src/views/chart/components/table/TableNormal.vue
Unescape Escape View File

@ -1,47 +1,48 @@
<template> <template>
<div <div ref="tableContainer" :style="bg_class" style="padding: 8px;width: 100%;height: 100%;overflow: hidden;">
ref="tableContainer" <el-row style="height: 100%;">
:style="bg_class" <p v-show="title_show" ref="title" :style="title_class">{{ chart.title }}</p>
style="padding: 8px; width: 100%; height: 100%; overflow: hidden"
>
<el-row style="height: 100%">
<p v-show="title_show" ref="title" :style="title_class">
{{ chart.title }}
</p>
<ux-grid <ux-grid
ref="plxTable" ref="plxTable"
size="mini" size="mini"
style="width: 100%" style="width: 100%;"
:height="height" :height="height"
:checkbox-config="{highlight: true}" :checkbox-config="{highlight: true}"
:width-resize="true" :width-resize="true"
:header-row-style="table_header_class" :header-row-style="table_header_class"
:row-style="getRowStyle" :row-style="getRowStyle"
:merge-cells="mergeCells"
class="table-class" class="table-class"
show-overflow="tooltip"
show-header-overflow="tooltip"
:class="chart.id" :class="chart.id"
:show-summary="showSummary" :show-summary="showSummary"
:summary-method="summaryMethod" :summary-method="summaryMethod"
> >
<ux-table-column <ux-table-column
v-for="field in fields" v-for="(field, index) in fields"
:key="Math.random()" :key="field.dataeaseName+index"
:field="field.dataeaseName" :field="field.subFields?'':field.dataeaseName"
:resizable="true" :resizable="true"
sortable :fixed="field.fixed"
:title="field.name" :title="field.name"
> >
<!-- <template slot="header">--> <template v-if="field.subFields">
<!-- <span>{{ field.name }}</span>--> <ux-table-column
<!-- </template>--> v-for="(subfield) in field.subFields"
:key="subfield.dataeaseName"
:field="subfield.dataeaseName"
:resizable="true"
:title="subfield.name"
/>
</template>
</ux-table-column> </ux-table-column>
</ux-grid> </ux-grid>
<el-row v-show="chart.type === 'table-info'" class="table-page"> <el-row v-show="chart.type === 'table-info'" class="table-page">
<span class="total-style"> <span class="total-style">
{{ $t('chart.total') }} {{ $t('chart.total') }}
<span>{{ <span>{{ (chart.data && chart.data.tableRow)?chart.data.tableRow.length:0 }}</span>
chart.data && chart.data.tableRow ? chart.data.tableRow.length : 0
}}</span>
{{ $t('chart.items') }} {{ $t('chart.items') }}
</span> </span>
<el-pagination <el-pagination
@ -89,6 +90,7 @@ export default {
return { return {
fields: [], fields: [],
height: 'auto', height: 'auto',
mergeCells: [],
title_class: { title_class: {
margin: '0 0', margin: '0 0',
width: '100%', width: '100%',
@ -105,7 +107,7 @@ export default {
table_header_class: { table_header_class: {
fontSize: '12px', fontSize: '12px',
color: '#606266', color: '#606266',
background: '#e8eaec', backgroundColor: '#e8eaec',
height: '36px' height: '36px'
}, },
table_item_class: { table_item_class: {
@ -120,6 +122,8 @@ export default {
background: '#ffffff', background: '#ffffff',
height: '36px' height: '36px'
}, },
cellDimension: 0,
tableLength: 0,
title_show: true, title_show: true,
borderRadius: '0px', borderRadius: '0px',
currentPage: { currentPage: {
@ -137,13 +141,9 @@ export default {
} }
} }
}, },
watch: { created() {
chart: function() {
this.init()
}
},
mounted() {
this.init() this.init()
console.log('init')
// 监听元素变动事件 // 监听元素变动事件
eventBus.$on('resizing', (componentId) => { eventBus.$on('resizing', (componentId) => {
this.chartResize() this.chartResize()
@ -166,36 +166,191 @@ export default {
} }
} }
}, },
deteleObject(obj) {
var uniques = []
var stringify = {}
for (var i = 0; i < obj.length; i++) {
var keys = Object.keys(obj[i])
keys.sort(function(a, b) {
return (Number(a) - Number(b))
})
var str = ''
for (var j = 0; j < keys.length; j++) {
str += JSON.stringify(keys[j])
str += JSON.stringify(obj[i][keys[j]])
}
if (!stringify.hasOwnProperty(str)) {
uniques.push(obj[i])
stringify[str] = true
}
}
return uniques
},
initData() { initData() {
const that = this const that = this
let datas = [] let datas = []
if (this.chart.data) { if (this.chart.data) {
this.fields = JSON.parse(JSON.stringify(this.chart.data.fields)) this.fields = JSON.parse(JSON.stringify(this.chart.data.fields))
const yAxis = JSON.parse(this.chart.yaxis)
if (yAxis && yAxis.length > 0) {
yAxis.forEach((item) => {
if (item.summary == 'ratio') {
this.chart.data.tableRow.forEach((tableRow) => {
console.log(33, tableRow)
tableRow[item.dataeaseName] += '%'
})
}
})
}
datas = JSON.parse(JSON.stringify(this.chart.data.tableRow)) datas = JSON.parse(JSON.stringify(this.chart.data.tableRow))
const findRowIndex = this.fields.findIndex(e => e.chartType === 'row')
const findValueIndex = this.fields.findIndex(e => e.chartType === 'bar')
if (this.chart.type === 'table-info') { if (this.chart.type === 'table-info') {
// 计算分页 // 计算分页
this.currentPage.show = datas.length this.currentPage.show = datas.length
const pageStart = const pageStart = (this.currentPage.page - 1) * this.currentPage.pageSize
(this.currentPage.page - 1) * this.currentPage.pageSize
const pageEnd = pageStart + this.currentPage.pageSize const pageEnd = pageStart + this.currentPage.pageSize
datas = datas.slice(pageStart, pageEnd) datas = datas.slice(pageStart, pageEnd)
} else if (this.chart.type === 'table-normal' && findRowIndex >= 0) {
// 交叉表数据处理
const xaxis = this.chart.xaxis ? JSON.parse(this.chart.xaxis) : []
const yaxisExt = this.chart.yaxisExt ? JSON.parse(this.chart.yaxisExt) : []
const xaxisFieldId = xaxis.map(e => e.dataeaseName)
const yaxisExtFieldId = yaxisExt.map(e => e.dataeaseName)
const fieldValueName = this.fields[findValueIndex].dataeaseName
this.cellDimension = xaxisFieldId.length
let fields = this.fields.filter(e => xaxisFieldId.includes(e.dataeaseName))
console.log(fields)
let rowSum = 0
let columnValue = []
let rowName = []
yaxisExtFieldId.forEach((e, index) => {
const arr = []
datas.forEach(ele => {
if (index > 0) {
arr.push({
dataeaseName: e + ele[e] + ',' + yaxisExtFieldId[0] + ele[yaxisExtFieldId[0]],
name: ele[e]
})
} else {
rowName.push({
dataeaseName: e + ele[e],
name: ele[e]
})
}
})
if (index > 0) {
const copyArr = this.deteleObject(arr)
rowName.forEach(item => {
const newArr = []
copyArr.forEach(sube => {
if (item.dataeaseName === sube.dataeaseName.split(',')[1]) {
newArr.push(sube)
}
})
item.subFields = newArr
})
} else {
rowName = this.deteleObject(rowName)
}
})
if (xaxisFieldId.length > 1) {
let arr1 = []
let arr2 = []
datas.forEach(obj => {
for (const key in obj) {
if (Object.hasOwnProperty.call(obj, key)) {
const element = obj[key]
if (xaxisFieldId[0] === key) {
arr1.push({
[key]: element
})
} else if (xaxisFieldId[1] === key) {
arr2.push({
[key]: element
})
}
}
}
})
arr1 = this.deteleObject(arr1)
arr2 = this.deteleObject(arr2)
let rowIndex = 0
arr1.forEach(e => {
this.mergeCells.push({
col: 0,
row: rowIndex,
rowspan: arr2.length,
colspan: 1
})
arr2.forEach(item => {
const obj = {}
columnValue.push(Object.assign(obj, e, item))
rowIndex += 1
})
})
columnValue.forEach(ele => {
if (yaxisExtFieldId.length > 1) {
datas.forEach(subEle => {
if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]] && ele[xaxisFieldId[1]] === subEle[xaxisFieldId[1]]) {
const key = yaxisExtFieldId[1] + subEle[yaxisExtFieldId[1]] + ',' + yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
ele[key] = subEle[fieldValueName]
rowSum += subEle[fieldValueName]
}
})
} else {
datas.forEach(subEle => {
if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]] && ele[xaxisFieldId[1]] === subEle[xaxisFieldId[1]]) {
const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
ele[key] = subEle[fieldValueName]
rowSum += subEle[fieldValueName]
}
})
}
ele.rowTotal = rowSum
rowSum = 0
})
} else {
datas.forEach(obj => {
for (const key in obj) {
if (Object.hasOwnProperty.call(obj, key)) {
const element = obj[key]
if (xaxisFieldId.includes(key)) {
columnValue.push({
[key]: element
})
}
}
}
})
columnValue = this.deteleObject(columnValue)
columnValue.forEach(ele => {
if (yaxisExtFieldId.length > 1) {
datas.forEach(subEle => {
if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]]) {
const key = yaxisExtFieldId[1] + subEle[yaxisExtFieldId[1]] + ',' + yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
ele[key] = subEle[fieldValueName]
rowSum += subEle[fieldValueName]
}
})
} else {
datas.forEach(subEle => {
if (ele[xaxisFieldId[0]] === subEle[xaxisFieldId[0]]) {
const key = yaxisExtFieldId[0] + subEle[yaxisExtFieldId[0]]
ele[key] = subEle[fieldValueName]
rowSum += subEle[fieldValueName]
}
})
}
ele.rowTotal = rowSum
rowSum = 0
})
}
fields = fields.concat(rowName)
fields.push({
dataeaseName: 'rowTotal',
name: `合计(${this.fields[findValueIndex].name})`
})
datas = columnValue
this.fields = fields
console.log(columnValue)
console.log(fields)
} }
} else { } else {
this.fields = [] this.fields = []
datas = [] datas = []
this.resetPage() this.resetPage()
} }
this.tableLength = datas.length
this.$refs.plxTable.reloadData(datas) this.$refs.plxTable.reloadData(datas)
this.$nextTick(() => { this.$nextTick(() => {
this.initStyle() this.initStyle()
@ -212,15 +367,13 @@ export default {
pageHeight = 36 pageHeight = 36
} }
const currentHeight = this.$refs.tableContainer.offsetHeight const currentHeight = this.$refs.tableContainer.offsetHeight
const tableMaxHeight = const tableMaxHeight = currentHeight - this.$refs.title.offsetHeight - 16 - pageHeight
currentHeight - this.$refs.title.offsetHeight - 16 - pageHeight
let tableHeight let tableHeight
if (this.chart.data) { if (this.chart.data) {
if (this.chart.type === 'table-info') { if (this.chart.type === 'table-info') {
tableHeight = (this.currentPage.pageSize + 2) * 36 - pageHeight tableHeight = (this.currentPage.pageSize + 2) * 36 - pageHeight
} else { } else {
tableHeight = tableHeight = (this.tableLength + 2) * 36 - pageHeight
(this.chart.data.tableRow.length + 2) * 36 - pageHeight
} }
} else { } else {
tableHeight = 0 tableHeight = 0
@ -243,28 +396,17 @@ export default {
const customAttr = JSON.parse(this.chart.customAttr) const customAttr = JSON.parse(this.chart.customAttr)
if (customAttr.color) { if (customAttr.color) {
this.table_header_class.color = customAttr.color.tableFontColor this.table_header_class.color = customAttr.color.tableFontColor
this.table_header_class.background = hexColorToRGBA( this.table_header_class.backgroundColor = hexColorToRGBA(customAttr.color.tableHeaderBgColor, customAttr.color.alpha)
customAttr.color.tableHeaderBgColor,
customAttr.color.alpha
)
this.table_item_class.color = customAttr.color.tableFontColor this.table_item_class.color = customAttr.color.tableFontColor
this.table_item_class.background = hexColorToRGBA( this.table_item_class.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha)
customAttr.color.tableItemBgColor,
customAttr.color.alpha
)
} }
if (customAttr.size) { if (customAttr.size) {
this.table_header_class.fontSize = this.table_header_class.fontSize = customAttr.size.tableTitleFontSize + 'px'
customAttr.size.tableTitleFontSize + 'px' this.table_item_class.fontSize = customAttr.size.tableItemFontSize + 'px'
this.table_item_class.fontSize = this.table_header_class.height = customAttr.size.tableTitleHeight + 'px'
customAttr.size.tableItemFontSize + 'px'
this.table_header_class.height =
customAttr.size.tableTitleHeight + 'px'
this.table_item_class.height = customAttr.size.tableItemHeight + 'px' this.table_item_class.height = customAttr.size.tableItemHeight + 'px'
} }
this.table_item_class_stripe = JSON.parse( this.table_item_class_stripe = JSON.parse(JSON.stringify(this.table_item_class))
JSON.stringify(this.table_item_class)
)
// 暂不支持斑马纹 // 暂不支持斑马纹
// if (customAttr.color.tableStripe) { // if (customAttr.color.tableStripe) {
// // this.table_item_class_stripe.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha - 40) // // this.table_item_class_stripe.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha - 40)
@ -283,18 +425,11 @@ export default {
this.title_class.fontSize = customStyle.text.fontSize + 'px' this.title_class.fontSize = customStyle.text.fontSize + 'px'
this.title_class.color = customStyle.text.color this.title_class.color = customStyle.text.color
this.title_class.textAlign = customStyle.text.hPosition this.title_class.textAlign = customStyle.text.hPosition
this.title_class.fontStyle = customStyle.text.isItalic this.title_class.fontStyle = customStyle.text.isItalic ? 'italic' : 'normal'
? 'italic' this.title_class.fontWeight = customStyle.text.isBolder ? 'bold' : 'normal'
: 'normal'
this.title_class.fontWeight = customStyle.text.isBolder
? 'bold'
: 'normal'
} }
if (customStyle.background) { if (customStyle.background) {
this.bg_class.background = hexColorToRGBA( this.bg_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)
customStyle.background.color,
customStyle.background.alpha
)
} }
} }
// 修改footer合计样式 // 修改footer合计样式
@ -304,11 +439,7 @@ export default {
// console.log(s_table) // console.log(s_table)
let s = '' let s = ''
for (const i in this.table_header_class) { for (const i in this.table_header_class) {
s += s += (i === 'fontSize' ? 'font-size' : i === 'backgroundColor' ? 'background-color' : i) + ':' + this.table_header_class[i] + ';'
(i === 'fontSize' ? 'font-size' : i) +
':' +
this.table_header_class[i] +
';'
} }
// console.log(s_table) // console.log(s_table)
for (let i = 0; i < s_table.length; i++) { for (let i = 0; i < s_table.length; i++) {
@ -323,29 +454,29 @@ export default {
return this.table_item_class return this.table_item_class
} }
}, },
getColumStyle({ columnIndex }) {
if (this.chart.type === 'table-normal' && this.cellDimension > 0 && (columnIndex < this.cellDimension || columnIndex === this.fields.length - 1)) {
return this.table_header_class
} else {
return ''
}
},
summaryMethod({ columns, data }) { summaryMethod({ columns, data }) {
const that = this const that = this
const means = [] // 合计 const means = [] // 合计
const findValueIndex = this.chart.data.fields.findIndex(e => e.chartType === 'bar')
columns.forEach((column, columnIndex) => { columns.forEach((column, columnIndex) => {
if (columnIndex === 0) { if (columnIndex === 0) {
if (this.cellDimension > 0 && findValueIndex !== -1) {
means.push(`合计(${this.chart.data.fields[findValueIndex].name})`)
} else {
means.push('合计') means.push('合计')
}
} else { } else {
let isRatio = false if (columnIndex >= that.chart.data.fields.length - that.chart.data.series.length || this.cellDimension > 0) {
if ( const values = data.map(item => Number(item[column.property]))
columnIndex >=
that.chart.data.fields.length - that.chart.data.series.length
) {
const values = data.map((item) => {
let a = item[column.property]
if (a.indexOf && a.indexOf('%') >= 0) {
a = a.replace('%', '')
isRatio = true
}
return Number(a)
})
// 合计 // 合计
if (!values.every((value) => isNaN(value))) { if (!values.every(value => isNaN(value))) {
means[columnIndex] = values.reduce((prev, curr) => { means[columnIndex] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
@ -354,14 +485,7 @@ export default {
return prev return prev
} }
}, 0) }, 0)
means[columnIndex] = (means[columnIndex] + '').includes('.') means[columnIndex] = (means[columnIndex] + '').includes('.') ? means[columnIndex].toFixed(2) : means[columnIndex]
? means[columnIndex].toFixed(2)
: means[columnIndex]
if (isRatio) {
means[columnIndex] =
means[columnIndex] > 100 ? 100 : means[columnIndex]
means[columnIndex] += '%'
}
} else { } else {
means[columnIndex] = '' means[columnIndex] = ''
} }
@ -437,4 +561,10 @@ export default {
.page-style >>> .el-input__inner{ .page-style >>> .el-input__inner{
height: 24px; height: 24px;
} }
.colum-header {
font-size: 12px;
color: #000;
background: rgb(78, 129, 187);
height: 36px;
}
</style> </style>

22
frontend/src/views/chart/view/ChartEdit.vue
Unescape Escape View File

@ -536,7 +536,7 @@
<div ref="imageWrapper" style="height: 100%"> <div ref="imageWrapper" style="height: 100%">
<chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'" ref="dynamicChart" :chart-id="chart.id" :chart="chart" class="chart-class" @onChartClick="chartClick" /> <chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'" ref="dynamicChart" :chart-id="chart.id" :chart="chart" class="chart-class" @onChartClick="chartClick" />
<chart-component-g2 v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'g2'" ref="dynamicChart" :chart-id="chart.id" :chart="chart" class="chart-class" /> <chart-component-g2 v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'g2'" ref="dynamicChart" :chart-id="chart.id" :chart="chart" class="chart-class" />
<table-normal v-if="httpRequest.status && chart.type && chart.type.includes('table')" :show-summary="chart.type === 'table-normal'" :chart="chart" class="table-class" /> <table-normal v-if="httpRequest.status && chart.type && chart.type.includes('table')" :key="chart.type === 'table-normal'?new Date().getTime():null" :show-summary="chart.type === 'table-normal'" :chart="chart" class="table-class" />
<label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" /> <label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" />
<div v-if="!httpRequest.status" class="chart-error-class"> <div v-if="!httpRequest.status" class="chart-error-class">
<div style="font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;"> <div style="font-size: 12px; color: #9ea6b2;height: 100%;display: flex;align-items: center;justify-content: center;">
@ -1440,9 +1440,12 @@ export default {
} }
}, },
addXaxis(e) { addXaxis(e) {
if ((this.view.type === 'map' && this.view.xaxis.length > 1) || (this.view.type === 'table-normal' && this.view.xaxis.length > 1 && this.view.yaxisExt.length > 0)) { if ((this.view.type === 'map' && this.view.xaxis.length > 1)) {
this.view.xaxis = [this.view.xaxis[0]] this.view.xaxis = [this.view.xaxis[0]]
} }
if (this.view.type === 'table-normal' && this.view.xaxis.length > 2 && this.view.yaxisExt.length > 0) {
this.view.xaxis = [this.view.xaxis[0], this.view.xaxis[1]]
}
if (this.view.type !== 'table-info') { if (this.view.type !== 'table-info') {
this.dragCheckType(this.view.xaxis, 'd') this.dragCheckType(this.view.xaxis, 'd')
} }
@ -1450,11 +1453,11 @@ export default {
this.save(true) this.save(true)
}, },
addRowXaxis(e) { addRowXaxis(e) {
if (this.view.yaxisExt.length > 1) { if (this.view.yaxisExt.length > 2) {
this.view.yaxisExt = [this.view.yaxisExt[0]] this.view.yaxisExt = [this.view.yaxisExt[0], this.view.yaxisExt[1]]
} }
if (this.view.xaxis.length > 1) { if (this.view.xaxis.length > 2) {
this.view.xaxis = [this.view.xaxis[0]] this.view.xaxis = [this.view.xaxis[0], this.view.xaxis[1]]
} }
if (this.view.yaxis.length > 1) { if (this.view.yaxis.length > 1) {
this.view.yaxis = [this.view.yaxis[0]] this.view.yaxis = [this.view.yaxis[0]]
@ -1680,7 +1683,7 @@ export default {
} }
</script> </script>
<style lang='scss' scoped> <style scoped>
.padding-lr { .padding-lr {
padding: 0 6px; padding: 0 6px;
} }
@ -1941,13 +1944,10 @@ export default {
padding: 0; padding: 0;
height: 100%; height: 100%;
} }
.tree-select-span { .tree-select-span >>> div.vue-treeselect__control {
>>>div.vue-treeselect__control {
height: 32px !important; height: 32px !important;
font-weight: normal !important; font-weight: normal !important;
} }
}
.drag-block-style{ .drag-block-style{
padding:2px 0 0 0; padding:2px 0 0 0;
width:100%; width:100%;

4
frontend/src/views/link/generate/index.vue
Unescape Escape View File

@ -22,12 +22,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item v-if="valid" label=" "> <!-- <el-form-item v-if="valid" label=" ">
<el-checkbox v-model="form.enablePwd" @change="resetEnablePwd">{{ $t('panel.passwd_protect') }} </el-checkbox> <el-checkbox v-model="form.enablePwd" @change="resetEnablePwd">{{ $t('panel.passwd_protect') }} </el-checkbox>
<span v-if="form.enablePwd" class="de-span">{{ form.pwd }}</span> <span v-if="form.enablePwd" class="de-span">{{ form.pwd }}</span>
<span v-if="form.enablePwd" class="de-span" @click="resetPwd"><el-link :underline="false" type="primary">{{ $t('commons.reset') }}</el-link></span> <span v-if="form.enablePwd" class="de-span" @click="resetPwd"><el-link :underline="false" type="primary">{{ $t('commons.reset') }}</el-link></span>
</el-form-item> </el-form-item> -->
<div v-if="valid" class="auth-root-class"> <div v-if="valid" class="auth-root-class">
<span slot="footer"> <span slot="footer">

2
frontend/src/views/login/index.vue
Unescape Escape View File

@ -13,7 +13,7 @@
{{ uiInfo['ui.loginTitle'].paramValue }} {{ uiInfo['ui.loginTitle'].paramValue }}
</div> </div>
<div v-else class="login-welcome"> <div v-else class="login-welcome">
{{ (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'Ipsos VIA BIBoard') }} {{ (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'Ipsos BIboard') }}
</div> </div>
<div class="login-form"> <div class="login-form">
<el-form-item v-if="loginTypes.length > 1"> <el-form-item v-if="loginTypes.length > 1">

7
frontend/src/views/panel/list/PanelList.vue
Unescape Escape View File

@ -153,9 +153,9 @@
<!-- <el-dropdown-item icon="el-icon-right" :command="beforeClickMore('move',data,node)">--> <!-- <el-dropdown-item icon="el-icon-right" :command="beforeClickMore('move',data,node)">-->
<!-- {{ $t('dataset.move_to') }}--> <!-- {{ $t('dataset.move_to') }}-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)">--> <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)">
<!-- {{ $t('panel.create_public_links') }}--> {{ $t('panel.create_public_links') }}
<!-- </el-dropdown-item>--> </el-dropdown-item>
<!-- <el-dropdown-item v-if="data.nodeType==='panel'" :disabled="data.isDefault" icon="el-icon-copy-document" :command="beforeClickMore('toDefaultPanel',data,node)">--> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" :disabled="data.isDefault" icon="el-icon-copy-document" :command="beforeClickMore('toDefaultPanel',data,node)">-->
<!-- {{ $t('panel.to_default_panel') }}--> <!-- {{ $t('panel.to_default_panel') }}-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
@ -237,7 +237,6 @@ import {
DEFAULT_COMMON_CANVAS_STYLE_STRING DEFAULT_COMMON_CANVAS_STYLE_STRING
} from '@/views/panel/panel' } from '@/views/panel/panel'
import TreeSelector from '@/components/TreeSelector' import TreeSelector from '@/components/TreeSelector'
import { post } from '@/api/chart/chart'
export default { export default {
name: 'PanelList', name: 'PanelList',

Write Preview
Loading…
Cancel
Save