소스 검색

fix: 定时器相关代码还原

wu.jian2 2 년 전
부모
커밋
db1e34cb78

+ 3 - 1
data-room-ui/packages/BigScreenRun/index.vue

@@ -154,7 +154,9 @@ export default {
     this.windowSize()
   },
   mounted () {
-    this.startTimer()
+    if (this.pageInfo.pageConfig.refreshConfig && this.pageInfo.pageConfig.refreshConfig.length > 0) {
+      this.startTimer()
+    }
   },
   beforeDestroy () {
     this.stopTimer()

+ 0 - 1
data-room-ui/packages/ComponentList/index.vue

@@ -226,7 +226,6 @@ export default {
       }
     },
     code () {
-      // return this.catalogInfo?.page?.code
       return ''
     },
     gridComputed () {

+ 0 - 1
data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue

@@ -138,7 +138,6 @@ export default {
   methods: {
     // 选择新增类型
     openAddForm (type, componentName) {
-      console.log()
       this.dialogVisible = false
       this.$emit('openAddForm', type, componentName)
     }

+ 0 - 1
data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue

@@ -945,7 +945,6 @@ export default {
         this.currentCount = data.data.currentCount
         this.tableLoading = false
       }).catch((e) => {
-        console.log(e)
         this.dataPreviewList = []
         this.structurePreviewList = []
         this.structurePreviewListCopy = []

+ 0 - 2
data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue

@@ -772,7 +772,6 @@ export default {
             }
           })
         }
-        console.log(this.structurePreviewList)
         if (this.structurePreviewList.length && this.dataForm.fieldDesc) {
           this.buildFieldDesc()
         }
@@ -780,7 +779,6 @@ export default {
         this.saveLoading = false
         this.passTest = true
       }).catch((e) => {
-        console.log(e)
         this.passTest = false
         this.saveLoading = false
       })

+ 0 - 1
data-room-ui/packages/assets/images/alignIcon/export.js

@@ -3,7 +3,6 @@ const svgFiles = require.context('./svg', true, /\.svg$/)
 const iconList = svgFiles.keys()?.map(item => svgFiles(item))
 export default {
   getNameList () {
-    console.log(iconList)
     return iconList?.map(item => {
       return item?.default?.id?.split('-')[1]
     }) || []

+ 0 - 1
data-room-ui/packages/js/mixins/linkageMixins.js

@@ -45,7 +45,6 @@ export default {
       this.dataLoading = true
       return getUpdateChartInfo(params)
         .then(res => {
-          console.log(2, res)
           config = this.buildOption(config, res)
           this.changeChartConfig(config)
           this.changeChartKey(config.code)

+ 0 - 1
data-room-ui/packages/js/mixins/multipleSelectMixin.js

@@ -125,7 +125,6 @@ export default {
       }
 
       if ((event.ctrlKey || event.metaKey) && event.keyCode === 86) {
-        console.log('粘贴')
         // 粘贴
         this.pasteCharts()
       }

+ 1 - 0
data-room-ui/packages/js/store/actions.js

@@ -64,6 +64,7 @@ export function handleResData (data) {
   }
   // 如果pageConfig中的cacheDataSets为null,赋值[]
   pageInfo.pageConfig.cacheDataSets = pageInfo.pageConfig.cacheDataSets || []
+  pageInfo.pageConfig.refreshConfig = pageInfo.pageConfig.refreshConfig || []
   pageInfo.chartList.forEach((chart) => {
     if (!['customComponent', 'remoteComponent'].includes(chart.type)) {
       chart.option = _.cloneDeep(setModules[chart.type])

+ 1 - 0
data-room-ui/packages/js/store/state.js

@@ -26,6 +26,7 @@ export const defaultData = {
       themeJson: {}, // 自定义主题配置
       // 缓存的数据集 { name: '', dataSetId: '' }
       cacheDataSets: [],
+      refreshConfig: [],
       // 自适应模式  无(none) 、自动(auto)、宽度铺满(fitWidth)、高度铺满(fitHeight)和 双向铺满(cover) 5 种自适应模式
       fitMode: 'none'
     },