diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 2883c1ed..24107861 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 1.0.1.2023101001.Alpha + 1.0.1.2023101101.Alpha dataroom-core diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java index 08023ae5..c46122bc 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java @@ -84,9 +84,6 @@ public class DataRoomPageController { public R add(@RequestBody DataRoomPageDTO bigScreenPageDTO) { ValidatorUtils.validateEntity(bigScreenPageDTO, Insert.class); bigScreenPageService.add(bigScreenPageDTO); - if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) { - bigScreenPageDTO.setParentCode("0"); - } return R.success(bigScreenPageDTO.getCode()); } @@ -100,9 +97,6 @@ public class DataRoomPageController { return R.success(code); } ValidatorUtils.validateEntity(bigScreenPageDTO, Update.class); - if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) { - bigScreenPageDTO.setParentCode("0"); - } bigScreenPageService.update(bigScreenPageDTO); return R.success(bigScreenPageDTO.getCode()); } @@ -136,9 +130,6 @@ public class DataRoomPageController { @ApiOperation(value = "从模板新增大屏页", position = 20, produces = MediaType.APPLICATION_JSON_VALUE) public R addByTemplate(@RequestBody DataRoomPageDTO bigScreenPageDTO) { String code = bigScreenPageService.addByTemplate(bigScreenPageDTO); - if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) { - bigScreenPageDTO.setParentCode("0"); - } return R.success(code); } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java index 8fa2dadc..ccdc7439 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java @@ -385,6 +385,9 @@ public class DataRoomMapServiceImpl extends ServiceImpl com.gccloud dataroom - 1.0.1.2023101001.Alpha + 1.0.1.2023101101.Alpha dataroom-server diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index c4ec9695..be55bda8 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -5,7 +5,7 @@ com.gccloud dataroom - 1.0.1.2023101001.Alpha + 1.0.1.2023101101.Alpha pom dataroom @@ -44,7 +44,7 @@ 1.5.21 2.13.3 20220320 - 1.0.1.2023101001.Alpha + 1.0.1.2023101101.Alpha 2.22.2 diff --git a/data-room-ui/package.json b/data-room-ui/package.json index abae220e..37a765cf 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023092702-Alpha", + "version": "1.0.1-2023101101-Alpha", "description": "自定义大屏", "author": "gcpaas", "license": "MIT", diff --git a/data-room-ui/packages/BasicComponents/IndexCard/index.vue b/data-room-ui/packages/BasicComponents/IndexCard/index.vue index 9cb44c69..549c9af6 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/index.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard/index.vue @@ -22,7 +22,7 @@ width: customize.imgSize + 'px', height: customize.imgSize + 'px', }" - :src="customize.src" + :src="customize.src?customize.src:imgUrl" fit="contain" /> @@ -79,6 +79,7 @@ export default { }, data () { return { + imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'), customClass: {} } }, diff --git a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js index 5792ff7d..8fbba853 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js @@ -39,7 +39,7 @@ const customConfig = { loading: false }, customize: { - src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png', + src: '', borderRadius: 0, borderWidth: 0, lineDistance: 6, diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue index ab6d5f88..49a32a65 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/index.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard2/index.vue @@ -22,7 +22,7 @@ width: customize.imgSize + 'px', height: customize.imgSize + 'px', }" - :src="customize.src" + :src="customize.src?customize.src:imgUrl" fit="contain" /> @@ -77,6 +77,7 @@ export default { }, data () { return { + imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'), customClass: {} } }, diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js index de1aa4dd..4cb4a4c5 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js @@ -39,7 +39,7 @@ const customConfig = { loading: false }, customize: { - src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png', + src: '', borderRadius: 0, borderWidth: 0, lineDistance: 6, diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue index 4334653e..ec50371e 100644 --- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue @@ -43,7 +43,6 @@ @keyup.enter.native="reSearch" /> @@ -167,7 +166,6 @@ @keyup.enter.native="reSearch" /> diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue index 7f80e9c8..0e0d1117 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue @@ -118,11 +118,6 @@ class="bs-el-color-picker" show-alpha /> - -
+ + + - + @@ -50,7 +62,8 @@ export default { default: () => ({ rotateX: 0, rotateY: 0, - rotateZ: 0 + rotateZ: 0, + perspective: 500 }) }, labelWidth: { diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue index 2570d79c..a54da668 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue @@ -118,6 +118,7 @@ export default { rotateX: this.config?.rotateX, rotateY: this.config?.rotateY, rotateZ: this.config?.rotateZ, + perspective: this.config?.perspective, setting: cloneDeep(this.config?.setting), customize: cloneDeep(this.config?.customize), url: this.config?.url, diff --git a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue index f10d5c65..6478d495 100644 --- a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue +++ b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue @@ -74,7 +74,15 @@ export default { return this.rightVisiable && this.activeCode }, title () { - return this.activeItem?.title || '' + if(this.activeItem.type=='customComponent'){ + return this.activeItem?.category + }else if(this.activeItem.type=='"remoteComponent"'){ + return this.activeItem?.title + } + else{ + return this.activeItem?.name + } + // if(this.activeItem) } }, mounted () { }, diff --git a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue index aa823436..d6849ef7 100644 --- a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue @@ -37,7 +37,6 @@ /> diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js index 3d2e7131..5be989c8 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js @@ -57,7 +57,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js index 19f47a71..f3a945b9 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js index 935c1131..9bda8eb7 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js @@ -67,7 +67,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js index 29348df3..fae9d75c 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js @@ -57,7 +57,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js index c33889d1..c9affd8a 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js index 88211451..a6dbaf91 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js @@ -55,7 +55,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js index 33238a97..e176d1b5 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js index a6b1eff5..200bb268 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js @@ -55,7 +55,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js index 1fe3a75b..3dd76b42 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js index c607fa17..516b1c3c 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js index e7b934bc..c20d8fd3 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js index 1e8e6e78..143c3ec7 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js index 6e47646a..d4966f26 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js @@ -56,7 +56,7 @@ const setting = [ optionField: 'gradientDirection', // 是否多选 multiple: false, - value: '', + value: 'to right', options: [ { label: '从左到右', diff --git a/data-room-ui/packages/Borders/Border14/settingConfig.js b/data-room-ui/packages/Borders/Border14/settingConfig.js index 9e146819..fa189b5b 100644 --- a/data-room-ui/packages/Borders/Border14/settingConfig.js +++ b/data-room-ui/packages/Borders/Border14/settingConfig.js @@ -15,26 +15,26 @@ const customConfig = { // 边框线颜色 borderColor: '#87888e', // 边框线宽度 - borderWidth: 2, + borderWidth: 10, // 边框背景颜色 backgroundColor: '#232832', colorType: 'single', // 渐变色0值 - gradientColor0: '#83bff6', + gradientColor0: '', // 渐变色1值 - gradientColor1: '#188df0', + gradientColor1: '', // 渐变色色值改变方向 gradientDirection: 'to right', // 透明度 opacity: 100, // 左上圆角 - radiusLeftTop: 2, + radiusLeftTop: 14, // 右上圆角 - radiusRightTop: 2, + radiusRightTop: 14, // 左下圆角 - radiusLeftBottom: 2, + radiusLeftBottom: 14, // 右下圆角 - radiusRightBottom: 2 + radiusRightBottom: 14 } } export const dataConfig = { diff --git a/data-room-ui/packages/Borders/Border15/settingConfig.js b/data-room-ui/packages/Borders/Border15/settingConfig.js index 77afd79a..8505e781 100644 --- a/data-room-ui/packages/Borders/Border15/settingConfig.js +++ b/data-room-ui/packages/Borders/Border15/settingConfig.js @@ -15,14 +15,14 @@ const customConfig = { // 边框线颜色 borderColor: '#87888e', // 边框线宽度 - borderWidth: 2, + borderWidth: 10, // 边框背景颜色 backgroundColor: '#232832', colorType: 'single', // 渐变色0值 - gradientColor0: '#83bff6', + gradientColor0: '', // 渐变色1值 - gradientColor1: '#188df0', + gradientColor1: '', // 渐变色色值改变方向 gradientDirection: 'to right', // 透明度 @@ -34,7 +34,7 @@ const customConfig = { // 字体粗细 fontWeight: 500, // 中心文本 - text: '文本' + text: '' } } export const dataConfig = { diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index 8af93990..c9a565a5 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -157,7 +157,7 @@