Skip to content

Commit 17de8d7

Browse files
mayinrainmayinrain
committed
upd: 令牌管理新增token查看；全局历史优化
1 parent c5127e3 commit 17de8d7

File tree

7 files changed

+254
-88
lines changed

7 files changed

+254
-88
lines changed

‎linkis-web/src/apps/linkis/i18n/common/en.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
"costTime": "Time Elapsed",
168168
"executeApplicationName": "Engine",
169169
"requestApplicationName": "App",
170+
"runType": "Run Type",
170171
"user": "User",
171172
"createdTime": "Created at",
172173
"updateTime": "Update Time",
@@ -286,11 +287,15 @@
286287
"instance": {
287288
"label": "Entrance Instance",
288289
"placeholder": "Please search by entering the instance"
289-
},
290+
},
290291
"creator": {
291292
"label": "App",
292293
"placeholder": "Please search by entering the application name"
293294
},
295+
"runType": {
296+
"label": "Run Type",
297+
"placeholder": "Please search by entering the run type"
298+
},
294299
"engine": {
295300
"label": "Engine"
296301
},
@@ -606,6 +611,7 @@
606611
"add": "Add",
607612
"remove": "Remove",
608613
"edit": "Edit",
614+
"tokenInfo": "Token",
609615
"searchLabel": "Fuzzy Search:",
610616
"searchPlaceholder": "Please enter your search",
611617
"search": "Search",

‎linkis-web/src/apps/linkis/i18n/common/zh.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
"startTime": "启动时间",
167167
"executeApplicationName": "引擎",
168168
"requestApplicationName": "应用",
169+
"runType": "任务类型",
169170
"user": "用户",
170171
"createdTime": "创建时间",
171172
"updateTime": "更新时间",
@@ -267,6 +268,10 @@
267268
"label": "应用",
268269
"placeholder": "请输入应用搜索"
269270
},
271+
"runType": {
272+
"label": "任务类型",
273+
"placeholder": "请输入runType"
274+
},
270275
"engine": {
271276
"label": "引擎"
272277
},
@@ -558,6 +563,7 @@
558563
"addUDFAdmin": "新增UDF管理员",
559564
"remove": "删除",
560565
"edit": "编辑",
566+
"tokenInfo": "Token信息",
561567
"searchLabel": "模糊搜索:",
562568
"searchPlaceholder": "请输入搜索内容",
563569
"search": "搜索",

‎linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue‎

Lines changed: 103 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717

1818
<template>
1919
<div class="table-warp">
20-
<form-create
21-
:rule="rule"
22-
v-model="formModel"
23-
:option="options"
24-
/>
20+
<form-create :rule="rule" v-model="formModel" :option="options" />
2521
</div>
2622
</template>
2723

@@ -30,24 +26,16 @@ export default {
3026
props: {
3127
mode: String,
3228
},
33-
data() {
34-
return {
35-
formModel: {
36-
elapseDay: 1,
37-
permanentlyValid: false,
38-
},
39-
// formData: {},
40-
options: {
41-
submitBtn: false,
42-
},
43-
rule: [
29+
computed: {
30+
rule: function () {
31+
return [
4432
{
4533
type: 'hidden',
46-
title: "id",
34+
title: 'id',
4735
field: 'id',
4836
value: '',
4937
props: {
50-
placeholder: "",
38+
placeholder: '',
5139
},
5240
validate: [
5341
{
@@ -61,42 +49,61 @@ export default {
6149
},
6250
{
6351
type: 'input',
64-
title: this.$t('message.linkis.basedataManagement.gatewayAuthToken.tokenName'),
52+
title: this.$t(
53+
'message.linkis.basedataManagement.gatewayAuthToken.tokenName'
54+
),
6555
field: 'tokenName',
6656
info: 'Token Name,Example: TEST-AUTH',
6757
value: '',
6858
props: {
69-
placeholder: "eg. TEST-AUTH",
59+
placeholder: 'eg. TEST-AUTH',
60+
disabled: this.mode === 'edit',
7061
},
7162
validate: [
7263
{
7364
required: true,
74-
message: `${this.$t(
75-
'message.linkis.datasource.pleaseInput'
76-
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.tokenName'),
65+
message:
66+
`${this.$t(
67+
'message.linkis.datasource.pleaseInput'
68+
)}` +
69+
this.$t(
70+
'message.linkis.basedataManagement.gatewayAuthToken.tokenName'
71+
),
7772
trigger: 'blur',
7873
},
7974
],
8075
},
8176
{
8277
type: 'input',
83-
title: this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsers'),
78+
title: this.$t(
79+
'message.linkis.basedataManagement.gatewayAuthToken.legalUsers'
80+
),
8481
field: 'legalUsers',
8582
value: '',
86-
info: this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersInfo'),
83+
info: this.$t(
84+
'message.linkis.basedataManagement.gatewayAuthToken.legalUsersInfo'
85+
),
8786
props: {
88-
placeholder: "eg. *",
87+
placeholder: 'eg. *',
8988
},
9089
validate: [
9190
{
9291
required: true,
93-
validator: (rule, value)=>{
94-
return new Promise((resolve, reject)=>{
95-
if(!value){
96-
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.empty'))
92+
validator: (rule, value) => {
93+
return new Promise((resolve, reject) => {
94+
if (!value) {
95+
reject(
96+
this.$t(
97+
'message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.empty'
98+
)
99+
)
97100
}
98-
if(value<-1){
99-
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.format'))
101+
if (value < -1) {
102+
reject(
103+
this.$t(
104+
'message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.format'
105+
)
106+
)
100107
}
101108
resolve()
102109
})
@@ -107,20 +114,28 @@ export default {
107114
},
108115
{
109116
type: 'input',
110-
title: this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHosts'),
117+
title: this.$t(
118+
'message.linkis.basedataManagement.gatewayAuthToken.legalHosts'
119+
),
111120
field: 'legalHosts',
112121
value: '',
113-
info: this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfo'),
122+
info: this.$t(
123+
'message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfo'
124+
),
114125
props: {
115-
placeholder: "eg. *",
126+
placeholder: 'eg. *',
116127
},
117128
validate: [
118129
{
119130
required: true,
120-
validator: (rule, value)=>{
121-
return new Promise((resolve, reject)=>{
122-
if(!value){
123-
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfoValidate.empty'))
131+
validator: (rule, value) => {
132+
return new Promise((resolve, reject) => {
133+
if (!value) {
134+
reject(
135+
this.$t(
136+
'message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfoValidate.empty'
137+
)
138+
)
124139
}
125140
resolve()
126141
})
@@ -131,54 +146,83 @@ export default {
131146
},
132147
{
133148
type: 'radio',
134-
title: this.$t('message.linkis.basedataManagement.gatewayAuthToken.permanentlyValid'),
135-
field: "permanentlyValid",
149+
title: this.$t(
150+
'message.linkis.basedataManagement.gatewayAuthToken.permanentlyValid'
151+
),
152+
field: 'permanentlyValid',
136153
value: false,
137154
hidden: false,
138155
options: [
139-
{value: false,label: "否",disabled: false},
140-
{value: true,label: "是",disabled: false},
156+
{ value: false, label: '否', disabled: false },
157+
{ value: true, label: '是', disabled: false },
141158
],
142159
on: {
143160
'on-change': () => {
144-
this.rule[5].hidden = !this.rule[5].hidden;
145-
if(!this.rule[5].hidden) {
146-
this.rule[5].value = 1;
161+
this.rule[5].hidden = !this.rule[5].hidden
162+
if (!this.rule[5].hidden) {
163+
this.rule[5].value = 1
147164
} else {
148-
this.rule[5].value = -1;
165+
this.rule[5].value = -1
149166
}
150-
}
151-
}
167+
},
168+
},
152169
},
153170
{
154171
type: 'inputNumber',
155-
title: this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDay'),
172+
title: this.$t(
173+
'message.linkis.basedataManagement.gatewayAuthToken.elapseDay'
174+
),
156175
field: 'elapseDay',
157176
value: 1,
158177
hidden: false,
159-
info: this.$t('message.linkis.basedataManagement.gatewayAuthToken.info'),
178+
info: this.$t(
179+
'message.linkis.basedataManagement.gatewayAuthToken.info'
180+
),
160181
props: {
161-
placeholder: "eg . 1",
182+
placeholder: 'eg . 1',
162183
},
163184
validate: [
164185
{
165186
required: true,
166-
validator: (rule, value)=>{
167-
return new Promise((resolve, reject)=>{
168-
if(!value){
169-
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDayValidate.empty'))
187+
validator: (rule, value) => {
188+
return new Promise((resolve, reject) => {
189+
if (!value) {
190+
reject(
191+
this.$t(
192+
'message.linkis.basedataManagement.gatewayAuthToken.elapseDayValidate.empty'
193+
)
194+
)
170195
}
171-
if(!this.formModel.permanentlyValid && value < 1) {
172-
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDayValidate.GT0'))
196+
if (
197+
!this.formModel.permanentlyValid &&
198+
value < 1
199+
) {
200+
reject(
201+
this.$t(
202+
'message.linkis.basedataManagement.gatewayAuthToken.elapseDayValidate.GT0'
203+
)
204+
)
173205
}
174206
resolve()
175207
})
176208
},
177209
trigger: 'blur',
178210
},
179211
],
180-
}
212+
},
181213
]
214+
},
215+
},
216+
data() {
217+
return {
218+
formModel: {
219+
elapseDay: 1,
220+
permanentlyValid: false,
221+
},
222+
// formData: {},
223+
options: {
224+
submitBtn: false,
225+
},
182226
}
183227
},
184228
}

0 commit comments

Comments
 (0)