This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 6e250ece2 fix:fixed some BaseDataManager frontend error (#3878)
6e250ece2 is described below
commit 6e250ece22d4ade93d04bbefef23fe101d109238
Author: jacktao007 <[email protected]>
AuthorDate: Thu Nov 24 14:57:44 2022 +0800
fix:fixed some BaseDataManager frontend error (#3878)
* fix:add user duplicate checks for UDF
* fix:add userNameValidate for udfManage
* fix:fixed add success message for errorCode
* fix:Fix validation of number components
---
.../server/restful/UdfManagerRestfulApi.java | 12 +++++-
linkis-web/package.json | 2 +-
linkis-web/src/apps/linkis/i18n/common/en.json | 21 ++++++++++-
linkis-web/src/apps/linkis/i18n/common/zh.json | 22 ++++++++++-
.../module/datasourceType/EditForm/index.vue | 25 +++---------
.../apps/linkis/module/datasourceType/index.vue | 5 +--
.../src/apps/linkis/module/errorCode/index.vue | 2 +-
.../module/gatewayAuthToken/EditForm/index.vue | 44 ++++++++++++++++------
.../apps/linkis/module/gatewayAuthToken/index.vue | 3 +-
.../linkis/module/udfManager/EditForm/index.vue | 16 ++++++--
.../apps/linkis/module/udfTree/EditForm/index.vue | 20 +---------
.../src/apps/linkis/module/udfTree/index.vue | 4 +-
12 files changed, 109 insertions(+), 67 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
index f7a362773..50777c0be 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -79,8 +80,15 @@ public class UdfManagerRestfulApi {
public Message add(HttpServletRequest request, @RequestBody UdfManagerEntity
udfManagerEntity) {
ModuleUserUtils.getOperationUser(
request, "Add a UDF Manager Record," + udfManagerEntity.toString());
- boolean result = udfManagerService.save(udfManagerEntity);
- return Message.ok("").data("result", result);
+ QueryWrapper<UdfManagerEntity> queryWrapper =
+ new QueryWrapper<>(udfManagerEntity).eq("user_name",
udfManagerEntity.getUserName());
+ UdfManagerEntity udfManager = udfManagerService.getOne(queryWrapper);
+ if (udfManager == null) {
+ boolean result = udfManagerService.save(udfManagerEntity);
+ return Message.ok("").data("result", result);
+ } else {
+ return Message.error("The username already exists,Please add again!");
+ }
}
@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "long",
name = "id")})
diff --git a/linkis-web/package.json b/linkis-web/package.json
index 366f4c322..03eb8a853 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -22,7 +22,7 @@
]
},
"dependencies": {
- "@form-create/iview": "2.5.13",
+ "@form-create/iview": "2.5.27",
"axios": "0.19.2",
"babel-polyfill": "6.26.0",
"core-js": "2.6.11",
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index c7a374c47..a97ba82bd 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -432,7 +432,20 @@
"createTime":"Create Time",
"updateTime": "Update Time",
"updateBy": "Update By",
- "searchPlaceholder": "TokenName/Users/Hosts"
+ "searchPlaceholder": "TokenName/Users/Hosts",
+ "info":"Elapse Day: -1 means permanent",
+ "legalUsersInfo": "* Allow all users; Multi-user use, separated, for
example :user1,user2",
+ "legalUsersValidate": {
+ "empty": "Please enter the Users"
+ },
+ "legalHostsInfo": "* Allow all hosts; Use multiple hosts, separated,
for example :host1,host2",
+ "legalHostsInfoValidate": {
+ "empty": "Please enter the Hosts"
+ },
+ "elapseDayValidate": {
+ "size": "The Elapse Day cannot be less than -1",
+ "empty": "Please enter the elapse day"
+ }
},
"errorCode": {
"errorCode": "Code",
@@ -449,7 +462,11 @@
},
"udfManager": {
"userName": "User Name",
- "searchPlaceholder": "UserName"
+ "searchPlaceholder": "UserName",
+ "userNameValidate": {
+ "size": "Usernames cannot be longer than 20 characters",
+ "empty": "Please enter your username"
+ }
},
"udfTree": {
"name": "Name",
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index 68d71baad..f1bd5b4df 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -433,7 +433,21 @@
"createTime":"创建时间",
"updateTime": "更新时间",
"updateBy": "更新人",
- "searchPlaceholder": "令牌名称/用户/主机"
+ "searchPlaceholder": "令牌名称/用户/主机",
+ "info":"过期天数: -1 表示永久",
+ "legalUsersInfo": "*允许所有用户；多用户使用,隔开，例如:user1,user2",
+ "legalUsersValidate": {
+ "empty": "请填写用户",
+ "format": "格式不正确，使用*或使用,分割，例如:user1,user2"
+ },
+ "legalHostsInfo": "*允许所有主机；多主机使用,隔开，例如:host1,host2",
+ "legalHostsInfoValidate": {
+ "empty": "请填写主机"
+ },
+ "elapseDayValidate": {
+ "format": "格式不正确，使用*或使用,分割，例如:host1,host2",
+ "empty": "请填写过期天数"
+ }
},
"errorCode": {
"errorCode": "错误代码",
@@ -450,7 +464,11 @@
},
"udfManager": {
"userName": "用户名",
- "searchPlaceholder": "用户名"
+ "searchPlaceholder": "用户名",
+ "userNameValidate": {
+ "size": "用户名长度不能超过20个字符",
+ "empty": "请输入用户名"
+ }
},
"udfTree": {
"name": "名称",
diff --git
a/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
index 0743c6910..ce517cd9f 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
@@ -141,7 +141,7 @@ export default {
},
validate: [
{
- required: true,
+ required: false,
type: "url",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
@@ -151,16 +151,19 @@ export default {
],
},
{
- type: 'InputNumber',
+ type: 'inputNumber',
title:
this.$t('message.linkis.basedataManagement.datasourceType.layers'),
field: 'layers',
value: 0,
props: {
- placeholder: "eg. 1-3"
+ placeholder: "eg. 1-3",
+ type: "number"
},
validate: [
{
required: true,
+ "mode": "required",
+ type: "number",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}
`+this.$t('message.linkis.basedataManagement.datasourceType.layers'),
@@ -171,21 +174,5 @@ export default {
]
}
},
- created() {
- this.getData(this.data)
- },
- methods: {
- getData(data){
- this.formData = {...data}
- }
- },
- watch: {
- data: {
- handler(newV) {
- this.getData(newV)
- },
- deep: true,
- },
- },
}
</script>
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index 47fe1b422..0b6a434b9 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -197,13 +197,12 @@ export default {
this.load()
},
onAdd(){
+ this.$refs.errorCodeForm.formModel.resetFields()
this.modalAddMode = 'add'
this.modalShow = true
- this.clearForm()
},
onTableEdit(row){
- row.layers = row.layers+""
- this.modalEditData = {...row}
+ this.$refs.errorCodeForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
},
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue
b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index 57e938f0e..3d3cb2449 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -220,7 +220,7 @@ export default {
if(data.result) {
this.$Message.success({
duration: 3,
- content:
this.$t('message.linkis.basedataManagement.modal.modalDeleteFail')
+ content:
this.$t('message.linkis.basedataManagement.modal.modalAddSuccess')
})
}else{
this.$Message.success({
diff --git
a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
index 3662ad771..af97f23fe 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
@@ -81,15 +81,24 @@ export default {
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsers'),
field: 'legalUsers',
value: '',
+ info:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersInfo'),
props: {
placeholder: "eg. *",
},
validate: [
{
required: true,
- message: `${this.$t(
- 'message.linkis.datasource.pleaseInput'
-
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsers'),
+ validator: (rule, value)=>{
+ return new Promise((resolve, reject)=>{
+ if(!value){
+
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.empty'))
+ }
+ if(value<-1){
+
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalUsersValidate.format'))
+ }
+ resolve()
+ })
+ },
trigger: 'blur',
},
],
@@ -99,34 +108,45 @@ export default {
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHosts'),
field: 'legalHosts',
value: '',
+ info:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfo'),
props: {
placeholder: "eg. *",
},
validate: [
{
required: true,
- message: `${this.$t(
- 'message.linkis.datasource.pleaseInput'
-
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHosts'),
+ validator: (rule, value)=>{
+ return new Promise((resolve, reject)=>{
+ if(!value){
+
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHostsInfoValidate.empty'))
+ }
+ resolve()
+ })
+ },
trigger: 'blur',
},
],
},
{
- type: 'input',
+ type: 'inputNumber',
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDay'),
field: 'elapseDay',
- value: '',
+ value: -1,
+ info:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.info'),
props: {
placeholder: "eg . -1",
},
validate: [
{
required: true,
- pattern: /^(\-|\+)?\d+(\.\d+)?$/,
- message: `${this.$t(
- 'message.linkis.datasource.pleaseInput'
-
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDay'),
+ validator: (rule, value)=>{
+ return new Promise((resolve, reject)=>{
+ if(!value){
+
reject(this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDayValidate.empty'))
+ }
+ resolve()
+ })
+ },
trigger: 'blur',
},
],
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 142c76770..43304f3ce 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -211,12 +211,11 @@ export default {
this.load()
},
onAdd(){
- this.$refs.editForm.formModel.resetFields ()
+ this.$refs.editForm.formModel.resetFields()
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
- row.elapseDay = row.elapseDay+""
this.$refs.editForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
diff --git a/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
index bc3c9ca95..f588c49d9 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
@@ -69,9 +69,19 @@ export default {
validate: [
{
required: true,
- message: `${this.$t(
- 'message.linkis.datasource.pleaseInput'
-
)}`+this.$t('message.linkis.basedataManagement.udfManager.userName'),
+ len: 20,
+ validator: (rule, value)=>{
+ console.log(rule,value,value.length)
+ return new Promise((resolve,reject)=>{
+ if(value.length>20){
+
reject(this.$t('message.linkis.basedataManagement.udfManager.userNameValidate.size'))
+ }else if (value.length<1){
+
reject(this.$t('message.linkis.basedataManagement.udfManager.userNameValidate.empty'))
+ } else{
+ resolve()
+ }
+ })
+ },
trigger: 'blur',
},
],
diff --git a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
index 389653b15..8eb611a75 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -21,7 +21,6 @@
:rule="rule"
v-model="formModel"
:option="options"
- :value.sync="formData"
/>
</div>
</template>
@@ -138,7 +137,7 @@ export default {
],
},
{
- type: 'input',
+ type: 'inputNumber',
title: this.$t('message.linkis.basedataManagement.udfTree.parent'),
field: 'parent',
value: '',
@@ -148,6 +147,7 @@ export default {
validate: [
{
required: true,
+ type: "number",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)} `+this.$t('message.linkis.basedataManagement.udfTree.parent'),
@@ -158,21 +158,5 @@ export default {
]
}
},
- created() {
- this.getData(this.data)
- },
- methods: {
- getData(data){
- this.formData = {...data}
- }
- },
- watch: {
- data: {
- handler(newV) {
- this.getData(newV)
- },
- deep: true,
- },
- },
}
</script>
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index cfe46d107..f88f54274 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -208,12 +208,12 @@ export default {
this.load()
},
onAdd(){
+ this.$refs.errorCodeForm.formModel.resetFields()
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
- row.parent = row.parent + ""
- this.modalEditData = row
+ this.$refs.errorCodeForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
