修改报表配置

src/App.vue

@@ -46,7 +46,7 @@ const openAiAssistantMenu = () => {
   height: 24px;
 }
 
-/deep/.el-message {
+.el-message {
   z-index:8006 !important;
 }
 </style>

src/permission.ts

@@ -15,6 +15,8 @@ const whiteList = ['/print', '/externalPrint', '/boardGenerate', '/boardView', '
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
   if (getToken()) {
+    console.log(to);
+    console.log(next);
     to.meta.title && useSettingsStore().setTitle(to.meta.title);
     /* has token*/
     if (to.path === '/login') {

src/views/boardGenerate/components/scrollText.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="marquee-container">
+    <div class="marquee-text">
+      这是一段自动滚动的超长文字效果，文字会从右往左不停滚动~
+    </div>
+  </div>
+</template>
+<script setup>
+
+const props = defineProps({
+  text: {
+    type: String,
+    required: false,
+    default: ''
+  }
+});
+</script>
+<style scoped>
+.marquee-container {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.marquee-text {
+  /*display: inline-block;
+  padding-left: 0%;
+  animation: marqueeYoyo 5s linear infinite alternate;*/
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+@keyframes marqueeYoyo {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(-100%);
+  }
+}
+</style>

src/views/boardGenerate/dataSourceList.vue

@@ -430,7 +430,6 @@ const delData = () => {
   constructionDataFormVisible.value = true;
 };
 const editDataSource = (e) => {
-  console.log(e);
   if (e.responseType === '1' || !e.responseType) {
     constructionDataFormVisible.value = true;
     constructionDataForm.value = e;
@@ -573,7 +572,12 @@ const findTier = () => {
 const sqlFindTier = () => {
   addSQLForm.value.designDataFieldList = [];
   if (addSQLForm.value.isPage) {
-    querySql1({ sql: addSQLForm.value.SQL, linkId: addSQLForm.value.db, pageSize: 10, pageNum: 1 }).then((res) => {
+    querySql1({
+      sql: addSQLForm.value.SQL.replace(/\n/g, ' '),
+      linkId: addSQLForm.value.db,
+      pageSize: 10,
+      pageNum: 1
+    }).then((res) => {
       let data = res.data || {};
       Object.keys(data.rows?.[0]).forEach(key => {
         addSQLForm.value.designDataFieldList.push({

src/views/boardGenerate/index.vue

@@ -1278,6 +1278,7 @@ const pitchOnNode = (e) => {
   nodeDataForm.value = e;
   customDataForm.value = e.data.customData;
 };
+let a = { "x1": ["2025-09-22", "2025-09-23", "2025-09-24"], "y1": ["40", "59", "50"], "y2": ["3", "6", "1"] };
 </script>
 <style lang="less" scoped>
 :deep( .swiper-slide-active) {

src/views/boardGenerate/nodes/data/customDataNode.vue

@@ -130,6 +130,7 @@ const getOutputData = () => {
   });
   }
   if (props.data.customData.type === '2') {
+    console.log('props.data.customData.type', props.data.customData.isPage);
     if (props.data.customData.isPage) {
 
       querySql1({

src/views/boardGenerate/nodes/form/tableNode.vue

@@ -20,7 +20,7 @@
                          :label="i.name"
                          :width="i.width">
           <template #default="scope">
-            <div>
+            <div style="height: 100%">
               <span
                 v-if="(scope.row[`cellType${k+1}`] || i.type) === '文本'">{{ setText(scope.row[i.field], scope.row, (scope.row[`cellFormula${k + 1}`] || i.formula))
                 }}</span>
@@ -35,8 +35,8 @@
               <el-progress v-else-if="(scope.row[`cellType${k+1}`] || i.type) === '进度条'" :text-inside="true"
                            :stroke-width="26"
                            :percentage="parseFloat(setText(scope.row[i.field],scope.row, (scope.row[`cellFormula${k+1}`] || i.formula)))" />
-              <span v-else>{{ setText(scope.row[i.field], scope.row, (scope.row[`cellFormula${k + 1}`] || i.formula))
-                }}</span>
+              <ScrollText v-else
+                          :text="setText(scope.row[i.field], scope.row, (scope.row[`cellFormula${k + 1}`] || i.formula))" />
             </div>
           </template>
         </el-table-column>
@@ -49,6 +49,7 @@
 import { defineEmits, defineProps, ref } from 'vue';
 import { NodeResizer } from '@vue-flow/node-resizer';
 import { Handle, Position } from '@vue-flow/core';
+import ScrollText from '../../components/scrollText.vue';
 import { vue3ScrollSeamless } from 'vue3-scroll-seamless';
 
 const a = {

src/views/boardGenerate/nodes/form/textNode.vue

@@ -5,9 +5,9 @@
                  @resize="resize" />
 
     <div class="custom-node"
-         :style="{textAlign:props.data.options.align,width:props.dimensions.width+'px',lineHeight:props.dimensions.height+'px',height:props.dimensions.height+'px',pointerEvents:props.isView?'auto': 'none'}">
+         :style="{textAlign:props.data.options.align,width:props.dimensions.width*props.ratioWidth+'px',lineHeight:props.dimensions.height*props.ratioHeight+'px',height:props.dimensions.height*props.ratioHeight+'px',pointerEvents:props.isView?'auto': 'none'}">
       <span
-        :style="{color:props.data.options.color,fontSize:props.dimensions.height+'px'}">{{ props.inputData?.text || props.data.options.text
+        :style="{color:props.data.options.color,fontSize:props.dimensions.height*props.ratioHeight+'px'}">{{ props.inputData?.text || props.data.options.text
         }}</span>
     </div>
     <Handle v-if="!props.isView" :id="`${props.id}.-t`" type="target" :position="Position.Left" />