tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gcpaas/DataRoom

Browse Source
main
liu.tao3 1 year ago
parent a470b192a2 006ce5aa87
commit ea4f16b0d9
12 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File

5
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java
Unescape Escape View File

@ -14,10 +14,13 @@ import java.util.List;
@Data
public class DataSetDataSource extends BaseChartDataSource {
@ApiModelProperty(notes = "数据来源，可能为数据集或者表达式")
private String source;
@ApiModelProperty(notes = "数据集标识")
private String businessKey;
@ApiModelProperty(notes = "数据源标识,仅用于出码时使用")
@ApiModelProperty(notes = "数据源标识")
private String dataSourceKey;
@ApiModelProperty(notes = "数据集类型")

18
DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json
Unescape Escape View File

@ -1,18 +0,0 @@
{
"success": false,
"data": [
{
"sum(num)": 1456532
}
],
"columnData": {
"num": {
"type": "bigint",
"tableName": "",
"originalColumn": "num",
"aggregate": "sum",
"alias": "sum(num)",
"remark": "访问次数"
}
}
}

18
DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json
Unescape Escape View File

@ -0,0 +1,18 @@
{
"success": false,
"data": [
{
"title": 1234
}
],
"columnData": {
"title": {
"type": "varchar",
"tableName": "",
"originalColumn": "title",
"aggregate": "",
"alias": "title",
"remark": "标题"
}
}
}

2
DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json
Unescape Escape View File

@ -6,7 +6,7 @@
}
],
"columnData": {
"num": {
"title": {
"type": "varchar",
"tableName": "",
"originalColumn": "title",

2
data-room-ui/package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
"version": "2.0.1-2023101601-Alpha",
"version": "2.0.1-RELEASE",
"description": "自定义大屏",
"author": "gcpaas",
"license": "MIT",

24
data-room-ui/packages/BasicComponents/Numbers/index.vue
Unescape Escape View File

@ -40,23 +40,23 @@ export default {
// 通过表达式计算得来的值
getDataByExpression (config) {
// 如果表达式是由其他组件的值构成的
const len = this.config.expressionCodes ? this.config.expressionCodes.length : 0
const len1 = this.currentComputedDatas ? Object.keys(this.currentComputedDatas).length : 0
const len2 = this.currentDataset ? Object.keys(this.currentDataset).length : 0
if (len && len === len1 + len2) {
// eslint-disable-next-line no-new-func
const result = new Function('dataset', 'computedDatas', this.config.expression)
config.customize.title = result(this.dataset, this.computedDatas)
// 同时将计算得来的值保存到公共的数据存储的地方
this.updateComputedDatas({ code: config.code, name: config.name, data: config.customize.title })
// this.changeChartConfig(config)
}
// const len = this.config.expressionCodes ? this.config.expressionCodes.length : 0
// const len1 = this.currentComputedDatas ? Object.keys(this.currentComputedDatas).length : 0
// const len2 = this.currentDataset ? Object.keys(this.currentDataset).length : 0
// if (len && len === len1 + len2) {
// eslint-disable-next-line no-new-func
const result = new Function('dataset', 'computedDatas', this.config.expression)
config.customize.title = result(this.dataset, this.computedDatas)
// 同时将计算得来的值保存到公共的数据存储的地方
this.updateComputedDatas({ code: config.code, name: config.name, data: config.customize.title })
// this.changeChartConfig(config)
// }
},
dataFormatting (config, data) {
// 文本数据配置原则：选择数据集则以后端返回的数据为主，否则以设置面板中标题设置为准
if (config.dataSource.businessKey) {
config.customize.title = data && data.data && data.data.length ? data.data[0][config.dataSource.metricField] : '暂无数据'
config.option.data = data && data.data && data.data.length ? data.data :[]
config.option.data = data && data.data && data.data.length ? data.data : []
}
return config
}

20
data-room-ui/packages/BasicComponents/Texts/index.vue
Unescape Escape View File

@ -40,17 +40,19 @@ export default {
// 通过表达式计算得来的值
getDataByExpression (config) {
// 如果表达式是由其他组件的值构成的
const len = this.config.expressionCodes ? this.config.expressionCodes.length : 0
const len1 = this.currentComputedDatas ? Object.keys(this.currentComputedDatas).length : 0
const len2 = this.currentDataset ? Object.keys(this.currentDataset).length : 0
if (len && len === len1 + len2) {
// const len = this.config.expressionCodes ? this.config.expressionCodes.length : 0
// const len1 = this.currentComputedDatas ? Object.keys(this.currentComputedDatas).length : 0
// const len2 = this.currentDataset ? Object.keys(this.currentDataset).length : 0
// console.log('len', len, len1, len2)
// if (len && len === len1 + len2) {
// eslint-disable-next-line no-new-func
const result = new Function('dataset', 'computedDatas', this.config.expression)
config.customize.title = result(this.dataset, this.computedDatas)
// 同时将计算得来的值保存到公共的数据存储的地方
this.updateComputedDatas({ code: config.code, name: config.name, data: config.customize.title })
const result = new Function('dataset', 'computedDatas', this.config.expression)
config.customize.title = result(this.dataset, this.computedDatas)
console.log(result(this.dataset, this.computedDatas))
// 同时将计算得来的值保存到公共的数据存储的地方
this.updateComputedDatas({ code: config.code, name: config.name, data: config.customize.title })
// this.changeChartConfig(config)
}
// }
},
dataFormatting (config, data) {
// 文本数据配置原则：选择数据集则以后端返回的数据为主，否则以设置面板中标题设置为准

4
data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue
Unescape Escape View File

@ -107,7 +107,7 @@ export default {
getDataList (config) {
this.loading = true
// 如果是G2组件并且未配置数据集的情况下，则需要从option里面取数据
if (['customComponent', 'remoteComponent', 'echartsComponent'].includes(config.type) && (!config.dataSource.businessKey)) {
if ((['customComponent', 'remoteComponent', 'echartsComponent'].includes(config.type) && (!config.dataSource.businessKey)) || (config.expressionCodes && config.expressionCodes.length)) {
this.getDataByOption(config)
this.fieldsFormat()
this.loading = false
@ -146,6 +146,8 @@ export default {
list = config.option.data.children
} else if (config.type === 'tables') {
list = config.option.tableData
} else if (config.expressionCodes && config.expressionCodes.length) {
list = [{ title: config.customize.title }]
} else {
list = config.option.data
}

20
data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
Unescape Escape View File

@ -27,7 +27,7 @@
label="数据来源"
>
<el-radio-group
v-model="dataSourceStyle"
v-model="config.dataSource.source "
class="bs-el-radio-group"
>
<el-radio label="dataset">
@ -39,7 +39,7 @@
</el-radio-group>
</el-form-item>
<el-form-item
v-if="dataSourceStyle === 'dataset'"
v-if="config.dataSource.source === 'dataset'"
label="数据集"
>
<data-set-select
@ -56,7 +56,7 @@
</data-set-select>
</el-form-item>
<el-form-item
v-if="dataSourceStyle === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
v-if="config.dataSource.source === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
label="表达式"
>
<i
@ -102,7 +102,7 @@ data.forEach(item => {
</div>
</div>
<div
v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable "
v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && config.dataSource.source !== 'expression'"
class="data-setting-data-box"
>
<div class="lc-field-head">
@ -300,7 +300,7 @@ data.forEach(item => {
<el-table-column
prop="width"
label="列宽"
width='90'
width="90"
align="center"
>
<template slot-scope="scope">
@ -470,7 +470,7 @@ data.forEach(item => {
</div>
</div>
<div
v-if="config.option.displayOption.params.enable"
v-if="config.option.displayOption.params.enable && config.dataSource.source !== 'expression'"
class="data-setting-data-box"
>
<div class="lc-field-head">
@ -642,7 +642,6 @@ export default {
},
data () {
return {
dataSourceStyle: 'dataset', // 数据来源方式
fieldsList: [],
params: [], // 参数配置
datasetName: '',
@ -764,11 +763,10 @@ export default {
}
},
methods: {
changeDsid(dsId){
this.clearVerify()
this.config.customize.columnConfig=[]
changeDsid (dsId) {
this.clearVerify()
this.config.customize.columnConfig = []
this.getDataSetDetailsById(dsId, 'treeTable')
},
// 打开表达式弹窗
openExpression () {

1
data-room-ui/packages/js/config/commonConfig.js
Unescape Escape View File

@ -67,6 +67,7 @@ export default function (customConfig) {
className:
'com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource',
dataSourceKey: '', // 数据源，选择不同数据库
source: 'dataset',
businessKey: '', // 数据集标识
dimensionField: '', // 维度
metricField: '', // 指标

4
data-room-ui/packages/js/store/actions.js
Unescape Escape View File

@ -18,6 +18,10 @@ export default {
const pageInfo = handleResData(data)
// 兼容边框配置
pageInfo.chartList.forEach((item) => {
if (item.dataSource) {
item.dataSource.source = item.dataSource?.source || 'dataset'
}
if (!item.border) {
item.border = { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }
}

5
doc/docker/application-docker.yml
Unescape Escape View File

@ -22,7 +22,10 @@ spring:
url: jdbc:h2:file:/db/h2DBData # jdbc:h2:mem:test
username: root
password: ${DB_PASSWORD:123456}
schema: classpath:init-h2.sql
sql:
init:
schema-locations: classpath:init-h2.sql
mode: always
gc:
starter:
file:

Write Preview
Loading…
Cancel
Save