tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
main
liu.shiyi 1 year ago
parent 6a9179ee8a 8a46532aba
commit 08d64cdc12
57 changed files with 383 additions and 327 deletions
Show Stats Download Patch File Download Diff File

2
DataRoom/dataroom-core/pom.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>1.0.1.2023101001.Alpha</version> <version>1.0.1.2023101101.Alpha</version>
</parent> </parent>
<artifactId>dataroom-core</artifactId> <artifactId>dataroom-core</artifactId>

9
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java
Unescape Escape View File

@ -84,9 +84,6 @@ public class DataRoomPageController {
public R<String> add(@RequestBody DataRoomPageDTO bigScreenPageDTO) { public R<String> add(@RequestBody DataRoomPageDTO bigScreenPageDTO) {
ValidatorUtils.validateEntity(bigScreenPageDTO, Insert.class); ValidatorUtils.validateEntity(bigScreenPageDTO, Insert.class);
bigScreenPageService.add(bigScreenPageDTO); bigScreenPageService.add(bigScreenPageDTO);
if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) {
bigScreenPageDTO.setParentCode("0");
}
return R.success(bigScreenPageDTO.getCode()); return R.success(bigScreenPageDTO.getCode());
} }
@ -100,9 +97,6 @@ public class DataRoomPageController {
return R.success(code); return R.success(code);
} }
ValidatorUtils.validateEntity(bigScreenPageDTO, Update.class); ValidatorUtils.validateEntity(bigScreenPageDTO, Update.class);
if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) {
bigScreenPageDTO.setParentCode("0");
}
bigScreenPageService.update(bigScreenPageDTO); bigScreenPageService.update(bigScreenPageDTO);
return R.success(bigScreenPageDTO.getCode()); return R.success(bigScreenPageDTO.getCode());
} }
@ -136,9 +130,6 @@ public class DataRoomPageController {
@ApiOperation(value = "从模板新增大屏页", position = 20, produces = MediaType.APPLICATION_JSON_VALUE) @ApiOperation(value = "从模板新增大屏页", position = 20, produces = MediaType.APPLICATION_JSON_VALUE)
public R<String> addByTemplate(@RequestBody DataRoomPageDTO bigScreenPageDTO) { public R<String> addByTemplate(@RequestBody DataRoomPageDTO bigScreenPageDTO) {
String code = bigScreenPageService.addByTemplate(bigScreenPageDTO); String code = bigScreenPageService.addByTemplate(bigScreenPageDTO);
if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) {
bigScreenPageDTO.setParentCode("0");
}
return R.success(code); return R.success(code);
} }

3
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java
Unescape Escape View File

@ -385,6 +385,9 @@ public class DataRoomMapServiceImpl extends ServiceImpl<DataRoomMapDao, DataRoom
return Lists.newArrayList(); return Lists.newArrayList();
} }
JSONObject geoObj = JSON.parseObject(geoJson); JSONObject geoObj = JSON.parseObject(geoJson);
if (!geoObj.has("features")) {
throw new GlobalException("geoJson格式错误，缺少features");
}
JSONArray features = geoObj.getJSONArray("features"); JSONArray features = geoObj.getJSONArray("features");
if (features == null || features.length() == 0) { if (features == null || features.length() == 0) {
return Lists.newArrayList(); return Lists.newArrayList();

2
DataRoom/dataroom-server/pom.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>1.0.1.2023101001.Alpha</version> <version>1.0.1.2023101101.Alpha</version>
</parent> </parent>
<artifactId>dataroom-server</artifactId> <artifactId>dataroom-server</artifactId>

4
DataRoom/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<groupId>com.gccloud</groupId> <groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId> <artifactId>dataroom</artifactId>
<version>1.0.1.2023101001.Alpha</version> <version>1.0.1.2023101101.Alpha</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>dataroom</name> <name>dataroom</name>
@ -44,7 +44,7 @@
<swagger-models.version>1.5.21</swagger-models.version> <swagger-models.version>1.5.21</swagger-models.version>
<jackson.version.core>2.13.3</jackson.version.core> <jackson.version.core>2.13.3</jackson.version.core>
<json.version>20220320</json.version> <json.version>20220320</json.version>
<dataset.core.version>1.0.1.2023101001.Alpha</dataset.core.version> <dataset.core.version>1.0.1.2023101101.Alpha</dataset.core.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
</properties> </properties>

2
data-room-ui/package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"name": "@gcpaas/data-room-ui", "name": "@gcpaas/data-room-ui",
"version": "1.0.1-2023092702-Alpha", "version": "1.0.1-2023101101-Alpha",
"description": "自定义大屏", "description": "自定义大屏",
"author": "gcpaas", "author": "gcpaas",
"license": "MIT", "license": "MIT",

3
data-room-ui/packages/BasicComponents/IndexCard/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
width: customize.imgSize + 'px', width: customize.imgSize + 'px',
height: customize.imgSize + 'px', height: customize.imgSize + 'px',
}" }"
:src="customize.src" :src="customize.src?customize.src:imgUrl"
fit="contain" fit="contain"
/> />
</div> </div>
@ -79,6 +79,7 @@ export default {
}, },
data () { data () {
return { return {
imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
customClass: {} customClass: {}
} }
}, },

2
data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
Unescape Escape View File

@ -39,7 +39,7 @@ const customConfig = {
loading: false loading: false
}, },
customize: { customize: {
src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png', src: '',
borderRadius: 0, borderRadius: 0,
borderWidth: 0, borderWidth: 0,
lineDistance: 6, lineDistance: 6,

3
data-room-ui/packages/BasicComponents/IndexCard2/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
width: customize.imgSize + 'px', width: customize.imgSize + 'px',
height: customize.imgSize + 'px', height: customize.imgSize + 'px',
}" }"
:src="customize.src" :src="customize.src?customize.src:imgUrl"
fit="contain" fit="contain"
/> />
</div> </div>
@ -77,6 +77,7 @@ export default {
}, },
data () { data () {
return { return {
imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
customClass: {} customClass: {}
} }
}, },

2
data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
Unescape Escape View File

@ -39,7 +39,7 @@ const customConfig = {
loading: false loading: false
}, },
customize: { customize: {
src: 'http://60.174.249.206:11080/upload/webDesign/uiSucai/dir/icon/icon_top6.png', src: '',
borderRadius: 0, borderRadius: 0,
borderWidth: 0, borderWidth: 0,
lineDistance: 6, lineDistance: 6,

2
data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
Unescape Escape View File

@ -43,7 +43,6 @@
@keyup.enter.native="reSearch" @keyup.enter.native="reSearch"
/> />
<el-button <el-button
size="small"
type="primary" type="primary"
@click="reSearch" @click="reSearch"
> >
@ -167,7 +166,6 @@
@keyup.enter.native="reSearch" @keyup.enter.native="reSearch"
/> />
<el-button <el-button
size="small"
type="primary" type="primary"
@click="reSearch" @click="reSearch"
> >

7
data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue
Unescape Escape View File

@ -118,11 +118,6 @@
class="bs-el-color-picker" class="bs-el-color-picker"
show-alpha show-alpha
/> />
<!-- 渐变色设置 -->
<GradualSetting
v-else-if="setting.type === 'gradual'"
v-model="setting.value"
/>
<el-input-number <el-input-number
v-else-if="setting.type === 'inputNumber'" v-else-if="setting.type === 'inputNumber'"
v-model="setting.value" v-model="setting.value"
@ -179,7 +174,6 @@ import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins'
import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue' import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue'
// import ColorPicker from 'data-room-ui/ColorPicker/index.vue' // import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import PaddingSetting from 'data-room-ui/BigScreenDesign/RightSetting/PaddingSetting/index.vue' import PaddingSetting from 'data-room-ui/BigScreenDesign/RightSetting/PaddingSetting/index.vue'
import GradualSetting from 'data-room-ui/BigScreenDesign/RightSetting/GradualSetting/index.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
export default { export default {
@ -188,7 +182,6 @@ export default {
ColorSelect, ColorSelect,
// ColorPicker, // ColorPicker,
PaddingSetting, PaddingSetting,
GradualSetting,
PosWhSetting, PosWhSetting,
BorderSetting, BorderSetting,
SettingTitle, SettingTitle,

17
data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
Unescape Escape View File

@ -4,6 +4,17 @@
<template> <template>
<div> <div>
<el-form-item
:label-width="labelWidth"
label="透视距离"
>
<el-input-number
v-model="config.perspective"
class="bs-el-input-number"
:min="0"
:step="1"
/>
</el-form-item>
<el-form-item <el-form-item
:label-width="labelWidth" :label-width="labelWidth"
label="绕x轴旋转角度" label="绕x轴旋转角度"
@ -27,7 +38,8 @@
:max="360" :max="360"
:step="1" :step="1"
/> />
</el-form-item> <el-form-item </el-form-item>
<el-form-item
:label-width="labelWidth" :label-width="labelWidth"
label="绕z轴旋转角度" label="绕z轴旋转角度"
> >
@ -50,7 +62,8 @@ export default {
default: () => ({ default: () => ({
rotateX: 0, rotateX: 0,
rotateY: 0, rotateY: 0,
rotateZ: 0 rotateZ: 0,
perspective: 500
}) })
}, },
labelWidth: { labelWidth: {

1
data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
Unescape Escape View File

@ -118,6 +118,7 @@ export default {
rotateX: this.config?.rotateX, rotateX: this.config?.rotateX,
rotateY: this.config?.rotateY, rotateY: this.config?.rotateY,
rotateZ: this.config?.rotateZ, rotateZ: this.config?.rotateZ,
perspective: this.config?.perspective,
setting: cloneDeep(this.config?.setting), setting: cloneDeep(this.config?.setting),
customize: cloneDeep(this.config?.customize), customize: cloneDeep(this.config?.customize),
url: this.config?.url, url: this.config?.url,

10
data-room-ui/packages/BigScreenDesign/SettingPanel.vue
Unescape Escape View File

@ -74,7 +74,15 @@ export default {
return this.rightVisiable && this.activeCode return this.rightVisiable && this.activeCode
}, },
title () { 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 () { }, mounted () { },

1
data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
Unescape Escape View File

@ -37,7 +37,6 @@
/> />
</el-select> </el-select>
<el-button <el-button
size="small"
type="primary" type="primary"
@click="reSearch" @click="reSearch"
> >

2
data-room-ui/packages/BorderComponents/GcBorder1/setting.js
Unescape Escape View File

@ -57,7 +57,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder10/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder11/setting.js
Unescape Escape View File

@ -67,7 +67,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder12/setting.js
Unescape Escape View File

@ -57,7 +57,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder13/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder2/setting.js
Unescape Escape View File

@ -55,7 +55,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder3/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder4/setting.js
Unescape Escape View File

@ -55,7 +55,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder5/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder6/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder7/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder8/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

2
data-room-ui/packages/BorderComponents/GcBorder9/setting.js
Unescape Escape View File

@ -56,7 +56,7 @@ const setting = [
optionField: 'gradientDirection', optionField: 'gradientDirection',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '', value: 'to right',
options: [ options: [
{ {
label: '从左到右', label: '从左到右',

14
data-room-ui/packages/Borders/Border14/settingConfig.js
Unescape Escape View File

@ -15,26 +15,26 @@ const customConfig = {
// 边框线颜色 // 边框线颜色
borderColor: '#87888e', borderColor: '#87888e',
// 边框线宽度 // 边框线宽度
borderWidth: 2, borderWidth: 10,
// 边框背景颜色 // 边框背景颜色
backgroundColor: '#232832', backgroundColor: '#232832',
colorType: 'single', colorType: 'single',
// 渐变色0值 // 渐变色0值
gradientColor0: '#83bff6', gradientColor0: '',
// 渐变色1值 // 渐变色1值
gradientColor1: '#188df0', gradientColor1: '',
// 渐变色色值改变方向 // 渐变色色值改变方向
gradientDirection: 'to right', gradientDirection: 'to right',
// 透明度 // 透明度
opacity: 100, opacity: 100,
// 左上圆角 // 左上圆角
radiusLeftTop: 2, radiusLeftTop: 14,
// 右上圆角 // 右上圆角
radiusRightTop: 2, radiusRightTop: 14,
// 左下圆角 // 左下圆角
radiusLeftBottom: 2, radiusLeftBottom: 14,
// 右下圆角 // 右下圆角
radiusRightBottom: 2 radiusRightBottom: 14
} }
} }
export const dataConfig = { export const dataConfig = {

8
data-room-ui/packages/Borders/Border15/settingConfig.js
Unescape Escape View File

@ -15,14 +15,14 @@ const customConfig = {
// 边框线颜色 // 边框线颜色
borderColor: '#87888e', borderColor: '#87888e',
// 边框线宽度 // 边框线宽度
borderWidth: 2, borderWidth: 10,
// 边框背景颜色 // 边框背景颜色
backgroundColor: '#232832', backgroundColor: '#232832',
colorType: 'single', colorType: 'single',
// 渐变色0值 // 渐变色0值
gradientColor0: '#83bff6', gradientColor0: '',
// 渐变色1值 // 渐变色1值
gradientColor1: '#188df0', gradientColor1: '',
// 渐变色色值改变方向 // 渐变色色值改变方向
gradientDirection: 'to right', gradientDirection: 'to right',
// 透明度 // 透明度
@ -34,7 +34,7 @@ const customConfig = {
// 字体粗细 // 字体粗细
fontWeight: 500, fontWeight: 500,
// 中心文本 // 中心文本
text: '文本' text: ''
} }
} }
export const dataConfig = { export const dataConfig = {

2
data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
Unescape Escape View File

@ -157,7 +157,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="数据缓存" label="缓存"
prop="cache" prop="cache"
> >
<el-radio-group <el-radio-group

2
data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
Unescape Escape View File

@ -258,7 +258,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="数据缓存" label="缓存"
prop="cache" prop="cache"
> >
<el-radio-group <el-radio-group

2
data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
Unescape Escape View File

@ -131,7 +131,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="数据缓存" label="缓存"
prop="cache" prop="cache"
> >
<el-radio-group <el-radio-group

2
data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
Unescape Escape View File

@ -158,7 +158,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="数据缓存" label="缓存"
prop="cache" prop="cache"
> >
<el-radio-group <el-radio-group

4
data-room-ui/packages/Decorations/Decoration1/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: '', decorationColor1: '#fff',
decorationColor2: '', decorationColor2: '#0de7c2',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration10/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#00c2ff',
decorationColor2: null, decorationColor2:'rgba(0, 194, 255, 0.3)' ,
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration11/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#1a98fc',
decorationColor2: null, decorationColor2: '#2cf7fe',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration2/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#3faacb',
decorationColor2: null, decorationColor2: '#fff',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

2
data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
Unescape Escape View File

@ -20,7 +20,7 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#3faacb',
decorationColor2: null, decorationColor2: null,
reverse: false, reverse: false,
dur: 3, dur: 3,

4
data-room-ui/packages/Decorations/Decoration3/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#7acaec',
decorationColor2: null, decorationColor2: '#000',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration4/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: 'rgba(255, 255, 255, 0.3)',
decorationColor2: null, decorationColor2: 'rgba(255, 255, 255, 0.3)',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: 'rgba(255, 255, 255, 0.3)',
decorationColor2: null, decorationColor2: 'rgba(255, 255, 255, 0.3)',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration5/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#3f96a5',
decorationColor2: null, decorationColor2: '#3f96a5',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration6/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1:'#7acaec',
decorationColor2: null, decorationColor2: '#7acaec',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration8/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#3f96a5',
decorationColor2: null, decorationColor2: '#3f96a5',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: '#3f96a5',
decorationColor2: null, decorationColor2: '#3f96a5',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

4
data-room-ui/packages/Decorations/Decoration9/settingConfig.js
Unescape Escape View File

@ -20,8 +20,8 @@ const customConfig = {
contribution: false contribution: false
}, },
customize: { customize: {
decorationColor1: null, decorationColor1: 'rgba(3, 166, 224, 0.8)',
decorationColor2: null, decorationColor2: 'rgba(3, 166, 224, 0.5)',
reverse: false, reverse: false,
dur: 3, dur: 3,
scanDur: 3, scanDur: 3,

218
data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
Unescape Escape View File

@ -3,7 +3,7 @@ const version = '2023091901'
// 标题 // 标题
const title = '3D分组柱状图' const title = '3D分组柱状图'
// 用于标识，唯一，和文件夹名称一致 // 用于标识，唯一，和文件夹名称一致
const name = '3DFenZuZhuZhuangTu' const name = '3D分组柱状图'
// 右侧配置项 // 右侧配置项
const setting = [ const setting = [
@ -217,6 +217,57 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
{
label: '名称',
type: 'input',
field: 'xAxis_name',
optionField: 'xAxis.name',
value: '',
tabName: 'custom',
groupName: 'xAxis'
},
{
label: '名称位置',
type: 'select',
field: 'xAxis_nameLocation',
optionField: 'xAxis.nameLocation',
value: 'start',
tabName: 'custom',
options: [
{
label: '左',
value: 'start'
},
{
label: '中',
value: 'center'
},
{
label: '右',
value: 'end'
}],
groupName: 'xAxis'
},
{
label: '名称字体大小',
type: 'inputNumber',
field: 'xAxis_nameTextStyle_fontSize',
optionField: 'xAxis.nameTextStyle.fontSize',
value: 12,
tabName: 'custom',
groupName: 'xAxis'
},
{
label: '名称颜色',
type: 'colorPicker',
field: 'xAxis_nameTextStyle_color',
optionField: 'xAxis.nameTextStyle.color',
// 是否多选
multiple: false,
value: '#8C8C8C',
tabName: 'custom',
groupName: 'xAxis'
},
{ {
label: '轴线显示', label: '轴线显示',
type: 'switch', type: 'switch',
@ -239,6 +290,15 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
{
label: '轴线宽度',
type: 'inputNumber',
field: 'xAxis_axisLine_lineStyle_width',
optionField: 'xAxis.axisLine.lineStyle.width',
value: 1,
tabName: 'custom',
groupName: 'xAxis'
},
{ {
label: '标签显示', label: '标签显示',
type: 'switch', type: 'switch',
@ -279,45 +339,37 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
// Y轴 yAxis
{ {
label: '标题', label: '显示',
type: 'input', type: 'switch',
field: 'xAxis_name', field: 'yAxis_show',
optionField: 'xAxis.name', optionField: 'yAxis.show',
value: '', value: 1,
tabName: 'custom', active: 1,
groupName: 'xAxis' inactive: 0,
},
{
label: '标题颜色',
type: 'colorPicker',
field: 'xAxis_nameTextStyle_color',
optionField: 'xAxis.nameTextStyle.color',
// 是否多选
multiple: false,
value: '#8C8C8C',
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'yAxis'
}, },
{ {
label: '标题大小', label: '名称',
type: 'inputNumber', type: 'input',
field: 'xAxis_nameTextStyle_fontSize', field: 'yAxis_name',
optionField: 'xAxis.nameTextStyle.fontSize', optionField: 'yAxis.name',
value: 12, value: '',
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'yAxis'
}, },
{ {
label: '标题位置', label: '名称位置',
type: 'select', type: 'select',
field: 'xAxis_nameLocation', field: 'yAxis_nameLocation',
optionField: 'xAxis.nameLocation', optionField: 'yAxis.nameLocation',
value: 'start', value: 'end',
tabName: 'custom', tabName: 'custom',
options: [ options: [
{ {
label: '左', label: '下',
value: 'start' value: 'start'
}, },
{ {
@ -325,50 +377,36 @@ const setting = [
value: 'center' value: 'center'
}, },
{ {
label: '右', label: '上',
value: 'end' value: 'end'
}], }],
groupName: 'xAxis'
},
// Y轴 yAxis
{
label: '显示',
type: 'switch',
field: 'yAxis_show',
optionField: 'yAxis.show',
value: 1,
active: 1,
inactive: 0,
tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '轴线显示', label: '名称字体大小',
type: 'switch', type: 'inputNumber',
field: 'yAxis_axisLine_show', field: 'yAxis_nameTextStyle_fontSize',
optionField: 'yAxis.axisLine.show', optionField: 'yAxis.nameTextStyle.fontSize',
value: 1, value: 12,
active: 1,
inactive: 0,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '轴线颜色', label: '名称颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_axisLine_lineStyle_color', field: 'yAxis_nameTextStyle_color',
optionField: 'yAxis.axisLine.lineStyle.color', optionField: 'yAxis.nameTextStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#333', value: '#8C8C8C',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度显示', label: '轴线显示',
type: 'switch', type: 'switch',
field: 'yAxis_axisTick_show', field: 'yAxis_axisLine_show',
optionField: 'yAxis.axisTick.show', optionField: 'yAxis.axisLine.show',
value: 1, value: 1,
active: 1, active: 1,
inactive: 0, inactive: 0,
@ -376,23 +414,21 @@ const setting = [
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度颜色', label: '轴线颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_axisTick_lineStyle_color', field: 'yAxis_axisLine_lineStyle_color',
optionField: 'yAxis.axisTick.lineStyle.color', optionField: 'yAxis.axisLine.lineStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#fff', value: '#333',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度宽度', label: '轴线宽度',
type: 'inputNumber', type: 'inputNumber',
field: 'yAxis_axisTick_lineStyle_width', field: 'yAxis_axisLine_lineStyle_width',
optionField: 'yAxis.axisTick.lineStyle.width', optionField: 'yAxis.axisLine.lineStyle.width',
// 是否多选
multiple: false,
value: 1, value: 1,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
@ -438,54 +474,36 @@ const setting = [
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题', label: '刻度显示',
type: 'input', type: 'switch',
field: 'yAxis_name', field: 'yAxis_axisTick_show',
optionField: 'yAxis.name', optionField: 'yAxis.axisTick.show',
value: '', value: 1,
active: 1,
inactive: 0,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题颜色', label: '刻度颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_nameTextStyle_color', field: 'yAxis_axisTick_lineStyle_color',
optionField: 'yAxis.nameTextStyle.color', optionField: 'yAxis.axisTick.lineStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#8C8C8C', value: '#fff',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题大小', label: '刻度长度',
type: 'inputNumber', type: 'inputNumber',
field: 'yAxis_nameTextStyle_fontSize', field: 'yAxis_axisTick_length',
optionField: 'yAxis.nameTextStyle.fontSize', optionField: 'yAxis.axisTick.length',
value: 12, // 是否多选
tabName: 'custom', multiple: false,
groupName: 'yAxis' value: 1,
},
{
label: '标题位置',
type: 'select',
field: 'yAxis_nameLocation',
optionField: 'yAxis.nameLocation',
value: 'end',
tabName: 'custom', tabName: 'custom',
options: [
{
label: '下',
value: 'start'
},
{
label: '中',
value: 'center'
},
{
label: '上',
value: 'end'
}],
groupName: 'yAxis' groupName: 'yAxis'
} }
] ]

231
data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
Unescape Escape View File

@ -3,7 +3,7 @@ const version = '2023091901'
// 标题 // 标题
const title = '3D基础柱状图' const title = '3D基础柱状图'
// 用于标识，唯一，和文件夹名称一致 // 用于标识，唯一，和文件夹名称一致
const name = '3DJiChuZhuZhuangTu' const name = '3D基础柱状图'
// 右侧配置项 // 右侧配置项
const setting = [ const setting = [
{ {
@ -192,6 +192,57 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
{
label: '名称',
type: 'input',
field: 'xAxis_name',
optionField: 'xAxis.name',
value: '',
tabName: 'custom',
groupName: 'xAxis'
},
{
label: '名称位置',
type: 'select',
field: 'xAxis_nameLocation',
optionField: 'xAxis.nameLocation',
value: 'start',
tabName: 'custom',
options: [
{
label: '左',
value: 'start'
},
{
label: '中',
value: 'center'
},
{
label: '右',
value: 'end'
}],
groupName: 'xAxis'
},
{
label: '名称字体大小',
type: 'inputNumber',
field: 'xAxis_nameTextStyle_fontSize',
optionField: 'xAxis.nameTextStyle.fontSize',
value: 12,
tabName: 'custom',
groupName: 'xAxis'
},
{
label: '名称颜色',
type: 'colorPicker',
field: 'xAxis_nameTextStyle_color',
optionField: 'xAxis.nameTextStyle.color',
// 是否多选
multiple: false,
value: '#8C8C8C',
tabName: 'custom',
groupName: 'xAxis'
},
{ {
label: '轴线显示', label: '轴线显示',
type: 'switch', type: 'switch',
@ -214,6 +265,15 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
{
label: '轴线宽度',
type: 'inputNumber',
field: 'xAxis_axisLine_lineStyle_width',
optionField: 'xAxis.axisLine.lineStyle.width',
value: 1,
tabName: 'custom',
groupName: 'xAxis'
},
{ {
label: '标签显示', label: '标签显示',
type: 'switch', type: 'switch',
@ -254,45 +314,37 @@ const setting = [
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'xAxis'
}, },
// Y轴 yAxis
{ {
label: '标题', label: '显示',
type: 'input', type: 'switch',
field: 'xAxis_name', field: 'yAxis_show',
optionField: 'xAxis.name', optionField: 'yAxis.show',
value: '', value: 1,
tabName: 'custom', active: 1,
groupName: 'xAxis' inactive: 0,
},
{
label: '标题颜色',
type: 'colorPicker',
field: 'xAxis_nameTextStyle_color',
optionField: 'xAxis.nameTextStyle.color',
// 是否多选
multiple: false,
value: '#8C8C8C',
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'yAxis'
}, },
{ {
label: '标题大小', label: '名称',
type: 'inputNumber', type: 'input',
field: 'xAxis_nameTextStyle_fontSize', field: 'yAxis_name',
optionField: 'xAxis.nameTextStyle.fontSize', optionField: 'yAxis.name',
value: 12, value: '',
tabName: 'custom', tabName: 'custom',
groupName: 'xAxis' groupName: 'yAxis'
}, },
{ {
label: '标题位置', label: '名称位置',
type: 'select', type: 'select',
field: 'xAxis_nameLocation', field: 'yAxis_nameLocation',
optionField: 'xAxis.nameLocation', optionField: 'yAxis.nameLocation',
value: 'start', value: 'end',
tabName: 'custom', tabName: 'custom',
options: [ options: [
{ {
label: '左', label: '下',
value: 'start' value: 'start'
}, },
{ {
@ -300,50 +352,36 @@ const setting = [
value: 'center' value: 'center'
}, },
{ {
label: '右', label: '上',
value: 'end' value: 'end'
}], }],
groupName: 'xAxis'
},
// Y轴 yAxis
{
label: '显示',
type: 'switch',
field: 'yAxis_show',
optionField: 'yAxis.show',
value: 1,
active: 1,
inactive: 0,
tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '轴线显示', label: '名称字体大小',
type: 'switch', type: 'inputNumber',
field: 'yAxis_axisLine_show', field: 'yAxis_nameTextStyle_fontSize',
optionField: 'yAxis.axisLine.show', optionField: 'yAxis.nameTextStyle.fontSize',
value: 1, value: 12,
active: 1,
inactive: 0,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '轴线颜色', label: '名称颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_axisLine_lineStyle_color', field: 'yAxis_nameTextStyle_color',
optionField: 'yAxis.axisLine.lineStyle.color', optionField: 'yAxis.nameTextStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#333', value: '#8C8C8C',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度显示', label: '轴线显示',
type: 'switch', type: 'switch',
field: 'yAxis_axisTick_show', field: 'yAxis_axisLine_show',
optionField: 'yAxis.axisTick.show', optionField: 'yAxis.axisLine.show',
value: 1, value: 1,
active: 1, active: 1,
inactive: 0, inactive: 0,
@ -351,23 +389,21 @@ const setting = [
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度颜色', label: '轴线颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_axisTick_lineStyle_color', field: 'yAxis_axisLine_lineStyle_color',
optionField: 'yAxis.axisTick.lineStyle.color', optionField: 'yAxis.axisLine.lineStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#fff', value: '#333',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '刻度宽度', label: '轴线宽度',
type: 'inputNumber', type: 'inputNumber',
field: 'yAxis_axisTick_lineStyle_width', field: 'yAxis_axisLine_lineStyle_width',
optionField: 'yAxis.axisTick.lineStyle.width', optionField: 'yAxis.axisLine.lineStyle.width',
// 是否多选
multiple: false,
value: 1, value: 1,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
@ -413,54 +449,36 @@ const setting = [
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题', label: '刻度显示',
type: 'input', type: 'switch',
field: 'yAxis_name', field: 'yAxis_axisTick_show',
optionField: 'yAxis.name', optionField: 'yAxis.axisTick.show',
value: '', value: 1,
active: 1,
inactive: 0,
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题颜色', label: '刻度颜色',
type: 'colorPicker', type: 'colorPicker',
field: 'yAxis_nameTextStyle_color', field: 'yAxis_axisTick_lineStyle_color',
optionField: 'yAxis.nameTextStyle.color', optionField: 'yAxis.axisTick.lineStyle.color',
// 是否多选 // 是否多选
multiple: false, multiple: false,
value: '#8C8C8C', value: '#fff',
tabName: 'custom', tabName: 'custom',
groupName: 'yAxis' groupName: 'yAxis'
}, },
{ {
label: '标题大小', label: '刻度长度',
type: 'inputNumber', type: 'inputNumber',
field: 'yAxis_nameTextStyle_fontSize', field: 'yAxis_axisTick_length',
optionField: 'yAxis.nameTextStyle.fontSize', optionField: 'yAxis.axisTick.length',
value: 12, // 是否多选
tabName: 'custom', multiple: false,
groupName: 'yAxis' value: 1,
},
{
label: '标题位置',
type: 'select',
field: 'yAxis_nameLocation',
optionField: 'yAxis.nameLocation',
value: 'end',
tabName: 'custom', tabName: 'custom',
options: [
{
label: '下',
value: 'start'
},
{
label: '中',
value: 'center'
},
{
label: '上',
value: 'end'
}],
groupName: 'yAxis' groupName: 'yAxis'
} }
] ]
@ -534,13 +552,18 @@ const option = {
// 坐标轴刻度设置 // 坐标轴刻度设置
axisTick: { axisTick: {
show: false, show: false,
alignWithLabel: true alignWithLabel: true,
lineStyle: {
width: 1,
color: '#333'
}
}, },
// 是否显示坐标轴的轴线 // 是否显示坐标轴的轴线
axisLine: { axisLine: {
show: false, show: false,
lineStyle: { lineStyle: {
color: '#333' color: '#333',
width: 1
} }
}, },
// 坐标轴刻度标签 // 坐标轴刻度标签
@ -593,6 +616,7 @@ const option = {
}, },
axisTick: { axisTick: {
show: true, show: true,
length: 1,
lineStyle: { lineStyle: {
color: '#fff', color: '#fff',
width: 1 width: 1
@ -610,7 +634,8 @@ const option = {
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: '#333' color: '#333',
width: 1
} }
} }

7
data-room-ui/packages/Echarts/echartList.js
Unescape Escape View File

@ -31,9 +31,10 @@ function getEchartsList (files) {
h: config?.option?.height || 320, h: config?.option?.height || 320,
x: 0, x: 0,
y: 0, y: 0,
rotateX: 0, rotateX: config.rotateX || 0,
rotateY: 0, rotateY: config.rotateY || 0,
rotateZ: 0, rotateZ: config.rotateZ || 0,
perspective: config.perspective || 500,
type: 'echartsComponent', type: 'echartsComponent',
loading: false, loading: false,
// 把默认右侧配置与自定义右侧配置集合 // 把默认右侧配置与自定义右侧配置集合

41
data-room-ui/packages/EchartsRender/index.vue
Unescape Escape View File

@ -75,37 +75,42 @@ export default {
'config.rotateX': { 'config.rotateX': {
deep: true, deep: true,
handler (val) { handler (val) {
const dom = document.querySelector('#' + this.config.code)
const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)` const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)`
const dom1 = document.querySelector('.bs-design-wrap') const regex = /rotateX\(\d+deg\) rotateY\(\d+deg\) rotateZ\(\d+deg\)/g
const dom2 = document.querySelector('.render-item-wrap') // 提取出原本的transform属性内容
dom1.setAttribute('style', 'perspective: 500px;') const result = dom.style.transform.replace(regex, '')
dom2.setAttribute('style', 'perspective: 500px;') dom.style.transform = result + ' ' + rotate
dom1.setAttribute('style', 'transform:' + rotate)
dom2.setAttribute('style', 'transform:' + rotate)
} }
}, },
'config.rotateY': { 'config.rotateY': {
deep: true, deep: true,
handler (val) { handler (val) {
const dom = document.querySelector('#' + this.config.code)
const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)` const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)`
const dom1 = document.querySelector('.bs-design-wrap') const regex = /rotateX\(\d+deg\) rotateY\(\d+deg\) rotateZ\(\d+deg\)/g;
const dom2 = document.querySelector('.render-item-wrap') const result = dom.style.transform.replace(regex, '')
dom1.setAttribute('style', 'perspective: 500px;') dom.style.transform = result + ' ' + rotate
dom2.setAttribute('style', 'perspective: 500px;')
dom1.setAttribute('style', 'transform:' + rotate)
dom2.setAttribute('style', 'transform:' + rotate)
} }
}, },
'config.rotateZ': { 'config.rotateZ': {
deep: true, deep: true,
handler (val) { handler (val) {
const dom = document.querySelector('#' + this.config.code)
const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)` const rotate = `rotateX(${this.config.rotateX}deg) rotateY(${this.config.rotateY}deg) rotateZ(${this.config.rotateZ}deg)`
const dom1 = document.querySelector('.bs-design-wrap') const regex = /rotateX\(\d+deg\) rotateY\(\d+deg\) rotateZ\(\d+deg\)/g;
const dom2 = document.querySelector('.render-item-wrap') const result = dom.style.transform.replace(regex, '')
dom1.setAttribute('style', 'perspective: 500px;') dom.style.transform = result + ' ' + rotate
dom2.setAttribute('style', 'perspective: 500px;') }
dom1.setAttribute('style', 'transform:' + rotate) },
dom2.setAttribute('style', 'transform:' + rotate) 'config.perspective': {
deep: true,
handler (val) {
const dom = document.querySelector('#' + this.config.code)
const regex = /perspective\(\d+px\)/g
const result = dom.style.transform.replace(regex, '')
const transform = result + ' ' + 'perspective(' + this.config.perspective + 'px)'
dom.style.transform = transform
} }
} }
}, },

BIN
data-room-ui/packages/assets/images/cardImg/cardicon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
data-room-ui/packages/assets/images/cardImg/indcard2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
data-room-ui/packages/assets/images/cardImg/indicard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB

2
data-room-ui/packages/assets/style/settingWrap.scss
Unescape Escape View File

@ -102,7 +102,7 @@
} }
} }
.data-form-item { .data-form-item {
padding: 12px; padding: 4px 12px;
} }
::v-deep .select-item { ::v-deep .select-item {

35
data-room-ui/packages/js/utils/getComponentConfig.js
Unescape Escape View File

@ -287,8 +287,8 @@ export default function getComponentConfig (type) {
} }
case 'indicatorCard': case 'indicatorCard':
return { return {
name: '指标卡', name: '指标卡一',
title: '指标卡', title: '指标卡一',
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/card.png'), img: require('data-room-ui/assets/images/cardImg/card.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
@ -298,37 +298,36 @@ export default function getComponentConfig (type) {
y: 0, y: 0,
type type
} }
case 'indicatorCard2':
case 'indexCard':
return { return {
name: '指标卡一', name: '指标卡二',
title: '指标卡一', title: '指标卡二',
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/indicard.png'), img: require('data-room-ui/assets/images/cardImg/card2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
w: 400, w: 400,
h: 200, h: 170,
x: 0, x: 0,
y: 0, y: 0,
type type
} }
case 'indicatorCard2': case 'indexCard':
return { return {
name: '指标卡二', name: '指标卡三',
title: '指标卡二', title: '指标卡三',
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/card2.png'), img: require('data-room-ui/assets/images/cardImg/indicard.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
w: 400, w: 400,
h: 170, h: 200,
x: 0, x: 0,
y: 0, y: 0,
type type
} }
case 'indexCard2': case 'indexCard2':
return { return {
name: '指标卡三', name: '指标卡四',
title: '指标卡三', title: '指标卡四',
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/indcard2.png'), img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',

Write Preview
Loading…
Cancel
Save