dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:刷新时间可以选择单位

Browse Source
This commit is contained in:
wangjiahao 2021-11-03 17:44:20 +08:00
parent f802d8e4f2
commit f31eb4efbc
7 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -175,7 +175,11 @@ export default {
this.timer && clearInterval(this.timer)
let refreshTime = 300000
if (this.canvasStyleData.refreshTime && this.canvasStyleData.refreshTime > 0) {
refreshTime = this.canvasStyleData.refreshTime * 1000
if (this.canvasStyleData.refreshUnit === 'second') {
refreshTime = this.canvasStyleData.refreshTime * 1000
} else {
refreshTime = this.canvasStyleData.refreshTime * 60000
}
}
this.timer = setInterval(() => {
this.searchCount++

2
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -1,6 +1,6 @@
<template>
<div
v-loading="requestStatus==='waiting'"
v-loading="canvasStyleData.refreshViewLoading&&requestStatus==='waiting'"
:class="[
{
['active']: active

3
frontend/src/components/canvas/utils/style.js
View File

@ -63,8 +63,9 @@ export function getComponentRotatedStyle(style) {
export function colorRgb(color, opacity) {
var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
var sColor = color.toLowerCase()
var sColor = color
if (sColor && reg.test(sColor)) {
sColor = sColor.toLowerCase()
if (sColor.length === 4) {
var sColorNew = '#'
for (var i = 1; i < 4; i += 1) {

13
frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
View File

@ -7,8 +7,17 @@
trigger="click"
>
<el-col>
<el-form ref="colorForm" label-width="80px" size="mini">
<el-form-item :label="$t('panel.second')" class="form-item form-item-slider">
<el-form ref="colorForm" label-width="110px" size="mini">
<el-form-item :label="'视图加载提示'" class="form-item form-item-slider">
<el-checkbox v-model="canvasStyleData.refreshViewLoading" @change="onChangePanelStyle" />
</el-form-item>
<el-form-item :label="'刷新时间单位'" class="form-item form-item-slider">
<el-radio-group v-model="canvasStyleData.refreshUnit" @change="onChangePanelStyle">
<el-radio label="second">秒</el-radio>
<el-radio label="minute">分</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="'刷新时间频率'" class="form-item form-item-slider">
<el-slider v-model="canvasStyleData.refreshTime" show-input :show-input-controls="false" input-size="mini" :min="1" :max="3600" @change="onChangePanelStyle" />
</el-form-item>
</el-form>

8
frontend/src/views/panel/edit/index.vue
View File

@ -422,7 +422,9 @@ export default {
this.$store.commit('setComponentData', this.resetID(componentDatas))
// this.$store.commit('setComponentData', this.resetID(JSON.parse(componentDataTemp)))
const temp = JSON.parse(canvasStyleDataTemp)
temp.refreshTime = (temp.refreshTime || 300)
temp.refreshTime = (temp.refreshTime || 5)
temp.refreshViewLoading = (temp.refreshViewLoading || false)
temp.refreshUnit = (temp.refreshUnit || 'minute')
this.$store.commit('setCanvasStyle', temp)
// 清空临时画布数据
@ -443,7 +445,9 @@ export default {
this.$store.commit('setComponentData', this.resetID(componentDatas))
// this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
const panelStyle = JSON.parse(response.data.panelStyle)
panelStyle.refreshTime = (panelStyle.refreshTime || 300)
panelStyle.refreshTime = (panelStyle.refreshTime || 5)
panelStyle.refreshViewLoading = (panelStyle.refreshViewLoading || false)
panelStyle.refreshUnit = (panelStyle.refreshUnit || 'minute')
this.$store.commit('setCanvasStyle', panelStyle)
this.$store.commit('recordSnapshot', 'init')// 记录快照

4
frontend/src/views/panel/list/PanelList.vue
View File

@ -631,7 +631,9 @@ export default {
this.$store.commit('setComponentData', this.resetID(componentDatas))
// this.$store.commit('setComponentData', sourceInfo.type === 'custom' ? sourceInfo : this.resetID(sourceInfo))
const temp = JSON.parse(response.data.panelStyle)
temp.refreshTime = (temp.refreshTime || 300)
temp.refreshTime = (temp.refreshTime || 5)
temp.refreshViewLoading = (temp.refreshViewLoading || false)
temp.refreshUnit = (temp.refreshUnit || 'minute')
this.$store.commit('setCanvasStyle', temp)
this.$store.dispatch('panel/setPanelInfo', data)

4
frontend/src/views/panel/panel.js
View File

@ -20,7 +20,9 @@ export const CANVAS_STYLE = {
auxiliaryMatrix: true,
openCommonStyle: true,
panel: DEFAULT_PANEL_STYLE,
refreshTime: 300 // 仪表板刷新时间 默认300秒
refreshViewLoading: true, // 仪表板视图loading提示
refreshUnit: 'minute', // 仪表板刷新时间带外 默认 分钟
refreshTime: 5 // 仪表板刷新时间 默认5分钟
}
export const DEFAULT_COMMON_CANVAS_STYLE_STRING = {