Compare commits
40 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
950735cd16 | ||
|
|
2063f42c04 | ||
|
|
1868523075 | ||
|
|
e1795ea32e | ||
|
|
cda06f8d1b | ||
|
|
8a9e87c0e8 | ||
|
|
f32b8b53b9 | ||
|
|
43fc5a1e3c | ||
|
|
13c11acc96 | ||
|
|
24fef55902 | ||
|
|
20a2e76cd1 | ||
|
|
acf36f0d23 | ||
|
|
a97315bdea | ||
|
|
9164c4c3f0 | ||
|
|
75b826ca8f | ||
|
|
58b68ce700 | ||
|
|
5373651856 | ||
|
|
57dd9bc27a | ||
|
|
df692fc00a | ||
|
|
c21d976471 | ||
|
|
dbccefad2f | ||
|
|
ffde3a0bdc | ||
|
|
7897fdeec3 | ||
|
|
b98dea0642 | ||
|
|
336394639c | ||
|
|
fe49b18383 | ||
|
|
9234c9d02d | ||
|
|
07eb822c1e | ||
|
|
cd1cf5d4c1 | ||
|
|
c511608b54 | ||
|
|
d798f37f52 | ||
|
|
6ec2c8b6e6 | ||
|
|
fe349fa906 | ||
|
|
c1c67de2da | ||
|
|
c2e9db264a | ||
|
|
78a9d491e8 | ||
|
|
065b981ccc | ||
|
|
8fdcb9e916 | ||
|
|
6827be7562 | ||
|
|
9ab6c1f95f |
@ -608,6 +608,7 @@
|
|||||||
id,
|
id,
|
||||||
table_id,
|
table_id,
|
||||||
chart_id,
|
chart_id,
|
||||||
|
origin_name,
|
||||||
`name`,
|
`name`,
|
||||||
dataease_name,
|
dataease_name,
|
||||||
group_type,
|
group_type,
|
||||||
@ -624,6 +625,7 @@
|
|||||||
uuid() AS id,
|
uuid() AS id,
|
||||||
chart_view_field.table_id,
|
chart_view_field.table_id,
|
||||||
chart_view_field.pv_copy.chart_view_id AS chart_id,
|
chart_view_field.pv_copy.chart_view_id AS chart_id,
|
||||||
|
chart_view_field.origin_name,
|
||||||
chart_view_field.`name`,
|
chart_view_field.`name`,
|
||||||
chart_view_field.dataease_name,
|
chart_view_field.dataease_name,
|
||||||
chart_view_field.group_type,
|
chart_view_field.group_type,
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
backend/src/main/resources/db/migration/V45__1.17.1.sql
Normal file
4
backend/src/main/resources/db/migration/V45__1.17.1.sql
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`,
|
||||||
|
`install_time`, `module_name`, `ds_type`)
|
||||||
|
VALUES ('人大金仓数据源插件', 'default', '0', '0', 'datasource', '人大金仓数据源插件', '1.0-SNAPSHOT', 'DATAEASE', '0',
|
||||||
|
'1650765903630', 'kingbase-backend', 'kingbase');
|
||||||
@ -443,6 +443,9 @@ export default {
|
|||||||
bus.$off('trigger-reset-button', this.triggerResetButton)
|
bus.$off('trigger-reset-button', this.triggerResetButton)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getCanvasHeight() {
|
||||||
|
return this.mainHeightCount
|
||||||
|
},
|
||||||
openChartDetailsDialog(paramInfo) {
|
openChartDetailsDialog(paramInfo) {
|
||||||
if (this.canvasId === 'canvas-main') {
|
if (this.canvasId === 'canvas-main') {
|
||||||
this.showChartInfo = paramInfo.showChartInfo
|
this.showChartInfo = paramInfo.showChartInfo
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
import { Condition } from '@/components/widget/bean/Condition'
|
import { Condition } from '@/components/widget/bean/Condition'
|
||||||
import { ApplicationContext } from '@/utils/ApplicationContext'
|
import { ApplicationContext } from '@/utils/ApplicationContext'
|
||||||
|
import store from '@/store'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 判断两个conditions数组是否相同
|
* 判断两个conditions数组是否相同
|
||||||
@ -70,7 +70,11 @@ export const buildViewKeyMap = panelItems => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const buildViewKeyFilters = (panelItems, result) => {
|
export const buildViewKeyFilters = (panelItems, result) => {
|
||||||
panelItems.forEach((element, index) => {
|
if (!(panelItems && panelItems.length > 0)) {
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
const buildItems = panelItems[0].canvasId === 'canvas-main' ? panelItems : store.state.componentData
|
||||||
|
buildItems.forEach((element, index) => {
|
||||||
if (element.type !== 'custom') {
|
if (element.type !== 'custom') {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,7 +67,7 @@
|
|||||||
>
|
>
|
||||||
{{ $t('chart.total') }}
|
{{ $t('chart.total') }}
|
||||||
<span>{{
|
<span>{{
|
||||||
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
||||||
}}</span>
|
}}</span>
|
||||||
{{ $t('chart.items') }}
|
{{ $t('chart.items') }}
|
||||||
</span>
|
</span>
|
||||||
@ -173,7 +173,8 @@ export default {
|
|||||||
},
|
},
|
||||||
totalStyle: {
|
totalStyle: {
|
||||||
color: '#606266'
|
color: '#606266'
|
||||||
}
|
},
|
||||||
|
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@ -55,7 +55,7 @@
|
|||||||
>
|
>
|
||||||
{{ $t('chart.total') }}
|
{{ $t('chart.total') }}
|
||||||
<span>{{
|
<span>{{
|
||||||
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
||||||
}}</span>
|
}}</span>
|
||||||
{{ $t('chart.items') }}
|
{{ $t('chart.items') }}
|
||||||
</span>
|
</span>
|
||||||
@ -166,7 +166,8 @@ export default {
|
|||||||
scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
|
scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
|
||||||
totalStyle: {
|
totalStyle: {
|
||||||
color: '#606266'
|
color: '#606266'
|
||||||
}
|
},
|
||||||
|
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
@ -82,7 +82,7 @@ export default {
|
|||||||
mainCanvasStyle() {
|
mainCanvasStyle() {
|
||||||
if (this.toExport) {
|
if (this.toExport) {
|
||||||
return {
|
return {
|
||||||
width: '4096px'
|
width: '1280px'
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return {
|
return {
|
||||||
@ -93,7 +93,7 @@ export default {
|
|||||||
templateHtmlStyle() {
|
templateHtmlStyle() {
|
||||||
if (this.toExport) {
|
if (this.toExport) {
|
||||||
return {
|
return {
|
||||||
fontSize: '48px!important'
|
fontSize: '14px!important'
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return {}
|
return {}
|
||||||
@ -133,17 +133,16 @@ export default {
|
|||||||
_this.toExport = true
|
_this.toExport = true
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
html2canvas(document.getElementById('exportPdf')).then(function(canvas) {
|
html2canvas(document.getElementById('exportPdf')).then(function(canvas) {
|
||||||
_this.exportLoading = false
|
_this.exportLoading = false
|
||||||
const contentWidth = canvas.width / 4
|
const contentWidth = canvas.width / 2
|
||||||
const contentHeight = canvas.height / 4
|
const contentHeight = canvas.height / 2
|
||||||
const pageData = canvas.toDataURL('image/jpeg', 1.0)
|
const pageData = canvas.toDataURL('image/jpeg', 1.0)
|
||||||
const lp = contentWidth > contentHeight ? 'l' : 'p'
|
const lp = contentWidth > contentHeight ? 'l' : 'p'
|
||||||
const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight])
|
const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight])
|
||||||
PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight)
|
PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight)
|
||||||
PDF.save(_this.panelName + '.pdf')
|
PDF.save(_this.panelName + '.pdf')
|
||||||
_this.$emit('closePreExport')
|
_this.$emit('closePreExport')
|
||||||
}
|
})
|
||||||
)
|
|
||||||
}, 1500)
|
}, 1500)
|
||||||
}, 500)
|
}, 500)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -328,10 +328,13 @@ export default {
|
|||||||
|
|
||||||
created() {
|
created() {
|
||||||
this.attrs = this.controlAttrs
|
this.attrs = this.controlAttrs
|
||||||
if (this.widget.isTimeWidget && this.widget.isTimeWidget()) {
|
if (this.widget.isTimeWidget) {
|
||||||
this.showParams = true
|
this.showParams = true
|
||||||
this.isRangeParamWidget = this.widget.isRangeParamWidget && this.widget.isRangeParamWidget()
|
this.isRangeParamWidget = this.widget.isRangeParamWidget && this.widget.isRangeParamWidget()
|
||||||
}
|
}
|
||||||
|
if ('timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
|
||||||
|
this.showParams = true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
changeDynamicParams(val, name) {
|
changeDynamicParams(val, name) {
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
|
style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
|
||||||
>
|
>
|
||||||
<div style="height: 100%;">
|
<div style="height: 100%;">
|
||||||
<share-head />
|
<share-head/>
|
||||||
</div>
|
</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row
|
<el-row
|
||||||
@ -45,7 +45,7 @@
|
|||||||
width="400"
|
width="400"
|
||||||
trigger="click"
|
trigger="click"
|
||||||
>
|
>
|
||||||
<panel-detail-info />
|
<panel-detail-info/>
|
||||||
<i
|
<i
|
||||||
slot="reference"
|
slot="reference"
|
||||||
class="el-icon-warning icon-class"
|
class="el-icon-warning icon-class"
|
||||||
@ -209,6 +209,7 @@
|
|||||||
>
|
>
|
||||||
<Preview
|
<Preview
|
||||||
v-if="showMainFlag"
|
v-if="showMainFlag"
|
||||||
|
ref="paneViewPreviewRef"
|
||||||
:component-data="mainCanvasComponentData"
|
:component-data="mainCanvasComponentData"
|
||||||
:canvas-style-data="canvasStyleData"
|
:canvas-style-data="canvasStyleData"
|
||||||
:active-tab="activeTab"
|
:active-tab="activeTab"
|
||||||
@ -378,8 +379,8 @@ export default {
|
|||||||
imageWrapperStyle() {
|
imageWrapperStyle() {
|
||||||
if (this.exporting) {
|
if (this.exporting) {
|
||||||
return {
|
return {
|
||||||
width: '2560px',
|
width: '1280px',
|
||||||
height: '1440px'
|
height: '720px'
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return {
|
return {
|
||||||
@ -429,6 +430,16 @@ export default {
|
|||||||
bus.$off('set-panel-share-user', this.setPanelShareUser)
|
bus.$off('set-panel-share-user', this.setPanelShareUser)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 画布高度大于6000px 自动使用原尺寸导出 减小浏览器再渲染压力
|
||||||
|
changeExportingState() {
|
||||||
|
const canvasHeight = this.$refs.paneViewPreviewRef.getCanvasHeight()
|
||||||
|
if (canvasHeight && canvasHeight > 6000) {
|
||||||
|
return false
|
||||||
|
} else {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
downLoadApp(appAttachInfo) {
|
downLoadApp(appAttachInfo) {
|
||||||
this.downLoadToApp(appAttachInfo)
|
this.downLoadToApp(appAttachInfo)
|
||||||
},
|
},
|
||||||
@ -597,7 +608,7 @@ export default {
|
|||||||
downloadAsImage() {
|
downloadAsImage() {
|
||||||
this.dataLoading = true
|
this.dataLoading = true
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.exporting = true
|
this.exporting = this.changeExportingState()
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const canvasID = document.getElementById(this.canvasInfoTemp)
|
const canvasID = document.getElementById(this.canvasInfoTemp)
|
||||||
const a = document.createElement('a')
|
const a = document.createElement('a')
|
||||||
@ -628,7 +639,7 @@ export default {
|
|||||||
this.dataLoading = true
|
this.dataLoading = true
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.exporting = true
|
this.exporting = this.changeExportingState()
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
html2canvas(document.getElementById(this.canvasInfoTemp)).then(canvas => {
|
html2canvas(document.getElementById(this.canvasInfoTemp)).then(canvas => {
|
||||||
const snapshot = canvas.toDataURL('image/jpeg', 1) // 是图片质量
|
const snapshot = canvas.toDataURL('image/jpeg', 1) // 是图片质量
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user