From 9db2228f8c92fe0c5143ad0a79275237a190153b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 21 Oct 2022 13:06:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81):=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEtypos=E5=B7=A5=E5=85=B7=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/DeViewSelect/index.bak.vue | 260 ------------------ .../src/components/DeViewSelect/index.vue | 2 +- .../src/components/ElTreeSelect/index.vue | 2 +- .../src/components/ElVisualSelect/index.vue | 16 +- .../GradientColorSelector/index.vue | 12 +- .../canvas/components/Editor/MarkLine.vue | 4 +- .../components/canvas/components/TextAttr.vue | 6 +- .../components/canvas/components/Toolbar.vue | 2 +- .../components/cron/cron/secondAndMinute.vue | 10 +- .../src/components/dataease/DeOutWidget.vue | 8 +- frontend/src/components/gridTable/index.vue | 14 +- .../widget/DeWidget/DeNumberRange.vue | 6 +- .../components/widget/DeWidget/DeSelect.vue | 26 +- .../widget/DeWidget/DeSelectGrid.vue | 52 ++-- .../widget/DeWidget/DeSelectTree.vue | 34 +-- .../src/components/widget/DeWidget/DeTabs.vue | 14 +- .../widget/DeWidget/DeTreeSelect.vue | 2 +- .../{TitlePostion.vue => TitlePosition.vue} | 0 .../widget/DeWidget/sources/ElQuarter.vue | 2 +- .../NumberSelectGridServiceImpl.js | 8 +- .../serviceImpl/NumberSelectServiceImpl.js | 8 +- .../serviceImpl/TextSelectGridServiceImpl.js | 8 +- .../serviceImpl/TextSelectServiceImpl.js | 8 +- .../serviceImpl/TextSelectTreeServiceImpl.js | 8 +- .../icons/svg/{warn-tre.svg => warn-tree.svg} | 0 frontend/src/lang/en.js | 22 +- frontend/src/lang/es.js | 4 +- frontend/src/lang/tw.js | 10 +- frontend/src/lang/zh.js | 10 +- frontend/src/permission.js | 12 +- frontend/src/styles/index.scss | 2 +- .../components/filter/ResultFilterEditor.vue | 8 +- .../chart/components/senior/MapMapping.vue | 18 +- .../chart/components/table/TableNormal.vue | 16 +- frontend/src/views/dataset/add/AddApi.vue | 6 +- frontend/src/views/dataset/add/AddCustom.vue | 8 +- frontend/src/views/dataset/add/AddDB.vue | 6 +- frontend/src/views/dataset/add/AddSQL.vue | 10 +- frontend/src/views/dataset/add/AddUnion.vue | 10 +- .../views/dataset/add/union/UnionPreview.vue | 8 +- .../views/dataset/common/DatasetTableData.vue | 4 +- .../src/views/dataset/data/CalcFieldEdit.vue | 4 +- .../src/views/dataset/data/TabDataPreview.vue | 4 +- frontend/src/views/msg/all.vue | 2 +- frontend/src/views/msg/setting.vue | 6 +- .../views/panel/GrantAuth/ShareHead/index.vue | 15 +- .../src/views/panel/GrantAuth/dept/index.vue | 6 +- .../src/views/panel/GrantAuth/shareTree.vue | 18 +- .../panel/ViewSelect/index-with-drag.vue | 6 +- frontend/src/views/panel/ViewSelect/index.vue | 6 +- .../panel/appTemplateMarket/log/index.vue | 2 +- frontend/src/views/panel/edit/index.vue | 2 +- frontend/src/views/panel/enshrine/index.vue | 6 +- .../src/views/panel/filter/ButtonDialog.vue | 6 +- .../src/views/panel/filter/filterDialog.vue | 117 ++++---- frontend/src/views/system/about/index.vue | 2 +- .../src/views/system/datasource/ApiBody.vue | 2 +- .../views/system/datasource/ApiVariable.vue | 2 +- .../src/views/system/datasource/CodeEdit.vue | 6 +- .../system/datasource/DsConfiguration.vue | 8 +- .../src/views/system/datasource/DsTree.vue | 8 +- .../src/views/system/datasource/convert.js | 5 - .../src/views/system/datasource/dsTable.vue | 2 +- frontend/src/views/system/log/filterUser.vue | 18 +- frontend/src/views/system/log/index.vue | 2 +- frontend/src/views/system/map/index.vue | 6 +- .../views/system/sysParam/BasicSetting.vue | 8 +- .../system/sysParam/ClusterModeSetting.vue | 8 +- .../views/system/sysParam/EmailSetting.vue | 8 +- .../sysParam/MapSetting/MapSettingLeft.vue | 4 +- .../sysParam/MapSetting/MapSettingRight.vue | 6 +- .../system/sysParam/MapSetting/index.vue | 12 +- .../sysParam/{Operater.vue => Operator.vue} | 4 +- .../src/views/system/task/DatasetTaskList.vue | 6 +- frontend/src/views/system/task/FilterUser.vue | 26 +- .../views/system/task/FilterUserRecord.vue | 26 +- .../src/views/system/task/TableSelector.vue | 6 +- frontend/src/views/system/task/TaskRecord.vue | 2 +- frontend/src/views/system/user/FilterUser.vue | 40 +-- .../src/views/system/user/PrivateForm.vue | 2 +- frontend/src/views/system/user/UserEditer.vue | 2 +- frontend/src/views/system/user/index.vue | 6 +- 82 files changed, 413 insertions(+), 680 deletions(-) delete mode 100644 frontend/src/components/DeViewSelect/index.bak.vue rename frontend/src/components/widget/DeWidget/{TitlePostion.vue => TitlePosition.vue} (100%) rename frontend/src/icons/svg/{warn-tre.svg => warn-tree.svg} (100%) rename frontend/src/views/system/sysParam/{Operater.vue => Operator.vue} (91%) diff --git a/frontend/src/components/DeViewSelect/index.bak.vue b/frontend/src/components/DeViewSelect/index.bak.vue deleted file mode 100644 index 93c850e5c6..0000000000 --- a/frontend/src/components/DeViewSelect/index.bak.vue +++ /dev/null @@ -1,260 +0,0 @@ - - - - - diff --git a/frontend/src/components/DeViewSelect/index.vue b/frontend/src/components/DeViewSelect/index.vue index 9603cbaa65..2995c8bec5 100644 --- a/frontend/src/components/DeViewSelect/index.vue +++ b/frontend/src/components/DeViewSelect/index.vue @@ -171,7 +171,7 @@ export default { _popoverShowFun(val) { this.openDialog() this._updateH() - this.$emit('onFoucs') + this.$emit('onFocus') }, _selectRemoveTag(viewId) { diff --git a/frontend/src/components/ElTreeSelect/index.vue b/frontend/src/components/ElTreeSelect/index.vue index 184a769a03..91cbcef2d6 100644 --- a/frontend/src/components/ElTreeSelect/index.vue +++ b/frontend/src/components/ElTreeSelect/index.vue @@ -535,7 +535,7 @@ export default { }, _popoverShowFun(val) { this._updateH() - this.$emit('onFoucs') + this.$emit('onFocus') }, _popoverHideFun(e) { const path = this._getEventPath(e) diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue index 58adbbd6ea..8295986d58 100644 --- a/frontend/src/components/ElVisualSelect/index.vue +++ b/frontend/src/components/ElVisualSelect/index.vue @@ -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() diff --git a/frontend/src/components/GradientColorSelector/index.vue b/frontend/src/components/GradientColorSelector/index.vue index e770b40f41..48da711b0d 100644 --- a/frontend/src/components/GradientColorSelector/index.vue +++ b/frontend/src/components/GradientColorSelector/index.vue @@ -58,7 +58,7 @@ @click="handler" >
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 diff --git a/frontend/src/components/canvas/components/Editor/MarkLine.vue b/frontend/src/components/canvas/components/Editor/MarkLine.vue index 4dc67b4d43..2ab53b91b8 100644 --- a/frontend/src/components/canvas/components/Editor/MarkLine.vue +++ b/frontend/src/components/canvas/components/Editor/MarkLine.vue @@ -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) { diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 7c0fe79921..ac15062e93 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -333,11 +333,11 @@
- diff --git a/frontend/src/components/cron/cron/secondAndMinute.vue b/frontend/src/components/cron/cron/secondAndMinute.vue index d56077ccd4..b7125e4ea2 100644 --- a/frontend/src/components/cron/cron/secondAndMinute.vue +++ b/frontend/src/components/cron/cron/secondAndMinute.vue @@ -7,7 +7,7 @@ label="1" size="mini" border - >{{ $t('cron.every') }}{{ lable }} + >{{ $t('cron.every') }}{{ label }}
- {{ lable }} + {{ label }}
- {{ lable }}{{ $t('cron.every_begin') }} + {{ label }}{{ $t('cron.every_begin') }} - {{ lable }}{{ $t('cron.every_exec') }} + {{ label }}{{ $t('cron.every_exec') }}
@@ -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) }, diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue index bc0ce6c281..cbaca4a51d 100644 --- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue +++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue @@ -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 }, diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 2d4079f2b0..e63f7bcb96 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -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" > 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 diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue index a43db7df16..d4f4c57ec4 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue +++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue @@ -32,7 +32,7 @@ @change="handleCheckedChange" > {{ item.id }} @@ -48,7 +48,7 @@ @change="changeRadioBox" > 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) { diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue index 12dea5b69b..96232638f2 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue +++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue @@ -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) }, /* 下面是树的渲染方法 */ diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 81f480e970..b9c32f817a 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -41,21 +41,21 @@ - + {{ $t('detabs.eidttitle') }} - + {{ $t('detabs.selectview') }} - + {{ $t('detabs.selectOthers') }} {{ $t('table.delete') }} @@ -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) diff --git a/frontend/src/components/widget/DeWidget/DeTreeSelect.vue b/frontend/src/components/widget/DeWidget/DeTreeSelect.vue index 01203f379b..c9f2e689f5 100644 --- a/frontend/src/components/widget/DeWidget/DeTreeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeTreeSelect.vue @@ -10,7 +10,7 @@ @change="changeValue" > !!item).map(item => { + optionData(data) { + if (!data) return null + return data.filter(item => !!item).map(item => { return { id: item, text: item diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js index 6707f530c7..3dcc29a6f6 100644 --- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js @@ -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 diff --git a/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js index 9c7644b1d5..1014d2b17d 100644 --- a/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js @@ -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 diff --git a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js index c1bd366db9..ab8cd690df 100644 --- a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js @@ -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 diff --git a/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js index 441f334b75..4f6d02afac 100644 --- a/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js @@ -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 diff --git a/frontend/src/icons/svg/warn-tre.svg b/frontend/src/icons/svg/warn-tree.svg similarity index 100% rename from frontend/src/icons/svg/warn-tre.svg rename to frontend/src/icons/svg/warn-tree.svg diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8a35b14753..f1a6c2e47e 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -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' }, diff --git a/frontend/src/lang/es.js b/frontend/src/lang/es.js index 8187bfe706..477af736cb 100755 --- a/frontend/src/lang/es.js +++ b/frontend/src/lang/es.js @@ -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', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 190436c596..495c17ae5f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -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: '站內消息', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 0722d9c43f..9f696b1aef 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -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: '站内消息', diff --git a/frontend/src/permission.js b/frontend/src/permission.js index 8b983c5449..990658e5ef 100644 --- a/frontend/src/permission.js +++ b/frontend/src/permission.js @@ -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 diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 8e4f24cc91..ac082f7053 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1400,7 +1400,7 @@ div:focus { } } -.de-serach-table { +.de-search-table { .top-operate { margin-bottom: 16px; diff --git a/frontend/src/views/chart/components/filter/ResultFilterEditor.vue b/frontend/src/views/chart/components/filter/ResultFilterEditor.vue index e6f4824845..f9f3c77fdf 100644 --- a/frontend/src/views/chart/components/filter/ResultFilterEditor.vue +++ b/frontend/src/views/chart/components/filter/ResultFilterEditor.vue @@ -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 diff --git a/frontend/src/views/chart/components/senior/MapMapping.vue b/frontend/src/views/chart/components/senior/MapMapping.vue index e8b0c535f6..b5db2b429b 100644 --- a/frontend/src/views/chart/components/senior/MapMapping.vue +++ b/frontend/src/views/chart/components/senior/MapMapping.vue @@ -1,7 +1,7 @@