From e0aa63d1373fdeb72bd16694f26da0c07147b628 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 18 Oct 2023 16:01:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djs=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0=E5=A4=B1=E6=95=88=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/JsComponents/ParamsSettingDialog.vue                  | 2 +-
 data-room-ui/packages/DataSetManagement/src/JsEditForm.vue    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue b/data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue
index 84284b15..27e23d11 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsComponents/ParamsSettingDialog.vue
@@ -12,7 +12,7 @@
       <div class="bs-table-box">
         <el-table
           ref="singleTable"
-          :data="paramsList"
+          :data="innerParamsList"
           :border="true"
           align="center"
           class="bs-el-table"
diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
index 0b5cfe5a..695ff548 100644
--- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue
@@ -754,7 +754,6 @@ export default {
       }
     },
     addParams (paramList) {
-      this.$refs.paramsSettingDialog.open()
       paramList.forEach(name => {
         this.dataForm.config.paramsList.push({
           name,
@@ -765,6 +764,9 @@ export default {
           remark: ''
         })
       })
+      this.$nextTick(() => {
+        this.$refs.paramsSettingDialog.open()
+      })
     },
     // 执行事件
     // toExecute () {

From f0faf33e14f14bfbdaaff8580845b4a99e00216a Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 18 Oct 2023 16:28:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=B3=A8=E9=87=8A=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/RightSetting/DataSetting.vue         | 9 +++------
 data-room-ui/packages/BigScreenManagement/addDialog.vue  | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index 21eac27a..adc0e9cb 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -93,10 +93,7 @@
                 v-model="config.dataHandler"
                 type="textarea"
                 :rows="5"
-                placeholder="示例:
-data.forEach(item => {
-// 数据处理
-})"
+                placeholder="示例:data.forEach(item => { // 数据处理 })"
               />
             </el-form-item>
           </div>
@@ -546,7 +543,7 @@ data.forEach(item => {
             </el-table>
           </div>
         </div>
-        <div
+        <!-- <div
           v-if="config.option.displayOption.serverPagination.enable"
           class="data-setting-data-box"
           name="分页配置"
@@ -601,7 +598,7 @@ data.forEach(item => {
               </el-select>
             </el-form-item>
           </div>
-        </div>
+        </div> -->
         <ComponentBinding
           v-if="['button'].includes(config.type)"
           :config="config"
diff --git a/data-room-ui/packages/BigScreenManagement/addDialog.vue b/data-room-ui/packages/BigScreenManagement/addDialog.vue
index ffa560d0..5f085166 100644
--- a/data-room-ui/packages/BigScreenManagement/addDialog.vue
+++ b/data-room-ui/packages/BigScreenManagement/addDialog.vue
@@ -222,10 +222,10 @@ export default {
       dataFormRules: {
         name: [
           { required: true, message: '页面名称不能为空', trigger: 'blur' }
-        ],
-        modelCode: [
-          { required: true, message: '数据模型不能为空', trigger: 'change' }
         ]
+        // modelCode: [
+        //   { required: true, message: '数据模型不能为空', trigger: 'change' }
+        // ]
       },
       currentPageType: '基础表格',
       sureLoading: false,

From fd994ac99c95d63b03778eaf31b81b1e1ca88f7b Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 20 Oct 2023 11:43:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataRoom/dataroom-server/src/main/resources/application.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/DataRoom/dataroom-server/src/main/resources/application.yml b/DataRoom/dataroom-server/src/main/resources/application.yml
index 30a49ace..c2e05aa6 100644
--- a/DataRoom/dataroom-server/src/main/resources/application.yml
+++ b/DataRoom/dataroom-server/src/main/resources/application.yml
@@ -24,9 +24,6 @@ spring:
     throw-exception-if-no-handler-found: true
     # 静态资源访问接口前缀
     static-path-pattern: /static/**
-    view:
-      prefix: classpath:/static/
-      suffix: .html
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
   web:
@@ -36,7 +33,7 @@ spring:
 mybatis-plus:
   # mybatis plus xml配置文件扫描，多个通过分号隔开
   mapper-locations: classpath*:mapper/**/*.xml
-  # xml中别名文件扫描，多个通过分号隔开
+  # typeHandler扫描路径，多个通过分号隔开
   type-handlers-package: com.gccloud
   global-config:
     db-config:

From b58d43e5407a6c147f3505279280ee2d49a45ae8 Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Fri, 20 Oct 2023 15:06:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=E6=97=B6=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/js/utils/registerConfig.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/js/utils/registerConfig.js b/data-room-ui/packages/js/utils/registerConfig.js
index 09ad377f..4df144cf 100644
--- a/data-room-ui/packages/js/utils/registerConfig.js
+++ b/data-room-ui/packages/js/utils/registerConfig.js
@@ -51,7 +51,7 @@ function registerRouters (config, router) {
         },
         {
           path: config?.routers?.templateListUrl || '/big-screen-template',
-          name: 'Template',
+          name: 'BigScreenTemplate',
           component: () =>
             require.ensure([], () => require('data-room-ui/BigScreenTempMag')),
           meta: {
@@ -97,13 +97,13 @@ function registerRouters (config, router) {
     },
     {
       path: config?.routers?.designUrl || '/big-screen/design',
-      name: 'Design',
+      name: 'BigScreenDesign',
       component: () =>
         require.ensure([], () => require('data-room-ui/BigScreenDesign'))
     },
     {
       path: config?.routers?.previewUrl || '/big-screen/preview',
-      name: 'Preview',
+      name: 'BigScreenPreview',
       component: () =>
         require.ensure([], () => require('data-room-ui/BigScreenRun'))
     },