diff --git a/core/frontend/src/App.vue b/core/frontend/src/App.vue index 1ec6edbbca..380888af6b 100644 --- a/core/frontend/src/App.vue +++ b/core/frontend/src/App.vue @@ -13,7 +13,7 @@ :title="$t('user.change_password')" :show-close="false" > - + @@ -26,21 +26,15 @@ import PasswordUpdateForm from '@/views/system/user/PasswordUpdateForm.vue' export default { name: 'App', components: { PluginCom, PasswordUpdateForm }, - computed: { - ...mapState('user', [ - 'passwordModified', - ]) - }, data() { return { showPasswordModifiedDialog: false } }, - mounted() { - const passwordModified = JSON.parse(localStorage.getItem('passwordModified')) - if (typeof passwordModified === 'boolean') { - this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified) - } + computed: { + ...mapState('user', [ + 'passwordModified' + ]) }, watch: { passwordModified: { @@ -49,6 +43,12 @@ export default { }, immediate: true } + }, + mounted() { + const passwordModified = JSON.parse(localStorage.getItem('passwordModified')) + if (typeof passwordModified === 'boolean') { + this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified) + } } } diff --git a/core/frontend/src/api/chart/chart.js b/core/frontend/src/api/chart/chart.js index be854d84bd..f812769b75 100644 --- a/core/frontend/src/api/chart/chart.js +++ b/core/frontend/src/api/chart/chart.js @@ -153,7 +153,6 @@ export const viewOptions = panelId => { }) } - export function getDatasourceRelationship(id) { return request({ url: `/api/relation/datasource/${id}`, @@ -162,7 +161,6 @@ export function getDatasourceRelationship(id) { }) } - export function getDatasetRelationship(id) { return request({ url: `/api/relation/dataset/${id}`, @@ -171,7 +169,6 @@ export function getDatasetRelationship(id) { }) } - export function getPanelRelationship(id) { return request({ url: `/api/relation/panel/${id}`, diff --git a/core/frontend/src/api/dataset/dataset.js b/core/frontend/src/api/dataset/dataset.js index 95ba9f0192..11a2d5de32 100644 --- a/core/frontend/src/api/dataset/dataset.js +++ b/core/frontend/src/api/dataset/dataset.js @@ -138,7 +138,7 @@ export function fieldList(id, showLoading = true) { } export function fieldListWithPermission(id, showLoading = true) { - //初始模板中的过滤组件无需走后台 + // 初始模板中的过滤组件无需走后台 if (id.indexOf('no_auth') > -1) { return new Promise(function(resolve) { resolve({ diff --git a/core/frontend/src/api/link/index.js b/core/frontend/src/api/link/index.js index 52d1481148..47c25f3672 100644 --- a/core/frontend/src/api/link/index.js +++ b/core/frontend/src/api/link/index.js @@ -66,9 +66,9 @@ export function loadGenerate(resourceId) { }) } -export function loadResource(resourceId,userId) { +export function loadResource(resourceId, userId) { return request({ - url: 'api/link/resourceDetail/' + resourceId+'/'+ userId, + url: 'api/link/resourceDetail/' + resourceId + '/' + userId, method: 'get' }) } diff --git a/core/frontend/src/api/panel/panel.js b/core/frontend/src/api/panel/panel.js index c0eddc88dd..86b9057988 100644 --- a/core/frontend/src/api/panel/panel.js +++ b/core/frontend/src/api/panel/panel.js @@ -192,7 +192,7 @@ export function initPanelData(panelId, useCache = false, callback) { watermarkOpen: response.data.watermarkOpen, watermarkInfo: watermarkInfo }) - const targetPanelId = response.data.panelType==='system'?response.data.source:panelId + const targetPanelId = response.data.panelType === 'system' ? response.data.source : panelId // 刷新联动信息 getPanelAllLinkageInfo(targetPanelId).then(rsp => { store.commit('setNowPanelTrackInfo', rsp.data) diff --git a/core/frontend/src/components/canvas/components/TextAttr.vue b/core/frontend/src/components/canvas/components/TextAttr.vue index d0fca3718b..10580991ca 100644 --- a/core/frontend/src/components/canvas/components/TextAttr.vue +++ b/core/frontend/src/components/canvas/components/TextAttr.vue @@ -24,7 +24,7 @@ > - + @@ -47,7 +47,7 @@ :value="item.value" > - + {{ item.label }} @@ -257,7 +257,7 @@ @click="goColor" /> -
+
-
+
-
+
- +
@@ -327,7 +327,7 @@ style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" > - +
@@ -336,7 +336,7 @@ style="width: 20px;float: left;margin-top: 2px;margin-left: 2px;" > - +
- +
diff --git a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue index ebcfcf0084..828ee49abe 100644 --- a/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue +++ b/core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue @@ -77,19 +77,19 @@