refactor: 代码合并

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;
+
     }
 
 }

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;
     }
 
 }

data-room-ui/packages/BasicComponents/Numbers/index.vue

@@ -40,13 +40,16 @@ export default {
     // 通过表达式计算得来的值
     getDataByExpression (config) {
       // 如果表达式是由其他组件的值构成的
-      if (this.config.expressionCodes && this.config.expressionCodes.length) {
+      const len = this.config.expressionCodes ? this.config.expressionCodes.length : 0
-      // eslint-disable-next-line no-new-func
+      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) {

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
     }

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">

data-room-ui/packages/Render/index.vue

@@ -38,6 +38,7 @@
       :style="{
         zIndex: chart.z || 0,
       }"
+      :transform="''"
       :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 'gc-vue-draggable-resizable'
-// import vdr from '@gcpaas/vue-draggable-resizable-gorkys'
+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'