diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json
index b7368cb4..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.0-RELEASE",
+ "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"
},
@@ -3394,7 +3394,7 @@
"dependencies": {
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.10.2",
- "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.2.tgz",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
"integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
"dev": true,
"requires": {
@@ -3407,7 +3407,7 @@
"dependencies": {
"hash-sum": {
"version": "1.0.2",
- "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
@@ -3486,7 +3486,7 @@
},
"json5": {
"version": "1.0.2",
- "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
@@ -3495,7 +3495,7 @@
},
"loader-utils": {
"version": "1.4.2",
- "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index aecfacbf..6b36ffe5 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
- "version": "2.0.1-RELEASE",
+ "version": "2.0.1-2023101801-Alpha",
"description": "自定义大屏",
"author": "gcpaas",
"license": "MIT",
@@ -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/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
index d2db4a86..cbf486cf 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
@@ -151,7 +151,7 @@
v-model="config[setting.field]"
v-else-if="setting.type === 'background'"
clearable
- placeholder="请选择图片"
+ placeholder="选择或输入链接"
>
+
+ 图形切割
+
+
@@ -277,13 +285,15 @@ import BorderColorSetting from 'data-room-ui/BigScreenDesign/RightSetting/Border
import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue'
import BorderSelect from 'data-room-ui/BorderSelect/index.vue'
import SourceDialog from '../SourceDialog/index.vue'
+import MoveDialog from './MoveDialog/index.vue'
export default {
name: '',
components: {
BorderSelect,
ColorSelect,
BorderColorSetting,
- SourceDialog
+ SourceDialog,
+ MoveDialog
},
props: {
bigTitle:{
@@ -381,6 +391,9 @@ export default {
// }
},
methods: {
+ changeBorder(val){
+ this.$set(this.config,'borderArray',val)
+ },
changeImg(val){
this.$set(this.config,'imgUrl',val.url)
},
@@ -389,6 +402,10 @@ export default {
},
initCard(){
this.$refs.SourceDialog.init()
+ },
+ initMove(val){
+ console.log(val)
+ this.$refs.MoveDialog.init(val,this.config.borderArray)
}
}
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index d297967e..21eac27a 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -27,7 +27,7 @@
label="数据来源"
>
@@ -39,7 +39,7 @@
{
@@ -300,7 +300,7 @@ data.forEach(item => {
@@ -470,7 +470,7 @@ data.forEach(item => {
@@ -642,7 +642,6 @@ export default {
},
data () {
return {
- dataSourceStyle: 'dataset', // 数据来源方式
fieldsList: [],
params: [], // 参数配置
datasetName: '',
@@ -764,11 +763,10 @@ export default {
}
},
methods: {
- changeDsid(dsId){
- this.clearVerify()
- this.config.customize.columnConfig=[]
+ changeDsid (dsId) {
+ this.clearVerify()
+ this.config.customize.columnConfig = []
this.getDataSetDetailsById(dsId, 'treeTable')
-
},
// 打开表达式弹窗
openExpression () {
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/BigScreenDesign/RightSetting/MoveDialog/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
new file mode 100644
index 00000000..d9dfa503
--- /dev/null
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/MoveDialog/index.vue
@@ -0,0 +1,338 @@
+
+
+
+
+
+
+ 方向 |
+ 描述 |
+
+
+ 左上角 |
+ 不能拉伸 |
+
+
+ 右上角 |
+ 不能拉伸 |
+
+
+ 左下角 |
+ 不能拉伸 |
+
+
+ 右下角 |
+ 不能拉伸 |
+
+
+ 左侧 |
+ 宽度不变,高度自动拉伸 |
+
+
+ 右侧 |
+ 宽度不变,高度自动拉伸 |
+
+
+ 顶部 |
+ 高度不变,宽度自动拉伸 |
+
+
+ 底部 |
+ 高度不变,宽度自动拉伸 |
+
+
+ 中部 |
+ 宽度,高度自动拉伸 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/component.png b/data-room-ui/packages/BorderComponents/GcBorder16/component.png
index cdbcda23..0bcd3434 100644
Binary files a/data-room-ui/packages/BorderComponents/GcBorder16/component.png and b/data-room-ui/packages/BorderComponents/GcBorder16/component.png differ
diff --git a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
index ac4205e0..867835fa 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder16/index.vue
@@ -4,6 +4,7 @@
class="bs-design-wrap"
:id="'border'+ config.code"
:style="{
+ opacity: opacity,
borderImageSlice:`${borderArray[0]} ${borderArray[1]} ${borderArray[2]} ${borderArray[3]} fill`,
borderImageWidth:`${borderArray[0]}px ${borderArray[1]}px ${borderArray[2]}px ${borderArray[3]}px`,
}"
@@ -12,6 +13,7 @@