diff --git a/data-room-ui/packages/BasicComponents/Numbers/index.vue b/data-room-ui/packages/BasicComponents/Numbers/index.vue index d55e9ad9..db682a97 100644 --- a/data-room-ui/packages/BasicComponents/Numbers/index.vue +++ b/data-room-ui/packages/BasicComponents/Numbers/index.vue @@ -53,6 +53,7 @@ export default { // 文本数据配置原则:选择数据集则以后端返回的数据为主,否则以设置面板中标题设置为准 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 :[] } return config } diff --git a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js index 97698e70..e0eee0fe 100644 --- a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js @@ -8,6 +8,7 @@ import { commonConfig, displayOption } from 'data-room-ui/js/config' export const settingConfig = { theme: 'dark', + data:[], text: '文本标签占位符', // text内容 // 设置面板属性的显隐 displayOption: { diff --git a/data-room-ui/packages/BasicComponents/Texts/index.vue b/data-room-ui/packages/BasicComponents/Texts/index.vue index d55e9ad9..db682a97 100644 --- a/data-room-ui/packages/BasicComponents/Texts/index.vue +++ b/data-room-ui/packages/BasicComponents/Texts/index.vue @@ -53,6 +53,7 @@ export default { // 文本数据配置原则:选择数据集则以后端返回的数据为主,否则以设置面板中标题设置为准 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 :[] } return config } diff --git a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js index 607f88b5..6eb9e016 100644 --- a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js @@ -8,6 +8,7 @@ import { commonConfig, displayOption } from 'data-room-ui/js/config' export const settingConfig = { theme: 'dark', + data:[], text: '文本标签占位符', // text内容 // 设置面板属性的显隐 displayOption: { @@ -37,7 +38,7 @@ export const settingConfig = { const customConfig = { type: 'texts', root: { - version: '2023071001', + version: '2023101401', url: 'https://www.runoob.com/', expression: 'return ', expressionCodes: [], diff --git a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue index d538a431..bae9014d 100644 --- a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue @@ -106,7 +106,7 @@ export default { // 获取数据列表 getDataList (config) { this.loading = true - // 如果是G2组件则需要从option里面取数据 + // 如果是G2组件并且未配置数据集的情况下,则需要从option里面取数据 if (['customComponent', 'remoteComponent', 'echartsComponent'].includes(config.type) && (!config.dataSource.businessKey)) { this.getDataByOption(config) this.fieldsFormat()