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

fix(规范代码): 根据typos工具规范部分前端代码

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-10-21 13:06:45 +08:00
parent 8ba5fcc849
commit 9db2228f8c
82 changed files with 413 additions and 680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
frontend/src/components/DeViewSelect/index.bak.vue
View File

@ -1,260 +0,0 @@
<template>
<div
class="el-view-select"
:class="selectClass"
>
<el-select
ref="select"
v-model="innerValues"
v-popover:popover
popper-class="view-select-option"
style="width: 100%;"
multiple
clearable
@remove-tag="_selectRemoveTag"
@clear="_selectClearFun"
@focus="_popoverShowFun"
>
<el-option
v-for="item in selectOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-popover
ref="popover"
v-model="visible"
:placement="placement"
:transition="transition"
:popper-class="popperClass"
:width="width"
trigger="click"
>
<el-scrollbar
v-if="viewLoaded"
tag="div"
wrap-class="el-select-dropdown__wrap"
view-class="el-select-dropdown__list"
class="is-empty"
>
<div :style="{'height': panelHeight + 'px'}">
<Preview
:component-data="componentData"
:canvas-style-data="canvasStyleData"
:panel-info="panelInfo"
:show-position="showPosition"
/>
</div>
</el-scrollbar>
<el-empty
v-else
style="height: 150px;"
:image-size="120"
description=""
/>
</el-popover>
</div>
</template>
<script>
import { on, off } from './dom'
import Preview from '@/components/canvas/components/Editor/Preview'
import { findOne } from '@/api/panel/panel'
import { viewOptions } from '@/api/chart/chart'
import { panelDataPrepare } from '@/components/canvas/utils/utils'
export default {
name: 'DeViewSelect',
components: { Preview },
props: {
value: {
type: Array,
default: () => []
},
panelId: {
type: String,
default: null
}
},
data() {
return {
visible: false,
placement: 'bottom',
transition: 'el-zoom-in-top',
width: 500,
selectClass: 'my-top-class',
innerValues: [],
panelHeight: 450,
showPosition: 'email-task',
viewLoaded: false,
selectOptions: []
}
},
computed: {
popperClass() {
const _c = 'el-view-select-popper ' + this.popoverClass
return this.disabled ? _c + ' disabled ' : _c
},
selectedViews() {
return this.$store.getters.panelViews[this.panelId]
}
},
watch: {
value(val, old) {
this.innerValues = val
},
innerValues(val, old) {
if (val !== old) {
this.$emit('input', val)
}
},
panelId(val, old) {
if (val !== old) {
this.innerValues = []
this.loadView()
}
},
selectedViews: {
handler(val) {
if (!val || !JSON.stringify(val)) {
this.innerValues = []
return
}
const viewIds = JSON.parse(JSON.stringify(val))
this.innerValues = JSON.parse(JSON.stringify(viewIds))
},
deep: true
}
},
mounted() {
this._updateH()
this.$nextTick(() => {
on(document, 'mouseup', this._popoverHideFun)
})
},
beforeDestroy() {
this._selectClearFun()
off(document, 'mouseup', this._popoverHideFun)
},
created() {
this.loadView()
},
methods: {
loadView() {
this._selectClearFun()
this.innerValues = this.value
this.viewLoaded = false
this.panelId && findOne(this.panelId).then(response => {
this.panelInfo = {
id: response.data.id,
name: response.data.name,
privileges: response.data.privileges,
sourcePanelName: response.data.sourcePanelName,
status: response.data.status
}
this.$store.dispatch('panel/setPanelInfo', this.panelInfo)
panelDataPrepare(JSON.parse(response.data.panelData), JSON.parse(response.data.panelStyle), rsp => {
this.viewLoaded = true
this.componentData = rsp.componentData
this.canvasStyleData = rsp.componentStyle
this.loadOptions()
})
})
},
loadOptions() {
this.panelId && viewOptions(this.panelId).then(res => {
this.selectOptions = res.data
this.init()
})
},
_updateH() {
this.$nextTick(() => {
this.width = this.$refs.select.$el.getBoundingClientRect().width
this.panelHeight = this.width * 9 / 16
})
},
_popoverShowFun(val) {
this._updateH()
this.$emit('onFoucs')
},
_popoverHideFun(e) {
const path = this._getEventPath(e)
const isInside = path.some(list => {
return list.className && typeof list.className === 'string' && list.className.indexOf('el-view-select') !== -1
})
if (!isInside) {
this.visible = false
}
},
_getEventPath(evt) {
const path = (evt.composedPath && evt.composedPath()) || evt.path
const target = evt.target
if (path != null) {
return path.indexOf(window) < 0 ? path.concat(window) : path
}
if (target === window) {
return [window]
}
function getParents(node, memo) {
memo = memo || []
const parentNode = node.parentNode
if (!parentNode) {
return memo
} else {
return getParents(parentNode, memo.concat(parentNode))
}
}
return [target].concat(getParents(target), window)
},
_selectRemoveTag(viewId) {
this.selectedViews.forEach(item => {
if (item.viewId === viewId) {
this.$store.dispatch('task/delView', { 'panelId': this.panelId, 'viewId': item.viewId })
}
})
},
_selectClearFun() {
this.$store.dispatch('task/delPanelViews', this.panelId)
},
init() {
if (this.value && this.value.length) {
const viewIds = JSON.parse(JSON.stringify(this.value))
this.$store.dispatch('task/initPanelView', { 'panelId': this.panelId, 'viewIds': viewIds })
}
}
}
}
</script>
<style lang="scss" scoped>
.el-view-select .view-select-option {
display: none !important;
}
.el-view-select-popper {
max-height: 800px;
overflow: auto;
}
.el-view-select-popper.disabled {
display: none !important;
}
.el-view-select-popper .el-button--small {
width: 25px !important;
min-width: 25px !important;
}
.el-view-select-popper[x-placement^='bottom'] {
margin-top: 5px;
}
.my-top-class {
width: 100%;
}
</style>

2
frontend/src/components/DeViewSelect/index.vue
View File

@ -171,7 +171,7 @@ export default {
_popoverShowFun(val) {
this.openDialog()
this._updateH()
this.$emit('onFoucs')
this.$emit('onFocus')
},
_selectRemoveTag(viewId) {

2
frontend/src/components/ElTreeSelect/index.vue
View File

@ -535,7 +535,7 @@ export default {
},
_popoverShowFun(val) {
this._updateH()
this.$emit('onFoucs')
this.$emit('onFocus')
},
_popoverHideFun(e) {
const path = this._getEventPath(e)

16
frontend/src/components/ElVisualSelect/index.vue
View File

@ -74,7 +74,7 @@ export default {
selectValue: this.value,
options: [],
domList: null,
slectBoxDom: null,
selectBoxDom: null,
scrollbar: null,
startIndex: 0,
endIndex: 0,
@ -154,9 +154,9 @@ export default {
reCacularHeight() {
this.maxHeightDom.style.height = this.newList.length * this.itemHeight + 'px'
},
resetList(arrys) {
if (Array.isArray(arrys)) {
this.newList = arrys.slice()
resetList(arrays) {
if (Array.isArray(arrays)) {
this.newList = arrays.slice()
this.domList.style.paddingTop = 0 + 'px'
this.scrollbar.scrollTop = 0
this.callback()
@ -183,13 +183,13 @@ export default {
`.${this.classId} .el-select-dropdown .el-select-dropdown__wrap`
)
this.scrollbar = document.querySelector(`.${this.classId} .el-select-dropdown .el-scrollbar`)
this.slectBoxDom = document.querySelector(`.${this.classId} .el-select-dropdown__wrap`)
this.slectBoxDom.style.display = 'flex'
this.slectBoxDom.style.flexDirection = 'row'
this.selectBoxDom = document.querySelector(`.${this.classId} .el-select-dropdown__wrap`)
this.selectBoxDom.style.display = 'flex'
this.selectBoxDom.style.flexDirection = 'row'
this.domList = selectDom.querySelector(
`.${this.classId} .el-select-dropdown__wrap .el-select-dropdown__list`
)
this.addScrollDiv(this.slectBoxDom)
this.addScrollDiv(this.selectBoxDom)
this.scrollFn()
this.customInputStyle()

12
frontend/src/components/GradientColorSelector/index.vue
View File

@ -58,7 +58,7 @@
@click="handler"
>
<div
v-for="option in pane.datas"
v-for="option in pane.data"
:key="option.value"
class="el-select-dropdown__item color-div-base"
:class="option.value === colorDto.value ? 'selected hover editor' : ''"
@ -163,12 +163,12 @@ export default {
{
label: '纯色',
name: 'simple',
datas: JSON.parse(JSON.stringify(colorCases))
data: JSON.parse(JSON.stringify(colorCases))
},
{
label: '渐变',
name: 'gradient',
datas: JSON.parse(JSON.stringify(gradientColorCases))
data: JSON.parse(JSON.stringify(gradientColorCases))
}
],
testColor: '#5470c6'
@ -213,7 +213,7 @@ export default {
}
this.activeName = this.colorCases.some(item => item.value === this.colorDto.value) ? 'simple' : 'gradient'
if (haspPropValue) {
this.tabPanes[this.activeName === 'simple' ? 0 : 1].datas.forEach(item => {
this.tabPanes[this.activeName === 'simple' ? 0 : 1].data.forEach(item => {
if (item.value === this.colorDto.value) {
item.colors = JSON.parse(JSON.stringify(this.colorDto.colors))
}
@ -261,7 +261,7 @@ export default {
},
_popoverShowFun(val) {
this._updateH()
this.$emit('onFoucs')
this.$emit('onFocus')
},
fillGradientColor() {
this.gradientColorCases.forEach(item => {
@ -270,7 +270,7 @@ export default {
return str
})
})
this.tabPanes[1].datas = JSON.parse(JSON.stringify(this.gradientColorCases))
this.tabPanes[1].data = JSON.parse(JSON.stringify(this.gradientColorCases))
},
formatBgColor(color, useValue) {
let activeName = this.activeName

4
frontend/src/components/canvas/components/Editor/MarkLine.vue
View File

@ -166,7 +166,7 @@ export default {
// 同一方向上同时显示三条线可能不太美观，因此才有了这个解决方案
// 同一方向上的线只显示一条，例如多条横条只显示一条横线
if (needToShow.length) {
this.chooseTheTureLine(needToShow, isDownward, isRightward)
this.chooseTheTrueLine(needToShow, isDownward, isRightward)
}
})
},
@ -180,7 +180,7 @@ export default {
return Math.round(condition.dragShift - (width - curComponentStyle.width) / 2)
},
chooseTheTureLine(needToShow, isDownward, isRightward) {
chooseTheTrueLine(needToShow, isDownward, isRightward) {
// 如果鼠标向右移动 则按从右到左的顺序显示竖线 否则按相反顺序显示
// 如果鼠标向下移动 则按从下到上的顺序显示横线 否则按相反顺序显示
if (isRightward) {

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

@ -333,11 +333,11 @@
</div>
<div
v-if="attrShow('titlePostion')"
v-if="attrShow('titlePosition')"
style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;"
>
<el-tooltip :content="$t('panel.title_position')">
<title-postion
<title-position
:element-type="elementType"
:show-vertical="showVertical"
:style-info="styleInfo"
@ -506,7 +506,7 @@ export default {
'fontWeight',
'letterSpacing',
'color',
'titlePostion'
'titlePosition'
],
// tab组件显示的属性
'de-tabs': [

2
frontend/src/components/canvas/components/Toolbar.vue
View File

@ -176,7 +176,7 @@
<el-row style="height: 20px">
<el-col :span="4">
<svg-icon
icon-class="warn-tre"
icon-class="warn-tree"
style="width: 20px;height: 20px;float: right"
/>
</el-col>

10
frontend/src/components/cron/cron/secondAndMinute.vue
View File

@ -7,7 +7,7 @@
label="1"
size="mini"
border
>{{ $t('cron.every') }}{{ lable }}</el-radio>
>{{ $t('cron.every') }}{{ label }}</el-radio>
</div>
<div>
<el-radio
@ -34,7 +34,7 @@
style="width: 100px;"
@change="type = '2'"
/>
{{ lable }}
{{ label }}
</div>
<div>
<el-radio
@ -52,7 +52,7 @@
style="width: 100px;"
@change="type = '3'"
/>
<span style="margin-left: 5px; margin-right: 5px;">{{ lable }}{{ $t('cron.every_begin') }}</span>
<span style="margin-left: 5px; margin-right: 5px;">{{ label }}{{ $t('cron.every_begin') }}</span>
<el-input-number
v-model="loop.end"
:min="1"
@ -61,7 +61,7 @@
style="width: 100px;"
@change="type = '3'"
/>
{{ lable }}{{ $t('cron.every_exec') }}
{{ label }}{{ $t('cron.every_exec') }}
</div>
<div>
<el-radio
@ -95,7 +95,7 @@ export default {
type: String,
default: '*'
},
lable: {
label: {
type: String
}
},

8
frontend/src/components/dataease/DeOutWidget.vue
View File

@ -30,9 +30,9 @@
<div class="condition-content-container">
<div class="first-element">
<div
:class="element.component === 'de-select-grid' ? 'first-element-grid-contaner': ''"
:class="element.component === 'de-select-grid' ? 'first-element-grid-container': ''"
:style="deSelectGridBg"
class="first-element-contaner"
class="first-element-container"
>
<component
@ -241,7 +241,7 @@ export default {
padding: 0px;
height: 100%;
}
.first-element-contaner {
.first-element-container {
width: calc(100% - 10px);
background: initial;
margin: 0 4px;
@ -251,7 +251,7 @@ export default {
display: flex;
align-items: flex-end;
}
.first-element-grid-contaner {
.first-element-grid-container {
background: #fff;
border: 1px solid #d7dae2;
top: 5px;

14
frontend/src/components/gridTable/index.vue
View File

@ -16,7 +16,7 @@
<div class="pagination-cont">
<el-pagination
background
v-bind="paginationDefalut"
v-bind="paginationDefault"
v-on="paginationEvent"
/>
</div>
@ -56,7 +56,7 @@ export default {
data() {
return {
paginationEvent: {},
paginationDefalut: {
paginationDefault: {
currentPage: 1,
pageSizes: [10, 20, 50, 100],
pageSize: 10,
@ -75,8 +75,8 @@ export default {
watch: {
pagination: {
handler() {
this.paginationDefalut = {
...this.paginationDefalut,
this.paginationDefault = {
...this.paginationDefault,
...this.pagination
}
},
@ -122,15 +122,15 @@ export default {
(ele) => ele[this.selectedFlags]
)
// 当前页的选中项索引
const notCurrenArr = []
const notCurrentArr = []
this.tableData.forEach((ele) => {
const resultIndex = flags.indexOf(ele[this.selectedFlags])
if (resultIndex !== -1) {
this.$refs.table.toggleRowSelection(ele, true)
notCurrenArr.push(resultIndex)
notCurrentArr.push(resultIndex)
}
})
notCurrenArr.sort().reduceRight((pre, next) => {
notCurrentArr.sort().reduceRight((pre, next) => {
this.multipleSelectionCach.splice(next, 1)
}, 0)
},

6
frontend/src/components/widget/DeWidget/DeNumberRange.vue
View File

@ -116,7 +116,7 @@ export default {
},
form: {
handler(value) {
this.destryTimeMachine()
this.destroyTimeMachine()
this.changeIndex++
this.searchWithKey(this.changeIndex)
},
@ -161,10 +161,10 @@ export default {
if (index === this.changeIndex) {
this.search()
}
this.destryTimeMachine()
this.destroyTimeMachine()
}, 1000)
},
destryTimeMachine() {
destroyTimeMachine() {
this.timeMachine && clearTimeout(this.timeMachine)
this.timeMachine = null
},

26
frontend/src/components/widget/DeWidget/DeSelect.vue
View File

@ -15,7 +15,7 @@
:filter-method="filterMethod"
:key-word="keyWord"
popper-class="coustom-de-select"
:list="datas"
:list="data"
:custom-style="customStyle"
@change="changeValue"
@focus="setOptionWidth"
@ -24,7 +24,7 @@
@handleShowNumber="handleShowNumber"
>
<el-option
v-for="item in templateDatas || datas"
v-for="item in templateData || data"
:key="item[element.options.attrs.key]"
:style="{width:selectOptionWidth}"
:label="item[element.options.attrs.label]"
@ -77,7 +77,7 @@ export default {
selectOptionWidth: 0,
show: true,
value: null,
datas: [],
data: [],
onFocus: false,
keyWord: ''
}
@ -90,7 +90,7 @@ export default {
}
return result
},
templateDatas() {
templateData() {
return this.mode === 'el-visual-select' ? [] : null
},
operator() {
@ -133,7 +133,7 @@ export default {
},
'element.options.attrs.fieldId': function(value, old) {
if (value === null || typeof value === 'undefined' || value === old) return
this.datas = []
this.data = []
let method = multFieldValues
const token = this.$store.getters.token || getToken()
@ -148,7 +148,7 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
bus.$emit('valid-values-change', true)
}).catch(e => {
bus.$emit('valid-values-change', false)
@ -171,7 +171,7 @@ export default {
if (value === null || typeof value === 'undefined' || value === old || isSameVueObj(value, old)) return
this.show = false
this.datas = []
this.data = []
let method = multFieldValues
const token = this.$store.getters.token || getToken()
@ -186,7 +186,7 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.$nextTick(() => {
this.show = true
this.handleCoustomStyle()
@ -248,7 +248,7 @@ export default {
},
initLoad() {
this.value = this.fillValueDerfault()
this.datas = []
this.data = []
if (this.element.options.attrs.fieldId) {
let method = multFieldValues
const token = this.$store.getters.token || getToken()
@ -257,7 +257,7 @@ export default {
method = linkMultFieldValues
}
method({ fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
bus.$emit('valid-values-change', true)
}).catch(e => {
bus.$emit('valid-values-change', false)
@ -336,9 +336,9 @@ export default {
return defaultV.split(',')[0]
}
},
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

52
frontend/src/components/widget/DeWidget/DeSelectGrid.vue
View File

@ -32,7 +32,7 @@
@change="handleCheckedChange"
>
<el-checkbox
v-for="item in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"
v-for="item in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"
:key="item.id"
:label="item.id"
>{{ item.id }}</el-checkbox>
@ -48,7 +48,7 @@
@change="changeRadioBox"
>
<el-radio
v-for="(item, index) in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"
v-for="(item, index) in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"
:key="index"
:label="item.id"
@click.native.prevent="testChange(item)"
@ -109,7 +109,7 @@ export default {
indeterminate: false
},
show: true,
datas: [],
data: [],
isIndeterminate: false,
checkAll: false
}
@ -148,13 +148,13 @@ export default {
this.changeValue(value)
if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
},
'element.options.attrs.fieldId': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.datas = []
this.data = []
let method = multFieldValues
const token = this.$store.getters.token || getToken()
const linkToken = this.$store.getters.linkToken || getLinkToken()
@ -168,11 +168,11 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.changeInputStyle()
if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
}) || (this.element.options.value = '')
},
@ -189,15 +189,15 @@ export default {
this.$nextTick(() => {
this.show = true
if (value) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
this.changeInputStyle()
})
},
'element.options.attrs.sort': function(value, old) {
if (typeof value === 'undefined' || value === old) return
this.datas = []
this.data = []
let method = multFieldValues
const token = this.$store.getters.token || getToken()
const linkToken = this.$store.getters.linkToken || getLinkToken()
@ -211,11 +211,11 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.changeInputStyle()
if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
}) || (this.element.options.value = '')
},
@ -251,8 +251,8 @@ export default {
this.changeValue(this.value)
if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
}
},
@ -284,11 +284,11 @@ export default {
method = linkMultFieldValues
}
method({ fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.changeInputStyle()
if (this.element.options.attrs.multiple) {
this.checkAll = this.value.length === this.datas.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
this.checkAll = this.value.length === this.data.length
this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
}
})
}
@ -337,9 +337,9 @@ export default {
return defaultV.split(',')[0]
}
},
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item
@ -350,14 +350,14 @@ export default {
this.changeValue(value)
},
handleCheckAllChange(val) {
this.value = val ? this.datas.map(item => item.id) : []
this.value = val ? this.data.map(item => item.id) : []
this.isIndeterminate = false
this.changeValue(this.value)
},
handleCheckedChange(values) {
const checkedCount = values.length
this.checkAll = checkedCount === this.datas.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.datas.length
this.checkAll = checkedCount === this.data.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.data.length
this.changeValue(values)
},
testChange(item) {

34
frontend/src/components/widget/DeWidget/DeSelectTree.vue
View File

@ -5,7 +5,7 @@
ref="deSelectTree"
v-model="value"
popover-class="test-class-wrap"
:data="datas"
:data="data"
:select-params="selectParams"
:tree-params="treeParams"
:filter-node-method="_filterFun"
@ -17,7 +17,7 @@
@removeTag="changeNodeIds"
@check="changeCheckNode"
@select-clear="selectClear"
@onFoucs="onFoucs"
@onFocus="onFocus"
@treeCheckChange="handleElTagStyle"
/>
@ -59,7 +59,7 @@ export default {
return {
show: true,
selectOptionWidth: 0,
datas: [],
data: [],
// eslint-disable-next-line
value: this.isSingle ? '' : [],
selectParams: {
@ -128,7 +128,7 @@ export default {
},
'element.options.attrs.fieldId': function(value, old) {
if (value === null || typeof value === 'undefined' || value === old) return
this.datas = []
this.data = []
let method = mappingFieldValues
const token = this.$store.getters.token || getToken()
@ -143,9 +143,9 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.$nextTick(() => {
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.datas)
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.data)
})
})
this.element.options.value = ''
@ -177,13 +177,13 @@ export default {
this.value = defaultV.split(',')[0]
}
}
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.datas)
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.data)
})
})
},
'element.options.attrs.sort': function(value, old) {
if (value === null || typeof value === 'undefined' || value === old || isSameVueObj(value, old)) return
this.datas = []
this.data = []
let method = mappingFieldValues
const token = this.$store.getters.token || getToken()
@ -198,9 +198,9 @@ export default {
this.element.options.attrs.fieldId &&
this.element.options.attrs.fieldId.length > 0 &&
method(param).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.$nextTick(() => {
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.datas)
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.data)
})
})
this.element.options.value = ''
@ -233,7 +233,7 @@ export default {
this.changeValue(this.value)
}
},
onFoucs() {
onFocus() {
this.$nextTick(() => {
this.handleCoustomStyle()
})
@ -260,7 +260,7 @@ export default {
},
initLoad() {
this.value = this.fillValueDerfault()
this.datas = []
this.data = []
if (this.element.options.attrs.fieldId) {
let method = mappingFieldValues
const token = this.$store.getters.token || getToken()
@ -269,9 +269,9 @@ export default {
method = linkMappingFieldValues
}
method({ fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }).then(res => {
this.datas = this.optionDatas(res.data)
this.data = this.optionData(res.data)
this.$nextTick(() => {
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.datas)
this.$refs.deSelectTree && this.$refs.deSelectTree.treeDataUpdateFun(this.data)
})
})
}
@ -355,10 +355,10 @@ export default {
return defaultV.split(',')[0]
}
},
optionDatas(datas) {
if (!datas) return null
optionData(data) {
if (!data) return null
return datas.filter(item => !!item)
return data.filter(item => !!item)
},
/* 下面是树的渲染方法 */

14
frontend/src/components/widget/DeWidget/DeTabs.vue
View File

@ -41,21 +41,21 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommond('editTitle', item)">
<el-dropdown-item :command="beforeHandleCommand('editTitle', item)">
{{ $t('detabs.eidttitle') }}
</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommond('selectView', item)">
<el-dropdown-item :command="beforeHandleCommand('selectView', item)">
{{ $t('detabs.selectview') }}
</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommond('selectOthers', item)">
<el-dropdown-item :command="beforeHandleCommand('selectOthers', item)">
{{ $t('detabs.selectOthers') }}
</el-dropdown-item>
<el-dropdown-item
v-if=" element.options.tabList.length > 1"
:command="beforeHandleCommond('deleteCur', item)"
:command="beforeHandleCommand('deleteCur', item)"
>
{{ $t('table.delete') }}
</el-dropdown-item>
@ -348,7 +348,7 @@ export default {
}
})
},
beforeHandleCommond(item, param) {
beforeHandleCommand(item, param) {
return {
'command': item,
'param': param
@ -477,8 +477,8 @@ export default {
if (this.element.options.tabList[len].name === param.name) {
this.element.options.tabList.splice(len, 1)
const activIndex = (len - 1 + this.element.options.tabList.length) % this.element.options.tabList.length
this.activeTabName = this.element.options.tabList[activIndex].name
const activeIndex = (len - 1 + this.element.options.tabList.length) % this.element.options.tabList.length
this.activeTabName = this.element.options.tabList[activeIndex].name
}
}
this.$store.dispatch('chart/setViewId', null)

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

@ -10,7 +10,7 @@
@change="changeValue"
>
<el-option
v-for="item in options.attrs.datas"
v-for="item in options.attrs.data"
:key="item[options.attrs.key]"
:label="item[options.attrs.label]"
:value="item[options.attrs.value]"

0
frontend/src/components/widget/DeWidget/TitlePostion.vue → frontend/src/components/widget/DeWidget/TitlePosition.vue
View File

2
frontend/src/components/widget/DeWidget/sources/ElQuarter.vue
View File

@ -86,7 +86,7 @@
* @author: v_zhuchun
* @date: 2019-05-23
* @description: UI组件 可选择季节
* @api: valueArr : 季度value defalut['01-03', '04-06', '07-09', '10-12'] 默认值待设置
* @api: valueArr : 季度value default['01-03', '04-06', '07-09', '10-12'] 默认值待设置
*/
export default {
props: {

8
frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js
View File

@ -13,7 +13,7 @@ const dialogPanel = {
multiple: false,
placeholder: 'denumbergridselect.placeholder',
viewIds: [],
datas: [],
data: [],
key: 'id',
label: 'text',
value: 'id',
@ -73,9 +73,9 @@ class NumberSelectGridServiceImpl extends WidgetService {
})
}
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

8
frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
View File

@ -12,7 +12,7 @@ const dialogPanel = {
attrs: {
multiple: false,
placeholder: 'denumberselect.placeholder',
datas: [],
data: [],
viewIds: [],
parameters: [],
key: 'id',
@ -75,9 +75,9 @@ class NumberSelectServiceImpl extends WidgetService {
})
}
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

8
frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js
View File

@ -14,7 +14,7 @@ const dialogPanel = {
placeholder: 'detextgridselect.placeholder',
viewIds: [],
parameters: [],
datas: [],
data: [],
key: 'id',
label: 'text',
value: 'id',
@ -74,9 +74,9 @@ class TextSelectGridServiceImpl extends WidgetService {
})
}
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

8
frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
View File

@ -13,7 +13,7 @@ const dialogPanel = {
placeholder: 'detextselect.placeholder',
viewIds: [],
parameters: [],
datas: [],
data: [],
key: 'id',
label: 'text',
value: 'id',
@ -77,9 +77,9 @@ class TextSelectServiceImpl extends WidgetService {
})
}
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

8
frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js
View File

@ -13,7 +13,7 @@ const dialogPanel = {
placeholder: 'detextselectTree.placeholder',
viewIds: [],
parameters: [],
datas: [],
data: [],
key: 'id',
label: 'text',
value: 'id',
@ -76,9 +76,9 @@ class TextSelectTreeServiceImpl extends WidgetService {
})
}
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

0
frontend/src/icons/svg/warn-tre.svg → frontend/src/icons/svg/warn-tree.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

22
frontend/src/lang/en.js
View File

@ -35,7 +35,7 @@ export default {
custom_table_fields_desc: 'Fixed field is not in the selection range'
},
steps: {
cancel: 'Cancle',
cancel: 'Cancel',
next: 'next',
prev: 'Last step',
finish: 'Finish'
@ -613,7 +613,7 @@ export default {
member: {
create: 'Add members',
modify: 'Modify members',
delete_confirm: 'Comfirm to delete this user?',
delete_confirm: 'Confirm to delete this user?',
please_choose_member: 'Please choose member',
search_by_name: 'Search by name',
modify_personal_info: 'Modify personal info',
@ -792,12 +792,12 @@ export default {
move_success: 'Removed successfully',
user: 'user',
add_organization: 'Add organization',
defalut_organization_canot_move: 'The default organization cannot be deleted',
default_organization_cannot_move: 'The default organization cannot be deleted',
organization_name: 'Organization name',
input_organization_name: 'Please enter the organization name',
relate_top_organization: 'Associated parent organization',
organization_name_exist: 'Organization name already exists',
canot_delete: 'Cannot delete',
cannot_delete: 'Cannot delete',
remove_user_first: 'Please remove all users in the organization before deleting the organization',
sure_delete_organization: 'Are you sure to delete this organization?',
add_child_org: 'Add sub organization',
@ -1721,7 +1721,7 @@ export default {
please_input_user_name: 'Please enter user name',
please_input_password: 'Please enter Password',
please_input_host: 'Please enter host',
please_input_url: 'Please enter url adress',
please_input_url: 'Please enter url address',
please_input_port: 'Please enter port',
modify: 'Edit data Source',
validate_success: 'Verification successful',
@ -1960,7 +1960,7 @@ export default {
confirm_delete: 'Confirm Delete',
delete_success: 'Delete Success',
confirm: 'Confirm',
cancel: 'Cancle',
cancel: 'Cancel',
search: 'Search',
back: 'Back',
view: 'Chart',
@ -2165,7 +2165,7 @@ export default {
install_time: 'Install Time',
release_time: 'Time',
un_install: 'Uninstall',
uninstall_confirm: 'Comfirm to uninstall the plugin?',
uninstall_confirm: 'Confirm to uninstall the plugin?',
uninstall_cancel: 'Cancel uninstall plugin',
un_install_success: 'Uninstall is successful and restart takes effect',
un_install_error: 'Uninstall failed, please contact the administrator'
@ -2253,7 +2253,7 @@ export default {
screen_method: 'Screening method',
select: 'Please select',
fixed_value: 'Fixed value',
defalut_method: 'Default condition',
default_method: 'Default condition',
select_all: 'Select all',
added: 'Added',
manual_input: 'Manual input',
@ -2273,7 +2273,7 @@ export default {
version_num: 'Version number',
standard: 'Standard',
enterprise: 'Enterprise',
suport: 'Get technical support',
support: 'Get technical support',
update_success: 'Update Success'
},
template: {
@ -2353,7 +2353,7 @@ export default {
i18n_msg_type_panel_share_cacnel: 'Dashboard unshared',
i18n_msg_type_dataset_sync: 'Data set synchronization',
i18n_msg_type_dataset_sync_success: 'Dataset synchronization successful',
i18n_msg_type_dataset_sync_faild: 'Dataset synchronization failed',
i18n_msg_type_dataset_sync_failed: 'Dataset synchronization failed',
i18n_msg_type_all: 'All type',
i18n_msg_type_ds_invalid: 'Datasource invalid',
channel_inner_msg: 'On site',
@ -2369,7 +2369,7 @@ export default {
please_key_max: 'Please key max value',
out_of_min: 'The min value cannot be less than the min integer -2³²',
out_of_max: 'The max value cannot be more than the max integer 2³²-1',
must_int: 'Please key interger',
must_int: 'Please key integer',
min_out_max: 'The min value must be less than the max value',
max_out_min: 'The max value must be more than the min value'
},

4
frontend/src/lang/es.js
View File

@ -8,7 +8,7 @@ export default {
pagePermission: 'Permisos de la página',
directivePermission: 'Permisos de la directiva',
icons: 'Iconos',
components: 'Componentes',
components: 'Components',
tinymce: 'Tinymce',
markdown: 'Markdown',
jsonEditor: 'Editor JSON',
@ -123,7 +123,7 @@ export default {
reviewer: 'reviewer',
id: 'ID',
date: 'Fecha',
author: 'Autor',
author: 'Author',
readings: 'Lector',
status: 'Estado',
actions: 'Acciones',

10
frontend/src/lang/tw.js
View File

@ -791,12 +791,12 @@ export default {
move_success: '移除成功',
user: '用戶',
add_organization: '添加組織',
defalut_organization_canot_move: '默認組織無法刪除',
default_organization_cannot_move: '默認組織無法刪除',
organization_name: '組織名稱',
input_organization_name: '請輸入組織名稱',
relate_top_organization: '關聯上級組織',
organization_name_exist: '組織名稱已存在',
canot_delete: '無法刪除',
cannot_delete: '無法刪除',
remove_user_first: '請先移除組織中所有用戶，再進行刪除組織操作。',
sure_delete_organization: '確定刪除該組織嗎？',
delete: '刪除',
@ -2254,7 +2254,7 @@ export default {
screen_method: '篩選方式',
select: '請選擇',
fixed_value: '固定值',
defalut_method: '默認條件',
default_method: '默認條件',
select_all: '全 選',
added: '已添加',
manual_input: '手工輸入',
@ -2274,7 +2274,7 @@ export default {
version_num: '版本號',
standard: '標準版',
enterprise: '企業版',
suport: '獲取技術支持',
support: '獲取技術支持',
update_success: '更新成功'
},
template: {
@ -2354,7 +2354,7 @@ export default {
i18n_msg_type_panel_share_cacnel: '儀表闆取消分享',
i18n_msg_type_dataset_sync: '數據集同步',
i18n_msg_type_dataset_sync_success: '數據集同步成功',
i18n_msg_type_dataset_sync_faild: '數據集同步失敗',
i18n_msg_type_dataset_sync_failed: '數據集同步失敗',
i18n_msg_type_ds_invalid: '數據源失效',
i18n_msg_type_all: '全部類型',
channel_inner_msg: '站內消息',

10
frontend/src/lang/zh.js
View File

@ -790,12 +790,12 @@ export default {
move_success: '移除成功',
user: '用户',
add_organization: '添加组织',
defalut_organization_canot_move: '默认组织无法删除',
default_organization_cannot_move: '默认组织无法删除',
organization_name: '组织名称',
input_organization_name: '请输入组织名称',
relate_top_organization: '关联上级组织',
organization_name_exist: '组织名称已存在',
canot_delete: '无法删除',
cannot_delete: '无法删除',
remove_user_first: '请先移除组织中所有用户，再进行删除组织操作。',
sure_delete_organization: '确定删除该组织吗？',
delete: '删除',
@ -2254,7 +2254,7 @@ export default {
screen_method: '筛选方式',
select: '请选择',
fixed_value: '固定值',
defalut_method: '默认条件',
default_method: '默认条件',
select_all: '全 选',
added: '已添加',
manual_input: '手工输入',
@ -2274,7 +2274,7 @@ export default {
version_num: '版本号',
standard: '标准版',
enterprise: '企业版',
suport: '获取技术支持',
support: '获取技术支持',
update_success: '更新成功'
},
template: {
@ -2354,7 +2354,7 @@ export default {
i18n_msg_type_panel_share_cacnel: '仪表板取消分享',
i18n_msg_type_dataset_sync: '数据集同步',
i18n_msg_type_dataset_sync_success: '数据集同步成功',
i18n_msg_type_dataset_sync_faild: '数据集同步失败',
i18n_msg_type_dataset_sync_failed: '数据集同步失败',
i18n_msg_type_ds_invalid: '数据源失效',
i18n_msg_type_all: '全部类型',
channel_inner_msg: '站内消息',

12
frontend/src/permission.js
View File

@ -126,11 +126,11 @@ router.beforeEach(async(to, from, next) => routeBefore(() => {
}))
export const loadMenus = (next, to) => {
buildMenus().then(res => {
const datas = res.data
const filterDatas = filterRouter(datas)
const asyncRouter = filterAsyncRouter(filterDatas)
const data = res.data
const filterData = filterRouter(data)
const asyncRouter = filterAsyncRouter(filterData)
// 如果包含首页 则默认页面是 首页 否则默认页面是仪表板页面
if (JSON.stringify(datas).indexOf('wizard') > -1) {
if (JSON.stringify(data).indexOf('wizard') > -1) {
asyncRouter.push({
path: '/',
component: Layout,
@ -234,8 +234,8 @@ const hasPermission = (router, user_permissions) => {
}
// 如果有字菜单 则 判断是否满足 ‘任意一个子菜单有权限’
if (router.children && router.children.length) {
const permissionChilds = router.children.filter(item => hasPermission(item, user_permissions))
router.children = permissionChilds
const permissionChildren = router.children.filter(item => hasPermission(item, user_permissions))
router.children = permissionChildren
return router.children.length > 0
}
return true

2
frontend/src/styles/index.scss
View File

@ -1400,7 +1400,7 @@ div:focus {
}
}
.de-serach-table {
.de-search-table {
.top-operate {
margin-bottom: 16px;

8
frontend/src/views/chart/components/filter/ResultFilterEditor.vue
View File

@ -266,13 +266,13 @@ export default {
// 查找枚举值
if (this.item.deType === 0 || this.item.deType === 5) {
multFieldValues({ fieldIds: [this.item.id] }).then(res => {
this.fieldOptions = this.optionDatas(res.data)
this.fieldOptions = this.optionData(res.data)
})
}
},
optionDatas(datas) {
if (!datas) return null
return datas.filter(item => !!item).map(item => {
optionData(data) {
if (!data) return null
return data.filter(item => !!item).map(item => {
return {
id: item,
text: item

18
frontend/src/views/chart/components/senior/MapMapping.vue
View File

@ -1,7 +1,7 @@
<template>
<div style="width: 100%;display: block !important;">
<el-table
:data="currentDatas"
:data="currentData"
size="mini"
:span-method="mergeCellMethod"
style="width: 100%"
@ -105,7 +105,7 @@ export default {
currentPage: 1,
pageSize: 10,
total: 0,
currentDatas: [],
currentData: [],
usePage: true
}
},
@ -194,7 +194,7 @@ export default {
}
},
buildGridList() {
this.currentDatas = []
this.currentData = []
if (!this.currentAreaCode || !this.mappingForm[this.currentAreaCode]) return
this.gridList = Object.keys(this.mappingForm[this.currentAreaCode]).map(key => {
return {
@ -202,17 +202,17 @@ export default {
attrArea: this.mappingForm[this.currentAreaCode][key] || key
}
})
const baseDatas = JSON.parse(JSON.stringify(this.gridList))
const tempDatas = baseDatas.filter(data => !this.keyWord || data.mapArea.toLowerCase().includes(this.keyWord.toLowerCase()) || (data.attrArea && data.attrArea.toLowerCase().includes(this.keyWord.toLowerCase())))
const baseData = JSON.parse(JSON.stringify(this.gridList))
const tempData = baseData.filter(data => !this.keyWord || data.mapArea.toLowerCase().includes(this.keyWord.toLowerCase()) || (data.attrArea && data.attrArea.toLowerCase().includes(this.keyWord.toLowerCase())))
if (this.usePage) {
const start = (this.currentPage - 1) * this.pageSize
let end = this.currentPage * this.pageSize
if (end >= tempDatas.length) end = tempDatas.length
this.currentDatas = tempDatas.slice(start, end)
if (end >= tempData.length) end = tempData.length
this.currentData = tempData.slice(start, end)
} else {
this.currentDatas = tempDatas
this.currentData = tempData
}
this.total = tempDatas.length
this.total = tempData.length
},
initMapping() {
const innerCallBack = (json, cCode) => {

16
frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -187,7 +187,7 @@ export default {
},
initData() {
const that = this
let datas = []
let data = []
this.showPage = false
if (this.chart.data) {
this.fields = JSON.parse(JSON.stringify(this.chart.data.fields))
@ -203,28 +203,28 @@ export default {
this.columnWidth = columnWidth
}
datas = JSON.parse(JSON.stringify(this.chart.data.tableRow))
if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && datas.length > this.currentPage.pageSize) {
data = JSON.parse(JSON.stringify(this.chart.data.tableRow))
if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && data.length > this.currentPage.pageSize) {
// 计算分页
this.currentPage.show = datas.length
this.currentPage.show = data.length
const pageStart = (this.currentPage.page - 1) * this.currentPage.pageSize
const pageEnd = pageStart + this.currentPage.pageSize
datas = datas.slice(pageStart, pageEnd)
data = data.slice(pageStart, pageEnd)
this.showPage = true
}
} else {
this.fields = []
datas = []
data = []
this.resetPage()
}
datas.forEach(item => {
data.forEach(item => {
Object.keys(item).forEach(key => {
if (typeof item[key] === 'object') {
item[key] = ''
}
})
})
this.$refs.plxTable.reloadData(datas)
this.$refs.plxTable.reloadData(data)
this.$nextTick(() => {
this.initStyle()
})

6
frontend/src/views/dataset/add/AddApi.vue
View File

@ -331,14 +331,14 @@ export default {
mousedownDrag() {
document
.querySelector('.dataset-api')
.addEventListener('mousemove', this.caculateHeight)
.addEventListener('mousemove', this.calculateHeight)
},
mouseupDrag() {
document
.querySelector('.dataset-api')
.removeEventListener('mousemove', this.caculateHeight)
.removeEventListener('mousemove', this.calculateHeight)
},
caculateHeight(e) {
calculateHeight(e) {
if (e.pageX < 240) {
this.LeftWidth = 240
return

8
frontend/src/views/dataset/add/AddCustom.vue
View File

@ -203,14 +203,14 @@ export default {
post('/dataset/table/customPreview', table).then(response => {
this.fields = response.data.fields
this.data = response.data.data
const datas = this.data
this.$refs.plxTable.reloadData(datas)
const data = this.data
this.$refs.plxTable.reloadData(data)
})
} else {
this.fields = []
this.data = []
const datas = this.data
this.$refs.plxTable.reloadData(datas)
const data = this.data
this.$refs.plxTable.reloadData(data)
}
},
getUnionData() {

6
frontend/src/views/dataset/add/AddDB.vue
View File

@ -348,14 +348,14 @@ export default {
mousedownDrag() {
document
.querySelector('.dataset-db')
.addEventListener('mousemove', this.caculateHeight)
.addEventListener('mousemove', this.calculateHeight)
},
mouseupDrag() {
document
.querySelector('.dataset-db')
.removeEventListener('mousemove', this.caculateHeight)
.removeEventListener('mousemove', this.calculateHeight)
},
caculateHeight(e) {
calculateHeight(e) {
if (e.pageX < 240) {
this.LeftWidth = 240
return

10
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -95,7 +95,7 @@
</el-col>
</el-row>
</div>
<div class="refrence-sql-table">
<div class="reference-sql-table">
<div
v-if="dataReference"
class="data-reference"
@ -608,14 +608,14 @@ export default {
mousedownDrag() {
document
.querySelector('.dataset-sql')
.addEventListener('mousemove', this.caculateHeight)
.addEventListener('mousemove', this.calculateHeight)
},
mouseupDrag() {
document
.querySelector('.dataset-sql')
.removeEventListener('mousemove', this.caculateHeight)
.removeEventListener('mousemove', this.calculateHeight)
},
caculateHeight(e) {
calculateHeight(e) {
if (e.pageY - 120 < 248) {
this.sqlHeight = 248
return
@ -896,7 +896,7 @@ export default {
padding: 16px 24px;
}
.refrence-sql-table {
.reference-sql-table {
flex: 1;
display: flex;
flex-direction: row-reverse;

10
frontend/src/views/dataset/add/AddUnion.vue
View File

@ -6,7 +6,7 @@
>
<div
:style="{ height: unionHeight + 'px' }"
class="unio-editer-container"
class="union-editer-container"
>
<!--添加第一个数据集按钮-->
<div
@ -229,14 +229,14 @@ export default {
mousedownDrag() {
document
.querySelector('.dataset-union')
.addEventListener('mousemove', this.caculateHeight)
.addEventListener('mousemove', this.calculateHeight)
},
mouseupDrag() {
document
.querySelector('.dataset-union')
.removeEventListener('mousemove', this.caculateHeight)
.removeEventListener('mousemove', this.calculateHeight)
},
caculateHeight(e) {
calculateHeight(e) {
if (e.pageY - 56 < 298) {
this.unionHeight = 298
return
@ -406,7 +406,7 @@ export default {
flex-direction: column;
width: 100%;
.unio-editer-container {
.union-editer-container {
min-height: 298px;
width: 100%;
background: #f5f6f7;

8
frontend/src/views/dataset/add/union/UnionPreview.vue
View File

@ -75,14 +75,14 @@ export default {
post('/dataset/table/unionPreview', this.table).then((response) => {
this.fields = response.data.fields
this.data = response.data.data
const datas = this.data
this.$refs.plxTable.reloadData(datas)
const data = this.data
this.$refs.plxTable.reloadData(data)
})
} else {
this.fields = []
this.data = []
const datas = this.data
this.$refs.plxTable.reloadData(datas)
const data = this.data
this.$refs.plxTable.reloadData(data)
}
}
}

4
frontend/src/views/dataset/common/DatasetTableData.vue
View File

@ -102,14 +102,14 @@ export default {
.then((response) => {
this.fields = response.data.fields
this.data = response.data.data
const datas = this.data
const data = this.data
if (response.data.status === 'warnning') {
this.$warning(response.data.msg, 3000)
}
if (response.data.status === 'error') {
this.$error(response.data.msg, 3000)
}
this.$refs.plxTable.reloadData(datas)
this.$refs.plxTable.reloadData(data)
this.dataLoading = false
})
.catch((res) => {

4
frontend/src/views/dataset/data/CalcFieldEdit.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="calcu-feild">
<div class="calcu-field">
<el-form
ref="form"
:model="fieldForm"
@ -747,7 +747,7 @@ export default {
</style>
<style lang="scss">
.calcu-feild {
.calcu-field {
.calcu-cont {
display: flex;
justify-content: space-between;

4
frontend/src/views/dataset/data/TabDataPreview.vue
View File

@ -121,8 +121,8 @@ export default {
},
watch: {
data() {
const datas = this.data
this.$refs.plxTable.reloadData(datas)
const data = this.data
this.$refs.plxTable.reloadData(data)
},
page() {
if (this.page.total < parseInt(this.form.row)) {

2
frontend/src/views/msg/all.vue
View File

@ -22,7 +22,7 @@
/>
</el-tabs>
<div class="tabs-container">
<div class="msg-cont de-serach-table">
<div class="msg-cont de-search-table">
<el-row class="top-operate">
<el-col :span="12">
<template v-if="tabActive === 'unread'">

6
frontend/src/views/msg/setting.vue
View File

@ -105,9 +105,9 @@ export default {
// 加载树节点数据
loadTreeData() {
treeList().then((res) => {
const datas = res.data
datas.forEach((data) => this.formatTreeNode(data))
this.treeData = datas
const data = res.data
data.forEach((data) => this.formatTreeNode(data))
this.treeData = data
})
},
formatTreeNode(node) {

15
frontend/src/views/panel/GrantAuth/ShareHead/index.vue
View File

@ -104,14 +104,13 @@ export default {
authVisible: false,
authTitle: '',
authResourceId: null,
targetDatas: [],
targetData: [],
tagTypes: { 0: 'info', 1: 'success', 2: 'primary' },
checked: false
}
},
computed: {
panelInfo() {
// this.initTagDatas()
return this.$store.state.panel.panelInfo
}
},
@ -121,13 +120,13 @@ export default {
// 刷新 进行重新渲染
this.$nextTick(() => {
this.initTagDatas()
this.initTagData()
})
}
},
created() {
this.initTagDatas()
this.initTagData()
},
methods: {
handleClose(tag) {
@ -140,7 +139,7 @@ export default {
type: tag.type
}
removeShares(param).then(res => {
this.initTagDatas()
this.initTagData()
})
},
showEditPage() {
@ -149,13 +148,13 @@ export default {
this.authVisible = true
},
closeGrant() {
this.initTagDatas()
this.initTagData()
this.authResourceId = null
this.authVisible = false
},
initTagDatas() {
initTagData() {
shareTargets(this.panelInfo.id).then(res => {
this.targetDatas = res.data
this.targetData = res.data
this.dynamicTags = res.data.map(item => {
item.tagType = this.tagTypes[item.type]
this.granterTime = item.createTime

6
frontend/src/views/panel/GrantAuth/dept/index.vue
View File

@ -80,7 +80,7 @@ export default {
},
watch: {
keyWord(v, o) {
this.destryTimeMachine()
this.destroyTimeMachine()
this.changeIndex++
this.searchWithKey(this.changeIndex)
}
@ -101,10 +101,10 @@ export default {
}
this.search(condition)
}
this.destryTimeMachine()
this.destroyTimeMachine()
}, 1500)
},
destryTimeMachine() {
destroyTimeMachine() {
this.timeMachine && clearTimeout(this.timeMachine)
this.timeMachine = null
},

18
frontend/src/views/panel/GrantAuth/shareTree.vue
View File

@ -8,7 +8,7 @@
>
<el-tree
ref="topTree"
:data="datas"
:data="data"
:props="defaultProps"
:highlight-current="true"
node-key="name"
@ -48,7 +48,7 @@
>
<el-tree
ref="botTree"
:data="outDatas"
:data="outData"
:props="defaultProps"
:highlight-current="true"
node-key="name"
@ -109,13 +109,13 @@ export default {
},
data() {
return {
datas: [],
data: [],
defaultProps: {
children: 'children',
label: 'name'
},
expandNodes: [],
outDatas: []
outData: []
}
},
computed: {
@ -126,13 +126,13 @@ export default {
created() {
bus.$on('refresh-my-share-out', this.refreshMyShareOut)
this.initData().then(res => {
this.datas = res.data
this.data = res.data
if (this.msgPanelIds && this.msgPanelIds.length > 0) {
this.expandMsgNode(this.msgPanelIds)
}
})
this.initOutData().then(res => {
this.outDatas = res.data
this.outData = res.data
})
},
beforeDestroy() {
@ -141,7 +141,7 @@ export default {
methods: {
refreshMyShareOut() {
this.initOutData().then(res => {
this.outDatas = res.data
this.outData = res.data
this.setMainNull()
})
},
@ -188,7 +188,7 @@ export default {
})
},
getMsgNodes(panelIds) {
this.datas.forEach(item => {
this.data.forEach(item => {
if (item.children && item.children.length > 0) {
item.children.forEach(node => {
if (panelIds.includes(node.id)) {
@ -208,7 +208,7 @@ export default {
removePanelShares(node.id).then(res => {
this.panelInfo && this.panelInfo.id && node.id === this.panelInfo.id && this.setMainNull()
this.initOutData().then(res => {
this.outDatas = res.data
this.outData = res.data
})
this.$success(this.$t('commons.delete_success'))
})

6
frontend/src/views/panel/ViewSelect/index-with-drag.vue
View File

@ -146,11 +146,11 @@ export default {
loadData() {
this.loading = true
queryPanelViewTree().then(res => {
const nodeDatas = res.data
const nodeData = res.data
if (this.selectModel) {
this.setParentDisable(nodeDatas)
this.setParentDisable(nodeData)
}
this.treeData = nodeDatas
this.treeData = nodeData
this.loading = false
})
},

6
frontend/src/views/panel/ViewSelect/index.vue
View File

@ -158,11 +158,11 @@ export default {
loadData() {
this.loading = true
queryPanelViewTree().then(res => {
const nodeDatas = res.data
const nodeData = res.data
if (this.selectModel) {
this.setParentDisable(nodeDatas)
this.setParentDisable(nodeData)
}
this.treeData = nodeDatas
this.treeData = nodeData
this.loading = false
})
},

2
frontend/src/views/panel/appTemplateMarket/log/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-row
style="text-align: left"
class="de-serach-table"
class="de-search-table"
>
<el-row class="top-operate">
<el-col :span="12">

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

@ -456,7 +456,7 @@
<el-row style="height: 20px">
<el-col :span="3">
<svg-icon
icon-class="warn-tre"
icon-class="warn-tree"
style="width: 20px;height: 20px;float: right"
/>
</el-col>

6
frontend/src/views/panel/enshrine/index.vue
View File

@ -2,7 +2,7 @@
<div>
<el-table
class="de-filter-data-table"
:data="starDatas"
:data="starData"
:show-header="false"
:highlight-current-row="true"
style="width: 100%"
@ -49,7 +49,7 @@ export default {
name: 'Enshrine',
data() {
return {
starDatas: []
starData: []
}
},
computed: {
@ -91,7 +91,7 @@ export default {
},
initData() {
enshrineList({}).then(res => {
this.starDatas = res.data
this.starData = res.data
})
},
setMainNull() {

6
frontend/src/views/panel/filter/ButtonDialog.vue
View File

@ -110,8 +110,8 @@ export default {
'componentData'
]),
filters() {
const datas = this.componentData.filter(item => item.type === 'custom')
datas.forEach(item => {
const data = this.componentData.filter(item => item.type === 'custom')
data.forEach(item => {
const serviceName = item.serviceName
const widget = ApplicationContext.getService(serviceName)
const showName = widget.initLeftPanel().label
@ -125,7 +125,7 @@ export default {
item.showName = result
})
return datas
return data
}
},
watch: {

117
frontend/src/views/panel/filter/filterDialog.vue
View File

@ -53,7 +53,7 @@
v-if="showDomType === 'tree'"
:default-expanded-keys="expandedArray"
node-key="id"
:data="tempTreeDatas || datas"
:data="tempTreeData || data"
:props="defaultProps"
@node-click="handleNodeClick"
@ -116,7 +116,7 @@
<div v-if="showDomType === 'field'">
<draggable
v-model="fieldDatas"
v-model="fieldData"
:options="{group:{name: 'dimension',pull:'clone'},sort: true}"
animation="300"
:move="onMove"
@ -125,7 +125,7 @@
>
<transition-group>
<div
v-for="item in fieldDatas"
v-for="item in fieldData"
:key="item.id"
:class="myAttrs && myAttrs.fieldId && myAttrs.fieldId.includes(item.id) ? 'filter-db-row-checked' : 'filter-db-row'"
class="filter-db-row"
@ -207,7 +207,7 @@
>
<div
class="filter-db-row"
@click="comShowFieldDatas(scope.row)"
@click="comShowFieldData(scope.row)"
>
<span style="display: flex;flex: 1;">
<span>
@ -226,7 +226,7 @@
<div v-else-if="comShowDomType === 'field'">
<draggable
v-model="comFieldDatas"
v-model="comFieldData"
:options="{group:{name: 'dimension',pull:'clone'},sort: true}"
animation="300"
:move="onMove"
@ -235,7 +235,7 @@
>
<transition-group>
<div
v-for="item in comFieldDatas"
v-for="item in comFieldData"
:key="item.id"
:class="myAttrs && myAttrs.fieldId && myAttrs.fieldId.includes(item.id) ? 'filter-db-row-checked' : 'filter-db-row'"
class="filter-db-row"
@ -347,13 +347,12 @@ export default {
link: false,
type: 'root'
}],
datas: [],
sceneDatas: [],
// viewDatas: [],
fieldDatas: [],
originFieldDatas: [],
comFieldDatas: [],
originComFieldDatas: [],
data: [],
sceneData: [],
fieldData: [],
originFieldData: [],
comFieldData: [],
originComFieldData: [],
defaultProps: {
label: 'name',
children: 'children',
@ -374,7 +373,7 @@ export default {
sort: 'type desc,name asc'
},
isTreeSearch: false,
defaultDatas: [],
defaultData: [],
keyWord: '',
timer: null,
expandedArray: [],
@ -389,7 +388,7 @@ export default {
datasetParams: []
},
currentElement: null,
tempTreeDatas: null,
tempTreeData: null,
showTips: false
}
},
@ -420,11 +419,11 @@ export default {
keyWord(val) {
this.expandedArray = []
if (this.showDomType === 'field') {
let results = this.originFieldDatas
let results = this.originFieldData
if (val) {
results = this.originFieldDatas.filter(item => item.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()))
results = this.originFieldData.filter(item => item.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()))
}
this.fieldDatas = JSON.parse(JSON.stringify(results))
this.fieldData = JSON.parse(JSON.stringify(results))
return
}
if (this.timer) {
@ -437,11 +436,11 @@ export default {
viewKeyWord(val) {
if (this.comShowDomType === 'field') {
let results = this.originComFieldDatas
let results = this.originComFieldData
if (val) {
results = this.originComFieldDatas.filter(item => item.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()))
results = this.originComFieldData.filter(item => item.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()))
}
this.comFieldDatas = JSON.parse(JSON.stringify(results))
this.comFieldData = JSON.parse(JSON.stringify(results))
}
}
},
@ -472,16 +471,16 @@ export default {
if (userCache) {
this.tData = JSON.parse(modelInfo)
const results = this.buildTree(this.tData)
this.defaultDatas = JSON.parse(JSON.stringify(results))
this.datas = JSON.parse(JSON.stringify(results))
this.defaultData = JSON.parse(JSON.stringify(results))
this.data = JSON.parse(JSON.stringify(results))
}
queryAuthModel({ modelType: 'dataset' }, !userCache).then(res => {
localStorage.setItem('dataset-tree', JSON.stringify(res.data))
if (!userCache) {
this.tData = res.data
const results = this.buildTree(this.tData)
this.defaultDatas = JSON.parse(JSON.stringify(results))
this.datas = JSON.parse(JSON.stringify(results))
this.defaultData = JSON.parse(JSON.stringify(results))
this.data = JSON.parse(JSON.stringify(results))
}
})
},
@ -491,8 +490,8 @@ export default {
if (this.myAttrs.fieldsParent) {
this.fieldsParent = this.myAttrs.fieldsParent
this.$nextTick(() => {
this.activeName === 'dataset' && this.showFieldDatas(this.fieldsParent)
this.activeName !== 'dataset' && this.comShowFieldDatas(this.fieldsParent)
this.activeName === 'dataset' && this.showFieldData(this.fieldsParent)
this.activeName !== 'dataset' && this.comShowFieldData(this.fieldsParent)
})
}
}
@ -514,7 +513,7 @@ export default {
name: val
}
authModel(queryCondition).then(res => {
this.datas = this.buildTree(res.data)
this.data = this.buildTree(res.data)
})
},
buildTree(arrs) {
@ -567,10 +566,10 @@ export default {
viewIds = [...viewIds, ...tabViewIds]
}
viewIds && viewIds.length > 0 && viewsWithIds(viewIds).then(res => {
const datas = res.data
const data = res.data
this.viewInfos = datas
this.childViews.viewInfos = datas
this.viewInfos = data
this.childViews.viewInfos = data
})
var type = 'TEXT'
if (this.widgetInfo.name.indexOf('time') !== -1) {
@ -580,14 +579,14 @@ export default {
type = 'NUM'
}
viewIds && viewIds.length > 0 && paramsWithIds(type, viewIds).then(res => {
const datas = res.data
const data = res.data
this.childViews.datasetParams = datas
this.childViews.datasetParams = data
})
},
handleNodeClick(data) {
if (data.modelInnerType !== 'group') {
this.showFieldDatas(data)
this.showFieldData(data)
} else {
if (!data.children || !data.children.length) {
const name = data.name
@ -601,9 +600,9 @@ export default {
loadDataSetTree() {
groupTree({}).then(res => {
const datas = res.data
const data = res.data
this.data = datas
this.data = data
})
},
@ -630,7 +629,7 @@ export default {
this.dataSetBreads = this.dataSetBreads.slice(0, 1)
const root = {
id: null,
children: JSON.parse(JSON.stringify(this.datas))
children: JSON.parse(JSON.stringify(this.data))
}
this.getPathById(node.id, root, res => {
if (res.length > 1) {
@ -710,15 +709,15 @@ export default {
this.keyWord = ''
this.isTreeSearch = false
if (bread.id) {
const node = this.getNode(bread.id, this.datas)
const node = this.getNode(bread.id, this.data)
if (node) {
this.tempTreeDatas = node.children
this.tempTreeData = node.children
}
} else {
this.tempTreeDatas = null
this.tempTreeData = null
}
this.datas = JSON.parse(JSON.stringify(this.defaultDatas))
this.data = JSON.parse(JSON.stringify(this.defaultData))
})
},
comBackLink(bread) {
@ -729,25 +728,25 @@ export default {
loadField(tableId) {
fieldListWithPermission(tableId).then(res => {
let datas = res.data
let data = res.data
if (this.widget && this.widget.filterFieldMethod) {
datas = this.widget.filterFieldMethod(datas)
data = this.widget.filterFieldMethod(data)
}
this.originFieldDatas = datas
this.fieldDatas = JSON.parse(JSON.stringify(datas))
this.originFieldData = data
this.fieldData = JSON.parse(JSON.stringify(data))
})
},
comLoadField(tableId) {
fieldListWithPermission(tableId).then(res => {
let datas = res.data
let data = res.data
if (this.widget && this.widget.filterFieldMethod) {
datas = this.widget.filterFieldMethod(datas)
data = this.widget.filterFieldMethod(data)
}
this.originComFieldDatas = datas
this.comFieldDatas = JSON.parse(JSON.stringify(datas))
this.originComFieldData = data
this.comFieldData = JSON.parse(JSON.stringify(data))
})
},
showFieldDatas(row) {
showFieldData(row) {
this.keyWord = ''
this.showDomType = 'field'
this.addQueue(row)
@ -755,12 +754,12 @@ export default {
this.loadField(row.id)
},
showNextGroup(row) {
this.tempTreeDatas = JSON.parse(JSON.stringify(row.children))
this.tempTreeData = JSON.parse(JSON.stringify(row.children))
this.keyWord = ''
this.showDomType = 'tree'
this.addQueue(row)
},
comShowFieldDatas(row) {
comShowFieldData(row) {
this.viewKeyWord = ''
this.comShowDomType = 'field'
this.comSetTailLink(row)
@ -772,8 +771,8 @@ export default {
this.showTips = false
this.moveId = e.draggedContext.element.id
if (this.isTree) return true
const tabelId = e.draggedContext.element.tableId
const prohibit = this.currentElement.options.attrs.dragItems.some(item => item.tableId === tabelId)
const tableId = e.draggedContext.element.tableId
const prohibit = this.currentElement.options.attrs.dragItems.some(item => item.tableId === tableId)
if (prohibit) {
this.showTips = true
}
@ -781,22 +780,22 @@ export default {
},
endDs(e) {
this.refuseMove(e, this.fieldDatas)
this.refuseMove(e, this.fieldData)
this.removeCheckedKey(e)
},
endVw(e) {
this.refuseMove(e, this.comFieldDatas)
this.refuseMove(e, this.comFieldData)
this.removeCheckedKey(e)
},
refuseMove(e, datas) {
refuseMove(e, data) {
const that = this
const xItems = datas.filter(function(m) {
const xItems = data.filter(function(m) {
return m.id === that.moveId
})
if (xItems && xItems.length > 1) {
this.datas.splice(e.newDraggableIndex, 1)
this.data.splice(e.newDraggableIndex, 1)
}
},
removeCheckedKey(e) {

2
frontend/src/views/system/about/index.vue
View File

@ -74,7 +74,7 @@
<a
class="md-primary pointer"
@click="support"
>{{ $t('about.suport') }}</a>
>{{ $t('about.support') }}</a>
</div>
</div>

2
frontend/src/views/system/datasource/ApiBody.vue
View File

@ -50,7 +50,7 @@
style="min-width: 1200px;"
>
<api-variable
:with-mor-setting="true"
:with-more-setting="true"
:is-read-only="isReadOnly"
:parameters="body.kvs"
:is-show-enable="isShowEnable"

2
frontend/src/views/system/datasource/ApiVariable.vue
View File

@ -154,7 +154,7 @@ export default {
default: true
},
suggestions: Array,
withMorSetting: Boolean
withMoreSetting: Boolean
},
data() {
return {

6
frontend/src/views/system/datasource/CodeEdit.vue
View File

@ -74,12 +74,12 @@ export default {
},
methods: {
editorInit: function(editor) {
require('brace/ext/language_tools') // language extension prerequsite...
require('brace/ext/language_tools')
this.modes.forEach(mode => {
require('brace/mode/' + mode) // language
require('brace/mode/' + mode)
})
require('brace/theme/' + this.theme)
require('brace/snippets/javascript') // snippet
require('brace/snippets/javascript')
if (this.readOnly) {
editor.setReadOnly(true)
}

8
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -1231,7 +1231,7 @@ export default {
},
previewData() {
this.showEmpty = false
const datas = []
const data = []
let maxPreviewNum = 0
for (let j = 0; j < this.apiItem.fields.length; j++) {
if (
@ -1242,18 +1242,18 @@ export default {
}
}
for (let i = 0; i < maxPreviewNum; i++) {
datas.push({})
data.push({})
}
for (let i = 0; i < this.apiItem.fields.length; i++) {
for (let j = 0; j < this.apiItem.fields[i].value.length; j++) {
this.$set(
datas[j],
data[j],
this.apiItem.fields[i].name,
this.apiItem.fields[i].value[j]
)
}
this.$nextTick(() => {
this.$refs.plxTable?.reloadData(datas)
this.$refs.plxTable?.reloadData(data)
})
}
this.showEmpty = this.apiItem.fields.length === 0

8
frontend/src/views/system/datasource/DsTree.vue
View File

@ -402,7 +402,7 @@ export default {
}
},
created() {
this.queryTreeDatas()
this.queryTreeData()
this.datasourceTypes()
},
methods: {
@ -451,7 +451,7 @@ export default {
return false
})
},
queryTreeDatas() {
queryTreeData() {
this.treeLoading = true
if (this.showView === 'Datasource') {
listDatasource().then((res) => {
@ -559,14 +559,14 @@ export default {
this.showView = 'Driver'
this.expandedArray = []
this.tData = []
this.queryTreeDatas()
this.queryTreeData()
},
dsMgm() {
this.$emit('switch-main', {})
this.showView = 'Datasource'
this.expandedArray = []
this.tData = []
this.queryTreeDatas()
this.queryTreeData()
},
addDb({ type }) {
const name = (this.dsTypes.find(ele => type === ele.type) || {}).name

5
frontend/src/views/system/datasource/convert.js
View File

@ -77,11 +77,6 @@ class Convert {
return baseResult
}
/**
* 递归函数，转换object对象为json schmea 格式
* @param {*} object 需要转换对象
* @param {*} name $id值
*/
_json2schema(object, name = '') {
// 如果递归值不是对象，那么return掉
if (!isObject(object)) {

2
frontend/src/views/system/datasource/dsTable.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="ds-table de-serach-table">
<div class="ds-table de-search-table">
<el-row class="top-operate">
<el-col :span="10">
<span class="table-name-top">{{ params.name }}</span>

18
frontend/src/views/system/log/filterUser.vue
View File

@ -103,7 +103,7 @@ export default {
usersValue: [],
activeUser: [],
users: [],
userCahe: [],
userCache: [],
activeType: [],
userDrawer: false
}
@ -113,7 +113,7 @@ export default {
return this.users.filter((ele) => !this.activeUser.includes(ele.id))
},
usersValueCopy() {
return this.userCahe.filter((ele) => this.activeUser.includes(ele.id))
return this.userCache.filter((ele) => this.activeUser.includes(ele.id))
}
},
mounted() {
@ -135,10 +135,10 @@ export default {
},
changeUser() {
if (
this.userCahe.length >
this.userCache.length >
this.usersValue.length + this.activeUser.length
) {
this.userCahe = this.userCahe.filter((ele) =>
this.userCache = this.userCache.filter((ele) =>
this.usersValue
.map((ele) => ele.id)
.concat(this.activeUser)
@ -148,14 +148,14 @@ export default {
}
const userIdx = this.usersValue.findIndex(
(ele) =>
!this.userCahe
!this.userCache
.map((ele) => ele.id)
.concat(this.activeUser)
.includes(ele.id)
)
if (userIdx === -1) return
this.activeUser.push(this.usersValue[userIdx].id)
this.userCahe.push(this.usersValue[userIdx])
this.userCache.push(this.usersValue[userIdx])
this.usersValue.splice(userIdx, 1)
},
activeUserChange(id) {
@ -165,7 +165,7 @@ export default {
this.usersValue = this.usersValue.filter((ele) => ele.id !== id)
} else {
this.activeUser.splice(userIndex, 1)
const user = this.userCahe.find((ele) => ele.id === id)
const user = this.userCache.find((ele) => ele.id === id)
this.usersValue.push(user)
}
},
@ -174,7 +174,7 @@ export default {
this.usersValue = []
this.activeUser = []
this.activeType = []
this.userCahe = []
this.userCache = []
this.$emit('search', [], [])
},
clearOneFilter(index) {
@ -219,7 +219,7 @@ export default {
this.filterTextMap.push([
'usersValue',
'activeUser',
'userCahe'
'userCache'
])
}

2
frontend/src/views/system/log/index.vue
View File

@ -1,6 +1,6 @@
<template>
<de-layout-content
class="de-serach-table"
class="de-search-table"
:header="$t('log.title')"
>
<el-row class="top-operate">

6
frontend/src/views/system/map/index.vue
View File

@ -51,12 +51,12 @@ export default {
]
})
this.queryAreaCodes(pcode).then(res => {
const areaEntitys = res.data
const areaEntities = res.data
this.myChart.on('click', param => {
const name = param.name
for (let index = 0; index < areaEntitys.length; index++) {
const element = areaEntitys[index]
for (let index = 0; index < areaEntities.length; index++) {
const element = areaEntities[index]
if (element.name === name) {
this.initMap(element.code)
}

8
frontend/src/views/system/sysParam/BasicSetting.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<operater title="system_parameter_setting.basic_setting">
<operator title="system_parameter_setting.basic_setting">
<deBtn
v-if="showEdit"
type="primary"
@ -24,7 +24,7 @@
>
{{ $t("commons.save") }}
</deBtn>
</operater>
</operator>
<!--基础配置表单-->
<el-form
@ -189,13 +189,13 @@
import { basicInfo, updateInfo } from '@/api/system/basic'
import { ldapStatus, oidcStatus, casStatus } from '@/api/user'
import bus from '@/utils/bus'
import operater from './Operater'
import operator from './Operator'
import msgCfm from '@/components/msgCfm'
import PluginCom from '@/views/system/plugin/PluginCom'
export default {
name: 'EmailSetting',
components: {
operater,
operator,
PluginCom
},
mixins: [msgCfm],

8
frontend/src/views/system/sysParam/ClusterModeSetting.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<operater title="system_parameter_setting.engine_mode_setting">
<operator title="system_parameter_setting.engine_mode_setting">
<deBtn
v-if="showCancel"
secondary
@ -28,7 +28,7 @@
>
{{ $t("commons.save") }}
</deBtn>
</operater>
</operator>
<el-form
ref="form"
v-loading="loading"
@ -182,13 +182,13 @@
<script>
import { engineInfo, validate, save } from '@/api/system/engine'
import i18n from '@/lang'
import operater from './Operater'
import operator from './Operator'
import msgCfm from '@/components/msgCfm'
import dePwd from '@/components/deCustomCm/dePwd.vue'
export default {
name: 'ClusterMode',
components: {
operater,
operator,
dePwd
},
mixins: [msgCfm],

8
frontend/src/views/system/sysParam/EmailSetting.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<operater title="system_parameter_setting.mailbox_service_settings">
<operator title="system_parameter_setting.mailbox_service_settings">
<deBtn
v-if="showCancel"
secondary
@ -31,7 +31,7 @@
>
{{ $t("commons.save") }}
</deBtn>
</operater>
</operator>
<!--邮件表单-->
<el-form
ref="formInline"
@ -129,14 +129,14 @@
<script>
import { emailInfo, updateInfo, validate } from '@/api/system/email'
import operater from './Operater'
import operator from './Operator'
import msgCfm from '@/components/msgCfm'
import dePwd from '@/components/deCustomCm/dePwd.vue'
const list = ['host', 'port', 'account', 'password', 'ssl', 'tls', '', 'recipient']
export default {
name: 'EmailSetting',
components: {
operater,
operator,
dePwd
},
mixins: [msgCfm],

4
frontend/src/views/system/sysParam/MapSetting/MapSettingLeft.vue
View File

@ -19,7 +19,7 @@
<el-tree
ref="tree"
class="filter-tree"
:data="treeDatas"
:data="treeData"
:props="defaultProps"
:filter-node-method="filterNode"
:expand-on-click-node="false"
@ -87,7 +87,7 @@ export default {
name: 'MapSettingLeft',
mixins: [msgCfm],
props: {
treeDatas: {
treeData: {
type: Array,
default: () => []
}

6
frontend/src/views/system/sysParam/MapSetting/MapSettingRight.vue
View File

@ -23,7 +23,7 @@
v-model="formInline.pCode"
popper-append-to-body
popover-class="map-class-wrap"
:data="treeDatas"
:data="treeData"
:select-params="selectParams"
:tree-params="treeParams"
:filter-node-method="_filterFun"
@ -158,7 +158,7 @@ export default {
type: String,
default: 'empty'
},
treeDatas: {
treeData: {
type: Array,
default: () => []
}
@ -231,7 +231,7 @@ export default {
}
},
watch: {
treeDatas: function(val) {
treeData: function(val) {
this.treeParams.data = val
}
},

12
frontend/src/views/system/sysParam/MapSetting/index.vue
View File

@ -11,7 +11,7 @@
>
<map-setting-left
ref="map_setting_tree"
:tree-datas="treeDatas"
:tree-data="treeData"
@emit-add="emitAdd"
@refresh-tree="refreshTree"
@show-node-info="loadForm"
@ -21,7 +21,7 @@
<de-main-container style="height: 100%;">
<map-setting-right
ref="map_setting_form"
:tree-datas="treeDatas"
:tree-data="treeData"
:status="formStatus"
@refresh-tree="refreshTree"
/>
@ -42,7 +42,7 @@ export default {
data() {
return {
formStatus: 'empty',
treeDatas: []
treeData: []
}
},
created() {
@ -63,13 +63,13 @@ export default {
this.formStatus = status
},
loadTreeData() {
!Object.keys(this.treeDatas).length && areaMapping().then(res => {
this.treeDatas = res.data
!Object.keys(this.treeData).length && areaMapping().then(res => {
this.treeData = res.data
})
},
refreshTree(node) {
areaMapping().then(res => {
this.treeDatas = res.data
this.treeData = res.data
if (!node?.code) return
this.$refs['map_setting_tree']?.showNewNode(node.code)
})

4
frontend/src/views/system/sysParam/Operater.vue → frontend/src/views/system/sysParam/Operator.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="operater-bar">
<div class="operator-bar">
<p class="title">{{ $t(title) }}</p>
<div class="btn-grounp">
<slot />
@ -19,7 +19,7 @@ export default {
</script>
<style lang="scss" scoped>
.operater-bar {
.operator-bar {
width: 100%;
height: 70px;
display: flex;

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

@ -1,5 +1,5 @@
<template>
<div class="dataset-on-time de-serach-table">
<div class="dataset-on-time de-search-table">
<el-row class="top-operate">
<el-col :span="10">
<deBtn
@ -48,7 +48,7 @@
>{{ $t("user.list") }}</deBtn>
<el-dropdown-menu
slot="dropdown"
class="list-colums-slect"
class="list-columns-select"
>
<p class="title">{{ $t("user.list_info") }}</p>
<el-checkbox
@ -728,7 +728,7 @@ export default {
}
</style>
<style lang="scss">
.list-colums-slect {
.list-columns-select {
padding: 8px 11px !important;
width: 238px;

26
frontend/src/views/system/task/FilterUser.vue
View File

@ -12,7 +12,7 @@
<span>{{ $t("dataset.datalist") }}</span>
<div class="filter-item">
<span
v-for="ele in selectDatasetsCahe"
v-for="ele in selectDatasetsCache"
:key="ele.id"
class="item"
:class="[activeDataset.includes(ele.id) ? 'active' : '']"
@ -157,9 +157,9 @@ export default {
treeLoading: false,
dataRange: [],
selectDatasets: [],
datasetCahe: [],
datasetCache: [],
activeDataset: [],
selectDatasetsCahe: [],
selectDatasetsCache: [],
treeData: [],
filterDataset,
active: {
@ -212,8 +212,8 @@ export default {
this.dataRange = []
this.activeDataset = []
this.selectDatasets = []
this.datasetCahe = []
this.selectDatasetsCahe = []
this.datasetCache = []
this.selectDatasetsCache = []
this.$refs.datasetTreeRef.filter()
this.$emit('search', [], [])
},
@ -245,18 +245,18 @@ export default {
this.selectDatasets.splice(datasetIdx, 1)
}
this.activeDataset.push(id)
this.selectDatasetsCahe.push({ id, name })
this.datasetCahe.push({ id, name })
this.selectDatasetsCache.push({ id, name })
this.datasetCache.push({ id, name })
this.$refs.datasetTreeRef.filter(id)
},
activeDatasetChange(id) {
const dataset = this.datasetCahe.find((ele) => ele.id === id)
const dataset = this.datasetCache.find((ele) => ele.id === id)
this.selectDatasets.push(dataset)
this.activeDataset = this.activeDataset.filter((ele) => ele !== id)
this.datasetCahe = this.datasetCahe.filter(
this.datasetCache = this.datasetCache.filter(
(ele) => ele.id !== id
)
this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
this.selectDatasetsCache = this.selectDatasetsCache.filter(
(ele) => ele.id !== id
)
this.$refs.datasetTreeRef.filter(true)
@ -271,7 +271,7 @@ export default {
if (this.activeDataset.length) {
const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce(
(pre, next) =>
(this.datasetCahe.find((ele) => ele.id === next) || {}).name +
(this.datasetCache.find((ele) => ele.id === next) || {}).name +
'、' +
pre,
''
@ -280,8 +280,8 @@ export default {
this.filterTextMap.push([
'activeDataset',
'selectDatasets',
'selectDatasetsCahe',
'datasetCahe'
'selectDatasetsCache',
'datasetCache'
])
}
[

26
frontend/src/views/system/task/FilterUserRecord.vue
View File

@ -12,7 +12,7 @@
<span>{{ $t("dataset.datalist") }}</span>
<div class="filter-item">
<span
v-for="ele in selectDatasetsCahe"
v-for="ele in selectDatasetsCache"
:key="ele.id"
class="item"
:class="[activeDataset.includes(ele.id) ? 'active' : '']"
@ -160,9 +160,9 @@ export default {
filterTextMap: [],
dataRange: [],
selectDatasets: [],
datasetCahe: [],
datasetCache: [],
activeDataset: [],
selectDatasetsCahe: [],
selectDatasetsCache: [],
treeData: [],
filterDataset: [filterDatasetRecord],
active: {
@ -211,8 +211,8 @@ export default {
this.dataRange = []
this.activeDataset = []
this.selectDatasets = []
this.datasetCahe = []
this.selectDatasetsCahe = []
this.datasetCache = []
this.selectDatasetsCache = []
this.$refs.datasetTreeRef.filter()
this.$emit('search', [], [])
},
@ -244,18 +244,18 @@ export default {
this.selectDatasets.splice(datasetIdx, 1)
}
this.activeDataset.push(id)
this.selectDatasetsCahe.push({ id, name })
this.datasetCahe.push({ id, name })
this.selectDatasetsCache.push({ id, name })
this.datasetCache.push({ id, name })
this.$refs.datasetTreeRef.filter(id)
},
activeDatasetChange(id) {
const dataset = this.datasetCahe.find((ele) => ele.id === id)
const dataset = this.datasetCache.find((ele) => ele.id === id)
this.selectDatasets.push(dataset)
this.activeDataset = this.activeDataset.filter((ele) => ele !== id)
this.datasetCahe = this.datasetCahe.filter(
this.datasetCache = this.datasetCache.filter(
(ele) => ele.id !== id
)
this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
this.selectDatasetsCache = this.selectDatasetsCache.filter(
(ele) => ele.id !== id
)
this.$refs.datasetTreeRef.filter(true)
@ -270,7 +270,7 @@ export default {
if (this.activeDataset.length) {
const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce(
(pre, next) =>
(this.datasetCahe.find((ele) => ele.id === next) || {}).name +
(this.datasetCache.find((ele) => ele.id === next) || {}).name +
'、' +
pre,
''
@ -279,8 +279,8 @@ export default {
this.filterTextMap.push([
'activeDataset',
'selectDatasets',
'selectDatasetsCahe',
'datasetCahe'
'selectDatasetsCache',
'datasetCache'
])
}
['dataset.task.last_exec_status'].forEach((ele, index) => {

6
frontend/src/views/system/task/TableSelector.vue
View File

@ -91,8 +91,8 @@
>
<template slot="header">
<svg-icon
:icon-class="iconFormate(field.deType).iconClass"
:class="iconFormate(field.deType).class"
:icon-class="iconFormat(field.deType).iconClass"
:class="iconFormat(field.deType).class"
/>
<span>{{ field.name }}</span>
</template>
@ -174,7 +174,7 @@ export default {
this.treeNode()
},
methods: {
iconFormate(deType) {
iconFormat(deType) {
const val = ['text', 'time', 'value', 'value', 'location'][deType]
return {
class: `field-icon-${val}`,

2
frontend/src/views/system/task/TaskRecord.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="dataset-on-time de-serach-table">
<div class="dataset-on-time de-search-table">
<el-row class="top-operate">
<el-col :span="10">
<deBtn

40
frontend/src/views/system/user/FilterUser.vue
View File

@ -24,7 +24,7 @@
<span>{{ $t("commons.organization") }}</span>
<div class="filter-item">
<span
v-for="ele in selectDeptsCahe"
v-for="ele in selectDeptsCache"
:key="ele.id"
class="item"
:class="[activeDept.includes(ele.id) ? 'active' : '']"
@ -139,8 +139,8 @@ import { getDeptTree, treeByDeptId } from '@/api/system/dept'
export default {
data() {
return {
roleCahe: [],
deptCahe: [],
roleCache: [],
deptCache: [],
roles: [],
filterTextMap: [],
status: [
@ -158,7 +158,7 @@ export default {
activeRole: [],
depts: [],
selectDepts: [],
selectDeptsCahe: [],
selectDeptsCache: [],
activeDept: [],
defaultProps: {
children: 'children',
@ -173,7 +173,7 @@ export default {
return this.roles.filter((ele) => !this.activeRole.includes(ele.id))
},
rolesValueCopy() {
return this.roleCahe.filter((ele) => this.activeRole.includes(ele.id))
return this.roleCache.filter((ele) => this.activeRole.includes(ele.id))
},
deptsComputed() {
return this.depts.filter((ele) => !this.activeDept.includes(ele.id))
@ -209,10 +209,10 @@ export default {
},
changeRole() {
if (
this.roleCahe.length >
this.roleCache.length >
this.rolesValue.length + this.activeRole.length
) {
this.roleCahe = this.roleCahe.filter((ele) =>
this.roleCache = this.roleCache.filter((ele) =>
this.rolesValue
.map((ele) => ele.id)
.concat(this.activeRole)
@ -222,14 +222,14 @@ export default {
}
const roleIdx = this.rolesValue.findIndex(
(ele) =>
!this.roleCahe
!this.roleCache
.map((ele) => ele.id)
.concat(this.activeRole)
.includes(ele.id)
)
if (roleIdx === -1) return
this.activeRole.push(this.rolesValue[roleIdx].id)
this.roleCahe.push(this.rolesValue[roleIdx])
this.roleCache.push(this.rolesValue[roleIdx])
this.rolesValue.splice(roleIdx, 1)
},
activeRoleChange(id) {
@ -239,7 +239,7 @@ export default {
this.rolesValue = this.rolesValue.filter((ele) => ele.id !== id)
} else {
this.activeRole.splice(roleIndex, 1)
const role = this.roleCahe.find((ele) => ele.id === id)
const role = this.roleCache.find((ele) => ele.id === id)
this.rolesValue.push(role)
}
},
@ -247,21 +247,21 @@ export default {
const deptIdx = this.selectDepts.findIndex((ele) => ele.id === id)
if (deptIdx !== -1) {
this.selectDepts.splice(deptIdx, 1)
this.selectDeptsCahe = this.selectDeptsCahe.filter(
this.selectDeptsCache = this.selectDeptsCache.filter(
(ele) => ele.id !== id
)
this.deptCahe = this.deptCahe.filter((ele) => ele.id !== id)
this.deptCache = this.deptCache.filter((ele) => ele.id !== id)
return
}
this.activeDept.push(id)
this.selectDeptsCahe.push({ id, label })
this.deptCahe.push({ id, label })
this.selectDeptsCache.push({ id, label })
this.deptCache.push({ id, label })
},
activeDeptChange(id) {
const dept = this.deptCahe.find((ele) => ele.id === id)
const dept = this.deptCache.find((ele) => ele.id === id)
this.selectDepts.push(dept)
this.activeDept = this.activeDept.filter((ele) => ele !== id)
this.selectDeptsCahe = this.selectDeptsCahe.filter(
this.selectDeptsCache = this.selectDeptsCache.filter(
(ele) => ele.id !== id
)
},
@ -325,15 +325,15 @@ export default {
}
if (this.activeDept.length) {
params.push(
`${this.$t('panel.org')}:${this.selectDeptsCahe
`${this.$t('panel.org')}:${this.selectDeptsCache
.map((ele) => ele.label)
.join('、')}`
)
this.filterTextMap.push([
'activeDept',
'selectDepts',
'selectDeptsCahe',
'deptCahe'
'selectDeptsCache',
'deptCache'
])
}
if (this.activeRole.length) {
@ -342,7 +342,7 @@ export default {
.map((ele) => ele.name)
.join('、')}`
)
this.filterTextMap.push(['rolesValue', 'activeRole', 'roleCahe'])
this.filterTextMap.push(['rolesValue', 'activeRole', 'roleCache'])
}
return params
},

2
frontend/src/views/system/user/PrivateForm.vue
View File

@ -230,7 +230,7 @@ export default {
defaultForm: { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, deptId: null, phone: null, roleIds: [] },
depts: null,
roles: [],
roleDatas: [],
roleData: [],
userRoles: [],
formType: 'add',
isPluginLoaded: false

2
frontend/src/views/system/user/UserEditer.vue
View File

@ -363,7 +363,7 @@ export default {
},
depts: [],
roles: [],
roleDatas: [],
roleData: [],
userRoles: [],
formType: 'add',
isPluginLoaded: false,

6
frontend/src/views/system/user/index.vue
View File

@ -1,5 +1,5 @@
<template>
<de-layout-content class="de-serach-table">
<de-layout-content class="de-search-table">
<el-row class="top-operate">
<el-col :span="12">
<deBtn
@ -50,7 +50,7 @@
>{{ $t('user.list') }}</deBtn>
<el-dropdown-menu
slot="dropdown"
class="list-colums-slect"
class="list-columns-select"
>
<p class="title">{{ $t('user.list_info') }}</p>
<el-checkbox
@ -726,7 +726,7 @@ export default {
}
}
}
.list-colums-slect {
.list-columns-select {
padding: 8px 11px !important;
width: 238px;