Explorar o código

Merge remote-tracking branch 'origin/master'

liu.shiyi hai 1 ano
pai
achega
33d95526d2
Modificáronse 65 ficheiros con 217 adicións e 60 borrados
  1. 5 0
      DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
  2. 3 1
      data-room-ui/packages/BasicComponents/Button/settingConfig.js
  3. 3 1
      data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
  4. 3 1
      data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
  5. 3 1
      data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
  6. 3 1
      data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
  7. 3 1
      data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
  8. 3 1
      data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
  9. 3 1
      data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
  10. 3 1
      data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
  11. 3 1
      data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
  12. 3 1
      data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
  13. 3 1
      data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
  14. 3 1
      data-room-ui/packages/BasicComponents/Input/settingConfig.js
  15. 3 1
      data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
  16. 3 1
      data-room-ui/packages/BasicComponents/Map/settingConfig.js
  17. 3 1
      data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
  18. 3 1
      data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
  19. 3 1
      data-room-ui/packages/BasicComponents/Picture/settingConfig.js
  20. 3 1
      data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
  21. 3 1
      data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
  22. 3 1
      data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
  23. 3 1
      data-room-ui/packages/BasicComponents/Select/settingConfig.js
  24. 3 1
      data-room-ui/packages/BasicComponents/Tables/settingConfig.js
  25. 3 1
      data-room-ui/packages/BasicComponents/Texts/settingConfig.js
  26. 3 1
      data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
  27. 3 1
      data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
  28. 3 1
      data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
  29. 3 1
      data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
  30. 3 1
      data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
  31. 3 1
      data-room-ui/packages/BasicComponents/Video/settingConfig.js
  32. 27 1
      data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
  33. 2 0
      data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
  34. 3 1
      data-room-ui/packages/Borders/Border1/settingConfig.js
  35. 3 1
      data-room-ui/packages/Borders/Border10/settingConfig.js
  36. 3 1
      data-room-ui/packages/Borders/Border11/settingConfig.js
  37. 3 1
      data-room-ui/packages/Borders/Border12/settingConfig.js
  38. 3 1
      data-room-ui/packages/Borders/Border13/settingConfig.js
  39. 3 1
      data-room-ui/packages/Borders/Border14/settingConfig.js
  40. 3 1
      data-room-ui/packages/Borders/Border15/settingConfig.js
  41. 3 1
      data-room-ui/packages/Borders/Border2/settingConfig.js
  42. 3 1
      data-room-ui/packages/Borders/Border3/settingConfig.js
  43. 3 1
      data-room-ui/packages/Borders/Border4/settingConfig.js
  44. 3 1
      data-room-ui/packages/Borders/Border5/settingConfig.js
  45. 3 1
      data-room-ui/packages/Borders/Border6/settingConfig.js
  46. 3 1
      data-room-ui/packages/Borders/Border7/settingConfig.js
  47. 3 1
      data-room-ui/packages/Borders/Border8/settingConfig.js
  48. 3 1
      data-room-ui/packages/Borders/Border9/settingConfig.js
  49. 3 1
      data-room-ui/packages/Decorations/Decoration1/settingConfig.js
  50. 3 1
      data-room-ui/packages/Decorations/Decoration10/settingConfig.js
  51. 3 1
      data-room-ui/packages/Decorations/Decoration11/settingConfig.js
  52. 3 1
      data-room-ui/packages/Decorations/Decoration12/settingConfig.js
  53. 3 1
      data-room-ui/packages/Decorations/Decoration2/settingConfig.js
  54. 3 1
      data-room-ui/packages/Decorations/Decoration3/settingConfig.js
  55. 3 1
      data-room-ui/packages/Decorations/Decoration4/settingConfig.js
  56. 3 1
      data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
  57. 3 1
      data-room-ui/packages/Decorations/Decoration5/settingConfig.js
  58. 3 1
      data-room-ui/packages/Decorations/Decoration6/settingConfig.js
  59. 3 1
      data-room-ui/packages/Decorations/Decoration8/settingConfig.js
  60. 3 1
      data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
  61. 3 1
      data-room-ui/packages/Decorations/Decoration9/settingConfig.js
  62. 2 0
      data-room-ui/packages/Echarts/echartList.js
  63. 2 0
      data-room-ui/packages/G2Plots/plotList.js
  64. 4 0
      data-room-ui/packages/RemoteComponents/remoteComponentsList.js
  65. 1 1
      data-room-ui/packages/Render/index.vue

+ 5 - 0
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java

@@ -109,6 +109,11 @@ public class Chart {
     @ApiModelProperty(notes = "透视")
     private Integer perspective;
 
+    @ApiModelProperty(notes = "倾斜x")
+    private Integer skewX;
+
+    @ApiModelProperty(notes = "倾斜y")
+    private Integer skewY;
 
 
 }

+ 3 - 1
data-room-ui/packages/BasicComponents/Button/settingConfig.js

@@ -45,7 +45,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js

@@ -23,7 +23,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     tabList: [],

+ 3 - 1
data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js

@@ -24,7 +24,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 28,

+ 3 - 1
data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js

@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js

@@ -39,7 +39,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     color: '#fff',

+ 3 - 1
data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js

@@ -45,7 +45,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 地图id

+ 3 - 1
data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js

@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色

+ 3 - 1
data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js

@@ -27,7 +27,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 20,

+ 3 - 1
data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js

@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     src: '',

+ 3 - 1
data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js

@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     src: '',

+ 3 - 1
data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js

@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderRadius: 0,

+ 3 - 1
data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js

@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderRadius: 0,

+ 3 - 1
data-room-ui/packages/BasicComponents/Input/settingConfig.js

@@ -21,7 +21,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js

@@ -38,7 +38,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '超链接占位符',

+ 3 - 1
data-room-ui/packages/BasicComponents/Map/settingConfig.js

@@ -46,7 +46,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     mapId: '',

+ 3 - 1
data-room-ui/packages/BasicComponents/Marquee/settingConfig.js

@@ -38,7 +38,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '跑马灯占位符',

+ 3 - 1
data-room-ui/packages/BasicComponents/Numbers/settingConfig.js

@@ -48,7 +48,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '1234',

+ 3 - 1
data-room-ui/packages/BasicComponents/Picture/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     url: '',

+ 3 - 1
data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue

@@ -128,13 +128,15 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 export default {
   name: 'BarSetting',
   components: {
     ColorPicker,
     PosWhSetting,
     SettingTitle,
-    BorderSetting
+    BorderSetting,
+    RotateSetting
   },
   data () {
     return {

+ 3 - 1
data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js

@@ -41,7 +41,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     rowNum: 5,

+ 3 - 1
data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js

@@ -34,7 +34,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     rowNum: 5,

+ 3 - 1
data-room-ui/packages/BasicComponents/Select/settingConfig.js

@@ -33,7 +33,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/Tables/settingConfig.js

@@ -43,7 +43,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
 
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/Texts/settingConfig.js

@@ -48,7 +48,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '文本标签占位符',

+ 3 - 1
data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js

@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '文本标签占位符',

+ 3 - 1
data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js

@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     activeColor: '#007aff', // 单选框字体激活状态

+ 3 - 1
data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js

@@ -23,7 +23,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 28,

+ 3 - 1
data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js

@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {

+ 3 - 1
data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js

@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色

+ 3 - 1
data-room-ui/packages/BasicComponents/Video/settingConfig.js

@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     videoType: 'application/x-mpegURL',

+ 27 - 1
data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue

@@ -51,6 +51,30 @@
         :step="1"
       />
     </el-form-item>
+    <el-form-item
+      :label-width="labelWidth"
+      label="沿x轴扭曲角度"
+    >
+      <el-input-number
+        v-model="config.skewX"
+        class="bs-el-input-number"
+        :min="-180"
+        :max="180"
+        :step="1"
+      />
+    </el-form-item>
+    <el-form-item
+      :label-width="labelWidth"
+      label="绕y轴扭曲角度"
+    >
+      <el-input-number
+        v-model="config.skewY"
+        class="bs-el-input-number"
+        :min="-180"
+        :max="180"
+        :step="1"
+      />
+    </el-form-item>
   </div>
 </template>
 <script>
@@ -63,7 +87,9 @@ export default {
         rotateX: 0,
         rotateY: 0,
         rotateZ: 0,
-        perspective: 0
+        perspective: 0,
+        skewX: 0,
+        skewY: 0
       })
     },
     labelWidth: {

+ 2 - 0
data-room-ui/packages/BigScreenDesign/RightSetting/index.vue

@@ -119,6 +119,8 @@ export default {
         rotateY: this.config?.rotateY,
         rotateZ: this.config?.rotateZ,
         perspective: this.config?.perspective,
+        skewX: this.config?.skewX,
+        skewY: this.config?.skewY,
         setting: cloneDeep(this.config?.setting),
         customize: cloneDeep(this.config?.customize),
         url: this.config?.url,

+ 3 - 1
data-room-ui/packages/Borders/Border1/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',

+ 3 - 1
data-room-ui/packages/Borders/Border10/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border11/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border12/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border13/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border14/settingConfig.js

@@ -19,7 +19,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色

+ 3 - 1
data-room-ui/packages/Borders/Border15/settingConfig.js

@@ -19,7 +19,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色

+ 3 - 1
data-room-ui/packages/Borders/Border2/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',

+ 3 - 1
data-room-ui/packages/Borders/Border3/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',

+ 3 - 1
data-room-ui/packages/Borders/Border4/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border5/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border6/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border7/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border8/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Borders/Border9/settingConfig.js

@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色

+ 3 - 1
data-room-ui/packages/Decorations/Decoration1/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#fff',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration10/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#00c2ff',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration11/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#1a98fc',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration12/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: null,

+ 3 - 1
data-room-ui/packages/Decorations/Decoration2/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3faacb',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration3/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#7acaec',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration4/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration5/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration6/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1:'#7acaec',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration8/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',

+ 3 - 1
data-room-ui/packages/Decorations/Decoration9/settingConfig.js

@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(3, 166, 224, 0.8)',

+ 2 - 0
data-room-ui/packages/Echarts/echartList.js

@@ -35,6 +35,8 @@ function getEchartsList (files) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 0,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'echartsComponent',
       loading: false,
       // 把默认右侧配置与自定义右侧配置集合

+ 2 - 0
data-room-ui/packages/G2Plots/plotList.js

@@ -45,6 +45,8 @@ function getPlotList (files) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 0,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'customComponent',
       chartType: config.chartType,
       loading: false,

+ 4 - 0
data-room-ui/packages/RemoteComponents/remoteComponentsList.js

@@ -43,6 +43,8 @@ export function getRemoteComponents (comList) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 500,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'remoteComponent',
       option: {
         ...cloneDeep(settingConfig),
@@ -79,6 +81,8 @@ export function getRemoteComponentConfig (code, name) {
     rotateY: 0,
     rotateZ: 0,
     perspective: 0,
+    skewX: 0,
+    skewY: 0,
     type: 'remoteComponent',
     option: {
       ...cloneDeep(settingConfig)

+ 1 - 1
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="`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) skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg)`"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"