From 2e11de3a812ddcad9126a3ac46b47bd1eeecc1ad Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 10:15:03 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/TimePicker/index.vue      |  1 +
 .../BasicComponents/TimePicker/setting.vue    | 90 ++++++++++++++-----
 .../TimePicker/settingConfig.js               |  2 +
 3 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/TimePicker/index.vue b/data-room-ui/packages/BasicComponents/TimePicker/index.vue
index f777b074..26764193 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/index.vue
+++ b/data-room-ui/packages/BasicComponents/TimePicker/index.vue
@@ -6,6 +6,7 @@
     clearable
     :class="['basic-component-time-picker', `time-picker-${config.code}`]"
     :popper-class="'basic-component-time-picker time-picker-popper-' + config.code"
+    :format="config.customize.format"
     :value-format="config.customize.valueFormat"
     :default-value="value"
     @focus="focusEvent"
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
index db9442b5..0efd7845 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
@@ -84,25 +84,69 @@
           </div>
           <SettingTitle>时间格式</SettingTitle>
           <div class="lc-field-body">
-            <el-form-item label="时间格式化类型">
-              <el-select
-                v-model="config.customize.formatType"
-                class="bs-el-select"
-                popper-class="bs-el-select"
-              >
-                <el-option
-                  v-for="(type) in formatTypeOptions"
-                  :key="type.value"
-                  :label="type.label"
-                  :value="type.value"
+            <el-form-item label="时间显示格式化">
+              <div class="description">
+                <el-input
+                  v-model="config.customize.format"
+                  placeholder="例如：HH:mm:ss"
+                  clearable
                 />
-              </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    小时：H，表示小时（24小时制），不补0，例如：3<br>
+                    小时：HH，表示小时（24小时制），补0，例如：03<br>
+                    小时：h，表示小时（12小时制），须和 A 或 a 使用，不补0，例如：3<br>
+                    小时：hh，表示小时（12小时制），须和 A 或 a 使用，补0，例如：03<br>
+                    分钟：m，表示分钟，不补0，例如：4<br>
+                    分钟：mm，表示分钟，补0，例如：04<br>
+                    秒：s，表示秒钟，不补0，例如：5<br>
+                    秒：ss，表示秒钟，补0，例如：05<br>
+                    JS时间戳：timestamp，仅 value-format 可用，组件绑定值为number类型，例如：1483326245000<br>
+                    不需要格式化字符：[MM]，使用方括号标识不需要格式化的字符，例如：MM<br>
+                    具体的时间格式化字符和使用方式，可以参考Element-UI官网的日期选择器的时间格式化部分。
+                  </div>
+                </el-tooltip>
+              </div>
+            </el-form-item>
+            <el-form-item label="时间数据类型">
+              <div class="description">
+                <el-select
+                  v-model="config.customize.formatType"
+                  class="bs-el-select"
+                  popper-class="bs-el-select"
+                >
+                  <el-option
+                    v-for="(type) in formatTypeOptions"
+                    :key="type.value"
+                    :label="type.label"
+                    :value="type.value"
+                  />
+                </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
+                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。<br>
+                  </div>
+                </el-tooltip>
+              </div>
             </el-form-item>
             <el-form-item
               v-if="config.customize.formatType === 'custom'"
-              label="自定义时间格式"
+              label="时间数据格式化"
             >
-              <div class="time-format-description">
+              <div class="description">
                 <el-input
                   v-model="config.customize.valueFormat"
                   placeholder="例如：HH:mm:ss"
@@ -116,11 +160,17 @@
                     style="color:#9e9e9e"
                   />
                   <div slot="content">
-                    时间格式示例：<br>
-                    HH：表示小时（24小时制），<br>
-                    mm：表示分钟，<br>
-                    ss：表示秒，
-                    具体可参考Element-UI官网的日期选择器的时间格式化部分。
+                    小时：H，表示小时（24小时制），不补0，例如：3<br>
+                    小时：HH，表示小时（24小时制），补0，例如：03<br>
+                    小时：h，表示小时（12小时制），须和 A 或 a 使用，不补0，例如：3<br>
+                    小时：hh，表示小时（12小时制），须和 A 或 a 使用，补0，例如：03<br>
+                    分钟：m，表示分钟，不补0，例如：4<br>
+                    分钟：mm，表示分钟，补0，例如：04<br>
+                    秒：s，表示秒钟，不补0，例如：5<br>
+                    秒：ss，表示秒钟，补0，例如：05<br>
+                    JS时间戳：timestamp，仅 value-format 可用，组件绑定值为number类型，例如：1483326245000<br>
+                    不需要格式化字符：[MM]，使用方括号标识不需要格式化的字符，例如：MM<br>
+                    具体的时间格式化字符和使用方式，可以参考Element-UI官网的日期选择器的时间格式化部分。
                   </div>
                 </el-tooltip>
               </div>
@@ -184,7 +234,7 @@ export default {
     width: 97%;
     padding: 16px;
   }
-  .time-format-description{
+  .description{
     display: flex;
     align-items: center;
     .el-tooltip{
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
index b7ebd516..f5ac420a 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/TimePicker/settingConfig.js
@@ -41,6 +41,8 @@ const customConfig = {
     dropDownSelectedFontColor: '#409EFF',
     // 时间格式化类型:时间戳（timestamp），自定义（custom）
     formatType: 'custom',
+    // 时间格式化
+    format: 'HH:mm:ss',
     // 绑定值的格式
     valueFormat: 'HH:mm:ss'
   }

From a9b12c767ce09d18607377e733318f368f5788a6 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Sun, 8 Oct 2023 10:15:38 +0800
Subject: [PATCH 02/13] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E3=80=81?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

时间、日期选择器新增显示格式化配置
---
 .../module/chart/components/ScreenDateTimePickerChart.java     | 3 +++
 .../core/module/chart/components/ScreenTimePickerChart.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
index 1a9deefb..28242c92 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
@@ -43,6 +43,9 @@ public class ScreenDateTimePickerChart extends Chart {
         @ApiModelProperty(notes = "绑定值的格式")
         private String valueFormat;
 
+        @ApiModelProperty(notes = "显示的格式")
+        private String format;
+
         @ApiModelProperty(notes = "下拉框")
         private Map<String, Object> dropDownBox;
 
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
index 1b8d0aee..4c085f1c 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
@@ -53,6 +53,9 @@ public class ScreenTimePickerChart extends Chart {
         @ApiModelProperty(notes = "绑定值的格式")
         private String valueFormat;
 
+        @ApiModelProperty(notes = "显示的格式")
+        private String format;
+
 
     }
 

From 0053cebca91269e86d3f706f12bf13ba3a2c061e Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 10:16:37 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/DateTimePicker/index.vue  |   1 +
 .../DateTimePicker/setting.vue                | 138 +++++++++++++-----
 .../DateTimePicker/settingConfig.js           |   3 +-
 3 files changed, 103 insertions(+), 39 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
index c75b1605..5f3d7ef9 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
@@ -8,6 +8,7 @@
     :class="['basic-component-date-picker', `date-picker-${config.code}`]"
     :popper-class="'basic-component-date-picker date-picker-popper-' + config.code"
     :value-format="config.customize.valueFormat"
+    :format="config.customize.format"
     :default-value="value"
     size="large"
     @focus="focusEvent"
diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
index df413f32..8b3fd596 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
@@ -21,6 +21,20 @@
           </div>
           <SettingTitle>基础</SettingTitle>
           <div class="lc-field-body">
+            <el-form-item label="组件类型">
+              <el-select
+                v-model="config.customize.type"
+                class="bs-el-select"
+                popper-class="bs-el-select"
+              >
+                <el-option
+                  v-for="(type) in displayTypeOptions"
+                  :key="type.value"
+                  :label="type.label"
+                  :value="type.value"
+                />
+              </el-select>
+            </el-form-item>
             <!-- 选择器背景颜色 -->
             <el-form-item label="背景颜色">
               <ColorPicker
@@ -94,41 +108,78 @@
           </div>
           <SettingTitle>时间格式</SettingTitle>
           <div class="lc-field-body">
-            <el-form-item label="显示类型">
-              <el-select
-                v-model="config.customize.type"
-                class="bs-el-select"
-                popper-class="bs-el-select"
-              >
-                <el-option
-                  v-for="(type) in displayTypeOptions"
-                  :key="type.value"
-                  :label="type.label"
-                  :value="type.value"
+            <el-form-item label="时间显示格式化">
+              <div class="description">
+                <el-input
+                  v-model="config.customize.format"
+                  placeholder="例如：yyyy-MM-dd HH:mm:ss"
+                  clearable
                 />
-              </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    年：yyyy，表示年份，例如：2017<br>
+                    月：M，表示月份，不补0，例如：1<br>
+                    月：MM，表示月份，补0，例如：01<br>
+                    日：d，表示日期，不补0，例如：2<br>
+                    日：dd，表示日期，补0，例如：02<br>
+                    小时：H，表示小时（24小时制），不补0，例如：3<br>
+                    小时：HH，表示小时（24小时制），补0，例如：03<br>
+                    小时：h，表示小时（12小时制），须和 A 或 a 使用，不补0，例如：3<br>
+                    小时：hh，表示小时（12小时制），须和 A 或 a 使用，补0，例如：03<br>
+                    分钟：m，表示分钟，不补0，例如：4<br>
+                    分钟：mm，表示分钟，补0，例如：04<br>
+                    秒：s，表示秒钟，不补0，例如：5<br>
+                    秒：ss，表示秒钟，补0，例如：05<br>
+                    AM/PM：A，仅 format 可用，大写，例如：AM<br>
+                    am/pm：a，仅 format 可用，小写，例如：am<br>
+                    JS时间戳：timestamp，仅 value-format 可用，组件绑定值为number类型，例如：1483326245000<br>
+                    不需要格式化字符：[MM]，使用方括号标识不需要格式化的字符，例如：MM<br>
+                    具体的时间格式化字符和使用方式，可以参考Element-UI官网的日期选择器的时间格式化部分。
+                  </div>
+                </el-tooltip>
+              </div>
             </el-form-item>
-            <el-form-item label="时间格式化类型">
-              <el-select
-                v-model="config.customize.formatType"
-                class="bs-el-select"
-                popper-class="bs-el-select"
-                clearable
-              >
-                <el-option
-                  v-for="(type) in formatTypeOptions"
-                  :key="type.value"
-                  :label="type.label"
-                  :value="type.value"
-                />
-              </el-select>
+            <el-form-item label="时间数据类型">
+              <div class="description">
+                <el-select
+                  v-model="config.customize.formatType"
+                  class="bs-el-select"
+                  popper-class="bs-el-select"
+                  clearable
+                >
+                  <el-option
+                    v-for="(type) in formatTypeOptions"
+                    :key="type.value"
+                    :label="type.label"
+                    :value="type.value"
+                  />
+                </el-select>
+                <el-tooltip
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                  <div slot="content">
+                    时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
+                    自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。<br>
+                  </div>
+                </el-tooltip>
+              </div>
             </el-form-item>
             <el-form-item
               v-if="config.customize.formatType === 'custom'"
-              label="自定义时间格式"
+              label="时间数据格式化"
             >
               <!-- year/month/date/week/ datetime/datetimerange/daterange -->
-              <div class="time-format-description">
+              <div class="description">
                 <el-input
                   v-model="config.customize.valueFormat"
                   placeholder="例如：yyyy-MM-dd HH:mm:ss"
@@ -143,14 +194,26 @@
                     style="color:#9e9e9e"
                   />
                   <div slot="content">
-                    时间格式示例：<br>
-                    yyyy：表示年份，<br>
-                    MM：表示月份，<br>
-                    dd：表示日期，<br>
-                    HH：表示小时（24小时制），<br>
-                    mm：表示分钟，<br>
-                    ss：表示秒，<br>
-                    具体可参考Element-UI官网的日期选择器的时间格式化部分。
+                    <div slot="content">
+                      年：yyyy，表示年份，例如：2017<br>
+                      月：M，表示月份，不补0，例如：1<br>
+                      月：MM，表示月份，补0，例如：01<br>
+                      日：d，表示日期，不补0，例如：2<br>
+                      日：dd，表示日期，补0，例如：02<br>
+                      小时：H，表示小时（24小时制），不补0，例如：3<br>
+                      小时：HH，表示小时（24小时制），补0，例如：03<br>
+                      小时：h，表示小时（12小时制），须和 A 或 a 使用，不补0，例如：3<br>
+                      小时：hh，表示小时（12小时制），须和 A 或 a 使用，补0，例如：03<br>
+                      分钟：m，表示分钟，不补0，例如：4<br>
+                      分钟：mm，表示分钟，补0，例如：04<br>
+                      秒：s，表示秒钟，不补0，例如：5<br>
+                      秒：ss，表示秒钟，补0，例如：05<br>
+                      AM/PM：A，仅 format 可用，大写，例如：AM<br>
+                      am/pm：a，仅 format 可用，小写，例如：am<br>
+                      JS时间戳：timestamp，仅 value-format 可用，组件绑定值为number类型，例如：1483326245000<br>
+                      不需要格式化字符：[MM]，使用方括号标识不需要格式化的字符，例如：MM<br>
+                      具体的时间格式化字符和使用方式，可以参考Element-UI官网的日期选择器的时间格式化部分。
+                    </div>
                   </div>
                 </el-tooltip>
               </div>
@@ -162,7 +225,6 @@
   </div>
 </template>
 <script>
-import moment from 'moment'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
@@ -227,7 +289,7 @@ export default {
     width: 97%;
     padding: 16px;
   }
-  .time-format-description{
+  .description{
     display: flex;
     align-items: center;
     .el-tooltip{
diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
index e74e3c84..8481b55d 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js
@@ -32,7 +32,8 @@ const customConfig = {
     type: 'datetimerange',
     // 时间格式化类型:时间戳（timestamp），自定义（custom）
     formatType: 'custom',
-    // 绑定值的格式
+    format: 'yyyy-MM-dd HH:mm:ss',
+    // 时间数据格式
     valueFormat: 'yyyy-MM-dd HH:mm:ss',
     // 下拉框
     dropDownBox: {

From d810a96fba91455b9f404be5481ba7dab32e02e0 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 11:00:28 +0800
Subject: [PATCH 04/13] =?UTF-8?q?refactor:=20=E6=97=A5=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E9=85=8D=E7=BD=AE=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=3D>?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/DateTimePicker/setting.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
index 8b3fd596..5523bbaf 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
@@ -106,7 +106,7 @@
               />
             </el-form-item>
           </div>
-          <SettingTitle>时间格式</SettingTitle>
+          <SettingTitle>日期时间格式</SettingTitle>
           <div class="lc-field-body">
             <el-form-item label="时间显示格式化">
               <div class="description">

From e65c5049ce602793f791655d1a23d0b192cd3583 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 14:13:46 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B8=B2=E6=9F=93=E5=87=BA=E9=94=99=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=8C=E4=BB=85=E5=B0=86=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BizComponent/index.vue | 105 +++++++++----------
 1 file changed, 47 insertions(+), 58 deletions(-)

diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue
index e0f33cfd..1fa20d71 100644
--- a/data-room-ui/packages/BizComponent/index.vue
+++ b/data-room-ui/packages/BizComponent/index.vue
@@ -339,69 +339,57 @@ export default {
         }
       })
     },
-    save (pageJump = false) {
+    async  save (pageJump = false) {
       this.loading = true
+      let dataUrl = ''
       const node = document.querySelector('.remote-preview-inner-wrap')
       // 获取node下的第一个子节点
       const childrenNode = node.children[0]
-      toJpeg(childrenNode, { quality: 0.2 })
-        .then((dataUrl) => {
-          const that = this
-          if (showSize(dataUrl) > 200) {
-            const url = dataURLtoBlob(dataUrl)
-            // 压缩到500KB,这里的500就是要压缩的大小,可自定义
-            imageConversion
-              .compressAccurately(url, {
-                size: 200, // 图片大小压缩到100kb
-                width: 1280, // 宽度压缩到1280
-                height: 720 // 高度压缩到720
-              })
-              .then((res) => {
-                translateBlobToBase64(res, function (e) {
-                  this.form.coverPicture = e.result
-                  updateBizComponent(this.form)
-                    .then(() => {
-                      this.$message({
-                        message: '保存成功',
-                        type: 'success',
-                        duration: 800,
-                        onClose: () => {
-                          // 此处写提示关闭后需要执行的函数
-                          if (pageJump) {
-                            this.pageJump()
-                          }
-                        }
-                      })
-                    })
-                    .finally(() => {
-                      that.loading = false
-                    })
-                })
-              })
-          } else {
-            this.form.coverPicture = dataUrl
-            updateBizComponent(this.form)
-              .then(() => {
-                this.$message({
-                  message: '保存成功',
-                  type: 'success',
-                  duration: 800,
-                  onClose: () => {
-                    // 此处写提示关闭后需要执行的函数
-                    if (pageJump) {
-                      this.pageJump()
-                    }
-                  }
-                })
-              })
-              .finally(() => {
-                this.loading = false
-              })
+      try {
+        dataUrl = await toJpeg(childrenNode, { quality: 0.2 })
+      } catch (error) {
+        console.info(error)
+      }
+      console.log(dataUrl)
+      if (dataUrl) {
+        if (showSize(dataUrl) > 200) {
+          const url = dataURLtoBlob(dataUrl)
+          // 压缩到500KB,这里的500就是要压缩的大小,可自定义
+          imageConversion.compressAccurately(
+            url,
+            {
+              size: 200, // 图片大小压缩到100kb
+              width: 1280, // 宽度压缩到1280
+              height: 720 // 高度压缩到720
+            }
+          ).then((res) => {
+            translateBlobToBase64(res, (e) => {
+              this.form.coverPicture = e.result
+            })
+          })
+        } else {
+          this.form.coverPicture = dataUrl
+        }
+      } else {
+        this.form.coverPicture = ''
+      }
+      updateBizComponent(this.form).then(() => {
+        this.$message({
+          message: '保存成功',
+          type: 'success',
+          duration: 800,
+          onClose: () => {
+            // 此处写提示关闭后需要执行的函数
+            if (pageJump) {
+              this.pageJump()
+            }
           }
         })
-        .catch(() => {
-          this.loading = false
-        })
+        this.loading = false
+      }).catch((error) => {
+        console.info(error)
+        this.loading = false
+      })
     },
     createdImg () {
       this.loading = true
@@ -421,7 +409,8 @@ export default {
           })
           this.loading = false
         })
-        .catch(() => {
+        .catch((error) => {
+          console.info(error)
           this.$message.warning('出现未知错误，请重试')
           this.loading = false
         })

From 3d8e2194e236d355742c68a83fd9635c47a58f7b Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 14:33:38 +0800
Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4http=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=9C=A8=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B0=B1=E6=89=A7=E8=A1=8C=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
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 2f39a86d..7e4b0fa0 100644
--- a/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/HttpEditForm.vue
@@ -885,7 +885,7 @@ export default {
           this.newParamsList = cloneDeep(paramsList)
           this.codemirrorOption.mode = this.dataForm.config.requestType === 'frontend' ? 'text/javascript' : 'text/x-groovy'
           // this.replaceParams(paramsList)
-          this.scriptExecute(true)
+          // this.scriptExecute(true)
         })
       }
     },

From 226feab07787ca81d236f968561c129a1ce0be0c Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Sun, 8 Oct 2023 14:42:57 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E6=9C=AA=E9=9A=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复组件参数配置未随数据集参数同步变动的问题
---
 .../BigScreenDesign/RightSetting/DataSetting.vue    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index f91c0116..50eb20da 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -764,6 +764,19 @@ export default {
                 })
               }
             }
+            if (res.params) {
+              // 如果数据集中有新增的参数，需要显示出来
+              res.params.forEach(param => {
+                if (!this.params.find(item => item.name === param.name)) {
+                  this.params.push({
+                    name: param.name,
+                    value: param.value,
+                    type: param.type,
+                    remark: param.remark
+                  })
+                }
+              })
+            }
             deleteKeys.forEach(key => {
               delete this.config.dataSource.params[key]
             })

From 0c49a75c09f4e8545803923da88439f668941f4a Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Sun, 8 Oct 2023 14:43:53 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix:=20sqlServer=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=BB=98=E8=AE=A4=E9=93=BE=E6=8E=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0encrypt=EF=BC=8C=E8=A7=A3=E5=86=B3jdk17?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=97=A0=E6=B3=95=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sqlServer 数据源默认链接添加参数encrypt，解决jdk17环境下无法连接的问题
---
 .../packages/DataSourceManagement/src/setDatasource.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
index 92ec8ffa..95329d9d 100644
--- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
@@ -339,7 +339,7 @@ export default {
         case 'com.ibm.db2.jcc.DB2Driver':
           return 'jdbc:db2://localhost:5000/db_name'
         case 'com.microsoft.sqlserver.jdbc.SQLServerDriver':
-          return 'jdbc:sqlserver://localhost:1433;databaseName=db_name'
+          return 'jdbc:sqlserver://localhost:1433;databaseName=db_name;encrypt=false'
         case 'org.postgresql.Driver':
           return 'jdbc:postgresql://localhost:13308/db_name'
         case 'org.apache.hive.jdbc.HiveDriver':

From 38dfdf64c01b67d63d3ac3cfd32d1e0be3e02414 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 14:58:34 +0800
Subject: [PATCH 09/13] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E5=BA=93?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E=E3=80=81=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=89=93=E5=BC=80=E6=96=B0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/ComponentList/EditForm.vue | 4 ++--
 data-room-ui/packages/ComponentList/index.vue    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/ComponentList/EditForm.vue b/data-room-ui/packages/ComponentList/EditForm.vue
index aa950d6d..b965c3ff 100644
--- a/data-room-ui/packages/ComponentList/EditForm.vue
+++ b/data-room-ui/packages/ComponentList/EditForm.vue
@@ -477,7 +477,7 @@ export default {
     // 跳转设计态
     toDesign (form) {
       const path = this.type === 'component' ? (window.BS_CONFIG?.routers?.designUrl || '/big-screen/design') : 'big-screen-biz-component-design'
-      const { href: bigScreenHref } = this.type == 'bizComponent' ? this.$router.resolve({
+      const { href: bigScreenHref } = this.type === 'bizComponent' ? this.$router.resolve({
         path,
         query: {
           code: form.code,
@@ -490,7 +490,7 @@ export default {
         }
       })
       // 新窗口打开
-      window.open(bigScreenHref, '_blank')
+      window.open(bigScreenHref, '_self')
     }
   }
 }
diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue
index 406c04f0..8765a15e 100644
--- a/data-room-ui/packages/ComponentList/index.vue
+++ b/data-room-ui/packages/ComponentList/index.vue
@@ -353,7 +353,7 @@ export default {
         }
       })
       // 新窗口打开
-      window.open(href, '_blank')
+      window.open(href, '_self')
     },
     add () {
       const page = {

From dcbb369a9aac97eb49203d4ee5df8f4a4076119c Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 15:05:11 +0800
Subject: [PATCH 10/13] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=A0=87=E9=A2=98=E7=9A=84=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=EF=BC=8C14px=3D>18px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BasicComponents/Input/settingConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/BasicComponents/Input/settingConfig.js b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
index bd796fa9..5db10909 100644
--- a/data-room-ui/packages/BasicComponents/Input/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
@@ -25,7 +25,7 @@ const customConfig = {
 
     titleStyle: {
       // 标题大小
-      fontSize: 14,
+      fontSize: 18,
       // 标题颜色
       color: '#fff',
       // 标题间距

From e9a16aa8f6f282fb0f0b08b28ebd7211dcbdfac3 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 15:14:45 +0800
Subject: [PATCH 11/13] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E6=95=B0=E6=8D=AE=E9=9B=86=E8=A1=A8=E6=A0=BC=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E9=AB=98=E5=BA=A6=E4=B8=BA100%=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4size=E6=97=B6=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=86=85=E9=83=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/DataSetManagement/src/OriginalEditForm.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index e09b9571..bd0ec75a 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -358,7 +358,7 @@
           <el-table
             align="center"
             :data="dataPreviewList"
-            max-height="400"
+            max-height="100%"
             :border="true"
             class="bs-el-table bs-scrollbar"
           >

From 9a14da2ca4fd52a43d309847c623bd0c349945a6 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 15:54:40 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=BF=9D=E5=AD=98=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E7=9A=84=E4=BF=9D=E5=AD=98=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5=E4=BE=9D=E7=84=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=B0=81=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/PageDesignTop.vue         | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
index 6f4dcce9..84cdc01e 100644
--- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
+++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
@@ -438,26 +438,32 @@ export default {
           pageInfo.isPreview = false
           this.saveLoading = true
           const node = document.querySelector('.render-theme-wrap')
-          const dataUrl = await toJpeg(node, { quality: 0.2 })
-          if (showSize(dataUrl) > 200) {
-            const url = dataURLtoBlob(dataUrl)
-            // 压缩到500KB,这里的500就是要压缩的大小,可自定义
-            const imgRes = await imageConversion.compressAccurately(url, {
-              size: 200, // 图片大小压缩到100kb
-              width: 1280, // 宽度压缩到1280
-              height: 720 // 高度压缩到720
-            })
-            const base64 = await translateBlobToBase64(imgRes)
-            pageInfo.coverPicture = base64.result
-            const res = await saveScreen(pageInfo)
-            this.$message.success('保存成功')
-            return res
+          let dataUrl = ''
+          try {
+            dataUrl = await toJpeg(node, { quality: 0.2 })
+          } catch (error) {
+            console.info(error)
+          }
+          if (dataUrl) {
+            if (showSize(dataUrl) > 200) {
+              const url = dataURLtoBlob(dataUrl)
+              // 压缩到500KB,这里的500就是要压缩的大小,可自定义
+              const imgRes = await imageConversion.compressAccurately(url, {
+                size: 200, // 图片大小压缩到100kb
+                width: 1280, // 宽度压缩到1280
+                height: 720 // 高度压缩到720
+              })
+              const base64 = await translateBlobToBase64(imgRes)
+              pageInfo.coverPicture = base64.result
+            } else {
+              pageInfo.coverPicture = dataUrl
+            }
           } else {
-            pageInfo.coverPicture = dataUrl
-            const res = await saveScreen(pageInfo)
-            this.$message.success('保存成功')
-            return res
+            pageInfo.coverPicture = ''
           }
+          const res = await saveScreen(pageInfo)
+          this.$message.success('保存成功')
+          return res
         }
       } catch (error) {
         console.error(error)

From d16b3be21cd2792e489ed8ae4b925f81947d252d Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sun, 8 Oct 2023 16:26:26 +0800
Subject: [PATCH 13/13] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=BE=91=E5=99=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=80=82=E9=85=8D=E6=B7=B1=E8=89=B2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BizComponent/index.vue  | 80 +++++++++++++++----
 .../DataSetManagement/src/CustomEditForm.vue  |  2 +
 .../DataSetManagement/src/ScriptEditForm.vue  | 45 +++++++++++
 3 files changed, 111 insertions(+), 16 deletions(-)

diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue
index 1fa20d71..4c6745f2 100644
--- a/data-room-ui/packages/BizComponent/index.vue
+++ b/data-room-ui/packages/BizComponent/index.vue
@@ -339,7 +339,7 @@ export default {
         }
       })
     },
-    async  save (pageJump = false) {
+    async save (pageJump = false) {
       this.loading = true
       let dataUrl = ''
       const node = document.querySelector('.remote-preview-inner-wrap')
@@ -435,7 +435,7 @@ export default {
   background: var(--bs-background-2);
   overflow: hidden;
 
-  > * {
+  >* {
     box-sizing: border-box;
   }
 
@@ -512,11 +512,13 @@ export default {
             flex-direction: row;
             align-items: center;
             justify-content: space-between;
-            .code-tab-btn{
+
+            .code-tab-btn {
               // width: 90px;
               cursor: pointer;
               text-align: center;
             }
+
             .code-tab {
               font-size: 14px;
               align-items: center;
@@ -558,12 +560,14 @@ export default {
         height: 100%;
         background: var(--bs-background-1);
         position: relative;
-        .code-tab-header{
+
+        .code-tab-header {
           height: 40px;
           display: flex;
           flex-direction: row;
           align-items: center;
           background-color: var(--bs-background-2);
+
           .code-tab {
             font-size: 14px;
             align-items: center;
@@ -582,16 +586,60 @@ export default {
 }
 </style>
 <style>
-  .cm-s-material-darker.CodeMirror,
-  .cm-s-material-darker .CodeMirror-gutters
-  {
-    background: var(--bs-background-1) !important;
-  }
-  .CodeMirror-scroll {
-    background-color: var(--bs-background-1) !important;
-  }
-  .CodeMirror-gutters {
-    border-right: 1px solid var(--bs-background-1) !important;
-    background-color: var(--bs-background-1) !important;
-  }
+.cm-s-material-darker.CodeMirror,
+.cm-s-material-darker .CodeMirror-gutters {
+  background: var(--bs-background-1) !important;
+}
+
+.CodeMirror-scroll {
+  background-color: var(--bs-background-1) !important;
+}
+
+.CodeMirror-gutters {
+  border-right: 1px solid var(--bs-background-1) !important;
+  background-color: var(--bs-background-1) !important;
+}
+
+.CodeMirror-vscrollbar {
+  right: 0;
+  top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+
+/* Webkit浏览器滚动条样式 */
+.CodeMirror-vscrollbar::-webkit-scrollbar {
+  width: 6px;
+  /* 滚动条宽度 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
+  background-color: #444851;
+  /* 滚动条滑块颜色 */
+  border-radius: 4px;
+  /* 滚动条滑块圆角 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover {
+  background-color: #444851;
+  /* 滚动条滑块悬停时颜色 */
+}
+
+/* Firefox和新版Chrome浏览器滚动条样式 */
+.CodeMirror-vscrollbar {
+  scrollbar-width: thin;
+  /* 滚动条宽度 */
+  scrollbar-color: #444851 #444851;
+  /* 滚动条颜色 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
+  background-color: #444851;
+  /* 滚动条滑块颜色 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover {
+  background-color: #444851;
+  /* 滚动条滑块悬停时颜色 */
+}
 </style>
diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index bb0bd674..b1404e40 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -1432,3 +1432,5 @@ export default {
   width: 100% !important;
 }
 </style>
+
+<style></style>
diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
index a3febe04..7d91f668 100644
--- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
@@ -1166,3 +1166,48 @@ return ElasticsearchDsService.query(host, port, username, password, path, dsl);
   width: 100% !important;
 }
 </style>
+
+<style>
+.CodeMirror-vscrollbar {
+  right: 0;
+  top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+
+/* Webkit浏览器滚动条样式 */
+.CodeMirror-vscrollbar::-webkit-scrollbar {
+  width: 6px;
+  /* 滚动条宽度 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
+  background-color: #444851;
+  /* 滚动条滑块颜色 */
+  border-radius: 4px;
+  /* 滚动条滑块圆角 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover {
+  background-color: #444851;
+  /* 滚动条滑块悬停时颜色 */
+}
+
+/* Firefox和新版Chrome浏览器滚动条样式 */
+.CodeMirror-vscrollbar {
+  scrollbar-width: thin;
+  /* 滚动条宽度 */
+  scrollbar-color: #444851 #444851;
+  /* 滚动条颜色 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
+  background-color: #444851;
+  /* 滚动条滑块颜色 */
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover {
+  background-color: #444851;
+  /* 滚动条滑块悬停时颜色 */
+}
+</style>