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 ce8e6014a fix(linkis-web): fix Linkis Management Desk issue record
error (#3771)
ce8e6014a is described below
commit ce8e6014a4558aa2e7b1f50dd9171059aa2facf2
Author: jacktao007 <[email protected]>
AuthorDate: Tue Nov 15 10:53:12 2022 +0800
fix(linkis-web): fix Linkis Management Desk issue record error (#3771)
---
.../server/dao/DatasourceAccessMapper.java | 1 -
.../server/dao/UdfManagerMapper.java | 1 -
.../server/domain/DatasourceTypeEntity.java | 2 +-
.../server/domain/GatewayAuthTokenEntity.java | 3 ++
.../domain/RmExternalResourceProviderEntity.java | 3 ++
.../server/restful/DatasourceAccessRestfulApi.java | 38 +++++++++++++++++++---
.../server/restful/GatewayAuthTokenRestfulApi.java | 15 ++++++---
.../RmExternalResourceProviderRestfulApi.java | 8 ++---
.../server/service/DatasourceAccessService.java | 1 -
.../server/service/DatasourceTypeService.java | 1 -
.../service/impl/DatasourceAccessServiceImpl.java | 1 -
linkis-public-enhancements/pom.xml | 10 ++++++
linkis-web/package.json | 2 +-
.../apps/linkis/module/datasourceAccess/index.vue | 12 ++++---
.../src/apps/linkis/module/datasourceEnv/index.vue | 8 ++---
.../module/datasourceType/EditForm/index.vue | 7 ++--
.../apps/linkis/module/datasourceType/index.vue | 9 +++--
.../src/apps/linkis/module/errorCode/index.vue | 1 +
.../module/gatewayAuthToken/EditForm/index.vue | 7 ++--
.../apps/linkis/module/gatewayAuthToken/index.vue | 23 ++++++++-----
.../module/rmExternalResourceProvider/index.vue | 7 ++--
.../src/apps/linkis/module/udfManager/index.vue | 2 +-
.../apps/linkis/module/udfTree/EditForm/index.vue | 25 ++++++++++++++
.../src/apps/linkis/module/udfTree/index.vue | 12 +++----
24 files changed, 135 insertions(+), 64 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
index febb56bc4..b1affa71a 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/DatasourceAccessMapper.java
@@ -24,7 +24,6 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
- * @author jack
* @description 针对表【linkis_ps_datasource_access】的数据库操作Mapper
* @createDate 2022-08-13 15:17:35 @Entity
* org.apache.linkis.basedatamanager.server.domain.LinkisPsDatasourceAccess
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
index 1c88224b8..894f31b04 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfManagerMapper.java
@@ -24,7 +24,6 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
- * @author jack
* @description Database operation Mapper for the table [linKIS_PS_UDF_manager]
* @createDate 2022-08-13 15:14:10 @Entity
* org.apache.linkis.basedatamanager.server.domain.LinkisPsUdfManager
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
index c105b777c..9c5137974 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeEntity.java
@@ -37,7 +37,7 @@ public class DatasourceTypeEntity implements Serializable {
/** */
private String description;
- /** */
+ @TableField(value = "`option`")
private String option;
/** */
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
index 75fdeffcb..fc9875c64 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/GatewayAuthTokenEntity.java
@@ -20,11 +20,14 @@ package org.apache.linkis.basedatamanager.server.domain;
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@TableName("linkis_mg_gateway_auth_token")
public class GatewayAuthTokenEntity implements Serializable {
/** */
+ @TableId(type = IdType.AUTO)
private Integer id;
/** */
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
index 064ce5d36..dea36b874 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/RmExternalResourceProviderEntity.java
@@ -19,12 +19,15 @@ package org.apache.linkis.basedatamanager.server.domain;
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
/** @TableName linkis_mg_gateway_auth_token */
@TableName("linkis_cg_rm_external_resource_provider")
public class RmExternalResourceProviderEntity implements Serializable {
/** */
+ @TableId(type = IdType.AUTO)
private Integer id;
/** */
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
index de2cbe664..5470a6843 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
@@ -17,12 +17,19 @@
package org.apache.linkis.basedatamanager.server.restful;
import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.DatasourceAccessEntity;
import
org.apache.linkis.basedatamanager.server.service.DatasourceAccessService;
import org.apache.linkis.server.Message;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+
+@Api(tags = "DatasourceAccessRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/datasource-access")
public class DatasourceAccessRestfulApi {
@@ -30,33 +37,56 @@ public class DatasourceAccessRestfulApi {
@Autowired
DatasourceAccessService datasourceAccessService;
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "string", name =
"searchName", value = ""),
+ @ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
+ @ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
+ })
+ @ApiOperation(value = "", notes = "", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
public Message list(String searchName,Integer currentPage,Integer
pageSize) {
PageInfo pageList =
datasourceAccessService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
+ })
+ @ApiOperation(value = "", notes = "", httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
public Message get(@PathVariable("id") Long id) {
DatasourceAccessEntity datasourceAccess =
datasourceAccessService.getById(id);
return Message.ok("").data("item", datasourceAccess);
}
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "errorCode", value = "")
+ })
+ @ApiOperation(value = "", notes = "", httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody DatasourceAccessEntity errorCode) {
- boolean result = datasourceAccessService.save(errorCode);
+ public Message add(@RequestBody DatasourceAccessEntity
datasourceAccessEntity) {
+ datasourceAccessEntity.setAccessTime(new Date());
+ boolean result = datasourceAccessService.save(datasourceAccessEntity);
return Message.ok("").data("result", result);
}
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
+ })
+ @ApiOperation(value = "", notes = "", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
public Message remove(@PathVariable("id") Long id) {
boolean result = datasourceAccessService.removeById(id);
return Message.ok("").data("result", result);
}
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "errorCode", value = "")
+ })
+ @ApiOperation(value = "", notes = "", httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody DatasourceAccessEntity errorCode) {
- boolean result = datasourceAccessService.updateById(errorCode);
+ public Message update(@RequestBody DatasourceAccessEntity
datasourceAccessEntity) {
+ boolean result =
datasourceAccessService.updateById(datasourceAccessEntity);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
index 12a43ac6b..e0bc072d1 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
@@ -27,6 +27,7 @@ import org.apache.linkis.server.Message;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.HashMap;
@@ -65,6 +66,10 @@ public class GatewayAuthTokenRestfulApi {
@ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
public Message add(@RequestBody GatewayAuthTokenEntity gatewayAuthToken) {
+ gatewayAuthToken.setCreateTime(new Date());
+ gatewayAuthToken.setUpdateTime(new Date());
+ gatewayAuthToken.setBusinessOwner("BDP");
+ gatewayAuthToken.setUpdateBy("LINKIS");
boolean result = gatewayAuthTokenService.save(gatewayAuthToken);
return Message.ok("").data("result", result);
}
@@ -75,6 +80,8 @@ public class GatewayAuthTokenRestfulApi {
@ApiOperation(value = "update", notes = "remove data by id", httpMethod =
"PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
public Message update(@RequestBody GatewayAuthTokenEntity token) {
+ token.setUpdateTime(new Date());
+ token.setUpdateBy("LINKIS");
boolean result = gatewayAuthTokenService.updateById(token);
return Message.ok("").data("result", result);
}
@@ -83,11 +90,9 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "string", name =
"tokenName", value = "")
})
@ApiOperation(value = "remove", notes = "update data", httpMethod =
"DELETE")
- @RequestMapping(path = "", method = RequestMethod.DELETE)
- public Message remove(String tokenName) {
- HashMap columnMap = new HashMap<String,Object>();
- columnMap.put("token_name",tokenName);
- boolean result = gatewayAuthTokenService.removeByMap(columnMap);
+ @RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
+ public Message remove(@PathVariable("id") Integer id) {
+ boolean result = gatewayAuthTokenService.removeById(id);;
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
index dc731d856..0fcb3c217 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
@@ -60,7 +60,7 @@ public class RmExternalResourceProviderRestfulApi {
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
public Message get(@PathVariable("id") Long id) {
RmExternalResourceProviderEntity rmExternalResourceProvider =
rmExternalResourceProviderService.getById(id);
- return Message.ok("").data("dbs", rmExternalResourceProvider);
+ return Message.ok("").data("item", rmExternalResourceProvider);
}
@ApiImplicitParams({
@@ -70,7 +70,7 @@ public class RmExternalResourceProviderRestfulApi {
@RequestMapping(path = "", method = RequestMethod.POST)
public Message add(@RequestBody RmExternalResourceProviderEntity
rmExternalResourceProvider) {
boolean result =
rmExternalResourceProviderService.save(rmExternalResourceProvider);
- return Message.ok("").data("dbs", result);
+ return Message.ok("").data("result", result);
}
@ApiImplicitParams({
@@ -80,7 +80,7 @@ public class RmExternalResourceProviderRestfulApi {
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
public Message remove(@PathVariable("id") Long id) {
boolean result = rmExternalResourceProviderService.removeById(id);
- return Message.ok("").data("dbs", result);
+ return Message.ok("").data("result", result);
}
@ApiImplicitParams({
@@ -90,7 +90,7 @@ public class RmExternalResourceProviderRestfulApi {
@RequestMapping(path = "", method = RequestMethod.PUT)
public Message update(@RequestBody RmExternalResourceProviderEntity
rmExternalResourceProvider) {
boolean result =
rmExternalResourceProviderService.updateById(rmExternalResourceProvider);
- return Message.ok("").data("dbs", result);
+ return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
index 927ed3920..5f5dce0d7 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceAccessService.java
@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
/**
- * @author jack
* @description 针对表【linkis_ps_datasource_access】的数据库操作Service
* @createDate 2022-08-13 15:17:35
*/
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
index 8a7366853..9dd88c113 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/DatasourceTypeService.java
@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
/**
- * @author jack
* @description Database operation Service for the
linKIS_PS_DM_DATASource_type table
* @createDate 2022-08-13 15:16:37
*/
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
index 80bb73ef7..25c585e03 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/DatasourceAccessServiceImpl.java
@@ -30,7 +30,6 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
/**
- * @author jack
* @description 针对表【linkis_ps_datasource_access】的数据库操作Service实现
* @createDate 2022-08-13 15:17:35
*/
diff --git a/linkis-public-enhancements/pom.xml
b/linkis-public-enhancements/pom.xml
index b30640e57..2ffc1e9b4 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -48,6 +48,16 @@
</modules>
<dependencies>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-rpc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-storage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-server</artifactId>
diff --git a/linkis-web/package.json b/linkis-web/package.json
index fb1f19ae2..aec558e02 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/module/datasourceAccess/index.vue
b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
index c311e1e71..2a34f07ed 100644
--- a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
@@ -139,13 +139,13 @@ export default {
},
{
title: "访问时间",
- key: 'access_time',
+ key: 'accessTime',
minWidth: 50,
tooltip: true,
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.accessTime),'yyyy-MM-dd hh:mm')
)
}
},
@@ -200,6 +200,8 @@ export default {
this.modalShow = true
},
onTableEdit(row){
+ row.tableId = row.tableId+""
+ row.applicationId= row.applicationId+""
this.modalEditData = row
this.modalAddMode = 'edit'
this.modalShow = true
@@ -225,8 +227,8 @@ export default {
content: "删除失败"
})
}
+ this.load()
})
- this.load()
}
})
@@ -236,7 +238,6 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -248,10 +249,10 @@ export default {
content: "添加失败"
})
}
+ this.load()
})
}else {
edit(formData).then((data)=>{
- console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -265,6 +266,7 @@ export default {
})
}
})
+ this.load()
}
this.modalLoading=false
this.modalShow = false
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index fd0aa9efd..ec8d3e136 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -270,8 +270,8 @@ export default {
content: "删除失败"
})
}
+ this.load()
})
- this.load()
}
})
@@ -290,7 +290,6 @@ export default {
formData.parameter = JSON.stringify(formData.parameter)
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- //console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -302,26 +301,27 @@ export default {
content: "添加失败"
})
}
+ this.load()
})
}else {
edit(formData).then((data)=>{
- //console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
content: "编辑成功"
})
- this.load()
}else{
this.$Message.success({
duration: 3,
content: "编辑失败"
})
}
+ this.load()
})
}
this.modalLoading=false
this.modalShow = false
+
})
},
onModalCancel(){
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 93a65eec4..0ffd001ba 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
@@ -152,17 +152,14 @@ export default {
type: 'input',
title: "层级",
field: 'layers',
- value: '',
- props: {
- placeholder: "",
- },
+ value: 0,
validate: [
{
required: true,
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}"层级"`,
- trigger: 'blur',
+ trigger: 'change',
},
],
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index 27258ab2c..8f7846b30 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -197,19 +197,17 @@ export default {
this.load()
},
onAdd(){
- console.log(this.modalEditData)
this.modalAddMode = 'add'
this.modalShow = true
this.clearForm()
},
onTableEdit(row){
+ row.layers = row.layers+""
this.modalEditData = {...row}
- //console.log(this.modalEditData)
this.modalAddMode = 'edit'
this.modalShow = true
},
onTableDelete(row){
- //console.log(row)
this.$Modal.confirm({
title: "提示信息",
content: `确定删除 ${row.name} 这条记录?`,
@@ -229,8 +227,8 @@ export default {
content: "删除失败"
})
}
+ this.load()
})
- this.load()
}
})
@@ -252,6 +250,7 @@ export default {
content: "添加失败"
})
}
+ this.load()
})
}else {
edit(formData).then((data)=>{
@@ -261,13 +260,13 @@ export default {
duration: 3,
content: "编辑成功"
})
- this.load()
}else{
this.$Message.success({
duration: 3,
content: "编辑失败"
})
}
+ this.load()
})
}
this.modalLoading=false
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue
b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index 745f8f067..d51a0240d 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -238,6 +238,7 @@ export default {
}
this.modalLoading=false
this.modalShow = false
+ this.load()
})
},
onModalCancel(){
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 65f7b3956..94665970b 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
@@ -94,6 +94,7 @@ export default {
},
],
},
+
{
type: 'input',
title: "主机",
@@ -113,10 +114,10 @@ export default {
],
},
{
- type: 'input',
+ type: 'Input',
title: "过期天数",
field: 'elapseDay',
- value: '',
+ value: -1,
props: {
placeholder: "",
},
@@ -129,7 +130,7 @@ export default {
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 2a2efe7ad..405a9ff5a 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -73,18 +73,18 @@
<Button type="text" size="large" @click="onModalCancel()">取消</Button>
<Button type="primary" size="large"
@click="onModalOk('userConfirm')">确定</Button>
</div>
- <ErrorCodeForm ref="errorCodeForm" :data="modalEditData"></ErrorCodeForm>
+ <EditForm ref="editForm" :data="modalEditData"></EditForm>
</Modal>
</div>
</template>
<script>
import mixin from '@/common/service/mixin';
-import ErrorCodeForm from './EditForm/index'
+import EditForm from './EditForm/index'
import {add, del, edit, getList} from "./service";
import {formatDate} from "iview/src/components/date-picker/util";
export default {
mixins: [mixin],
- components: {ErrorCodeForm},
+ components: {EditForm},
data() {
return {
searchName: "",
@@ -140,7 +140,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.createTime),'yyyy-MM-dd')
)
}
},
@@ -152,7 +152,7 @@ export default {
align: 'center',
render: (h,params)=>{
return h('div',
- formatDate(new Date(params.row.createTime),'yyyy-MM-dd hh:mm')
+ formatDate(new Date(params.row.updateTime),'yyyy-MM-dd')
)
}
},
@@ -205,14 +205,17 @@ export default {
onAdd(){
this.modalEditData={
id: "",
- errorCode: "",
- errorDesc: "",
- errorRegex: '',
+ tokenName: "",
+ legalUsers: "",
+ legalHosts: "",
+ elapseDay: '',
}
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
+ console.log(row);
+ row.elapseDay = row.elapseDay+""
this.modalEditData = row
this.modalAddMode = 'edit'
this.modalShow = true
@@ -245,7 +248,8 @@ export default {
},
onModalOk(){
- this.$refs.errorCodeForm.formModel.submit((formData)=>{
+ this.$refs.editForm.formModel.submit((formData)=>{
+ console.log(formData);
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
@@ -281,6 +285,7 @@ export default {
}
this.modalLoading=false
this.modalShow = false
+ this.load()
})
},
onModalCancel(){
diff --git
a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
index 43c581641..b016b48b0 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
@@ -201,8 +201,8 @@ export default {
content: "删除失败"
})
}
+ this.load()
})
- this.load()
}
})
@@ -213,7 +213,6 @@ export default {
formData.config = JSON.stringify(formData.config)
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -225,22 +224,22 @@ export default {
content: "添加失败"
})
}
+ this.load()
})
}else {
edit(formData).then((data)=>{
- console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
content: "编辑成功"
})
- this.load()
}else{
this.$Message.success({
duration: 3,
content: "编辑失败"
})
}
+ this.load()
})
}
this.modalLoading=false
diff --git a/linkis-web/src/apps/linkis/module/udfManager/index.vue
b/linkis-web/src/apps/linkis/module/udfManager/index.vue
index caca2aa88..b8021fb42 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/index.vue
@@ -215,7 +215,6 @@ export default {
duration: 3,
content: "编辑成功"
})
- this.load()
}else{
this.$Message.success({
duration: 3,
@@ -226,6 +225,7 @@ export default {
}
this.modalLoading=false
this.modalShow = false
+ this.load()
})
},
onModalCancel(){
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 910912ce5..1ff1fb834 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -76,6 +76,31 @@ export default {
},
],
},
+ {
+ type: 'select',
+ title: "分类",
+ field: 'category',
+ value: '',
+ options: [
+ {"value": "udf", "label": "UDF", "disabled": false},
+ {"value": "function", "label": "函数", "disabled": false},
+ ],
+ props: {
+ multiple: false,
+ placeholder: "请选择",
+ notFoundText: "无匹配数据",
+ placement: "bottom",
+ },
+ validate: [
+ {
+ required: true,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}"名称"`,
+ trigger: 'blur',
+ },
+ ],
+ },
{
type: 'input',
title: "用户名",
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index c7cd6d0b0..5c05a0219 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -198,16 +198,11 @@ export default {
this.load()
},
onAdd(){
- this.modalEditData={
- id: "",
- errorCode: "",
- errorDesc: "",
- errorRegex: '',
- }
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
+ row.parent = row.parent + ""
this.modalEditData = row
this.modalAddMode = 'edit'
this.modalShow = true
@@ -233,8 +228,8 @@ export default {
content: "删除失败"
})
}
+ this.load()
})
- this.load()
}
})
@@ -256,6 +251,7 @@ export default {
content: "添加失败"
})
}
+ this.load()
})
}else {
edit(formData).then((data)=>{
@@ -265,13 +261,13 @@ export default {
duration: 3,
content: "编辑成功"
})
- this.load()
}else{
this.$Message.success({
duration: 3,
content: "编辑失败"
})
}
+ this.load()
})
}
this.modalLoading=false
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
