From 9d49f54ae85fa506dfbc0b34b21d103a3a5f716c Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Mon, 16 Oct 2023 11:36:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/RightSetting/DataSetting.vue        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index bc473f20..a0ae2b24 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -300,6 +300,7 @@ data.forEach(item => {
               <el-table-column
                 prop="width"
                 label="列宽"
+                width='90'
                 align="center"
               >
                 <template slot-scope="scope">

From 93cd27364ffa51c08b2ca5c15df9aa8530cf0093 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Mon, 16 Oct 2023 11:42:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=8C=87=E6=A0=87=E5=8D=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/chart/components/ScreenIndexCardChart.java    | 9 +++++++++
 .../chart/components/ScreenIndicatorCardChart.java       | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java
index 6b580f5b..bd1a2f5a 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java
@@ -80,6 +80,15 @@ public class ScreenIndexCardChart extends Chart {
         @ApiModelProperty(notes = "单位字体颜色")
         private String unitColor;
 
+        @ApiModelProperty(notes = "渐变方向")
+        private String gradientDirection;
+
+        @ApiModelProperty(notes = "渐变颜色0")
+        private String gradientColor0;
+
+        @ApiModelProperty(notes = "渐变颜色1")
+        private String gradientColor1;
+
     }
 
 }
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java
index 4db83163..88e4112e 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java
@@ -71,7 +71,14 @@ public class ScreenIndicatorCardChart extends Chart {
         @ApiModelProperty(notes = "单位字体颜色")
         private String unitColor;
 
+        @ApiModelProperty(notes = "渐变方向")
+        private String gradientDirection;
 
+        @ApiModelProperty(notes = "渐变颜色0")
+        private String gradientColor0;
+
+        @ApiModelProperty(notes = "渐变颜色1")
+        private String gradientColor1;
     }
 
 }

From 6c5be239fefafcdd7357f4526a95949477ec1318 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Mon, 16 Oct 2023 13:34:38 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=97=8B=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/Render/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index 0a20f95a..7e81efc2 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,6 +38,7 @@
       :style="{
         zIndex: chart.z || 0,
       }"
+      :transform="`perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"
@@ -84,8 +85,8 @@ import RenderCard from './RenderCard.vue'
 import Configuration from './Configuration.vue'
 // import _ from 'lodash'
 import cloneDeep from 'lodash/cloneDeep'
-import vdr from 'gc-vue-draggable-resizable'
-// import vdr from '@gcpaas/vue-draggable-resizable-gorkys'
+// import vdr from 'gc-vue-draggable-resizable'
+import vdr from '@gcpaas/vue-draggable-resizable-gorkys'
 import 'gc-vue-draggable-resizable/dist/VueDraggableResizable.css'
 import { randomString } from '../js/utils'
 import { compile } from 'tiny-sass-compiler/dist/tiny-sass-compiler.esm-browser.prod.js'

From 316585b45c26c6772c2043874ce92671bf54fe37 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Mon, 16 Oct 2023 13:42:41 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E6=97=8B=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/Render/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index 7e81efc2..05ad14eb 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,7 +38,7 @@
       :style="{
         zIndex: chart.z || 0,
       }"
-      :transform="`perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
+      :transform="''"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"

From c89e0adaf3f38d73328445d5a8d1537fcb2334f8 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Mon, 16 Oct 2023 14:38:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BasicComponents/Numbers/index.vue | 9 ++++++---
 data-room-ui/packages/BasicComponents/Texts/index.vue   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Numbers/index.vue b/data-room-ui/packages/BasicComponents/Numbers/index.vue
index 7c28dd4a..a1cf5bd7 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/index.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/index.vue
@@ -40,13 +40,16 @@ export default {
     // 通过表达式计算得来的值
     getDataByExpression (config) {
       // 如果表达式是由其他组件的值构成的
-      if (this.config.expressionCodes && this.config.expressionCodes.length) {
-      // eslint-disable-next-line no-new-func
+      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)
+        // this.changeChartConfig(config)
       }
     },
     dataFormatting (config, data) {
diff --git a/data-room-ui/packages/BasicComponents/Texts/index.vue b/data-room-ui/packages/BasicComponents/Texts/index.vue
index 7c28dd4a..4f24012d 100644
--- a/data-room-ui/packages/BasicComponents/Texts/index.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/index.vue
@@ -40,7 +40,10 @@ export default {
     // 通过表达式计算得来的值
     getDataByExpression (config) {
       // 如果表达式是由其他组件的值构成的
-      if (this.config.expressionCodes && this.config.expressionCodes.length) {
+      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)
@@ -53,7 +56,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 :[]
+        config.option.data = data && data.data && data.data.length ? data.data : []
       }
       return config
     }