github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-04-27 11:10:51 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 去掉i18n检查

Browse Source
This commit is contained in:
ibuler 2020-05-13 17:47:23 +08:00
parent d83684b1f1
commit f6e85771ec
6 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.eslintrc.js
View File

@ -9,16 +9,11 @@ module.exports = {
node: true,
es6: true
},
extends: ['plugin:vue/recommended', 'eslint:recommended', 'plugin:vue-i18n/recommended'],
extends: ['plugin:vue/recommended', 'eslint:recommended'],
globals: {
window: true,
_: true
},
settings: {
'vue-i18n': {
localeDir: './src/i18n/langs/*.json' // extention is glob formatting!
}
},
// add your custom rules here
// it is base on https://github.com/vuejs/eslint-config-vue
rules: {

4
src/components/AssetSelect/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<el-select ref="select" v-model="internalValue" @focus="handleFocus" multiple placeholder="请选择资产" />
<el-select ref="select" v-model="internalValue" multiple placeholder="请选择资产" @focus="handleFocus" />
<el-dialog
:title="this.$t('Assets')"
:visible.sync="dialogVisible"
@ -15,7 +15,7 @@
/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="handleConfirm" type="primary">确 定</el-button>
<el-button type="primary" @click="handleConfirm">确 定</el-button>
</span>
</el-dialog>
</div>

8
src/views/tickets/TicketDetail/TicketDetail.vue
View File

@ -38,11 +38,11 @@
</el-form-item>
<el-form-item style="float: right">
<template v-if="hasActionPerm">
<el-button :disabled="object.status === 'closed'" @click="handleApprove" type="primary" size="small"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
<el-button :disabled="object.status === 'closed'" @click="handleReject" type="warning" size="small"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
</template>
<el-button :disabled="object.status === 'closed'" @click="handleClosed" type="danger" size="small"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
<el-button :disabled="object.status === 'closed'" @click="handleComment" type="info" size="small"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
</el-form-item>
</el-form>
</div>

2
src/views/tickets/TicketDetail/index.vue
View File

@ -1,6 +1,6 @@
<template>
<GenericDetailPage :object.sync="ticket" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
<component v-bind:is="config.activeMenu" :object="ticket" />
<component :is="config.activeMenu" :object="ticket" />
</GenericDetailPage>
</template>

2
src/views/users/groups/UserGroupDetail/index.vue
View File

@ -1,7 +1,7 @@
<template>
<GenericDetailPage :object.sync="group" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
<keep-alive>
<component v-bind:is="config.activeMenu" :object="group" />
<component :is="config.activeMenu" :object="group" />
</keep-alive>
</GenericDetailPage>
</template>

2
src/views/users/users/UserDetail/index.vue
View File

@ -1,7 +1,7 @@
<template>
<GenericDetailPage :object.sync="user" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
<keep-alive>
<component v-bind:is="config.activeMenu" :object="user" />
<component :is="config.activeMenu" :object="user" />
</keep-alive>
</GenericDetailPage>
</template>