From 22d496a528d9bf4f4917a3908ed804bb345bd5c5 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Mon, 6 Nov 2023 15:31:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20eslint=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/App.vue | 22 +- core/frontend/src/api/chart/chart.js | 3 - core/frontend/src/api/dataset/dataset.js | 2 +- core/frontend/src/api/link/index.js | 4 +- core/frontend/src/api/panel/panel.js | 2 +- .../components/canvas/components/TextAttr.vue | 18 +- .../components/editor/ComponentWrapper.vue | 18 +- .../canvas/components/editor/DeEditor.vue | 82 +++-- .../canvas/components/editor/FieldsList.vue | 5 +- .../canvas/components/editor/LinkageField.vue | 7 +- .../components/editor/TabCarouselDialog.vue | 4 +- .../canvas/components/editor/ViewTrackBar.vue | 3 +- .../canvas/customComponent/DeFrame.vue | 2 +- .../canvas/customComponent/DeRichTextView.vue | 7 +- .../canvas/customComponent/DeStreamMedia.vue | 2 +- .../canvas/customComponent/DeVideo.vue | 2 +- .../canvas/customComponent/UserViewDialog.vue | 2 +- .../src/components/canvas/store/copy.js | 14 +- .../components/canvas/utils/shortcutKey.js | 21 +- .../components/dataease/DeAsideContainer.vue | 2 +- core/frontend/src/components/deDrag/index.vue | 12 +- .../src/components/elVisualSelect/index.vue | 2 +- core/frontend/src/components/msgCfm/index.js | 23 +- .../components/widget/deWidget/DeButton.vue | 5 +- .../src/components/widget/deWidget/DeDate.vue | 49 ++- .../widget/deWidget/DeResetButton.vue | 5 +- .../components/widget/deWidget/DeSelect.vue | 2 +- .../src/components/widget/deWidget/DeTabs.vue | 22 +- core/frontend/src/layout/index.vue | 2 +- core/frontend/src/mobile/main.js | 1 - core/frontend/src/permission.js | 2 +- core/frontend/src/router/mobile.js | 2 +- core/frontend/src/store/index.js | 36 +-- core/frontend/src/store/modules/user.js | 9 +- .../views/background/BackgroundOverall.vue | 1 + core/frontend/src/views/background/index.vue | 4 +- core/frontend/src/views/chart/chart/chart.js | 4 +- .../src/views/chart/chart/table/table-info.js | 26 +- .../chart/components/ChartComponentS2.vue | 4 +- .../chart/components/compare/CompareEdit.vue | 1 - .../componentStyle/TitleSelector.vue | 14 +- .../componentStyle/dialog/RemarkEditor.vue | 2 +- .../chart/components/senior/Threshold.vue | 53 ++-- .../senior/dialog/TableThresholdEdit.vue | 293 +++++++++--------- .../src/views/chart/view/TitleRemark.vue | 6 +- core/frontend/src/views/dataset/Form.vue | 5 +- .../frontend/src/views/dataset/add/AddApi.vue | 6 +- .../src/views/dataset/add/AddCustom.vue | 2 +- core/frontend/src/views/dataset/add/AddDB.vue | 6 +- .../src/views/dataset/add/AddExcel.vue | 31 +- .../frontend/src/views/dataset/add/AddSQL.vue | 187 +++++------ .../src/views/dataset/add/AddUnion.vue | 18 +- core/frontend/src/views/dataset/add/util.js | 12 +- .../src/views/dataset/data/ViewTable.vue | 24 +- .../src/views/dataset/group/CreatDsGroup.vue | 4 +- .../src/views/dataset/group/Group.vue | 47 ++- .../views/dataset/group/GroupMoveSelector.vue | 2 +- core/frontend/src/views/mobile/index.vue | 50 +-- .../panel/appTemplate/AppTemplateContent.vue | 7 +- .../appTemplate/component/TemplateItem.vue | 6 +- .../appTemplate/component/TemplateList.vue | 2 +- .../component/TemplateMoveList.vue | 10 +- core/frontend/src/views/panel/edit/index.vue | 44 +-- .../src/views/panel/linkJumpSet/index.vue | 2 +- .../src/views/panel/list/PanelList.vue | 15 +- .../src/views/panel/list/PanelMain.vue | 8 +- .../src/views/panel/list/PanelViewShow.vue | 69 +++-- .../src/views/panel/outerParamsSet/index.vue | 6 +- .../panelStyle/BackgroundSelector.vue | 1 - .../panelStyle/MobileBackgroundSelector.vue | 15 +- .../panel/template/component/TemplateList.vue | 2 +- .../system/datasource/ApiHttpRequestForm.vue | 33 +- .../src/views/system/datasource/DsAppForm.vue | 4 +- .../system/datasource/DsConfiguration.vue | 35 ++- .../src/views/system/datasource/DsForm.vue | 4 +- .../views/system/datasource/DsFormContent.vue | 70 ++--- .../src/views/system/datasource/DsTable.vue | 10 +- .../src/views/system/datasource/DsTree.vue | 9 +- .../views/system/datasource/MsgContent.vue | 13 +- .../system/relationship/consanguinity.vue | 92 +++--- .../views/system/sysParam/BasicSetting.vue | 5 +- .../views/system/sysParam/EmailSetting.vue | 15 +- .../views/system/user/PasswordUpdateForm.vue | 23 +- .../src/views/system/user/PersonPwd.vue | 2 +- core/frontend/src/views/wizard/index.vue | 28 +- 85 files changed, 904 insertions(+), 822 deletions(-) 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 @@