From 0c59d65dc4ca7cfc2e584f175283b4c2fb24dd63 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Sat, 22 Oct 2022 22:32:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ElTreeSelect/index.vue | 4 +- .../src/components/ElVisualSelect/index.vue | 4 +- .../src/components/Notification/index.vue | 6 +-- .../canvas/components/Editor/Shape.vue | 6 +-- ...s => calculateComponentPositionAndSize.js} | 52 +++++++++---------- frontend/src/components/gridTable/index.vue | 12 ++--- .../svg/{readed-msg.svg => read-msg.svg} | 0 frontend/src/lang/en.js | 6 +-- frontend/src/lang/tw.js | 6 +-- frontend/src/lang/zh.js | 6 +-- frontend/src/settings.js | 2 +- frontend/src/styles/index.scss | 2 +- frontend/src/views/dataset/add/AddApi.vue | 20 +++---- frontend/src/views/dataset/add/AddDB.vue | 20 +++---- frontend/src/views/dataset/add/AddExcel.vue | 20 +++---- .../src/views/dataset/data/UpdateInfo.vue | 2 +- frontend/src/views/dataset/form.vue | 22 ++++---- frontend/src/views/msg/all.vue | 26 +++++----- .../panel/template/component/TemplateList.vue | 2 +- .../src/views/system/task/DatasetTaskList.vue | 2 +- 20 files changed, 110 insertions(+), 110 deletions(-) rename frontend/src/components/canvas/utils/{calculateComponentPositonAndSize.js => calculateComponentPositionAndSize.js} (85%) rename frontend/src/icons/svg/{readed-msg.svg => read-msg.svg} (100%) diff --git a/frontend/src/components/ElTreeSelect/index.vue b/frontend/src/components/ElTreeSelect/index.vue index 91cbcef2d6..529836d36b 100644 --- a/frontend/src/components/ElTreeSelect/index.vue +++ b/frontend/src/components/ElTreeSelect/index.vue @@ -54,7 +54,7 @@ v-model="selectAll" v-customStyle="customStyle" :indeterminate="isIndeterminate" - @change="selectAllChane" + @change="selectAllChange" >{{ $t('dataset.check_all') }}

{{ $t('dataset.check_all') }}

ele.id)] : [] this.visualChange(vals) this.selectValue = vals diff --git a/frontend/src/components/Notification/index.vue b/frontend/src/components/Notification/index.vue index b09bccb536..e225e4f179 100644 --- a/frontend/src/components/Notification/index.vue +++ b/frontend/src/components/Notification/index.vue @@ -152,11 +152,11 @@ export default { if (this.$route && this.$route.name && this.$route.name === row.router) { // 如果当前路由就是目标路由 那么使用router.push页面不会刷新 这时候要使用事件方式 row.callback && bus.$emit(row.callback, param) - row.status || this.setReaded(row.msgId) + row.status || this.setRead(row.msgId) } else { if (this.hasPermissionRoute(row.router)) { this.$router.push({ name: row.router, params: param }) - row.status || this.setReaded(row.msgId) + row.status || this.setRead(row.msgId) return } this.$warning(this.$t('commons.no_target_permission')) @@ -247,7 +247,7 @@ export default { this.visible = true }, // 设置已读 - setReaded(msgId) { + setRead(msgId) { updateStatus(msgId).then(res => { this.search() }) diff --git a/frontend/src/components/canvas/components/Editor/Shape.vue b/frontend/src/components/canvas/components/Editor/Shape.vue index 9b258ca8f4..eff4fc7a77 100644 --- a/frontend/src/components/canvas/components/Editor/Shape.vue +++ b/frontend/src/components/canvas/components/Editor/Shape.vue @@ -39,7 +39,7 @@ import eventBus from '@/components/canvas/utils/eventBus' import runAnimation from '@/components/canvas/utils/runAnimation' import { mapState } from 'vuex' -import calculateComponentPositonAndSize from '@/components/canvas/utils/calculateComponentPositonAndSize' +import calculateComponentPositionAndSize from '@/components/canvas/utils/calculateComponentPositionAndSize' import { mod360 } from '@/components/canvas/utils/translate' export default { @@ -347,12 +347,12 @@ export default { } needSave = true - const curPositon = { + const curPosition = { x: moveEvent.clientX - editorRectInfo.left, y: moveEvent.clientY - editorRectInfo.top } - calculateComponentPositonAndSize(point, style, curPositon, proportion, needLockProportion, { + calculateComponentPositionAndSize(point, style, curPosition, proportion, needLockProportion, { center, curPoint, symmetricPoint diff --git a/frontend/src/components/canvas/utils/calculateComponentPositonAndSize.js b/frontend/src/components/canvas/utils/calculateComponentPositionAndSize.js similarity index 85% rename from frontend/src/components/canvas/utils/calculateComponentPositonAndSize.js rename to frontend/src/components/canvas/utils/calculateComponentPositionAndSize.js index 7e4effc74b..27e8cdad46 100644 --- a/frontend/src/components/canvas/utils/calculateComponentPositonAndSize.js +++ b/frontend/src/components/canvas/utils/calculateComponentPositionAndSize.js @@ -12,10 +12,10 @@ const funcs = { l: calculateLeft } -function calculateLeftTop(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateLeftTop(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint } = pointInfo - let newCenterPoint = getCenterPoint(curPositon, symmetricPoint) - let newTopLeftPoint = calculateRotatedPointCoordinate(curPositon, newCenterPoint, -style.rotate) + let newCenterPoint = getCenterPoint(curPosition, symmetricPoint) + let newTopLeftPoint = calculateRotatedPointCoordinate(curPosition, newCenterPoint, -style.rotate) let newBottomRightPoint = calculateRotatedPointCoordinate(symmetricPoint, newCenterPoint, -style.rotate) let newWidth = newBottomRightPoint.x - newTopLeftPoint.x @@ -50,10 +50,10 @@ function calculateLeftTop(style, curPositon, proportion, needLockProportion, poi } } -function calculateRightTop(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateRightTop(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint } = pointInfo - let newCenterPoint = getCenterPoint(curPositon, symmetricPoint) - let newTopRightPoint = calculateRotatedPointCoordinate(curPositon, newCenterPoint, -style.rotate) + let newCenterPoint = getCenterPoint(curPosition, symmetricPoint) + let newTopRightPoint = calculateRotatedPointCoordinate(curPosition, newCenterPoint, -style.rotate) let newBottomLeftPoint = calculateRotatedPointCoordinate(symmetricPoint, newCenterPoint, -style.rotate) let newWidth = newTopRightPoint.x - newBottomLeftPoint.x @@ -85,11 +85,11 @@ function calculateRightTop(style, curPositon, proportion, needLockProportion, po } } -function calculateRightBottom(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateRightBottom(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint } = pointInfo - let newCenterPoint = getCenterPoint(curPositon, symmetricPoint) + let newCenterPoint = getCenterPoint(curPosition, symmetricPoint) let newTopLeftPoint = calculateRotatedPointCoordinate(symmetricPoint, newCenterPoint, -style.rotate) - let newBottomRightPoint = calculateRotatedPointCoordinate(curPositon, newCenterPoint, -style.rotate) + let newBottomRightPoint = calculateRotatedPointCoordinate(curPosition, newCenterPoint, -style.rotate) let newWidth = newBottomRightPoint.x - newTopLeftPoint.x let newHeight = newBottomRightPoint.y - newTopLeftPoint.y @@ -120,11 +120,11 @@ function calculateRightBottom(style, curPositon, proportion, needLockProportion, } } -function calculateLeftBottom(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateLeftBottom(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint } = pointInfo - let newCenterPoint = getCenterPoint(curPositon, symmetricPoint) + let newCenterPoint = getCenterPoint(curPosition, symmetricPoint) let newTopRightPoint = calculateRotatedPointCoordinate(symmetricPoint, newCenterPoint, -style.rotate) - let newBottomLeftPoint = calculateRotatedPointCoordinate(curPositon, newCenterPoint, -style.rotate) + let newBottomLeftPoint = calculateRotatedPointCoordinate(curPosition, newCenterPoint, -style.rotate) let newWidth = newTopRightPoint.x - newBottomLeftPoint.x let newHeight = newBottomLeftPoint.y - newTopRightPoint.y @@ -155,12 +155,12 @@ function calculateLeftBottom(style, curPositon, proportion, needLockProportion, } } -function calculateTop(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateTop(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint, curPoint } = pointInfo - const rotatedcurPositon = calculateRotatedPointCoordinate(curPositon, curPoint, -style.rotate) + const rotatedcurPosition = calculateRotatedPointCoordinate(curPosition, curPoint, -style.rotate) const rotatedTopMiddlePoint = calculateRotatedPointCoordinate({ x: curPoint.x, - y: rotatedcurPositon.y + y: rotatedcurPosition.y }, curPoint, style.rotate) // 勾股定理 @@ -185,11 +185,11 @@ function calculateTop(style, curPositon, proportion, needLockProportion, pointIn } } -function calculateRight(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateRight(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint, curPoint } = pointInfo - const rotatedcurPositon = calculateRotatedPointCoordinate(curPositon, curPoint, -style.rotate) + const rotatedcurPosition = calculateRotatedPointCoordinate(curPosition, curPoint, -style.rotate) const rotatedRightMiddlePoint = calculateRotatedPointCoordinate({ - x: rotatedcurPositon.x, + x: rotatedcurPosition.x, y: curPoint.y }, curPoint, style.rotate) @@ -213,12 +213,12 @@ function calculateRight(style, curPositon, proportion, needLockProportion, point } } -function calculateBottom(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateBottom(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint, curPoint } = pointInfo - const rotatedcurPositon = calculateRotatedPointCoordinate(curPositon, curPoint, -style.rotate) + const rotatedcurPosition = calculateRotatedPointCoordinate(curPosition, curPoint, -style.rotate) const rotatedBottomMiddlePoint = calculateRotatedPointCoordinate({ x: curPoint.x, - y: rotatedcurPositon.y + y: rotatedcurPosition.y }, curPoint, style.rotate) const newHeight = Math.sqrt((rotatedBottomMiddlePoint.x - symmetricPoint.x) ** 2 + (rotatedBottomMiddlePoint.y - symmetricPoint.y) ** 2) @@ -241,11 +241,11 @@ function calculateBottom(style, curPositon, proportion, needLockProportion, poin } } -function calculateLeft(style, curPositon, proportion, needLockProportion, pointInfo) { +function calculateLeft(style, curPosition, proportion, needLockProportion, pointInfo) { const { symmetricPoint, curPoint } = pointInfo - const rotatedcurPositon = calculateRotatedPointCoordinate(curPositon, curPoint, -style.rotate) + const rotatedcurPosition = calculateRotatedPointCoordinate(curPosition, curPoint, -style.rotate) const rotatedLeftMiddlePoint = calculateRotatedPointCoordinate({ - x: rotatedcurPositon.x, + x: rotatedcurPosition.x, y: curPoint.y }, curPoint, style.rotate) @@ -268,6 +268,6 @@ function calculateLeft(style, curPositon, proportion, needLockProportion, pointI } } -export default function calculateComponentPositonAndSize(name, style, curPositon, proportion, needLockProportion, pointInfo) { - funcs[name](style, curPositon, proportion, needLockProportion, pointInfo) +export default function calculateComponentPositionAndSize(name, style, curPosition, proportion, needLockProportion, pointInfo) { + funcs[name](style, curPosition, proportion, needLockProportion, pointInfo) } diff --git a/frontend/src/components/gridTable/index.vue b/frontend/src/components/gridTable/index.vue index 487f9c4bb4..abd098799c 100644 --- a/frontend/src/components/gridTable/index.vue +++ b/frontend/src/components/gridTable/index.vue @@ -63,13 +63,13 @@ export default { layout: 'total, prev, pager, next, sizes, jumper', total: 0 }, - multipleSelectionCach: [], + multipleSelectionCache: [], tableEvent: {} } }, computed: { multipleSelectionAll() { - return [...this.multipleSelectionCach, ...this.multipleSelection] + return [...this.multipleSelectionCache, ...this.multipleSelection] } }, watch: { @@ -114,11 +114,11 @@ export default { this.$refs.table.toggleRowSelection(row, true) }, handlerSelected(multipleSelection) { - this.multipleSelectionCach = [ - ...this.multipleSelectionCach, + this.multipleSelectionCache = [ + ...this.multipleSelectionCache, ...multipleSelection ] - const flags = this.multipleSelectionCach.map( + const flags = this.multipleSelectionCache.map( (ele) => ele[this.selectedFlags] ) // 当前页的选中项索引 @@ -131,7 +131,7 @@ export default { } }) notCurrentArr.sort().reduceRight((pre, next) => { - this.multipleSelectionCach.splice(next, 1) + this.multipleSelectionCache.splice(next, 1) }, 0) }, handleListeners() { diff --git a/frontend/src/icons/svg/readed-msg.svg b/frontend/src/icons/svg/read-msg.svg similarity index 100% rename from frontend/src/icons/svg/readed-msg.svg rename to frontend/src/icons/svg/read-msg.svg diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index dfd7a11eee..804ddce80d 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1437,7 +1437,7 @@ export default { field_rename: 'Rename Field', params_work: 'Effective only when editing SQL', sql_variable_limit_1: '1、SQL variables can only be used in where conditions', - sql_variable_limit_2: '2、Example：select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2}', + sql_variable_limit_2: '2、Example：select * from table_name where column_name1=${param_name1} and column_name2 in ${param_name2}', select_year: 'Select Year', select_month: 'Select Month', select_date: 'Select Date', @@ -2345,8 +2345,8 @@ export default { sned_time: 'Send Time', read_time: 'Read Time', type: 'Message Type', - mark_readed: 'Mark As Read', - all_mark_readed: 'Mark All As Read', + mark_read: 'Mark As Read', + all_mark_read: 'Mark All As Read', please_select: 'Please select at least one message', mark_success: 'Mark read successfully', receive_manage: 'Receive Manage', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index d1f717ddd6..6f69214e79 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1437,7 +1437,7 @@ export default { field_rename: '字段重命名', params_work: '僅在編輯 sql 時生效', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', - sql_variable_limit_2: '2、示例：select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2}', + sql_variable_limit_2: '2、示例：select * from table_name where column_name1=${param_name1} and column_name2 in ${param_name2}', selesql_variable_limit_2ct_year: '選擇年', select_month: '選擇月', select_date: '選擇日期', @@ -2346,8 +2346,8 @@ export default { sned_time: '提交時間', read_time: '查看時間', type: '消息類型', - mark_readed: '標記已讀', - all_mark_readed: '全部已讀', + mark_read: '標記已讀', + all_mark_read: '全部已讀', please_select: '請至少選擇一條消息', mark_success: '標記已讀成功', receive_manage: '接收管理', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 29dcb39191..73d7733c38 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1437,7 +1437,7 @@ export default { params_work: '仅在编辑sql时生效', select_year: '选择年', sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用', - sql_variable_limit_2: '2、示例：select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2} ', + sql_variable_limit_2: '2、示例：select * from table_name where column_name1=${param_name1} and column_name2 in ${param_name2} ', select_month: '选择月', select_date: '选择日期', select_time: '选择时间', @@ -2346,8 +2346,8 @@ export default { sned_time: '提交时间', read_time: '查看时间', type: '消息类型', - mark_readed: '标记已读', - all_mark_readed: '全部已读', + mark_read: '标记已读', + all_mark_read: '全部已读', please_select: '请至少选择一条消息', mark_success: '标记已读成功', receive_manage: '接收管理', diff --git a/frontend/src/settings.js b/frontend/src/settings.js index 24e96017fc..191d0e01f2 100644 --- a/frontend/src/settings.js +++ b/frontend/src/settings.js @@ -21,7 +21,7 @@ module.exports = { */ sidebarLogo: false, showSettings: true, - interruptTokenContineUrls: [ + interruptTokenContinueUrls: [ '/api/sys_msg/list/', '/dataset/taskLog/list/' ] diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index ac082f7053..0c6f4b2b69 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1545,7 +1545,7 @@ div:focus { } } -.de-icon-sence { +.de-icon-sense { margin-right: 9px; width: 16px !important; height: 12px !important; diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue index 55d9b9f67f..a142f9a921 100644 --- a/frontend/src/views/dataset/add/AddApi.vue +++ b/frontend/src/views/dataset/add/AddApi.vue @@ -99,8 +99,8 @@ /> {{ showTableNameWithComment(t) }}
@@ -284,7 +284,7 @@ export default { this.tables = response.data this.tables.forEach((ele) => { this.$set(ele, 'datasetName', dsName + '_' + ele.name) - this.$set(ele, 'nameExsit', false) + this.$set(ele, 'nameExist', false) }) this.tableData = [...this.tables] this.avilibelTable = !this.tableData.some((ele) => ele.enableCheck) @@ -349,8 +349,8 @@ export default { } this.LeftWidth = e.pageX }, - nameExsitValidator(ele) { - ele.nameExsit = + nameExistValidator(ele) { + ele.nameExist = this.nameList .concat(this.checkDatasetName) .filter((name) => name === ele.datasetName) @@ -359,9 +359,9 @@ export default { validateName() { this.tables.forEach((ele, index) => { if (this.checkTableList.includes(ele.name)) { - this.nameExsitValidator(ele) + this.nameExistValidator(ele) } else { - ele.nameExsit = false + ele.nameExist = false } }) }, @@ -412,7 +412,7 @@ export default { } }, save() { - if (this.tableData.some((ele) => ele.nameExsit)) { + if (this.tableData.some((ele) => ele.nameExist)) { this.openMessageSuccess('deDataset.cannot_be_duplicate', 'error') return } @@ -553,7 +553,7 @@ export default { text-overflow: ellipsis; white-space: nowrap; } - .error-name-exsit { + .error-name-exist { position: absolute; top: 10px; right: 10px; diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index 1b16f2b38b..ba39fb8381 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -101,8 +101,8 @@ /> {{ showTableNameWithComment(t) }}
@@ -291,7 +291,7 @@ export default { this.tables = response.data this.tables.forEach((ele) => { this.$set(ele, 'datasetName', dsName + '_' + ele.name) - this.$set(ele, 'nameExsit', false) + this.$set(ele, 'nameExist', false) }) this.tableData = [...this.tables] this.avilibelTable = !this.tableData.some((ele) => ele.enableCheck) @@ -366,8 +366,8 @@ export default { } this.LeftWidth = e.pageX }, - nameExsitValidator(ele) { - ele.nameExsit = + nameExistValidator(ele) { + ele.nameExist = this.nameList .concat(this.checkDatasetName) .filter((name) => name === ele.datasetName) @@ -376,9 +376,9 @@ export default { validateName() { this.tables.forEach((ele, index) => { if (this.checkTableList.includes(ele.name)) { - this.nameExsitValidator(ele) + this.nameExistValidator(ele) } else { - ele.nameExsit = false + ele.nameExist = false } }) }, @@ -429,7 +429,7 @@ export default { } }, save() { - if (this.tableData.some((ele) => ele.nameExsit)) { + if (this.tableData.some((ele) => ele.nameExist)) { this.openMessageSuccess('deDataset.cannot_be_duplicate', 'error') return } @@ -570,7 +570,7 @@ export default { text-overflow: ellipsis; white-space: nowrap; } - .error-name-exsit { + .error-name-exist { position: absolute; top: 10px; right: 10px; diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index deebdf9217..0829f396c9 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -76,11 +76,11 @@ {{ data.excelLabel }}
{{ $t( - sheetObj.nameExsit + sheetObj.nameExist ? 'deDataset.already_exists' : sheetObj.overLength ? 'dataset.char_can_not_more_50' @@ -339,10 +339,10 @@ export default { labelList.filter((ele) => !excelList.includes(ele)).length ) }, - nameExsitValidator(ele, checkList) { + nameExistValidator(ele, checkList) { this.$set( ele, - 'nameExsit', + 'nameExist', this.nameListCopy .concat(checkList) .filter((name) => name === ele.datasetName).length > 1 @@ -356,10 +356,10 @@ export default { .reduce((pre, next) => pre.concat(next.sheets), []) .forEach((ele, index) => { if (checkList.includes(ele.datasetName)) { - this.nameExsitValidator(ele, checkList) + this.nameExistValidator(ele, checkList) this.nameLengthValidator(ele) } else { - this.$set(ele, 'nameExsit', false) + this.$set(ele, 'nameExist', false) this.$set(ele, 'empty', false) this.$set(ele, 'overLength', false) } @@ -458,7 +458,7 @@ export default { var effectExtField = false var changeFiled = false var selectNode = this.$refs.tree.getCheckedNodes() - if (!this.param.tableId && selectNode.some((ele) => ele.nameExsit)) { + if (!this.param.tableId && selectNode.some((ele) => ele.nameExist)) { this.openMessageSuccess('deDataset.cannot_be_duplicate', 'error') return } @@ -673,7 +673,7 @@ export default { width: 85%; } } - .error-name-exsit { + .error-name-exist { position: absolute; top: 0; right: 0; diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index cfe09c7f03..c9d90257ce 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -163,7 +163,7 @@ {{ $t('components.continue') }} diff --git a/frontend/src/views/dataset/form.vue b/frontend/src/views/dataset/form.vue index 2db205a59d..fa397647c1 100644 --- a/frontend/src/views/dataset/form.vue +++ b/frontend/src/views/dataset/form.vue @@ -17,11 +17,11 @@ @blur="nameBlur" />
- {{ $t('deDataset.already_exists') }} + {{ $t('deDataset.already_Exists') }}
{ this.openMessageSuccess('components.all_read_successfully') bus.$emit('refresh-top-notification') this.initSearch() }) }, - markReaded() { + markRead() { const param = this.multipleSelection.map(item => item.msgId) batchRead(param).then(res => { this.openMessageSuccess('webmsg.mark_success') @@ -249,7 +249,7 @@ export default { } if (this.tabActive !== 'allMsg') { - param.status = this.tabActive === 'readed' + param.status = this.tabActive === 'read' } const { currentPage, pageSize } = this.paginationConfig @@ -274,7 +274,7 @@ export default { } if (this.hasPermissionRoute(row.router)) { this.$router.push({ name: row.router, params: param }) - row.status || this.setReaded(row) + row.status || this.setRead(row) return } this.$warning(this.$t('commons.no_target_permission')) @@ -289,7 +289,7 @@ export default { return false }, // 设置已读 - setReaded(row) { + setRead(row) { updateStatus(row.msgId).then((res) => { bus.$emit('refresh-top-notification') this.search() diff --git a/frontend/src/views/panel/template/component/TemplateList.vue b/frontend/src/views/panel/template/component/TemplateList.vue index c5f3f618ec..87db45ec19 100644 --- a/frontend/src/views/panel/template/component/TemplateList.vue +++ b/frontend/src/views/panel/template/component/TemplateList.vue @@ -31,7 +31,7 @@ > {{ $t("components.continue") }}