From 5158bfdebc444b01428dba851d250792f57314a7 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 09:43:09 +0800
Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=B8=AD=E8=B5=84=E6=BA=90=E5=BA=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=98=BE=E7=A4=BA=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=BB=85=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/SourceDialog/index.vue    | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
index d6849ef7..acb8882d 100644
--- a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
@@ -25,7 +25,7 @@
             v-model="code"
             class="bs-el-select"
             popper-class="bs-el-select"
-            placeholder="请选择类型"
+            placeholder="请选择分组"
             clearable
             @change="reSearch"
           >
@@ -71,7 +71,7 @@
             >
               <div class="big-screen-card-img">
                 <el-image
-                  :src="screen.url"
+                  :src="getCoverPicture(screen.url)"
                   fit="contain"
                   style="width: 100%; height: 100%"
                 >
@@ -147,8 +147,9 @@
 </template>
 <script>
 import { pageMixins } from 'data-room-ui/js/mixins/page'
-// import _ from 'lodash'
 import cloneDeep from 'lodash/cloneDeep'
+import { getFileUrl } from 'data-room-ui/js/utils/file'
+
 export default {
   name: 'SourceDialog',
   mixins: [pageMixins],
@@ -161,7 +162,8 @@ export default {
       code: '',
       focus: -1,
       list: [],
-      searchKey: ''
+      searchKey: '',
+      imgExtends: ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'ico']
     }
   },
   computed: {
@@ -200,7 +202,8 @@ export default {
         module: this.code,
         current: this.current,
         size: this.size,
-        extension: '',
+        // 资源库中只显示图片类型的文件
+        extensionList: this.imgExtends,
         searchKey: this.searchKey
       })
         .then((data) => {
@@ -218,7 +221,15 @@ export default {
           this.options = data
         })
         .catch(() => { })
-    }
+    },
+    /**
+     * 获取文件访问地址,如果是相对路径则拼接上文件访问前缀地址
+     * @param url
+     * @returns {*}
+     */
+    getCoverPicture (url) {
+      return getFileUrl(url)
+    },
   }
 }
 </script>

From 314041becc45feb5bad9c6f189e7f6811403e921 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 09:43:35 +0800
Subject: [PATCH 02/20] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=90=8E=E7=BC=80=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataroom/core/module/file/dto/FileSearchDTO.java      | 8 ++++++++
 .../module/file/service/impl/DataRoomFileServiceImpl.java | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/dto/FileSearchDTO.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/dto/FileSearchDTO.java
index 0e4b8bba..1dd94dc7 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/dto/FileSearchDTO.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/dto/FileSearchDTO.java
@@ -3,6 +3,8 @@ package com.gccloud.dataroom.core.module.file.dto;
 import com.gccloud.common.dto.SearchDTO;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class FileSearchDTO extends SearchDTO {
 
@@ -17,4 +19,10 @@ public class FileSearchDTO extends SearchDTO {
     private String extension;
 
 
+    /**
+     * 文件后缀列表，批量过滤
+     */
+    private List<String> extensionList;
+
+
 }
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java
index dba0863e..1b415cd3 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java
@@ -31,6 +31,9 @@ public class DataRoomFileServiceImpl extends ServiceImpl<DataRoomFileDao, DataRo
         LambdaQueryWrapper<DataRoomFileEntity> queryWrapper = QueryWrapperUtils.wrapperLike(new LambdaQueryWrapper(), searchDTO.getSearchKey(), DataRoomFileEntity::getOriginalName);
         queryWrapper.eq(StringUtils.isNotBlank(searchDTO.getModule()), DataRoomFileEntity::getModule, searchDTO.getModule());
         queryWrapper.eq(StringUtils.isNotBlank(searchDTO.getExtension()), DataRoomFileEntity::getExtension, searchDTO.getExtension());
+        if (searchDTO.getExtensionList() != null && searchDTO.getExtensionList().size() > 0) {
+            queryWrapper.in(DataRoomFileEntity::getExtension, searchDTO.getExtensionList());
+        }
         queryWrapper.orderByDesc(DataRoomFileEntity::getCreateDate);
         return page(searchDTO, queryWrapper);
     }

From 49c5edde42abb6daf4ce1ec845f5f04537243b84 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 10:03:17 +0800
Subject: [PATCH 03/20] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/Numbers/setting.vue  | 15 +++++++++------
 .../BasicComponents/Numbers/settingConfig.js      |  2 +-
 .../packages/BasicComponents/Texts/setting.vue    | 10 +++++-----
 .../RightSetting/TextGradient/index.vue           | 11 +++++++++--
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Numbers/setting.vue b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
index d442a514..a6d8329f 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
@@ -51,12 +51,12 @@
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
-          label="标题字体大小"
+          label="数字大小"
           label-width="100px"
         >
           <el-input
             v-model="config.customize.fontSize"
-            placeholder="请输入标题字体大小"
+            placeholder="请输入数字大小"
             clearable
           >
             <template slot="append">
@@ -65,17 +65,17 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          label="标题字体权重"
+          label="数字权重"
           label-width="100px"
         >
           <el-input-number
             v-model="config.customize.fontWeight"
             class="bs-el-input-number"
-            placeholder="请输入标题字体权重"
+            placeholder="请输入数字权重"
           />
         </el-form-item>
         <el-form-item
-          label="标题字体类型"
+          label="数字类型"
           label-width="100px"
         >
           <el-select
@@ -91,7 +91,10 @@
             />
           </el-select>
         </el-form-item>
-        <TextGradient v-model="config.customize.color" />
+        <TextGradient
+          v-model="config.customize.color"
+          label="数字"
+        />
       </div>
     </el-form>
   </div>
diff --git a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
index 8a151a48..14e1e2ed 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
@@ -51,7 +51,7 @@ const customConfig = {
     perspective: 500
   },
   customize: {
-    title: '数字标签占位符',
+    title: '1234',
     fontSize: 20,
     fontWeight: 700,
     fontFamily: '', // 字体类型
diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue
index d442a514..0f09aa3b 100644
--- a/data-room-ui/packages/BasicComponents/Texts/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue
@@ -51,12 +51,12 @@
       <SettingTitle>基础</SettingTitle>
       <div class="lc-field-body">
         <el-form-item
-          label="标题字体大小"
+          label="文字大小"
           label-width="100px"
         >
           <el-input
             v-model="config.customize.fontSize"
-            placeholder="请输入标题字体大小"
+            placeholder="请输入文字大小"
             clearable
           >
             <template slot="append">
@@ -65,17 +65,17 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          label="标题字体权重"
+          label="文字权重"
           label-width="100px"
         >
           <el-input-number
             v-model="config.customize.fontWeight"
             class="bs-el-input-number"
-            placeholder="请输入标题字体权重"
+            placeholder="请输入文字权重"
           />
         </el-form-item>
         <el-form-item
-          label="标题字体类型"
+          label="文字类型"
           label-width="100px"
         >
           <el-select
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue
index d2b65dc7..eee5f09b 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/TextGradient/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="bs-gradual-wrap">
     <el-form-item
-      label="文字渐变方向"
+      :label="`${customLabel}渐变方向`"
       label-width="100px"
     >
       <el-radio-group
@@ -18,7 +18,7 @@
       </el-radio-group>
     </el-form-item>
     <el-form-item
-      label="文字渐变颜色"
+      :label="`${customLabel}渐变颜色`"
       label-width="100px"
     >
       <div class="color-picker-box">
@@ -51,6 +51,10 @@ export default {
     colors: {
       type: String,
       default: ''
+    },
+    label: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -65,6 +69,9 @@ export default {
   computed: {
     newColors () {
       return cloneDeep(this.colors)
+    },
+    customLabel () {
+      return this.label || '文字'
     }
   },
   watch: {

From c1382e7e770a183e1cb7bb131074d25822738563 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 13 Oct 2023 10:29:04 +0800
Subject: [PATCH 04/20] =?UTF-8?q?refactor:=20=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BE=B9=E6=A1=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BasicComponents/Input/setting.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Input/setting.vue b/data-room-ui/packages/BasicComponents/Input/setting.vue
index 62515470..dd5fcf79 100644
--- a/data-room-ui/packages/BasicComponents/Input/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Input/setting.vue
@@ -71,15 +71,6 @@
           <SettingTitle>位置</SettingTitle>
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
-          </div>
-           <SettingTitle v-if="config.border">边框</SettingTitle>
-          <div class="lc-field-body">
-            <BorderSetting
-              v-if="config.border"
-              label-width="100px"
-              :config="config.border"
-              :bigTitle='config.title'
-            />
           </div>
           <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">

From 2a56d1fe2984f0fe6102eaf017f113f82d0ee57d Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 10:57:23 +0800
Subject: [PATCH 05/20] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/ExpressionDialog.vue         | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue
index f4062523..7a3b203f 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue
@@ -13,13 +13,33 @@
           ref="tree"
           :data="treeData"
           :indent="0"
-          :props="{ label: 'label', children: 'children' }"
+          :props="defaultProps"
           :default-expand-all="true"
           :highlight-current="true"
           :expand-on-click-node="false"
           class="bs-el-tree tree-box"
           @node-click="handleNodeClick"
-        />
+        >
+          <template #default="{ node, data }">
+            <!-- Check if the node is a top-level node -->
+            <span
+              v-if="node.level === 1"
+              :class="{ 'disabled': node.disabled}"
+            >
+              <i
+                class="el-icon-folder"
+              />
+              {{ data.label }}
+            </span>
+            <span
+              v-else
+              :class="{ 'disabled': node.disabled}"
+              style="padding-left: 20px"
+            >
+              {{ data.label }}
+            </span>
+          </template>
+        </el-tree>
       </div>
       <div class="right-box">
         <div class="codemirror-wrap">
@@ -96,7 +116,8 @@ export default {
         hintOptions: {
           completeSingle: true
         }
-      }
+      },
+      defaultProps: { label: 'label', children: 'children' }
     }
   },
   computed: {
@@ -113,13 +134,15 @@ export default {
           return {
             label: field,
             code: item,
-            value: `dataset.${item}[0].${field}`
+            value: `dataset.${item}[0].${field}`,
+            disabled: item.includes(this.config.code)
           }
         })
         list.push({
           label: item,
           code: item,
           value: `dataset.${item}`,
+          disabled: item.includes(this.config.code),
           children
         })
       }
@@ -127,7 +150,8 @@ export default {
         list.push({
           label: item,
           code: item,
-          value: `computedDatas.${item}`
+          value: `computedDatas.${item}`,
+          disabled: item.includes(this.config.code)
         })
       }
       return list
@@ -154,9 +178,9 @@ export default {
     },
     // 点击树节点将数据添加到脚本编辑器中
     handleNodeClick (node, data, nodeObj) {
-      console.log(node, data, nodeObj)
       const str = node.value
       const code = node.code
+      if (node.disabled) return
       this.$refs.codemirrorRef.codemirror.setValue(this.currentConfig.expression + ' +  ' + str)
       // 同时将点击的数据存在expressionCodes中
       if (this.currentConfig.expressionCodes && Array.isArray(this.currentConfig.expressionCodes)) {
@@ -217,5 +241,8 @@ export default {
       }
     }
   }
-
+.disabled{
+  cursor: not-allowed;
+  color: #666666;
+}
 </style>

From 69b34a7b92530c81caefce6f701e79e8ab52d67f Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 13 Oct 2023 11:12:20 +0800
Subject: [PATCH 06/20] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B71.0.1-2023101301-Alpha?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index 5a1dd907..fd5a6428 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-2023101101-Alpha",
+  "version": "1.0.1-2023101301-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",

From 1fe1854b05d07471fd7d117489db7524ac1e4680 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 13 Oct 2023 11:19:45 +0800
Subject: [PATCH 07/20] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dperspective?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AF=BC=E8=87=B4=E6=96=87=E5=AD=97=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/Button/settingConfig.js   |  2 +-
 .../BasicComponents/ChartTab/settingConfig.js |  2 +-
 .../CurrentTime/settingConfig.js              |  2 +-
 .../DateTimePicker/settingConfig.js           |  2 +-
 .../DigitalFlop/settingConfig.js              |  2 +-
 .../BasicComponents/FlyMap/settingConfig.js   |  2 +-
 .../HorizontalLine/settingConfig.js           |  2 +-
 .../IframeChart/settingConfig.js              |  2 +-
 .../IndexCard/settingConfig.js                |  2 +-
 .../IndexCard2/settingConfig.js               |  2 +-
 .../IndicatorCard/settingConfig.js            |  2 +-
 .../IndicatorCard2/settingConfig.js           |  2 +-
 .../BasicComponents/Input/settingConfig.js    |  2 +-
 .../LinkChart/settingConfig.js                |  2 +-
 .../BasicComponents/Map/settingConfig.js      |  2 +-
 .../BasicComponents/Marquee/settingConfig.js  |  2 +-
 .../BasicComponents/Numbers/settingConfig.js  |  2 +-
 .../BasicComponents/Picture/settingConfig.js  |  2 +-
 .../ScreenScrollBoard/settingConfig.js        |  2 +-
 .../ScreenScrollRanking/settingConfig.js      |  2 +-
 .../BasicComponents/Select/settingConfig.js   |  2 +-
 .../BasicComponents/Texts/settingConfig.js    |  2 +-
 .../ThemeSelect/settingConfig.js              |  2 +-
 .../ThemeSwitcher/settingConfig.js            |  2 +-
 .../TimeCountDown/settingConfig.js            |  2 +-
 .../TimePicker/settingConfig.js               |  2 +-
 .../VerticalLine/settingConfig.js             |  2 +-
 .../BasicComponents/Video/settingConfig.js    |  2 +-
 .../RightSetting/RotateSetting.vue            |  2 +-
 .../packages/Borders/Border1/settingConfig.js |  2 +-
 .../Borders/Border10/settingConfig.js         |  2 +-
 .../Borders/Border11/settingConfig.js         |  2 +-
 .../Borders/Border12/settingConfig.js         |  2 +-
 .../Borders/Border13/settingConfig.js         |  2 +-
 .../Borders/Border14/settingConfig.js         |  2 +-
 .../Borders/Border15/settingConfig.js         |  2 +-
 .../packages/Borders/Border2/settingConfig.js |  2 +-
 .../packages/Borders/Border3/settingConfig.js |  2 +-
 .../packages/Borders/Border4/settingConfig.js |  2 +-
 .../packages/Borders/Border5/settingConfig.js |  2 +-
 .../packages/Borders/Border6/settingConfig.js |  2 +-
 .../packages/Borders/Border7/settingConfig.js |  2 +-
 .../packages/Borders/Border8/settingConfig.js |  2 +-
 .../packages/Borders/Border9/settingConfig.js |  2 +-
 .../Decorations/Decoration1/settingConfig.js  |  2 +-
 .../Decorations/Decoration10/settingConfig.js |  2 +-
 .../Decorations/Decoration11/settingConfig.js |  2 +-
 .../Decorations/Decoration12/settingConfig.js |  2 +-
 .../Decorations/Decoration2/settingConfig.js  |  2 +-
 .../Decoration2Reverse/settingConfig.js       |  2 +-
 .../Decorations/Decoration3/settingConfig.js  |  2 +-
 .../Decorations/Decoration4/settingConfig.js  |  2 +-
 .../Decoration4Reverse/settingConfig.js       |  2 +-
 .../Decorations/Decoration5/settingConfig.js  |  2 +-
 .../Decorations/Decoration6/settingConfig.js  |  2 +-
 .../Decorations/Decoration8/settingConfig.js  |  2 +-
 .../Decoration8Reverse/settingConfig.js       |  2 +-
 .../Decorations/Decoration9/settingConfig.js  |  2 +-
 .../Echarts/3D图/3D分组柱状图.js        | 30 ++++++++++--
 .../Echarts/3D图/3D基础柱状图.js        | 46 +++++++++++++------
 data-room-ui/packages/Echarts/echartList.js   |  2 +-
 .../RemoteComponents/remoteComponentsList.js  |  2 +-
 data-room-ui/packages/Render/index.vue        |  2 +-
 63 files changed, 119 insertions(+), 79 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Button/settingConfig.js b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
index 2a1efcf1..a94019b9 100644
--- a/data-room-ui/packages/BasicComponents/Button/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
@@ -45,7 +45,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js b/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
index 0afcb06a..6af968e8 100644
--- a/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
@@ -23,7 +23,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     tabList: [],
diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
index 8a17c013..4ec7fde1 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
@@ -24,7 +24,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     fontSize: 28,
diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
index 72f36262..08dd1889 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
@@ -26,7 +26,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
index 5007b243..2956b6ad 100644
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
@@ -39,7 +39,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     color: '#fff',
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
index f518011b..ab4046ce 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
@@ -45,7 +45,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 地图id
diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
index 74f37b37..1b15e801 100644
--- a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
@@ -20,7 +20,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
index b7ebf77a..6b19d37d 100644
--- a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
@@ -27,7 +27,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     fontSize: 20,
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
index 81504f79..915001bb 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
@@ -44,7 +44,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     src: '',
diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
index 3b07faa3..d0678f44 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
@@ -44,7 +44,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     src: '',
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
index 6bb776bc..c0d6b246 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
@@ -44,7 +44,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     borderRadius: 0,
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
index e07a24b7..b854ee55 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
@@ -44,7 +44,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     borderRadius: 0,
diff --git a/data-room-ui/packages/BasicComponents/Input/settingConfig.js b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
index 088a46cc..21ff3242 100644
--- a/data-room-ui/packages/BasicComponents/Input/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
@@ -21,7 +21,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js b/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
index 19b75da0..fbef488d 100644
--- a/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
@@ -38,7 +38,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     title: '超链接占位符',
diff --git a/data-room-ui/packages/BasicComponents/Map/settingConfig.js b/data-room-ui/packages/BasicComponents/Map/settingConfig.js
index f215473c..68b6c4ce 100644
--- a/data-room-ui/packages/BasicComponents/Map/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Map/settingConfig.js
@@ -46,7 +46,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     mapId: '',
diff --git a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
index 2c165b1e..63828478 100644
--- a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
@@ -38,7 +38,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     title: '跑马灯占位符',
diff --git a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
index 8a151a48..4b618c17 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
@@ -48,7 +48,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     title: '数字标签占位符',
diff --git a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
index 6b62626e..f9a73b27 100644
--- a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     url: '',
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
index 9072a2f8..a12343a6 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
@@ -41,7 +41,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     rowNum: 5,
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
index e63896e4..83033918 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
@@ -34,7 +34,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     rowNum: 5,
diff --git a/data-room-ui/packages/BasicComponents/Select/settingConfig.js b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
index 7324f0c9..05cb5fd9 100644
--- a/data-room-ui/packages/BasicComponents/Select/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
@@ -33,7 +33,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
index 492326c2..9c4060fa 100644
--- a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
@@ -48,7 +48,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     title: '文本标签占位符',
diff --git a/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js b/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
index 467e50ec..f6df1e5b 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
@@ -26,7 +26,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     title: '文本标签占位符',
diff --git a/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js b/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
index ad85304b..0fab58a2 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
@@ -26,7 +26,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     activeColor: '#007aff', // 单选框字体激活状态
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
index ad1f0f87..fac7a0d7 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
@@ -23,7 +23,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     fontSize: 28,
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
index 4d24d8ef..0d931df7 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
@@ -26,7 +26,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
index d3059b23..60b34b13 100644
--- a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
@@ -20,7 +20,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/Video/settingConfig.js b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
index 689c0b7a..82ae825a 100644
--- a/data-room-ui/packages/BasicComponents/Video/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
@@ -20,7 +20,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     videoType: 'application/x-mpegURL',
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
index 867688aa..fd3de109 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
@@ -63,7 +63,7 @@ export default {
         rotateX: 0,
         rotateY: 0,
         rotateZ: 0,
-        perspective: 500
+        perspective: 0
       })
     },
     labelWidth: {
diff --git a/data-room-ui/packages/Borders/Border1/settingConfig.js b/data-room-ui/packages/Borders/Border1/settingConfig.js
index c1a146e1..d70eba6a 100644
--- a/data-room-ui/packages/Borders/Border1/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border1/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border10/settingConfig.js b/data-room-ui/packages/Borders/Border10/settingConfig.js
index e16b07d8..75fdf930 100644
--- a/data-room-ui/packages/Borders/Border10/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border10/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border11/settingConfig.js b/data-room-ui/packages/Borders/Border11/settingConfig.js
index 0eb3f94f..1c456a79 100644
--- a/data-room-ui/packages/Borders/Border11/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border11/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border12/settingConfig.js b/data-room-ui/packages/Borders/Border12/settingConfig.js
index 11176356..9de3fac6 100644
--- a/data-room-ui/packages/Borders/Border12/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border12/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border13/settingConfig.js b/data-room-ui/packages/Borders/Border13/settingConfig.js
index cb6d6aea..7ebd78cd 100644
--- a/data-room-ui/packages/Borders/Border13/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border13/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border14/settingConfig.js b/data-room-ui/packages/Borders/Border14/settingConfig.js
index cc2aed0a..57f2fd1a 100644
--- a/data-room-ui/packages/Borders/Border14/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border14/settingConfig.js
@@ -19,7 +19,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/Borders/Border15/settingConfig.js b/data-room-ui/packages/Borders/Border15/settingConfig.js
index 0a25baef..564fda87 100644
--- a/data-room-ui/packages/Borders/Border15/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border15/settingConfig.js
@@ -19,7 +19,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/Borders/Border2/settingConfig.js b/data-room-ui/packages/Borders/Border2/settingConfig.js
index 00dec08a..36403e65 100644
--- a/data-room-ui/packages/Borders/Border2/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border2/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border3/settingConfig.js b/data-room-ui/packages/Borders/Border3/settingConfig.js
index 71019395..45f92b74 100644
--- a/data-room-ui/packages/Borders/Border3/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border3/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border4/settingConfig.js b/data-room-ui/packages/Borders/Border4/settingConfig.js
index ef0447b9..80240b36 100644
--- a/data-room-ui/packages/Borders/Border4/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border4/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border5/settingConfig.js b/data-room-ui/packages/Borders/Border5/settingConfig.js
index 6c6ff0fd..584b04ca 100644
--- a/data-room-ui/packages/Borders/Border5/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border5/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border6/settingConfig.js b/data-room-ui/packages/Borders/Border6/settingConfig.js
index 04ca4c08..a6afba0f 100644
--- a/data-room-ui/packages/Borders/Border6/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border6/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border7/settingConfig.js b/data-room-ui/packages/Borders/Border7/settingConfig.js
index 1bf543c7..e007a867 100644
--- a/data-room-ui/packages/Borders/Border7/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border7/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border8/settingConfig.js b/data-room-ui/packages/Borders/Border8/settingConfig.js
index 339829de..cd6281c5 100644
--- a/data-room-ui/packages/Borders/Border8/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border8/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border9/settingConfig.js b/data-room-ui/packages/Borders/Border9/settingConfig.js
index f358c3ca..5214a662 100644
--- a/data-room-ui/packages/Borders/Border9/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border9/settingConfig.js
@@ -29,7 +29,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Decorations/Decoration1/settingConfig.js b/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
index c6a82f4c..2addab00 100644
--- a/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#fff',
diff --git a/data-room-ui/packages/Decorations/Decoration10/settingConfig.js b/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
index 0e20db1d..3d9adea5 100644
--- a/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#00c2ff',
diff --git a/data-room-ui/packages/Decorations/Decoration11/settingConfig.js b/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
index 0a2029db..0afc1bc9 100644
--- a/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#1a98fc',
diff --git a/data-room-ui/packages/Decorations/Decoration12/settingConfig.js b/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
index c5bfecfc..13ec8569 100644
--- a/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: null,
diff --git a/data-room-ui/packages/Decorations/Decoration2/settingConfig.js b/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
index 9dcca338..01be8c24 100644
--- a/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#3faacb',
diff --git a/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js b/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
index b800b28a..7fea88bd 100644
--- a/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration2Reverse/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#3faacb',
diff --git a/data-room-ui/packages/Decorations/Decoration3/settingConfig.js b/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
index e642753e..76469114 100644
--- a/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#7acaec',
diff --git a/data-room-ui/packages/Decorations/Decoration4/settingConfig.js b/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
index ee65679b..45c78777 100644
--- a/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',
diff --git a/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js b/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
index 6ee38bc2..cab2229c 100644
--- a/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',
diff --git a/data-room-ui/packages/Decorations/Decoration5/settingConfig.js b/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
index cedc43c8..49e4caad 100644
--- a/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration6/settingConfig.js b/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
index ed516ef4..a64c75e7 100644
--- a/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1:'#7acaec',
diff --git a/data-room-ui/packages/Decorations/Decoration8/settingConfig.js b/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
index 41c7f8da..cec78c73 100644
--- a/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js b/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
index 60764b24..53515319 100644
--- a/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration9/settingConfig.js b/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
index 87b2ace5..91b0a668 100644
--- a/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0
   },
   customize: {
     decorationColor1: 'rgba(3, 166, 224, 0.8)',
diff --git a/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js b/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
index d20445de..69e3718a 100644
--- a/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
+++ b/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
@@ -248,6 +248,15 @@ const setting = [
       }],
     groupName: 'xAxis'
   },
+  {
+    label: '名称到轴线距离',
+    type: 'inputNumber',
+    field: 'xAxis_nameGap',
+    optionField: 'xAxis.nameGap',
+    value: 10,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
   {
     label: '名称字体大小',
     type: 'inputNumber',
@@ -382,6 +391,15 @@ const setting = [
       }],
     groupName: 'yAxis'
   },
+  {
+    label: '名称到轴线距离',
+    type: 'inputNumber',
+    field: 'yAxis_nameGap',
+    optionField: 'yAxis.nameGap',
+    value: 10,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
   {
     label: '名称字体大小',
     type: 'inputNumber',
@@ -526,17 +544,17 @@ const option = {
     show: true
   },
   grid: {
-    left: '15%',
-    right: '5%',
-    bottom: '15%',
+    left: '12%',
+    right: '8%',
+    bottom: '20%',
     z: 100,
     containLabel: false,
     show: false
   },
   graphic: {
     type: 'group',
-    bottom: '5%',
-    left: '10%',
+    bottom: '10%',
+    left: '7%',
     z: 100,
     children: [
       {
@@ -569,6 +587,7 @@ const option = {
     {
       show: true,
       name: '',
+      nameGap: 10,
       type: 'category',
       data: xData,
       nameTextStyle: {
@@ -621,6 +640,7 @@ const option = {
   ],
   yAxis: {
     name: '',
+    nameGap: 10,
     nameTextStyle: {
       color: '',
       fontSize: 12
diff --git a/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js b/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
index 5c1d7015..3f433532 100644
--- a/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
+++ b/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
@@ -193,7 +193,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称',
+    label: '标题',
     type: 'input',
     field: 'xAxis_name',
     optionField: 'xAxis.name',
@@ -202,7 +202,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称位置',
+    label: '标题位置',
     type: 'select',
     field: 'xAxis_nameLocation',
     optionField: 'xAxis.nameLocation',
@@ -224,7 +224,16 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称字体大小',
+    label: '标题到轴线距离',
+    type: 'inputNumber',
+    field: 'xAxis_nameGap',
+    optionField: 'xAxis.nameGap',
+    value: 10,
+    tabName: 'custom',
+    groupName: 'xAxis'
+  },
+  {
+    label: '标题字体大小',
     type: 'inputNumber',
     field: 'xAxis_nameTextStyle_fontSize',
     optionField: 'xAxis.nameTextStyle.fontSize',
@@ -233,7 +242,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称颜色',
+    label: '标题颜色',
     type: 'colorPicker',
     field: 'xAxis_nameTextStyle_color',
     optionField: 'xAxis.nameTextStyle.color',
@@ -327,7 +336,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称',
+    label: '标题',
     type: 'input',
     field: 'yAxis_name',
     optionField: 'yAxis.name',
@@ -336,7 +345,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称位置',
+    label: '标题位置',
     type: 'select',
     field: 'yAxis_nameLocation',
     optionField: 'yAxis.nameLocation',
@@ -358,7 +367,16 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称字体大小',
+    label: '标题到轴线距离',
+    type: 'inputNumber',
+    field: 'yAxis_nameGap',
+    optionField: 'yAxis.nameGap',
+    value: 10,
+    tabName: 'custom',
+    groupName: 'yAxis'
+  },
+  {
+    label: '标题字体大小',
     type: 'inputNumber',
     field: 'yAxis_nameTextStyle_fontSize',
     optionField: 'yAxis.nameTextStyle.fontSize',
@@ -367,7 +385,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称颜色',
+    label: '标题颜色',
     type: 'colorPicker',
     field: 'yAxis_nameTextStyle_color',
     optionField: 'yAxis.nameTextStyle.color',
@@ -499,17 +517,17 @@ const option = {
     show: true
   },
   grid: {
-    left: '15%',
-    right: '5%',
-    bottom: '15%',
+    left: '12%',
+    right: '8%',
+    bottom: '20%',
     z: 100,
     containLabel: false,
     show: false
   },
   graphic: {
     type: 'group',
-    bottom: '5%',
-    left: '10%',
+    bottom: '10%',
+    left: '7%',
     z: 100,
     children: [
       {
@@ -542,6 +560,7 @@ const option = {
     {
       show: false,
       name: '',
+      nameGap: 30,
       type: 'category',
       data: xData,
       nameTextStyle: {
@@ -599,6 +618,7 @@ const option = {
   ],
   yAxis: {
     name: '',
+    nameGap: 10,
     nameTextStyle: {
       color: '',
       fontSize: 12
diff --git a/data-room-ui/packages/Echarts/echartList.js b/data-room-ui/packages/Echarts/echartList.js
index 70f68221..56e68450 100644
--- a/data-room-ui/packages/Echarts/echartList.js
+++ b/data-room-ui/packages/Echarts/echartList.js
@@ -34,7 +34,7 @@ function getEchartsList (files) {
       rotateX: config.rotateX || 0,
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
-      perspective: config.perspective || 500,
+      perspective: config.perspective || 0,
       type: 'echartsComponent',
       loading: false,
       // 把默认右侧配置与自定义右侧配置集合
diff --git a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
index 6802a484..2dda2291 100644
--- a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
+++ b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
@@ -78,7 +78,7 @@ export function getRemoteComponentConfig (code, name) {
     rotateX: 0,
     rotateY: 0,
     rotateZ: 0,
-    perspective: 500,
+    perspective: 0,
     type: 'remoteComponent',
     option: {
       ...cloneDeep(settingConfig)
diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index 16bee38e..7e81efc2 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,7 +38,7 @@
       :style="{
         zIndex: chart.z || 0,
       }"
-      :transform="`perspective(${chart.perspective == undefined ? 500 : chart.perspective}px) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
+      :transform="`perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"

From ee94bca432934bbefc9a59026df6b7da46b4cc90 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 13 Oct 2023 11:25:03 +0800
Subject: [PATCH 08/20] =?UTF-8?q?fix:=E5=9B=BE=E5=BD=A2=E6=AD=A3=E9=80=86?=
 =?UTF-8?q?=E5=90=91=E6=97=8B=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/RightSetting/RotateSetting.vue   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
index fd3de109..8f4093f8 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
@@ -22,8 +22,8 @@
       <el-input-number
         v-model="config.rotateX"
         class="bs-el-input-number"
-        :min="0"
-        :max="360"
+        :min="-180"
+        :max="180"
         :step="1"
       />
     </el-form-item>
@@ -34,8 +34,8 @@
       <el-input-number
         v-model="config.rotateY"
         class="bs-el-input-number"
-        :min="0"
-        :max="360"
+        :min="-180"
+        :max="180"
         :step="1"
       />
     </el-form-item>
@@ -46,8 +46,8 @@
       <el-input-number
         v-model="config.rotateZ"
         class="bs-el-input-number"
-        :min="0"
-        :max="360"
+        :min="-180"
+        :max="180"
         :step="1"
       />
     </el-form-item>

From dade1b89fd6a23ce15096bece9f101cfdcd46ed8 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 13 Oct 2023 11:37:29 +0800
Subject: [PATCH 09/20] =?UTF-8?q?refactor:=E5=8E=BB=E9=99=A43D=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=B9=E6=97=8B=E8=BD=AC=E5=B1=9E=E6=80=A7=E7=9A=84?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=EF=BC=88=E5=86=97=E4=BD=99=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9g2=E5=9B=BE=E8=A1=A8=E9=BB=98=E8=AE=A4perspec?=
 =?UTF-8?q?tive=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/EchartsRender/index.vue | 44 -------------------
 data-room-ui/packages/G2Plots/plotList.js     |  2 +-
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/data-room-ui/packages/EchartsRender/index.vue b/data-room-ui/packages/EchartsRender/index.vue
index 504bd978..f829eba0 100644
--- a/data-room-ui/packages/EchartsRender/index.vue
+++ b/data-room-ui/packages/EchartsRender/index.vue
@@ -71,50 +71,6 @@ export default {
           this.changeStyle(this.config, true)
         }
       }
-    },
-    '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 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 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 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)
-        // 获取translate属性
-        const translateReg = /translate\((.*?)\)/
-        const translateResult = dom.style.transform.match(translateReg)
-        const rotateReg = /rotateX\(\d+deg\) rotateY\(\d+deg\) rotateZ\(\d+deg\)/g
-        const rotateResult = dom.style.transform.match(rotateReg)
-        const transform = translateResult[0] + ' ' + 'perspective(' + this.config.perspective + 'px)' + ' ' + rotateResult[0]
-        dom.style.transform = transform
-      }
     }
   },
   mounted () {
diff --git a/data-room-ui/packages/G2Plots/plotList.js b/data-room-ui/packages/G2Plots/plotList.js
index a9f58432..d7aba9f2 100644
--- a/data-room-ui/packages/G2Plots/plotList.js
+++ b/data-room-ui/packages/G2Plots/plotList.js
@@ -44,7 +44,7 @@ function getPlotList (files) {
       rotateX: config.rotateX || 0,
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
-      perspective: config.perspective || 500,
+      perspective: config.perspective || 0,
       type: 'customComponent',
       chartType: config.chartType,
       loading: false,

From b8b5e503a6eb18413ebb9cf552acaee85776e7da Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 14:17:13 +0800
Subject: [PATCH 10/20] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/js/utils/fontList.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 data-room-ui/packages/js/utils/fontList.js

diff --git a/data-room-ui/packages/js/utils/fontList.js b/data-room-ui/packages/js/utils/fontList.js
new file mode 100644
index 00000000..908b6f8b
--- /dev/null
+++ b/data-room-ui/packages/js/utils/fontList.js
@@ -0,0 +1,22 @@
+const fontList = [
+  {
+    label: '默认',
+    value: ''
+  },
+  {
+    label: '时钟加粗倾斜',
+    value: 'ds-digitalbold_italic'
+  },
+  {
+    label: '时钟加粗正常',
+    value: 'ds-digitalbold'
+  },
+  {
+    label: '时钟倾斜',
+    value: 'ds-digitalitalic'
+  },
+  {
+    label: '时钟正常',
+    value: 'ds-digitalnormal'
+  }]
+export default fontList

From a5034def7794c4fb175df09e6efea489535ba9e9 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 14:31:36 +0800
Subject: [PATCH 11/20] =?UTF-8?q?fix:=E5=9F=BA=E7=A1=80=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E4=BD=93=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/CurrentTime/index.vue     |  5 +++-
 .../BasicComponents/CurrentTime/setting.vue   | 19 +++++++++++++++
 .../CurrentTime/settingConfig.js              |  1 +
 .../BasicComponents/Numbers/setting.vue       | 23 ++-----------------
 .../BasicComponents/Texts/setting.vue         | 23 ++-----------------
 .../BasicComponents/TimeCountDown/index.vue   |  9 +++++---
 .../BasicComponents/TimeCountDown/setting.vue | 19 +++++++++++++++
 .../TimeCountDown/settingConfig.js            |  1 +
 .../packages/js/utils/themeFormatting.js      |  5 +++-
 9 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/index.vue b/data-room-ui/packages/BasicComponents/CurrentTime/index.vue
index f3aea7b0..17b6c6dc 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/index.vue
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/index.vue
@@ -19,7 +19,9 @@
           'px;color:' +
           config.customize.color +
           ';font-weight:' +
-          config.customize.fontWeight
+          config.customize.fontWeight+
+          ';font-family:' +
+          config.customize.fontFamily
       "
     >
       {{ nowTime }}
@@ -101,6 +103,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "../../BasicComponents/fonts/index.css";
+@import "../../assets/fonts/numberFont/stylesheet.css";
 .bs-design-wrap{
   width: 100%;
 }
diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
index d79ceb04..24fa8c4e 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
@@ -66,6 +66,23 @@
             placeholder="请输入字体权重"
           />
         </el-form-item>
+        <el-form-item
+          label="字体类型"
+          label-width="100px"
+        >
+          <el-select
+            v-model="config.customize.fontFamily"
+            popper-class="bs-el-select"
+            class="bs-el-select"
+          >
+            <el-option
+              v-for="item in fontFamilyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="字体颜色"
           label-width="100px"
@@ -102,6 +119,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'CurrentTimeSetting',
   components: {
@@ -112,6 +130,7 @@ export default {
   },
   data () {
     return {
+      fontFamilyList: fontList,
       activeName: 'data',
       dateFormatList: [
         { label: '年-月-日 时:分:秒', value: 'YYYY-MM-DD HH:mm:ss' },
diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
index 4ec7fde1..79d5c531 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
@@ -29,6 +29,7 @@ const customConfig = {
   customize: {
     fontSize: 28,
     fontWeight: 700,
+    fontFamily: '', // 字体类型
     color: 'rgb(155 159 172)'
   }
 
diff --git a/data-room-ui/packages/BasicComponents/Numbers/setting.vue b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
index a6d8329f..a9416885 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
@@ -105,6 +105,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import TextGradient from 'data-room-ui/BigScreenDesign/RightSetting/TextGradient/index'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'TextSetting',
   components: {
@@ -116,27 +117,7 @@ export default {
   },
   data () {
     return {
-      fontFamilyList: [
-        {
-          label: '默认',
-          value: ''
-        },
-        {
-          label: '时钟加粗倾斜',
-          value: 'ds-digitalbold_italic'
-        },
-        {
-          label: '时钟加粗正常',
-          value: 'ds-digitalbold'
-        },
-        {
-          label: '时钟倾斜',
-          value: 'ds-digitalitalic'
-        },
-        {
-          label: '时钟正常',
-          value: 'ds-digitalnormal'
-        }],
+      fontFamilyList: fontList,
       rules: {
         title: [
           { required: true, message: '请输入标题', trigger: 'blur' }
diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue
index 0f09aa3b..18dc62d9 100644
--- a/data-room-ui/packages/BasicComponents/Texts/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue
@@ -102,6 +102,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import TextGradient from 'data-room-ui/BigScreenDesign/RightSetting/TextGradient/index'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'TextSetting',
   components: {
@@ -113,27 +114,7 @@ export default {
   },
   data () {
     return {
-      fontFamilyList: [
-        {
-          label: '默认',
-          value: ''
-        },
-        {
-          label: '时钟加粗倾斜',
-          value: 'ds-digitalbold_italic'
-        },
-        {
-          label: '时钟加粗正常',
-          value: 'ds-digitalbold'
-        },
-        {
-          label: '时钟倾斜',
-          value: 'ds-digitalitalic'
-        },
-        {
-          label: '时钟正常',
-          value: 'ds-digitalnormal'
-        }],
+      fontFamilyList: fontList,
       rules: {
         title: [
           { required: true, message: '请输入标题', trigger: 'blur' }
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue
index c654948c..ab09d298 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/index.vue
@@ -23,7 +23,9 @@
           'px;color:' +
           config.customize.color +
           ';font-weight:' +
-          config.customize.fontWeight
+          config.customize.fontWeight +
+          ';font-family:' +
+          config.customize.fontFamily
       "
     >
       {{ dateDiff }}
@@ -34,8 +36,8 @@
 <script>
 import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
 import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
-import cloneDeep from "lodash/cloneDeep";
-import {mapMutations, mapState} from "vuex";
+import cloneDeep from 'lodash/cloneDeep'
+import { mapMutations, mapState } from 'vuex'
 export default {
   name: 'TimeCountDown',
   mixins: [paramsMixins],
@@ -161,6 +163,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "../../BasicComponents/fonts/index.css";
+@import "../../assets/fonts/numberFont/stylesheet.css";
 .bs-design-wrap{
   width: 100%;
 }
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
index 6fce7b02..98396bb4 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
@@ -65,6 +65,23 @@
             placeholder="请输入字体权重"
           />
         </el-form-item>
+        <el-form-item
+          label="字体类型"
+          label-width="100px"
+        >
+          <el-select
+            v-model="config.customize.fontFamily"
+            popper-class="bs-el-select"
+            class="bs-el-select"
+          >
+            <el-option
+              v-for="item in fontFamilyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="字体颜色"
           label-width="100px"
@@ -101,6 +118,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import fontList from 'data-room-ui/js/utils/fontList'
 export default {
   name: 'TimeCountDownSetting',
   components: {
@@ -111,6 +129,7 @@ export default {
   },
   data () {
     return {
+      fontFamilyList: fontList,
       pickerOptions: {
         disabledDate (time) {
           return time.getTime() < Date.now() - 8.64e7
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
index fac7a0d7..12c3e82d 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
@@ -28,6 +28,7 @@ const customConfig = {
   customize: {
     fontSize: 28,
     fontWeight: 700,
+    fontFamily: '', // 字体类型
     color: 'rgb(155 159 172)'
   }
 
diff --git a/data-room-ui/packages/js/utils/themeFormatting.js b/data-room-ui/packages/js/utils/themeFormatting.js
index 52b6a758..4890272b 100644
--- a/data-room-ui/packages/js/utils/themeFormatting.js
+++ b/data-room-ui/packages/js/utils/themeFormatting.js
@@ -72,7 +72,10 @@ export function themeToSetting (chartList, type) {
 }
 // 对单个组件进行主题设置（从theme到Setting）
 function chartThemeToSetting (chart, type) {
-  chart.option.theme = type === 'dark' ? 'transparent' : 'light'
+  if (chart.option && chart.option.theme) {
+    chart.option.theme = type === 'dark' ? 'transparent' : 'light'
+  }
+
   if (chart.theme && chart.theme[type]) {
     // 如果是g2组件或者远程组件
     if (['customComponent', 'remoteComponent', 'echartsComponent'].includes(chart.type)) {

From d4674f8f7eeadbeceeca19eed9d3ceed065787a1 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 13 Oct 2023 14:39:20 +0800
Subject: [PATCH 12/20] =?UTF-8?q?feat:=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=95x=E8=BD=B4y=E8=BD=B4=E6=89=AD=E6=9B=B2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/Button/settingConfig.js   |  4 ++-
 .../BasicComponents/ChartTab/settingConfig.js |  4 ++-
 .../CurrentTime/settingConfig.js              |  4 ++-
 .../DateTimePicker/settingConfig.js           |  4 ++-
 .../DigitalFlop/settingConfig.js              |  4 ++-
 .../BasicComponents/FlyMap/settingConfig.js   |  4 ++-
 .../HorizontalLine/settingConfig.js           |  4 ++-
 .../IframeChart/settingConfig.js              |  4 ++-
 .../IndexCard/settingConfig.js                |  4 ++-
 .../IndexCard2/settingConfig.js               |  4 ++-
 .../IndicatorCard/settingConfig.js            |  4 ++-
 .../IndicatorCard2/settingConfig.js           |  4 ++-
 .../BasicComponents/Input/settingConfig.js    |  4 ++-
 .../LinkChart/settingConfig.js                |  4 ++-
 .../BasicComponents/Map/settingConfig.js      |  4 ++-
 .../BasicComponents/Marquee/settingConfig.js  |  4 ++-
 .../BasicComponents/Numbers/settingConfig.js  |  4 ++-
 .../BasicComponents/Picture/settingConfig.js  |  4 ++-
 .../ScreenScrollBoard/setting.vue             |  4 ++-
 .../ScreenScrollBoard/settingConfig.js        |  4 ++-
 .../ScreenScrollRanking/settingConfig.js      |  4 ++-
 .../BasicComponents/Select/settingConfig.js   |  4 ++-
 .../BasicComponents/Tables/settingConfig.js   |  4 ++-
 .../BasicComponents/Texts/settingConfig.js    |  4 ++-
 .../ThemeSelect/settingConfig.js              |  4 ++-
 .../ThemeSwitcher/settingConfig.js            |  4 ++-
 .../TimeCountDown/settingConfig.js            |  4 ++-
 .../TimePicker/settingConfig.js               |  4 ++-
 .../VerticalLine/settingConfig.js             |  4 ++-
 .../BasicComponents/Video/settingConfig.js    |  4 ++-
 .../RightSetting/RotateSetting.vue            | 28 ++++++++++++++++++-
 .../BigScreenDesign/RightSetting/index.vue    |  2 ++
 .../packages/Borders/Border1/settingConfig.js |  4 ++-
 .../Borders/Border10/settingConfig.js         |  4 ++-
 .../Borders/Border11/settingConfig.js         |  4 ++-
 .../Borders/Border12/settingConfig.js         |  4 ++-
 .../Borders/Border13/settingConfig.js         |  4 ++-
 .../Borders/Border14/settingConfig.js         |  4 ++-
 .../Borders/Border15/settingConfig.js         |  4 ++-
 .../packages/Borders/Border2/settingConfig.js |  4 ++-
 .../packages/Borders/Border3/settingConfig.js |  4 ++-
 .../packages/Borders/Border4/settingConfig.js |  4 ++-
 .../packages/Borders/Border5/settingConfig.js |  4 ++-
 .../packages/Borders/Border6/settingConfig.js |  4 ++-
 .../packages/Borders/Border7/settingConfig.js |  4 ++-
 .../packages/Borders/Border8/settingConfig.js |  4 ++-
 .../packages/Borders/Border9/settingConfig.js |  4 ++-
 .../Decorations/Decoration1/settingConfig.js  |  4 ++-
 .../Decorations/Decoration10/settingConfig.js |  4 ++-
 .../Decorations/Decoration11/settingConfig.js |  4 ++-
 .../Decorations/Decoration12/settingConfig.js |  4 ++-
 .../Decorations/Decoration2/settingConfig.js  |  4 ++-
 .../Decorations/Decoration3/settingConfig.js  |  4 ++-
 .../Decorations/Decoration4/settingConfig.js  |  4 ++-
 .../Decoration4Reverse/settingConfig.js       |  4 ++-
 .../Decorations/Decoration5/settingConfig.js  |  4 ++-
 .../Decorations/Decoration6/settingConfig.js  |  4 ++-
 .../Decorations/Decoration8/settingConfig.js  |  4 ++-
 .../Decoration8Reverse/settingConfig.js       |  4 ++-
 .../Decorations/Decoration9/settingConfig.js  |  4 ++-
 data-room-ui/packages/Echarts/echartList.js   |  2 ++
 data-room-ui/packages/G2Plots/plotList.js     |  2 ++
 .../RemoteComponents/remoteComponentsList.js  |  4 +++
 data-room-ui/packages/Render/index.vue        |  2 +-
 64 files changed, 212 insertions(+), 60 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Button/settingConfig.js b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
index a94019b9..d75dbbf0 100644
--- a/data-room-ui/packages/BasicComponents/Button/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
@@ -45,7 +45,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js b/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
index 6af968e8..8d197ff5 100644
--- a/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ChartTab/settingConfig.js
@@ -23,7 +23,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     tabList: [],
diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
index 4ec7fde1..98da4553 100644
--- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js
@@ -24,7 +24,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 28,
diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
index 08dd1889..14e68276 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
index 2956b6ad..4ca410c8 100644
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js
@@ -39,7 +39,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     color: '#fff',
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
index ab4046ce..088664f3 100644
--- a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
@@ -45,7 +45,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 地图id
diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
index 1b15e801..daa4546a 100644
--- a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
index 6b19d37d..7f9043f5 100644
--- a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js
@@ -27,7 +27,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 20,
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
index 915001bb..d73fbac3 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard/settingConfig.js
@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     src: '',
diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
index d0678f44..1f4e50b9 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndexCard2/settingConfig.js
@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     src: '',
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
index c0d6b246..0f8c3d08 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js
@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderRadius: 0,
diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
index b854ee55..534069b1 100644
--- a/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/settingConfig.js
@@ -44,7 +44,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderRadius: 0,
diff --git a/data-room-ui/packages/BasicComponents/Input/settingConfig.js b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
index 21ff3242..4fdf3ca8 100644
--- a/data-room-ui/packages/BasicComponents/Input/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
@@ -21,7 +21,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js b/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
index fbef488d..a88f597b 100644
--- a/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/LinkChart/settingConfig.js
@@ -38,7 +38,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '超链接占位符',
diff --git a/data-room-ui/packages/BasicComponents/Map/settingConfig.js b/data-room-ui/packages/BasicComponents/Map/settingConfig.js
index 68b6c4ce..a1489dcc 100644
--- a/data-room-ui/packages/BasicComponents/Map/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Map/settingConfig.js
@@ -46,7 +46,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     mapId: '',
diff --git a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
index 63828478..bc813a56 100644
--- a/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Marquee/settingConfig.js
@@ -38,7 +38,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '跑马灯占位符',
diff --git a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
index 1ec1dbdc..97698e70 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Numbers/settingConfig.js
@@ -48,7 +48,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '1234',
diff --git a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
index f9a73b27..c0b7e674 100644
--- a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     url: '',
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
index 4a6109e3..2ff4d702 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
@@ -128,13 +128,15 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 export default {
   name: 'BarSetting',
   components: {
     ColorPicker,
     PosWhSetting,
     SettingTitle,
-    BorderSetting
+    BorderSetting,
+    RotateSetting
   },
   data () {
     return {
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
index a12343a6..d7078d7f 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/settingConfig.js
@@ -41,7 +41,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     rowNum: 5,
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
index 83033918..207cf0b8 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
@@ -34,7 +34,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     rowNum: 5,
diff --git a/data-room-ui/packages/BasicComponents/Select/settingConfig.js b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
index 05cb5fd9..95a13962 100644
--- a/data-room-ui/packages/BasicComponents/Select/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
@@ -33,7 +33,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
index ff9e204f..93be7841 100644
--- a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
@@ -43,7 +43,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 500
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
 
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
index 9c4060fa..607f88b5 100644
--- a/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Texts/settingConfig.js
@@ -48,7 +48,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '文本标签占位符',
diff --git a/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js b/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
index f6df1e5b..11abeaf4 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ThemeSelect/settingConfig.js
@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     title: '文本标签占位符',
diff --git a/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js b/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
index 0fab58a2..b5c771a6 100644
--- a/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ThemeSwitcher/settingConfig.js
@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     activeColor: '#007aff', // 单选框字体激活状态
diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
index fac7a0d7..5b5e6928 100644
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/settingConfig.js
@@ -23,7 +23,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     fontSize: 28,
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
index 0d931df7..a7899595 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
@@ -26,7 +26,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   // 自定义属性
   customize: {
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
index 60b34b13..cc981da0 100644
--- a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/Video/settingConfig.js b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
index 82ae825a..acf85d8a 100644
--- a/data-room-ui/packages/BasicComponents/Video/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
@@ -20,7 +20,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     videoType: 'application/x-mpegURL',
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
index 8f4093f8..fa48e4b6 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/RotateSetting.vue
@@ -51,6 +51,30 @@
         :step="1"
       />
     </el-form-item>
+    <el-form-item
+      :label-width="labelWidth"
+      label="沿x轴扭曲角度"
+    >
+      <el-input-number
+        v-model="config.skewX"
+        class="bs-el-input-number"
+        :min="-180"
+        :max="180"
+        :step="1"
+      />
+    </el-form-item>
+    <el-form-item
+      :label-width="labelWidth"
+      label="绕y轴扭曲角度"
+    >
+      <el-input-number
+        v-model="config.skewY"
+        class="bs-el-input-number"
+        :min="-180"
+        :max="180"
+        :step="1"
+      />
+    </el-form-item>
   </div>
 </template>
 <script>
@@ -63,7 +87,9 @@ export default {
         rotateX: 0,
         rotateY: 0,
         rotateZ: 0,
-        perspective: 0
+        perspective: 0,
+        skewX: 0,
+        skewY: 0
       })
     },
     labelWidth: {
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
index a54da668..e683b519 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
@@ -119,6 +119,8 @@ export default {
         rotateY: this.config?.rotateY,
         rotateZ: this.config?.rotateZ,
         perspective: this.config?.perspective,
+        skewX: this.config?.skewX,
+        skewY: this.config?.skewY,
         setting: cloneDeep(this.config?.setting),
         customize: cloneDeep(this.config?.customize),
         url: this.config?.url,
diff --git a/data-room-ui/packages/Borders/Border1/settingConfig.js b/data-room-ui/packages/Borders/Border1/settingConfig.js
index d70eba6a..60536c96 100644
--- a/data-room-ui/packages/Borders/Border1/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border1/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border10/settingConfig.js b/data-room-ui/packages/Borders/Border10/settingConfig.js
index 75fdf930..d40efcc2 100644
--- a/data-room-ui/packages/Borders/Border10/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border10/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border11/settingConfig.js b/data-room-ui/packages/Borders/Border11/settingConfig.js
index 1c456a79..4457150d 100644
--- a/data-room-ui/packages/Borders/Border11/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border11/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border12/settingConfig.js b/data-room-ui/packages/Borders/Border12/settingConfig.js
index 9de3fac6..d04993e2 100644
--- a/data-room-ui/packages/Borders/Border12/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border12/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border13/settingConfig.js b/data-room-ui/packages/Borders/Border13/settingConfig.js
index 7ebd78cd..04b55019 100644
--- a/data-room-ui/packages/Borders/Border13/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border13/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border14/settingConfig.js b/data-room-ui/packages/Borders/Border14/settingConfig.js
index 57f2fd1a..0d605641 100644
--- a/data-room-ui/packages/Borders/Border14/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border14/settingConfig.js
@@ -19,7 +19,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/Borders/Border15/settingConfig.js b/data-room-ui/packages/Borders/Border15/settingConfig.js
index 564fda87..80f0500f 100644
--- a/data-room-ui/packages/Borders/Border15/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border15/settingConfig.js
@@ -19,7 +19,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框线颜色
diff --git a/data-room-ui/packages/Borders/Border2/settingConfig.js b/data-room-ui/packages/Borders/Border2/settingConfig.js
index 36403e65..1591b8d6 100644
--- a/data-room-ui/packages/Borders/Border2/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border2/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border3/settingConfig.js b/data-room-ui/packages/Borders/Border3/settingConfig.js
index 45f92b74..f6dea95d 100644
--- a/data-room-ui/packages/Borders/Border3/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border3/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     borderMainColor: '#83bff6',
diff --git a/data-room-ui/packages/Borders/Border4/settingConfig.js b/data-room-ui/packages/Borders/Border4/settingConfig.js
index 80240b36..1d7c77e8 100644
--- a/data-room-ui/packages/Borders/Border4/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border4/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border5/settingConfig.js b/data-room-ui/packages/Borders/Border5/settingConfig.js
index 584b04ca..a0bfa90d 100644
--- a/data-room-ui/packages/Borders/Border5/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border5/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border6/settingConfig.js b/data-room-ui/packages/Borders/Border6/settingConfig.js
index a6afba0f..f942cf51 100644
--- a/data-room-ui/packages/Borders/Border6/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border6/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border7/settingConfig.js b/data-room-ui/packages/Borders/Border7/settingConfig.js
index e007a867..23b63e95 100644
--- a/data-room-ui/packages/Borders/Border7/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border7/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border8/settingConfig.js b/data-room-ui/packages/Borders/Border8/settingConfig.js
index cd6281c5..8386c5cf 100644
--- a/data-room-ui/packages/Borders/Border8/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border8/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Borders/Border9/settingConfig.js b/data-room-ui/packages/Borders/Border9/settingConfig.js
index 5214a662..5aa7aa58 100644
--- a/data-room-ui/packages/Borders/Border9/settingConfig.js
+++ b/data-room-ui/packages/Borders/Border9/settingConfig.js
@@ -29,7 +29,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     // 边框主要颜色
diff --git a/data-room-ui/packages/Decorations/Decoration1/settingConfig.js b/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
index 2addab00..bbd1a75c 100644
--- a/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration1/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#fff',
diff --git a/data-room-ui/packages/Decorations/Decoration10/settingConfig.js b/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
index 3d9adea5..70111c69 100644
--- a/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration10/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#00c2ff',
diff --git a/data-room-ui/packages/Decorations/Decoration11/settingConfig.js b/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
index 0afc1bc9..a26ec2be 100644
--- a/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration11/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#1a98fc',
diff --git a/data-room-ui/packages/Decorations/Decoration12/settingConfig.js b/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
index 13ec8569..b49dc0e6 100644
--- a/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration12/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: null,
diff --git a/data-room-ui/packages/Decorations/Decoration2/settingConfig.js b/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
index 01be8c24..74f1ee59 100644
--- a/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration2/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3faacb',
diff --git a/data-room-ui/packages/Decorations/Decoration3/settingConfig.js b/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
index 76469114..e444714e 100644
--- a/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration3/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#7acaec',
diff --git a/data-room-ui/packages/Decorations/Decoration4/settingConfig.js b/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
index 45c78777..8b3f7b12 100644
--- a/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',
diff --git a/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js b/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
index cab2229c..a29e813d 100644
--- a/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration4Reverse/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(255, 255, 255, 0.3)',
diff --git a/data-room-ui/packages/Decorations/Decoration5/settingConfig.js b/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
index 49e4caad..544017d1 100644
--- a/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration5/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration6/settingConfig.js b/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
index a64c75e7..236983c2 100644
--- a/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration6/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1:'#7acaec',
diff --git a/data-room-ui/packages/Decorations/Decoration8/settingConfig.js b/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
index cec78c73..0963e58d 100644
--- a/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js b/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
index 53515319..630fd053 100644
--- a/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration8Reverse/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: '#3f96a5',
diff --git a/data-room-ui/packages/Decorations/Decoration9/settingConfig.js b/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
index 91b0a668..f1518ec1 100644
--- a/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
+++ b/data-room-ui/packages/Decorations/Decoration9/settingConfig.js
@@ -25,7 +25,9 @@ const customConfig = {
     // 绕z轴旋转角度
     rotateZ: 0,
     // 透视距离
-    perspective: 0
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
   },
   customize: {
     decorationColor1: 'rgba(3, 166, 224, 0.8)',
diff --git a/data-room-ui/packages/Echarts/echartList.js b/data-room-ui/packages/Echarts/echartList.js
index 56e68450..b909960f 100644
--- a/data-room-ui/packages/Echarts/echartList.js
+++ b/data-room-ui/packages/Echarts/echartList.js
@@ -35,6 +35,8 @@ function getEchartsList (files) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 0,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'echartsComponent',
       loading: false,
       // 把默认右侧配置与自定义右侧配置集合
diff --git a/data-room-ui/packages/G2Plots/plotList.js b/data-room-ui/packages/G2Plots/plotList.js
index d7aba9f2..610ea31b 100644
--- a/data-room-ui/packages/G2Plots/plotList.js
+++ b/data-room-ui/packages/G2Plots/plotList.js
@@ -45,6 +45,8 @@ function getPlotList (files) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 0,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'customComponent',
       chartType: config.chartType,
       loading: false,
diff --git a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
index 2dda2291..5c1a3236 100644
--- a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
+++ b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js
@@ -43,6 +43,8 @@ export function getRemoteComponents (comList) {
       rotateY: config.rotateY || 0,
       rotateZ: config.rotateZ || 0,
       perspective: config.perspective || 500,
+      skewX: config.skewX || 0,
+      skewY: config.skewY || 0,
       type: 'remoteComponent',
       option: {
         ...cloneDeep(settingConfig),
@@ -79,6 +81,8 @@ export function getRemoteComponentConfig (code, name) {
     rotateY: 0,
     rotateZ: 0,
     perspective: 0,
+    skewX: 0,
+    skewY: 0,
     type: 'remoteComponent',
     option: {
       ...cloneDeep(settingConfig)
diff --git a/data-room-ui/packages/Render/index.vue b/data-room-ui/packages/Render/index.vue
index 7e81efc2..ac360c61 100644
--- a/data-room-ui/packages/Render/index.vue
+++ b/data-room-ui/packages/Render/index.vue
@@ -38,7 +38,7 @@
       :style="{
         zIndex: chart.z || 0,
       }"
-      :transform="`perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
+      :transform="`perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg)  rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg) skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg)`"
       :grid="[1,1]"
       :handles="handlesList"
       class-name-handle="bs-handle-class"

From c0f7229de72daf6079bca34fa4520409079b5e18 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 14:46:16 +0800
Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=80=BE=E6=96=9C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gccloud/dataroom/core/module/chart/bean/Chart.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
index 5c056221..f134cf88 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
@@ -109,6 +109,11 @@ public class Chart {
     @ApiModelProperty(notes = "透视")
     private Integer perspective;
 
+    @ApiModelProperty(notes = "倾斜x")
+    private Integer skewX;
+
+    @ApiModelProperty(notes = "倾斜y")
+    private Integer skewY;
 
 
 }

From 9637a4d52e8c762892badc4089c47acddc224445 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 15:16:29 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fix:G2=E7=BB=84=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E4=BD=93=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/G2Plots/进度图/仪表盘.js   | 18 ++++++++++++++-
 .../packages/G2Plots/进度图/水波图.js   | 22 ++++++++++++++++---
 .../G2Plots/进度图/矩形水波图.js      | 18 ++++++++++++++-
 .../G2Plots/进度图/进度仪表盘.js      | 18 ++++++++++++++-
 .../G2Plots/进度图/进度指标环图.js   | 18 ++++++++++++++-
 .../G2Plots/进度图/进度环图.js         | 18 ++++++++++++++-
 .../G2Plots/进度图/钻石水波图.js      | 18 ++++++++++++++-
 .../packages/G2Plots/饼图/基础环图.js   | 18 ++++++++++++++-
 8 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/data-room-ui/packages/G2Plots/进度图/仪表盘.js b/data-room-ui/packages/G2Plots/进度图/仪表盘.js
index a634ae4c..174ed3dc 100644
--- a/data-room-ui/packages/G2Plots/进度图/仪表盘.js
+++ b/data-room-ui/packages/G2Plots/进度图/仪表盘.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -87,6 +87,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '指标字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_title_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.title.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '标签内容',
     // 设置组件类型
@@ -174,6 +189,7 @@ const option = {
       style: {
         fontSize: 20,
         lineHeight: 2,
+        fontFamily: '',
         color: '#d0d0d0'
       },
       formatter: ({ percent }) => `${(percent * 100).toFixed(0)}%`
diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js
index 9b106ff6..c35e08f8 100644
--- a/data-room-ui/packages/G2Plots/进度图/水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/水波图.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -92,6 +92,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '边框宽度',
     // 设置组件类型
@@ -136,7 +151,7 @@ const setting = [
     value: '#598BF2',
     tabName: 'custom',
     groupName: 'graph'
-  },
+  }
 ]
 
 const data = [
@@ -187,7 +202,8 @@ const option = {
       style: {
         fontSize: 20,
         lineHeight: 1,
-        fill: '#d0d0d0'
+        fill: '#d0d0d0',
+        fontFamily: ''
       }
     }
   }
diff --git a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
index e474bcda..dfe89401 100644
--- a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -92,6 +92,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '边框宽度',
     // 设置组件类型
@@ -173,6 +188,7 @@ const option = {
       style: {
         fontSize: 20,
         lineHeight: 1,
+        fontFamily: '',
         fill: '#d0d0d0'
       }
     }
diff --git a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
index 2aadc2c4..c3fb1b1e 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -63,6 +63,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '指标字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_title_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.title.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '指标位置',
     // 设置组件类型
@@ -140,6 +155,7 @@ const option = {
       style: {
         fontSize: 20,
         lineHeight: 2,
+        fontFamily: '',
         color: '#d0d0d0'
       },
       formatter: ({ percent }) => `${(percent * 100).toFixed(0)}%`
diff --git a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js
index d01e7dbb..331f1fe7 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js
@@ -1,3 +1,4 @@
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -123,6 +124,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '指标字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '指标位置',
     // 设置组件类型
@@ -169,7 +185,7 @@ const option = {
     //   offsetY: 0
     // },
     content: {
-      style: { fill: '#fafafa', fontSize: 28, lineHeight: 2 },
+      style: { fill: '#fafafa', fontSize: 28, fontFamily: '', lineHeight: 2 },
       offsetY: 0
     }
   }
diff --git a/data-room-ui/packages/G2Plots/进度图/进度环图.js b/data-room-ui/packages/G2Plots/进度图/进度环图.js
index f2b0d411..1e5ce83a 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度环图.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度环图.js
@@ -1,3 +1,4 @@
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -123,6 +124,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '指标字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '指标位置',
     // 设置组件类型
@@ -169,7 +185,7 @@ const option = {
       offsetY: 0
     },
     content: {
-      style: { fill: '#fafafa', fontSize: 28, lineHeight: 2 },
+      style: { fill: '#fafafa', fontSize: 28, fontFamily: '', lineHeight: 2 },
       offsetY: 0
     }
   }
diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
index 5d1bff31..335faee6 100644
--- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092201'
 // 分类
@@ -92,6 +92,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '边框宽度',
     // 设置组件类型
@@ -171,6 +186,7 @@ const option = {
       style: {
         fontSize: 20,
         lineHeight: 1,
+        fontFamily: '',
         fill: '#d0d0d0'
       }
     }
diff --git a/data-room-ui/packages/G2Plots/饼图/基础环图.js b/data-room-ui/packages/G2Plots/饼图/基础环图.js
index b5f48c9b..86138150 100644
--- a/data-room-ui/packages/G2Plots/饼图/基础环图.js
+++ b/data-room-ui/packages/G2Plots/饼图/基础环图.js
@@ -1,4 +1,4 @@
-
+import fontList from 'data-room-ui/js/utils/fontList'
 // 配置版本号
 const version = '2023092501'
 // 分类
@@ -200,6 +200,21 @@ const setting = [
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '副标题字体类型',
+    // 设置组件类型
+    type: 'select',
+    // 字段
+    field: 'statistic_content_style_fontFamily',
+    // 对应options中的字段
+    optionField: 'statistic.content.style.fontFamily',
+    // 是否多选
+    multiple: false,
+    value: '',
+    tabName: 'custom',
+    options: fontList,
+    groupName: 'graph'
+  },
   {
     label: '外环半径',
     // 设置组件类型
@@ -367,6 +382,7 @@ const option = {
         lineHeight: 2,
         overflow: 'hidden',
         textOverflow: 'ellipsis',
+        fontFamily: '',
         color: '#d0d0d0',
         fontSize: 30
       }

From b1c5467a6a9be1103c62aa706944a315f82e3a87 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 15:44:26 +0800
Subject: [PATCH 15/20] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E7=89=88=E6=9C=AC=E4=B8=BA1.0.1.2023101301.A?=
 =?UTF-8?q?lpha=EF=BC=8C=E4=BF=AE=E5=A4=8Dhttp=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataRoom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index 8ce3d234..34046d60 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -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.2023101201.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023101301.Alpha</dataset.core.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 

From 7bc7cc804af4f8280446338b1269ae10295e999e Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 15:49:02 +0800
Subject: [PATCH 16/20] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
index 7e4b0fa0..43719705 100644
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@@ -1157,7 +1157,7 @@ export default {
         const script = JSON.stringify(this.dataForm.config)
         const executeParams = {
           script,
-          params: this.dataForm.config.paramsList,
+          params: this.newParamsList,
           dataSetType: 'http'
         }
         datasetExecuteTest(executeParams).then(res => {

From 13547cb11db9dca6b5520835b06ddc7523e31518 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 15:59:51 +0800
Subject: [PATCH 17/20] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89html=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/constant/PageDesignConstant.java     |  5 ++++
 .../components/ScreenCurrentTimeChart.java    |  3 ++
 .../components/ScreenCustomHtmlChart.java     | 30 +++++++++++++++++++
 .../components/ScreenTimeCountDownChart.java  |  3 ++
 4 files changed, 41 insertions(+)
 create mode 100644 DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCustomHtmlChart.java

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
index 436dcf1b..d702bf4a 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
@@ -192,6 +192,11 @@ public interface PageDesignConstant {
              */
             String NUMBER = "number";
 
+            /**
+             * 自定义html
+             */
+            String CUSTOM_HTML = "customHtml";
+
         }
     }
 
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCurrentTimeChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCurrentTimeChart.java
index 3638b4e4..6fb62b36 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCurrentTimeChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCurrentTimeChart.java
@@ -33,5 +33,8 @@ public class ScreenCurrentTimeChart extends Chart {
 
         @ApiModelProperty(notes = "字体颜色")
         private String color;
+
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
     }
 }
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCustomHtmlChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCustomHtmlChart.java
new file mode 100644
index 00000000..c31c2c48
--- /dev/null
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCustomHtmlChart.java
@@ -0,0 +1,30 @@
+package com.gccloud.dataroom.core.module.chart.components;
+
+import com.gccloud.dataroom.core.constant.PageDesignConstant;
+import com.gccloud.dataroom.core.module.chart.bean.Chart;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 自定义html
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/3/16 16:44
+ */
+@Data
+public class ScreenCustomHtmlChart extends Chart {
+
+    @ApiModelProperty(notes = "类型")
+    private String type = PageDesignConstant.BigScreen.Type.CUSTOM_HTML;
+
+    @ApiModelProperty(notes = "个性化")
+    private Customize customize = new Customize();
+
+
+    @Data
+    public static class Customize {
+
+        @ApiModelProperty(notes = "自定义html")
+        private String htmlStr;
+    }
+}
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimeCountDownChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimeCountDownChart.java
index 062ecfcc..5b9c604a 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimeCountDownChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimeCountDownChart.java
@@ -46,6 +46,9 @@ public class ScreenTimeCountDownChart extends Chart {
         @ApiModelProperty(notes = "字体颜色")
         private String color;
 
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
     }
 
 

From 7dde7a45e5b8161fecb2b3c437464940b80bef85 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 13 Oct 2023 16:25:39 +0800
Subject: [PATCH 18/20] =?UTF-8?q?fix:=20=E4=B8=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80=E5=89=8D=E7=BC=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?baseURL=E5=8A=A0/static?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/js/utils/registerConfig.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data-room-ui/packages/js/utils/registerConfig.js b/data-room-ui/packages/js/utils/registerConfig.js
index ce83ef95..09ad377f 100644
--- a/data-room-ui/packages/js/utils/registerConfig.js
+++ b/data-room-ui/packages/js/utils/registerConfig.js
@@ -170,7 +170,10 @@ function registerTheme (config) {
 export default function (config, router) {
   window.BS_CONFIG = {}
   window.BS_CONFIG = configDeepMerge(window.BS_CONFIG, config)
-
+  if (!config?.httpConfigs?.fileUrlPrefix) {
+    // 如果没有配置文件访问前缀，使用baseURL加上/static作为文件前缀
+    window.BS_CONFIG.httpConfigs.fileUrlPrefix = window.BS_CONFIG.httpConfigs.baseURL + '/static'
+  }
   // 注册路由
   registerRouters(config, router)
   // 注册自定义主题

From 293ae5ab2b9e3d104efe900119304a2509940515 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 13 Oct 2023 16:39:11 +0800
Subject: [PATCH 19/20] =?UTF-8?q?fix:=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0h?=
 =?UTF-8?q?tml=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/CustomHtml/index.vue      |  56 ++++++++++
 .../BasicComponents/CustomHtml/setting.vue    | 104 ++++++++++++++++++
 .../CustomHtml/settingConfig.js               |  37 +++++++
 .../RightSetting/ComponentBinding/index.vue   |   2 +-
 .../images/bigScreenIcon/svg/29html.svg       |   1 +
 .../js/config/basicComponentsConfig.js        |   1 +
 .../packages/js/utils/getComponentConfig.js   |  13 +++
 7 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 data-room-ui/packages/BasicComponents/CustomHtml/index.vue
 create mode 100644 data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
 create mode 100644 data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js
 create mode 100644 data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg

diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/index.vue b/data-room-ui/packages/BasicComponents/CustomHtml/index.vue
new file mode 100644
index 00000000..40e298b0
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/index.vue
@@ -0,0 +1,56 @@
+<template>
+  <div
+    class="bs-design-wrap"
+    :class="`bs-current-time-${customTheme}`"
+  >
+    <div
+      ref="customHtml"
+      v-html="config.customize.htmlStr"
+    />
+  </div>
+</template>
+
+<script>
+import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
+import { mapMutations, mapState } from 'vuex'
+export default {
+  name: 'CustomHtml',
+  mixins: [paramsMixins],
+  props: {
+    config: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    ...mapState({
+    })
+  },
+  data () {
+    return {
+    }
+  },
+  mounted () {
+  },
+  // 销毁定时器
+  destroyed () {
+  },
+  methods: {
+    ...mapMutations({
+      changeChartConfig: 'bigScreen/changeChartConfig',
+      changeActiveItemConfig: 'bigScreen/changeActiveItemConfig'
+    }),
+    changeStyle (config) {
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../BasicComponents/fonts/index.css";
+@import "../../assets/fonts/numberFont/stylesheet.css";
+.bs-design-wrap{
+  width: 100%;
+  padding: 10px;
+}
+</style>
diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
new file mode 100644
index 00000000..36dc73a4
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/setting.vue
@@ -0,0 +1,104 @@
+<!--
+ * @description: 指标组件案例设计面板
+ * @Date: 2022-08-17 16:53:28
+ * @Author: xingheng
+-->
+<template>
+  <div>
+    <el-form
+      ref="form"
+      label-width="100px"
+      label-position="left"
+      :model="config"
+      class="bs-el-form"
+    >
+      <SettingTitle>标题</SettingTitle>
+      <div class="setting-wrap">
+        <el-form-item
+          label="标题"
+          label-width="100px"
+        >
+          <el-input
+            v-model="config.title"
+            placeholder="请输入标题"
+          />
+        </el-form-item>
+      </div>
+      <SettingTitle>位置</SettingTitle>
+      <div class="setting-wrap">
+        <PosWhSetting :config="config" />
+      </div>
+      <SettingTitle v-if="config.border">边框</SettingTitle>
+      <div class="lc-field-body">
+        <BorderSetting
+          v-if="config.border"
+          label-width="100px"
+          :config="config.border"
+          :bigTitle='config.title'
+        />
+      </div>
+      <SettingTitle>旋转</SettingTitle>
+      <div class="lc-field-body">
+        <RotateSetting
+          :config="config"
+        />
+      </div>
+      <SettingTitle>基础</SettingTitle>
+      <div class="setting-wrap">
+        <el-form-item
+          label="html内容"
+          label-width="100px"
+        >
+          <el-input
+            v-model="config.customize.htmlStr"
+            type="textarea"
+            :rows="5"
+          />
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
+import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+export default {
+  name: 'CurrentTimeSetting',
+  components: {
+    PosWhSetting,
+    SettingTitle,
+    BorderSetting,
+    RotateSetting
+  },
+  data () {
+    return {
+      activeName: 'data'
+    }
+  },
+  computed: {
+    config: {
+      get () {
+        return this.$store.state.bigScreen.activeItemConfig
+      },
+      set (val) {
+        this.$store.state.bigScreen.activeItemConfig = val
+      }
+    }
+  },
+  watch: {
+  },
+  mounted () {},
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+ @import "../../assets/style/settingWrap.scss";
+ @import "../../assets/style/bsTheme.scss";
+.setting-wrap{
+  padding: 12px 16px;
+}
+</style>
diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js
new file mode 100644
index 00000000..b7d5afd8
--- /dev/null
+++ b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js
@@ -0,0 +1,37 @@
+import { commonConfig } from '../../js/config'
+
+export const settingConfig = {
+  time: '',
+  theme: 'dark',
+  // 设置面板属性的显隐
+  displayOption: {
+    dataAllocation: {
+      // 是否存在数据配置
+      enable: false
+    }
+  }
+}
+const customConfig = {
+
+  type: 'customHtml',
+  root: {
+    version: '2023071001',
+    // 绕x轴旋转角度
+    rotateX: 0,
+    // 绕y轴旋转角度
+    rotateY: 0,
+    // 绕z轴旋转角度
+    rotateZ: 0,
+    // 透视距离
+    perspective: 0,
+    skewX: 0,
+    skewY: 0
+  },
+  customize: {
+    htmlStr: '<h1 style="color:#ffffff;font-size: 30px">我是自定义html内容</h1>' // html的内容
+  }
+
+}
+export const dataConfig = {
+  ...commonConfig(customConfig)
+}
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
index 6a502d50..8458e289 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentBinding/index.vue
@@ -116,7 +116,7 @@ export default {
           })
         }
       })
-      layouts = layouts?.filter(item => item.code !== code && !['Tabs', 'titles', 'currentTime', 'timeCountDown', 'iframeChart', 'linkChart', 'carousel', 'themeSwitcher', 'themeSelect'].includes(item.type))
+      layouts = layouts?.filter(item => item.code !== code && !['Tabs', 'titles', 'currentTime', 'timeCountDown', 'iframeChart', 'linkChart', 'carousel', 'themeSwitcher', 'themeSelect', 'customHtml'].includes(item.type))
       layouts = [...layouts, ...tabComponents]?.map(item => ({
         name: item.code,
         comment: item.title
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg
new file mode 100644
index 00000000..b5fb9652
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/29html.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1697184484757" class="icon" viewBox="0 0 2217 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9081" xmlns:xlink="http://www.w3.org/1999/xlink" width="433.0078125" height="200"><path d="M534.894998 1024L0 512.056531 534.894998 0.113062l125.611572 131.264657L262.755438 512.169593l397.751132 380.678812zM1682.132273 1024l-125.611571-131.264657 397.751132-380.678812-397.751132-380.791874L1682.132273 0l534.894999 511.943469z" fill="#4077ED" p-id="9082"></path><path d="M765.653969 912.068897L1295.122005 19.333554l156.138236 92.710611-529.468036 892.622281z" fill="#A2BFFF" p-id="9083"></path></svg>
\ No newline at end of file
diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js
index ed4c4bf6..f910c8b3 100644
--- a/data-room-ui/packages/js/config/basicComponentsConfig.js
+++ b/data-room-ui/packages/js/config/basicComponentsConfig.js
@@ -20,6 +20,7 @@ const typeList = [
   'picture',
   'timeCountDown',
   'currentTime',
+  'customHtml',
   'iframeChart',
   'digitalFlop',
   'tables',
diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js
index e34be6ea..03dd7f70 100644
--- a/data-room-ui/packages/js/utils/getComponentConfig.js
+++ b/data-room-ui/packages/js/utils/getComponentConfig.js
@@ -175,6 +175,19 @@ export default function getComponentConfig (type) {
         y: 0,
         type
       }
+    case 'customHtml':
+      return {
+        name: '自定义html',
+        title: '自定义html',
+        icon: Icon.getNameList()[29],
+        className:
+          'com.gccloud.dataroom.core.module.chart.components.ScreenCustomHtmlChart',
+        w: 600,
+        h: 150,
+        x: 0,
+        y: 0,
+        type
+      }
     case 'video':
       return {
         name: '播放器',

From a469a6a2c3ba7a9b5d4213b2f15bf00a6ccd9af1 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 13 Oct 2023 17:34:02 +0800
Subject: [PATCH 20/20] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=90=8E=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=87=E7=AD=BE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Echarts/3D图/3D分组柱状图.js        | 20 +++++++++----------
 .../Echarts/3D图/3D基础柱状图.js        |  2 +-
 data-room-ui/packages/EchartsRender/index.vue | 10 ++++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js b/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
index 69e3718a..d9663f35 100644
--- a/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
+++ b/data-room-ui/packages/Echarts/3D图/3D分组柱状图.js
@@ -218,7 +218,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称',
+    label: '标题',
     type: 'input',
     field: 'xAxis_name',
     optionField: 'xAxis.name',
@@ -227,7 +227,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称位置',
+    label: '标题位置',
     type: 'select',
     field: 'xAxis_nameLocation',
     optionField: 'xAxis.nameLocation',
@@ -249,7 +249,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称到轴线距离',
+    label: '标题到轴线距离',
     type: 'inputNumber',
     field: 'xAxis_nameGap',
     optionField: 'xAxis.nameGap',
@@ -258,7 +258,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称字体大小',
+    label: '标题字体大小',
     type: 'inputNumber',
     field: 'xAxis_nameTextStyle_fontSize',
     optionField: 'xAxis.nameTextStyle.fontSize',
@@ -267,7 +267,7 @@ const setting = [
     groupName: 'xAxis'
   },
   {
-    label: '名称颜色',
+    label: '标题颜色',
     type: 'colorPicker',
     field: 'xAxis_nameTextStyle_color',
     optionField: 'xAxis.nameTextStyle.color',
@@ -361,7 +361,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称',
+    label: '标题',
     type: 'input',
     field: 'yAxis_name',
     optionField: 'yAxis.name',
@@ -370,7 +370,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称位置',
+    label: '标题位置',
     type: 'select',
     field: 'yAxis_nameLocation',
     optionField: 'yAxis.nameLocation',
@@ -392,7 +392,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称到轴线距离',
+    label: '标题到轴线距离',
     type: 'inputNumber',
     field: 'yAxis_nameGap',
     optionField: 'yAxis.nameGap',
@@ -401,7 +401,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称字体大小',
+    label: '标题字体大小',
     type: 'inputNumber',
     field: 'yAxis_nameTextStyle_fontSize',
     optionField: 'yAxis.nameTextStyle.fontSize',
@@ -410,7 +410,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '名称颜色',
+    label: '标题颜色',
     type: 'colorPicker',
     field: 'yAxis_nameTextStyle_color',
     optionField: 'yAxis.nameTextStyle.color',
diff --git a/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js b/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
index 3f433532..1fb15be0 100644
--- a/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
+++ b/data-room-ui/packages/Echarts/3D图/3D基础柱状图.js
@@ -489,7 +489,7 @@ const setting = [
     groupName: 'yAxis'
   },
   {
-    label: '刻度长度',
+    label: '刻度宽度',
     type: 'inputNumber',
     field: 'yAxis_axisTick_length',
     optionField: 'yAxis.axisTick.length',
diff --git a/data-room-ui/packages/EchartsRender/index.vue b/data-room-ui/packages/EchartsRender/index.vue
index f829eba0..d92f6703 100644
--- a/data-room-ui/packages/EchartsRender/index.vue
+++ b/data-room-ui/packages/EchartsRender/index.vue
@@ -302,6 +302,13 @@ export default {
         const seriesFieldList = [...new Set(data.map(item => item[seriesField]))]
         option.series = []
         const barWidth = option.seriesCustom.barWidth
+        // 获取数据标签展示情况
+        let labelShow = 0
+        config.setting.forEach(set => {
+          if (set.field === 'series_barColor_label_show') {
+            labelShow = set.value
+          }
+        })
         // 偏移量数组
         const offsetArr = []
         let index = 0
@@ -347,8 +354,7 @@ export default {
               barWidth: barWidth,
               color: '#115ba6',
               label: {
-                show: false
-
+                show: labelShow
               },
               zlevel: 2,
               z: 12,