diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json
index b6ee77d2..8d4c06a5 100644
--- a/data-room-ui/package-lock.json
+++ b/data-room-ui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
- "version": "2.0.1-2023101601-Alpha",
+ "version": "2.0.1-RELEASE",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1660,9 +1660,9 @@
"dev": true
},
"@gcpaas/vue-draggable-resizable-gorkys": {
- "version": "1.0.1-2023101602-Alpha",
- "resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101602-Alpha.tgz",
- "integrity": "sha512-bNC/v2B4tByl2Z7GfXXsBFkcIiHhxtaaDatjpwmz5KMpK72VzK1RPhePnePyr/yPFLhQiE2NbPpjpvDLRiz1tg==",
+ "version": "1.0.1-2023101705-Alpha",
+ "resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101705-Alpha.tgz",
+ "integrity": "sha512-y03QX0I88eM7ZJMS88cG0g+2ak9jPZdXAHZCO2bFR4L88KllMWQ3tW4jEbqbWll3Xz0npN5JwHn4V2ltSgd6ew==",
"requires": {
"core-js": "^2.6.11"
},
@@ -3392,6 +3392,27 @@
"whatwg-fetch": "^3.6.2"
},
"dependencies": {
+ "@vue/vue-loader-v15": {
+ "version": "npm:vue-loader@15.10.2",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
+ "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
+ "dev": true,
+ "requires": {
+ "@vue/component-compiler-utils": "^3.1.0",
+ "hash-sum": "^1.0.2",
+ "loader-utils": "^1.1.0",
+ "vue-hot-reload-api": "^2.3.0",
+ "vue-style-loader": "^4.1.0"
+ },
+ "dependencies": {
+ "hash-sum": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+ "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+ "dev": true
+ }
+ }
+ },
"acorn-walk": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
@@ -3463,6 +3484,26 @@
"tapable": "^2.0.0"
}
},
+ "json5": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.0"
+ }
+ },
+ "loader-utils": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+ "dev": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^1.0.1"
+ }
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3697,47 +3738,6 @@
"lodash": "^4.17.4"
}
},
- "@vue/vue-loader-v15": {
- "version": "npm:vue-loader@15.10.2",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
- "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
- "dev": true,
- "requires": {
- "@vue/component-compiler-utils": "^3.1.0",
- "hash-sum": "^1.0.2",
- "loader-utils": "^1.1.0",
- "vue-hot-reload-api": "^2.3.0",
- "vue-style-loader": "^4.1.0"
- },
- "dependencies": {
- "hash-sum": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
- "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
- "dev": true
- },
- "json5": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
- "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
- "dev": true,
- "requires": {
- "minimist": "^1.2.0"
- }
- },
- "loader-utils": {
- "version": "1.4.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
- "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
- "dev": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^1.0.1"
- }
- }
- }
- },
"@vue/vue2-jest": {
"version": "27.0.0",
"resolved": "https://registry.npmjs.org/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz",
@@ -20142,7 +20142,7 @@
},
"vue-hot-reload-api": {
"version": "2.3.4",
- "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+ "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
"integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
"dev": true
},
diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index aecfacbf..36e3433a 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -56,7 +56,7 @@
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@antv/g2plot": "2.4.0",
- "@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101602-Alpha",
+ "@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101705-Alpha",
"@jiaminghi/data-view": "2.10.0",
"axios": "0.18.1",
"echarts": "^5.2.2",
diff --git a/data-room-ui/packages/BasicComponents/Button/setting.vue b/data-room-ui/packages/BasicComponents/Button/setting.vue
index 90993bc6..bf974a7e 100644
--- a/data-room-ui/packages/BasicComponents/Button/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Button/setting.vue
@@ -28,12 +28,12 @@
:bigTitle='config.title'
/>
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/ChartTab/setting.vue b/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
index 4f0067c9..52bc7476 100644
--- a/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
@@ -35,12 +35,12 @@
label-width="120px"
/>
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
index 50b4075b..84eb6c38 100644
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
@@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
index e195642d..e99234c7 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
+++ b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue
@@ -33,12 +33,12 @@
:bigTitle='config.title'
/>
-
+ 旋转
+
+
+
基础
-
+
边框
-
+ 旋转
+
+
+
边框
-
+
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
index 536a227b..a0e09f1e 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue
@@ -27,12 +27,12 @@
-
+
+
+
基础
diff --git a/data-room-ui/packages/BasicComponents/LinkChart/setting.vue b/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
index 6f82e2f3..c6257f42 100644
--- a/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
+++ b/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
@@ -40,12 +40,12 @@
:bigTitle='config.title'
/>
-
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
index b05e8b54..259c05fc 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue
@@ -35,12 +35,12 @@
:bigTitle='config.title'
/>
-
+
基础
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/Tables/setting.vue b/data-room-ui/packages/BasicComponents/Tables/setting.vue
index 2b30957c..d727c4db 100644
--- a/data-room-ui/packages/BasicComponents/Tables/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Tables/setting.vue
@@ -35,12 +35,12 @@
label-width="120px"
/>
-
+ 旋转
+
+
+
基础
diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue
index c7679b00..b7b62147 100644
--- a/data-room-ui/packages/BasicComponents/Texts/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue
@@ -42,12 +42,12 @@
:big-title="config.title"
/>
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+ 旋转
+
+
+
基础
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
index e06ae1ea..5e64b59c 100644
--- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
@@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
-
+
基础
diff --git a/data-room-ui/packages/BasicComponents/Video/setting.vue b/data-room-ui/packages/BasicComponents/Video/setting.vue
index 33a01dff..53a044ca 100644
--- a/data-room-ui/packages/BasicComponents/Video/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Video/setting.vue
@@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
-
+
基础
diff --git a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
index 70d4629b..a7986a1f 100644
--- a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
index 67374603..efa10623 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
@@ -37,12 +37,12 @@
:config="config"
/>
-
+ 旋转
+
+
+
{{ group.groupName | filterGroupName }}
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
index 36935a17..0cdff0a5 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue
@@ -37,12 +37,12 @@
:config="config"
/>
-
+ 旋转
+
+
+
{{ group.groupName | filterGroupName }}
diff --git a/data-room-ui/packages/Borders/Border14/setting.vue b/data-room-ui/packages/Borders/Border14/setting.vue
index 8dcbff8d..9d41e1d7 100644
--- a/data-room-ui/packages/Borders/Border14/setting.vue
+++ b/data-room-ui/packages/Borders/Border14/setting.vue
@@ -22,6 +22,12 @@
/>
+
旋转
+
+
+
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from 'data-room-ui/js/utils/colorList'
export default {
name: 'Border14Setting',
components: {
ColorPicker,
- PosWhSetting
+ PosWhSetting,
+ RotateSetting
},
props: {
config: {
diff --git a/data-room-ui/packages/Borders/Border15/setting.vue b/data-room-ui/packages/Borders/Border15/setting.vue
index e14b83f6..1758f3fe 100644
--- a/data-room-ui/packages/Borders/Border15/setting.vue
+++ b/data-room-ui/packages/Borders/Border15/setting.vue
@@ -22,6 +22,12 @@
/>
+
旋转
+
+
+
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from "data-room-ui/js/utils/colorList";
export default {
name: 'Border14Setting',
components: {
ColorPicker,
- PosWhSetting
+ PosWhSetting,
+ RotateSetting
},
props: {
config: {
diff --git a/data-room-ui/packages/Decorations/Decoration1/setting.vue b/data-room-ui/packages/Decorations/Decoration1/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration1/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration1/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration10/setting.vue b/data-room-ui/packages/Decorations/Decoration10/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration10/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration10/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration11/setting.vue b/data-room-ui/packages/Decorations/Decoration11/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration11/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration11/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration12/setting.vue b/data-room-ui/packages/Decorations/Decoration12/setting.vue
index 3f335e54..b80fd3de 100644
--- a/data-room-ui/packages/Decorations/Decoration12/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration12/setting.vue
@@ -53,12 +53,12 @@
/>
-
+
diff --git a/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
index 18147fcb..04dc2ce7 100644
--- a/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue
@@ -24,12 +24,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration3/setting.vue b/data-room-ui/packages/Decorations/Decoration3/setting.vue
index d52118cc..27650631 100644
--- a/data-room-ui/packages/Decorations/Decoration3/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration3/setting.vue
@@ -24,12 +24,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration4/setting.vue b/data-room-ui/packages/Decorations/Decoration4/setting.vue
index 842312ca..5a28de6e 100644
--- a/data-room-ui/packages/Decorations/Decoration4/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration4/setting.vue
@@ -24,12 +24,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
index 842312ca..5a28de6e 100644
--- a/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue
@@ -24,12 +24,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration5/setting.vue b/data-room-ui/packages/Decorations/Decoration5/setting.vue
index b3e0a14a..5e000b1f 100644
--- a/data-room-ui/packages/Decorations/Decoration5/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration5/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration6/setting.vue b/data-room-ui/packages/Decorations/Decoration6/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration6/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration6/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration8/setting.vue b/data-room-ui/packages/Decorations/Decoration8/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration8/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration8/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue b/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
index d413158b..d98fe0cf 100644
--- a/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Decorations/Decoration9/setting.vue b/data-room-ui/packages/Decorations/Decoration9/setting.vue
index cdc420e6..f0399b68 100644
--- a/data-room-ui/packages/Decorations/Decoration9/setting.vue
+++ b/data-room-ui/packages/Decorations/Decoration9/setting.vue
@@ -27,12 +27,12 @@
-
+
基础
diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index cbea26bd..997360bc 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,7 +38,8 @@
:style="{
zIndex: chart.z || 0,
}"
- :transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) 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)`"
+ :perspective="parseInt(`${chart.perspective == undefined ? 0 : chart.perspective}`)"
+ :transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) 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"
@@ -85,7 +86,6 @@ 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 'gc-vue-draggable-resizable/dist/VueDraggableResizable.css'
import { randomString } from '../js/utils'