Merge remote-tracking branch 'origin/master' into pr

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:

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"

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,

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"

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

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'))
     },