Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/pom.xml

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

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/DataRoomPageController.java

@@ -84,9 +84,6 @@ public class DataRoomPageController {
     public R<String> 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<String> addByTemplate(@RequestBody DataRoomPageDTO bigScreenPageDTO) {
         String code = bigScreenPageService.addByTemplate(bigScreenPageDTO);
-        if (StringUtils.isBlank(bigScreenPageDTO.getParentCode())) {
-            bigScreenPageDTO.setParentCode("0");
-        }
         return R.success(code);
     }
 

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<DataRoomMapDao, DataRoom
             return Lists.newArrayList();
         }
         JSONObject geoObj = JSON.parseObject(geoJson);
+        if (!geoObj.has("features")) {
+            throw new GlobalException("geoJson格式错误，缺少features");
+        }
         JSONArray features = geoObj.getJSONArray("features");
         if (features == null || features.length() == 0) {
             return Lists.newArrayList();

DataRoom/dataroom-server/pom.xml

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

DataRoom/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>1.0.1.2023101001.Alpha</version>
+    <version>1.0.1.2023101101.Alpha</version>
 
     <packaging>pom</packaging>
     <name>dataroom</name>
@@ -44,7 +44,7 @@
         <swagger-models.version>1.5.21</swagger-models.version>
         <jackson.version.core>2.13.3</jackson.version.core>
         <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>
     </properties>
 

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",

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"
         />
       </div>
@@ -79,6 +79,7 @@ export default {
   },
   data () {
     return {
+      imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
       customClass: {}
     }
   },

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,

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"
         />
       </div>
@@ -77,6 +77,7 @@ export default {
   },
   data () {
     return {
+      imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
       customClass: {}
     }
   },

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,

data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue

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

data-room-ui/packages/BigScreenDesign/RightSetting/EchartsCustomSetting.vue

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

data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue

@@ -4,6 +4,17 @@
 
 <template>
   <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
       :label-width="labelWidth"
       label="绕x轴旋转角度"
@@ -27,7 +38,8 @@
         :max="360"
         :step="1"
       />
-    </el-form-item> <el-form-item
+    </el-form-item>
+    <el-form-item
       :label-width="labelWidth"
       label="绕z轴旋转角度"
     >
@@ -50,7 +62,8 @@ export default {
       default: () => ({
         rotateX: 0,
         rotateY: 0,
-        rotateZ: 0
+        rotateZ: 0,
+        perspective: 500
       })
     },
     labelWidth: {

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,

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 () { },

data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue

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

data-room-ui/packages/BorderComponents/GcBorder1/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder10/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder11/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder12/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder13/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder2/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder3/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder4/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder5/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder6/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder7/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder8/setting.js

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

data-room-ui/packages/BorderComponents/GcBorder9/setting.js

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

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 = {

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 = {

data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue

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

data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue

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

data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue

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

data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue

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

data-room-ui/packages/Decorations/Decoration1/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration10/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration11/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration2/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration3/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration4/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration5/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration6/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration8/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js

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

data-room-ui/packages/Decorations/Decoration9/settingConfig.js

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

data-room-ui/packages/Echarts/3D图/3D分组柱状图.js

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

data-room-ui/packages/Echarts/3D图/3D基础柱状图.js

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

data-room-ui/packages/Echarts/echartList.js

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

data-room-ui/packages/EchartsRender/index.vue

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

data-room-ui/packages/assets/style/settingWrap.scss

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

data-room-ui/packages/js/utils/getComponentConfig.js

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