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

fix: 前端拼写错误

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-10-22 22:32:44 +08:00
parent 86e2ed96d3
commit 0c59d65dc4
20 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@
v-model="selectAll"
v-customStyle="customStyle"
:indeterminate="isIndeterminate"
@change="selectAllChane"
@change="selectAllChange"
>{{ $t('dataset.check_all') }}</el-checkbox></p>
<el-scrollbar
tag="div"
@ -276,7 +276,7 @@ export default {
resetSelectAll() {
this.selectAll = false
},
selectAllChane(val) {
selectAllChange(val) {
if (val) {
this.ids = this._checkSum()
this._emitFun()

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

@ -19,7 +19,7 @@
v-model="selectAll"
v-customStyle="customStyle"
:indeterminate="isIndeterminate"
@change="selectAllChane"
@change="selectAllChange"
>{{ $t('dataset.check_all') }}</el-checkbox></p>
<el-option
v-for="item in options"
@ -139,7 +139,7 @@ export default {
}
return this.selectValue === id && 'selected'
},
selectAllChane(val) {
selectAllChange(val) {
const vals = val ? [...this.list.map(ele => ele.id)] : []
this.visualChange(vals)
this.selectValue = vals

6
frontend/src/components/Notification/index.vue
View File

@ -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()
})

6
frontend/src/components/canvas/components/Editor/Shape.vue
View File

@ -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

52
frontend/src/components/canvas/utils/calculateComponentPositonAndSize.js → frontend/src/components/canvas/utils/calculateComponentPositionAndSize.js
View File

@ -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)
}

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

@ -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() {

0
frontend/src/icons/svg/readed-msg.svg → frontend/src/icons/svg/read-msg.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -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',

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

@ -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: '接收管理',

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

@ -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: '接收管理',

2
frontend/src/settings.js
View File

@ -21,7 +21,7 @@ module.exports = {
*/
sidebarLogo: false,
showSettings: true,
interruptTokenContineUrls: [
interruptTokenContinueUrls: [
'/api/sys_msg/list/',
'/dataset/taskLog/list/'
]

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

@ -1545,7 +1545,7 @@ div:focus {
}
}
.de-icon-sence {
.de-icon-sense {
margin-right: 9px;
width: 16px !important;
height: 12px !important;

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

@ -99,8 +99,8 @@
/>
<span class="label">{{ showTableNameWithComment(t) }}</span>
<span
v-if="t.nameExsit"
class="error-name-exsit"
v-if="t.nameExist"
class="error-name-exist"
>
<svg-icon
icon-class="exclamationmark"
@ -159,7 +159,7 @@
@change="validateName"
/>
<div
v-if="activeTable.nameExsit"
v-if="activeTable.nameExist"
style="left: 107px; top: 52px"
class="el-form-item__error"
>
@ -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;

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

@ -101,8 +101,8 @@
/>
<span class="label">{{ showTableNameWithComment(t) }}</span>
<span
v-if="t.nameExsit"
class="error-name-exsit"
v-if="t.nameExist"
class="error-name-exist"
>
<svg-icon
icon-class="exclamationmark"
@ -166,7 +166,7 @@
@change="validateName"
/>
<div
v-if="activeTable.nameExsit"
v-if="activeTable.nameExist"
style="left: 107px; top: 52px"
class="el-form-item__error"
>
@ -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;

20
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -76,11 +76,11 @@
<span class="label">{{ data.excelLabel }}</span>
<span
v-if="
(data.nameExsit && !param.tableId) ||
(data.nameExist && !param.tableId) ||
data.empty ||
data.overLength
"
class="error-name-exsit"
class="error-name-exist"
>
<svg-icon
icon-class="exclamationmark"
@ -110,7 +110,7 @@
/>
<div
v-if="
(sheetObj.nameExsit && !param.tableId) ||
(sheetObj.nameExist && !param.tableId) ||
sheetObj.empty ||
sheetObj.overLength
"
@ -119,7 +119,7 @@
>
{{
$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;

2
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -163,7 +163,7 @@
</el-dropdown-item>
<el-dropdown-item
v-if="scope.row.status === 'Pending'"
command="contine"
command="continue"
>
{{ $t('components.continue') }}
</el-dropdown-item>

22
frontend/src/views/dataset/form.vue
View File

@ -17,11 +17,11 @@
@blur="nameBlur"
/>
<div
v-if="nameExsit"
v-if="nameExist"
style="left: 55px"
class="el-form-item__error"
>
{{ $t('deDataset.already_exists') }}
{{ $t('deDataset.already_Exists') }}
</div>
</template>
<template v-else>
@ -87,7 +87,7 @@ export default {
datasetType: '',
component: '',
table: {},
nameExsit: false,
nameExist: false,
nameList: [],
datasetForm: {
id: '',
@ -164,8 +164,8 @@ export default {
this.handlerConfirm(options)
},
nameBlur() {
this.nameExsitValidator()
this.showInput = this.nameExsit
this.nameExistValidator()
this.showInput = this.nameExist
},
getDatasetNameFromGroup(sceneId, name) {
post(`/dataset/table/getDatasetNameFromGroup/${sceneId}`, null).then(
@ -179,8 +179,8 @@ export default {
},
datasetSave() {
if (['sql', 'union'].includes(this.datasetType)) {
this.nameExsitValidator()
if (this.nameExsit) {
this.nameExistValidator()
if (this.nameExist) {
return
}
}
@ -202,17 +202,17 @@ export default {
},
nameValidator(rule, value, callback) {
if (this.nameRepeat(value)) {
callback(new Error(this.$t('deDataset.already_exists')))
callback(new Error(this.$t('deDataset.already_Exists')))
} else {
callback()
}
},
nameExsitValidator() {
nameExistValidator() {
if (!this.nameList || this.nameList.length === 0) {
this.nameExsit = false
this.nameExist = false
return
}
this.nameExsit = this.nameList.some(
this.nameExist = this.nameList.some(
(name) => name === this.table.name && name !== this.originName
)
},

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

@ -14,7 +14,7 @@
/>
<el-tab-pane
:label="$t('components.read_message')"
name="readed"
name="read"
/>
<el-tab-pane
:label="$t('components.all_messages')"
@ -28,20 +28,20 @@
<template v-if="tabActive === 'unread'">
<deBtn
secondary
@click="allMarkReaded"
@click="allMarkRead"
>{{
$t("webmsg.all_mark_readed")
$t("webmsg.all_mark_read")
}}</deBtn>
<deBtn
key="mark_readed"
key="mark_read"
secondary
:disabled="multipleSelection.length === 0"
@click="markReaded"
>{{ $t("webmsg.mark_readed") }}</deBtn>
@click="markRead"
>{{ $t("webmsg.mark_read") }}</deBtn>
</template>
<deBtn
v-if="tabActive === 'readed'"
v-if="tabActive === 'read'"
key="delete"
secondary
:disabled="multipleSelection.length === 0"
@ -104,7 +104,7 @@
/>
<svg-icon
v-else
icon-class="readed-msg"
icon-class="read-msg"
/>
</span>
<span
@ -213,14 +213,14 @@ export default {
initSearch() {
this.handleCurrentChange(1)
},
allMarkReaded() {
allMarkRead() {
allRead().then(res => {
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()

2
frontend/src/views/panel/template/component/TemplateList.vue
View File

@ -31,7 +31,7 @@
>
<svg-icon
icon-class="scene"
class="de-icon-sence"
class="de-icon-sense"
/>
<span
class="text-template-overflow"

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

@ -278,7 +278,7 @@
</el-dropdown-item>
<el-dropdown-item
v-if="scope.row.status === 'Pending'"
command="contine"
command="continue"
>
{{ $t("components.continue") }}
</el-dropdown-item>