center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 前端eslint警告以及报错

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-12-01 18:04:53 +08:00
parent 6f5c34fec1
commit 3b546a6f41
12 changed files with 158 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/api/dataset/dataset.js
View File

@ -150,6 +150,7 @@ export function taskList(spage, size, data) {
return request({
url: '/dataset/group/isKettleRunning',
method: 'post',
// eslint-disable-next-line no-undef
loading: showLoading
})
}

2
frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
View File

@ -70,7 +70,7 @@ export default {
return this.curComponent && this.config === this.curComponent
},
curGap() {
return this.config.auxiliaryMatrix ? this.componentGap : 0
return this.config.auxiliaryMatrix ? this.componentGap : 0
},
...mapState([
'mobileLayoutStatus',

7
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -471,6 +471,7 @@ function removeItem(index) {
this.yourList.splice(index, 1, {})
}
// eslint-disable-next-line no-unused-vars
function initPosition(_this) {
_this.yourList.forEach(item => {
checkItemPosition.call(_this, item, {
@ -501,6 +502,7 @@ function addItem(item, index) {
// makeCoordinate.call(this, item);
}
// eslint-disable-next-line no-unused-vars
function changeToCoord(left, top, width, height) {
return {
x1: left,
@ -517,6 +519,7 @@ function changeToCoord(left, top, width, height) {
*
* @param {any} tCoord 比对对象的坐标
*/
// eslint-disable-next-line no-unused-vars
function findClosetCoords(item, tCoord) {
if (isOverlay) return
let i = coordinates.length
@ -560,6 +563,7 @@ function findClosetCoords(item, tCoord) {
*
* @param {any} item
*/
// eslint-disable-next-line no-unused-vars
function makeCoordinate(item) {
const width = this.cellWidth * (item.sizex) - this.baseMarginLeft
const height = this.cellHeight * (item.sizey) - this.baseMarginTop
@ -750,7 +754,7 @@ function findBelowItems(item) {
return _.sortBy(_.values(belowItems), 'y')
}
// eslint-disable-next-line no-unused-vars
function getoPsitionBox() {
return positionBox
}
@ -1287,6 +1291,7 @@ export default {
this.resizeStart.call(null, e, item, index)
// e.preventDefault();
// eslint-disable-next-line no-unused-vars
const target = $(e.target)
if (!this.infoBox) {

38
frontend/src/components/canvas/components/TextAttr.vue
View File

@ -283,24 +283,7 @@ export default {
]
}
},
watch: {
innerOpacity: {
handler(oldVal, newVal) {
this.styleInfo['opacity'] = this.innerOpacity / 100
}
},
curComponent: {
handler(oldVal, newVal) {
this.$nextTick(() => {
this.init()
})
// console.log('curComponent change')
}
}
},
mounted() {
this.init()
},
computed: {
boardDivColor() {
const style = {
@ -348,6 +331,25 @@ export default {
])
},
watch: {
innerOpacity: {
handler(oldVal, newVal) {
this.styleInfo['opacity'] = this.innerOpacity / 100
}
},
curComponent: {
handler(oldVal, newVal) {
this.$nextTick(() => {
this.init()
})
// console.log('curComponent change')
}
}
},
mounted() {
this.init()
},
methods: {
init() {
if (this.styleInfo['opacity']) {

11
frontend/src/components/canvas/custom-component/DeVideo.vue
View File

@ -1,6 +1,6 @@
<template>
<el-row ref="mainPlayer">
<div v-if="this.element.videoLinks[this.element.videoLinks.videoType].sources[0].src" class="player">
<div v-if="element.videoLinks[element.videoLinks.videoType].sources[0].src" class="player">
<video-player
ref="videoPlayer"
class="vjs-custom-skin"
@ -62,10 +62,7 @@ export default {
pOption: {}
}
},
created() {
this.pOption = this.element.videoLinks[this.element.videoLinks.videoType]
this.pOption.height = this.h - (this.curGap * 2)
},
computed: {
moveFlag() {
return (this.element.optStatus.dragging || this.element.optStatus.resizing)
@ -86,6 +83,10 @@ export default {
'canvasStyleData'
])
},
created() {
this.pOption = this.element.videoLinks[this.element.videoLinks.videoType]
this.pOption.height = this.h - (this.curGap * 2)
},
mounted() {
},
methods: {

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

@ -93,6 +93,7 @@ export default {
required: false,
default: false
},
// eslint-disable-next-line vue/require-default-prop
componentIndex: {
type: Number,
required: false

2
frontend/src/components/widget/DeWidget/DeTreeSelect.vue
View File

@ -1,6 +1,6 @@
<template>
<el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
<el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
<el-option
v-for="item in options.attrs.datas"
:key="item[options.attrs.key]"

2
frontend/src/views/dataset/add/union/UnionItemEdit.vue
View File

@ -165,7 +165,7 @@ span{
.union-header-operator{
display: flex;
align-items: center;
justify-content: end;
justify-content: flex-end;
}
.union-selector{
display: inline-block;

1
frontend/src/views/panel/export/PDFPreExport.vue
View File

@ -27,6 +27,7 @@ import { pdfTemplateReplaceAll } from '@/utils/StringUtils.js'
export default {
name: 'PDFPreExport',
props: {
// eslint-disable-next-line vue/require-default-prop
panelName: {
type: String,
required: false

3
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -75,7 +75,7 @@
<el-row class="panel-design-preview">
<div id="imageWrapper" ref="imageWrapper" style="width: 100%;height: 100%">
<fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen">
<Preview v-if="showMain" :in-screen="!fullscreen" :show-type="'width'" :screen-shot="dataLoading"/>
<Preview v-if="showMain" :in-screen="!fullscreen" :show-type="'width'" :screen-shot="dataLoading" />
</fullscreen>
</div>
</el-row>
@ -134,6 +134,7 @@ export default {
name: 'PanelViewShow',
components: { Preview, SaveToTemplate, PDFPreExport, ShareHead },
props: {
// eslint-disable-next-line vue/require-default-prop
activeTab: {
type: String,
required: false

181
frontend/src/views/system/datasource/form.vue
View File

@ -1,26 +1,36 @@
<template>
<layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')">
<template v-slot:header>
<el-icon name="back" class="back-button" @click.native="backToList"/>
<el-icon name="back" class="back-button" @click.native="backToList" />
{{
params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('datasource.show_info') : formType == 'add' ? $t('datasource.create') : $t('datasource.modify')
}}
</template>
<div>
<el-form ref="dsForm" :model="form" :rules="rule" size="small"
:disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit "
label-width="180px" label-position="right">
<el-form
ref="dsForm"
:model="form"
:rules="rule"
size="small"
:disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit "
label-width="180px"
label-position="right"
>
<el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="form.name" autocomplete="off"/>
<el-input v-model="form.name" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('commons.description')" prop="desc">
<el-input v-model="form.desc" autocomplete="off"/>
<el-input v-model="form.desc" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('datasource.type')" prop="type">
<el-select v-model="form.type" :placeholder="$t('datasource.please_choose_type')" class="select-width"
:disabled="formType=='modify' || (formType==='add' && params && !!params.type)"
@change="changeType()">
<el-select
v-model="form.type"
:placeholder="$t('datasource.please_choose_type')"
class="select-width"
:disabled="formType=='modify' || (formType==='add' && params && !!params.type)"
@change="changeType()"
>
<el-option
v-for="item in allTypes"
:key="item.name"
@ -30,22 +40,37 @@
</el-select>
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.host')"
prop="configuration.host">
<el-input v-model="form.configuration.host" autocomplete="off"/>
<el-form-item
v-if="form.configuration.dataSourceType=='jdbc'"
:label="$t('datasource.host')"
prop="configuration.host"
>
<el-input v-model="form.configuration.host" autocomplete="off" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='es'" :label="$t('datasource.datasource_url')"
prop="configuration.url">
<el-input v-model="form.configuration.url" :placeholder="$t('datasource.please_input_datasource_url')"
autocomplete="off"/>
<el-form-item
v-if="form.configuration.dataSourceType=='es'"
:label="$t('datasource.datasource_url')"
prop="configuration.url"
>
<el-input
v-model="form.configuration.url"
:placeholder="$t('datasource.please_input_datasource_url')"
autocomplete="off"
/>
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.data_base')"
prop="configuration.dataBase">
<el-input v-model="form.configuration.dataBase" autocomplete="off"/>
<el-form-item
v-if="form.configuration.dataSourceType=='jdbc'"
:label="$t('datasource.data_base')"
prop="configuration.dataBase"
>
<el-input v-model="form.configuration.dataBase" autocomplete="off" />
</el-form-item>
<el-form-item v-if="form.type=='oracle'" :label="$t('datasource.oracle_connection_type')"
prop="configuration.connectionType">
<el-form-item
v-if="form.type=='oracle'"
:label="$t('datasource.oracle_connection_type')"
prop="configuration.connectionType"
>
<el-radio v-model="form.configuration.connectionType" label="sid">{{ $t('datasource.oracle_sid') }}</el-radio>
<el-radio v-model="form.configuration.connectionType" label="serviceName">
{{ $t('datasource.oracle_service_name') }}
@ -53,26 +78,31 @@
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.user_name')">
<el-input v-model="form.configuration.username" autocomplete="off"/>
<el-input v-model="form.configuration.username" autocomplete="off" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.password')">
<el-input v-model="form.configuration.password" autocomplete="off" show-password/>
<el-input v-model="form.configuration.password" autocomplete="off" show-password />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='es'" :label="$t('datasource.user_name')">
<el-input v-model="form.configuration.esUsername" autocomplete="off"/>
<el-input v-model="form.configuration.esUsername" autocomplete="off" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='es'" :label="$t('datasource.password')">
<el-input v-model="form.configuration.esPassword" autocomplete="off" show-password/>
<el-input v-model="form.configuration.esPassword" autocomplete="off" show-password />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc' && form.type!=='oracle'"
:label="$t('datasource.extra_params')">
<el-input v-model="form.configuration.extraParams" autocomplete="off"/>
<el-form-item
v-if="form.configuration.dataSourceType=='jdbc' && form.type!=='oracle'"
:label="$t('datasource.extra_params')"
>
<el-input v-model="form.configuration.extraParams" autocomplete="off" />
</el-form-item>
<el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.port')"
prop="configuration.port">
<el-input v-model="form.configuration.port" autocomplete="off" type="number" min="0"/>
<el-form-item
v-if="form.configuration.dataSourceType=='jdbc'"
:label="$t('datasource.port')"
prop="configuration.port"
>
<el-input v-model="form.configuration.port" autocomplete="off" type="number" min="0" />
</el-form-item>
<el-form-item v-if="form.type=='oracle' || form.type=='sqlServer' || form.type=='pg' || form.type=='redshift'">
<el-button icon="el-icon-plus" size="mini" @click="getSchema()">
@ -80,10 +110,16 @@
</el-button>
</el-form-item>
<el-form-item v-if="form.type=='oracle' || form.type=='sqlServer' || form.type=='pg' || form.type=='redshift'"
:label="$t('datasource.schema')">
<el-select filterable v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')"
class="select-width">
<el-form-item
v-if="form.type=='oracle' || form.type=='sqlServer' || form.type=='pg' || form.type=='redshift'"
:label="$t('datasource.schema')"
>
<el-select
v-model="form.configuration.schema"
filterable
:placeholder="$t('datasource.please_choose_schema')"
class="select-width"
>
<el-option
v-for="item in schemas"
:key="item"
@ -95,33 +131,48 @@
<el-collapse v-if="form.configuration.dataSourceType=='jdbc'">
<el-collapse-item :title="$t('datasource.priority')" name="1">
<el-form-item :label="$t('datasource.initial_pool_size')" prop="configuration.initialPoolSize">
<el-input v-model="form.configuration.initialPoolSize" autocomplete="off" type="number" min="0"
size="small"/>
<el-input
v-model="form.configuration.initialPoolSize"
autocomplete="off"
type="number"
min="0"
size="small"
/>
</el-form-item>
<el-form-item :label="$t('datasource.min_pool_size')" prop="configuration.minPoolSize">
<el-input v-model="form.configuration.minPoolSize" autocomplete="off" type="number" min="0"/>
<el-input v-model="form.configuration.minPoolSize" autocomplete="off" type="number" min="0" />
</el-form-item>
<el-form-item :label="$t('datasource.max_pool_size')" prop="configuration.maxPoolSize">
<el-input v-model="form.configuration.maxPoolSize" autocomplete="off" type="number" min="0"/>
<el-input v-model="form.configuration.maxPoolSize" autocomplete="off" type="number" min="0" />
</el-form-item>
</el-collapse-item>
</el-collapse>
</el-form>
<div v-if="canEdit" slot="footer" class="dialog-footer">
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource">{{ $t('commons.validate') }}
<el-button
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource"
>{{ $t('commons.validate') }}
</el-button>
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
@click="save">{{ $t('commons.save') }}
<el-button
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
type="primary"
@click="save"
>{{ $t('commons.save') }}
</el-button>
</div>
<div v-else slot="footer" class="dialog-footer">
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource">{{ $t('commons.validate') }}
<el-button
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
@click="validaDatasource"
>{{ $t('commons.validate') }}
</el-button>
<el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
@click="changeEdit">{{ $t('commons.edit') }}
<el-button
v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
type="primary"
@click="changeEdit"
>{{ $t('commons.edit') }}
</el-button>
</div>
</div>
@ -130,13 +181,13 @@
<script>
import LayoutContent from '@/components/business/LayoutContent'
import {addDs, editDs, getSchema, validateDs, validateDsById} from '@/api/system/datasource'
import {$confirm} from '@/utils/message'
import { addDs, editDs, getSchema, validateDs, validateDsById } from '@/api/system/datasource'
import { $confirm } from '@/utils/message'
import i18n from '@/lang/index'
export default {
name: 'DsForm',
components: {LayoutContent},
components: { LayoutContent },
props: {
params: {
type: Object,
@ -158,10 +209,10 @@ export default {
}
},
rule: {
name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
{min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
desc: [{min: 0, max: 50, message: i18n.t('datasource.input_limit_0_50'), trigger: 'blur'}],
type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change'}],
name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
{ min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
desc: [{ min: 0, max: 50, message: i18n.t('datasource.input_limit_0_50'), trigger: 'blur' }],
type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change' }],
'configuration.dataBase': [{
required: true,
message: i18n.t('datasource.please_input_data_base'),
@ -182,9 +233,9 @@ export default {
message: i18n.t('datasource.please_input_password'),
trigger: 'change'
}],
'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'change'}],
'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}],
'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'change'}],
'configuration.host': [{ required: true, message: i18n.t('datasource.please_input_host'), trigger: 'change' }],
'configuration.url': [{ required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change' }],
'configuration.port': [{ required: true, message: i18n.t('datasource.please_input_port'), trigger: 'change' }],
'configuration.initialPoolSize': [{
required: true,
message: i18n.t('datasource.please_input_initial_pool_size'),
@ -223,11 +274,11 @@ export default {
type: 'jdbc',
extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'
},
{name: 'hive', label: 'Apache Hive', type: 'jdbc', extraParams: ''},
{name: 'oracle', label: 'Oracle', type: 'jdbc'},
{name: 'sqlServer', label: 'SQL Server', type: 'jdbc', extraParams: ''},
{name: 'pg', label: 'PostgreSQL', type: 'jdbc', extraParams: ''},
{name: 'es', label: 'Elasticsearch', type: 'es'},
{ name: 'hive', label: 'Apache Hive', type: 'jdbc', extraParams: '' },
{ name: 'oracle', label: 'Oracle', type: 'jdbc' },
{ name: 'sqlServer', label: 'SQL Server', type: 'jdbc', extraParams: '' },
{ name: 'pg', label: 'PostgreSQL', type: 'jdbc', extraParams: '' },
{ name: 'es', label: 'Elasticsearch', type: 'es' },
{
name: 'mariadb',
label: 'MariaDB',
@ -240,9 +291,9 @@ export default {
type: 'jdbc',
extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'
},
{name: 'ck', label: 'ClickHouse', type: 'jdbc', extraParams: ''},
{name: 'redshift', label: 'AWS Redshift', type: 'jdbc'},
{name: 'mongo', label: 'MongoDB', type: 'jdbc', extraParams: ''}
{ name: 'ck', label: 'ClickHouse', type: 'jdbc', extraParams: '' },
{ name: 'redshift', label: 'AWS Redshift', type: 'jdbc' },
{ name: 'mongo', label: 'MongoDB', type: 'jdbc', extraParams: '' }
],
schemas: [],
canEdit: false,

4
frontend/src/views/system/task/DatasetTaskList.vue
View File

@ -60,7 +60,7 @@
<span v-if="scope.row.status === 'Underway'" style="color: green">
<el-link type="success" style="font-size: 12px" @click="changeTaskStatus(scope.row)">{{ $t('dataset.task.underway') }}</el-link>
</span>
<span v-if="scope.row.status === 'Stopped'" >
<span v-if="scope.row.status === 'Stopped'">
<div style="font-size: 12px">{{ $t('dataset.task.stopped') }}</div>
</span>
<span v-if="scope.row.status === 'Pending'" class="blue-color">
@ -168,7 +168,7 @@
<!--添加任务-选择数据集-->
<el-dialog v-dialogDrag :title="$t('dataset.task.create')" :visible="selectDatasetFlag" :show-close="false" width="70%" class="dialog-css" :destroy-on-close="true">
<table-selector privileges="manage" :mode="1" :clearEmptyDir="true" :custom-type="customType" show-mode="datasetTask" @getTable="getTable" />
<table-selector privileges="manage" :mode="1" :clear-empty-dir="true" :custom-type="customType" show-mode="datasetTask" @getTable="getTable" />
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="closeCreateTask">{{ $t('chart.cancel') }}</el-button>
<el-button type="primary" size="small" :disabled="!table.id" @click="create(undefined)">{{ $t('chart.confirm') }}</el-button>