From fa1f27c665b22033eb3f1408e6b5cfd757ca4035 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Sat, 14 Oct 2023 16:54:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=96=87=E6=9C=AC?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9F=A5=E7=9C=8Bjs=E3=80=81http=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data-room-ui/packages/BasicComponents/Numbers/index.vue | 1 +
data-room-ui/packages/BasicComponents/Numbers/settingConfig.js | 1 +
data-room-ui/packages/BasicComponents/Texts/index.vue | 1 +
data-room-ui/packages/BasicComponents/Texts/settingConfig.js | 3 ++-
data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue | 2 +-
5 files changed, 6 insertions(+), 2 deletions(-)
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()