mirror of
https://github.com/jumpserver/lina.git
synced 2025-07-30 22:35:56 +00:00
perf: 修改账号创建
This commit is contained in:
parent
89466a0995
commit
41b00cb293
@ -111,19 +111,12 @@ export default {
|
||||
} else {
|
||||
let result
|
||||
if (error) {
|
||||
console.log('Error: ', error)
|
||||
result = error.response.data
|
||||
} else {
|
||||
result = resp
|
||||
}
|
||||
const iResult = []
|
||||
for (const [host, value] of Object.entries(result)) {
|
||||
iResult.push({
|
||||
asset: host,
|
||||
...value
|
||||
})
|
||||
}
|
||||
console.log('bulk-create-done', [iResult, error])
|
||||
this.$emit('bulk-create-done', iResult)
|
||||
this.$emit('bulk-create-done', result)
|
||||
}
|
||||
},
|
||||
setFieldError(error) {
|
||||
|
@ -6,6 +6,9 @@
|
||||
@confirm="closeDialog"
|
||||
v-on="$listeners"
|
||||
>
|
||||
<el-alert style="margin-bottom: 10px" type="success">
|
||||
<span v-for="item of summary" :key="item.key"><b>{{ item.label }}</b>: {{ item.value }} </span>
|
||||
</el-alert>
|
||||
<DataTable :config="config" />
|
||||
</Dialog>
|
||||
</template>
|
||||
@ -50,7 +53,7 @@ export default {
|
||||
prop: 'state',
|
||||
label: this.$t('common.Status'),
|
||||
width: '200px',
|
||||
formatter: (row, column, cellValue) => {
|
||||
formatter: (row) => {
|
||||
if (row.error) {
|
||||
return <span class='color-error'>{ errorProp }: { row.error }</span>
|
||||
} else if (row.state) {
|
||||
@ -65,6 +68,26 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
summary() {
|
||||
const labels = {
|
||||
total: this.$tc('common.Total'),
|
||||
created: this.$tc('common.Created'),
|
||||
updated: this.$tc('common.Updated'),
|
||||
skipped: this.$tc('common.Skipped')
|
||||
}
|
||||
const grouped = _.groupBy(this.result, 'state')
|
||||
const groupedLength = _.mapValues(grouped, 'length')
|
||||
groupedLength['total'] = this.result.length
|
||||
return _.map(groupedLength, (value, key) => {
|
||||
return {
|
||||
label: labels[key],
|
||||
value: value,
|
||||
key: key
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
closeDialog() {
|
||||
this.$emit('update:visible', false)
|
||||
|
@ -1,5 +1,6 @@
|
||||
import i18n from '@/i18n/i18n'
|
||||
import { message } from '@/utils/message'
|
||||
|
||||
const _ = require('lodash')
|
||||
const moment = require('moment')
|
||||
|
||||
@ -244,10 +245,10 @@ export function getDayFuture(days, now) {
|
||||
export function getErrorResponseMsg(error) {
|
||||
let msg = ''
|
||||
let data = ''
|
||||
if (error.response.status === 500) {
|
||||
if (error?.response?.status === 500) {
|
||||
data = i18n.t('common.ServerError')
|
||||
} else {
|
||||
data = error.response && error.response.data || error
|
||||
data = error?.response && error?.response.data || error
|
||||
}
|
||||
if (data && (data.error || data.msg || data.detail)) {
|
||||
msg = data.error || data.msg || data.detail
|
||||
|
Loading…
Reference in New Issue
Block a user