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 0ba5ae6b7 fix:Parent tree display that implements UDF classification
(#3894)
0ba5ae6b7 is described below
commit 0ba5ae6b78e5770ed6d80afe12164745714a66ed
Author: jacktao007 <[email protected]>
AuthorDate: Fri Nov 25 09:52:01 2022 +0800
fix:Parent tree display that implements UDF classification (#3894)
* fix:Parent tree display that implements UDF classification
* fix:Drop-down selection is recommended
* fix:add get all for udf tree
* fix:add some field for DatasourceTypeKey
---
.../server/dao/mapper/DatasourceTypeKeyMapper.xml | 43 ++++----
.../server/domain/DatasourceTypeKeyEntity.java | 37 +++++++
.../server/restful/UdfTreeRestfulApi.java | 11 +++
linkis-web/src/apps/linkis/i18n/common/en.json | 13 ++-
linkis-web/src/apps/linkis/i18n/common/zh.json | 11 ++-
.../module/datasourceType/EditForm/index.vue | 10 +-
.../module/datasourceTypeKey/EditForm/index.vue | 110 +++++++++++++++++++++
.../apps/linkis/module/datasourceTypeKey/index.vue | 14 +++
.../apps/linkis/module/udfTree/EditForm/index.vue | 18 +++-
.../src/apps/linkis/module/udfTree/index.vue | 3 +
.../src/apps/linkis/module/udfTree/service.js | 9 +-
11 files changed, 248 insertions(+), 31 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
index 1d87ea12b..fb17885ec 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/DatasourceTypeKeyMapper.xml
@@ -21,29 +21,32 @@
<mapper
namespace="org.apache.linkis.basedatamanager.server.dao.DatasourceTypeKeyMapper">
<resultMap id="BaseResultMap"
type="org.apache.linkis.basedatamanager.server.domain.DatasourceTypeKeyEntity">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="dataSourceTypeId" column="data_source_type_id"
jdbcType="INTEGER"/>
- <result property="key" column="key" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="defaultValue" column="default_value"
jdbcType="VARCHAR"/>
- <result property="valueType" column="value_type"
jdbcType="VARCHAR"/>
- <result property="scope" column="scope" jdbcType="VARCHAR"/>
- <result property="require" column="require" jdbcType="TINYINT"/>
- <result property="description" column="description"
jdbcType="VARCHAR"/>
- <result property="valueRegex" column="value_regex"
jdbcType="VARCHAR"/>
- <result property="refId" column="ref_id" jdbcType="BIGINT"/>
- <result property="refValue" column="ref_value" jdbcType="VARCHAR"/>
- <result property="dataSource" column="data_source"
jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time"
jdbcType="TIMESTAMP"/>
- <result property="createTime" column="create_time"
jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="dataSourceTypeId" column="data_source_type_id"
jdbcType="INTEGER"/>
+ <result property="key" column="key" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="nameEn" column="name_en" jdbcType="VARCHAR"/>
+ <result property="defaultValue" column="default_value"
jdbcType="VARCHAR"/>
+ <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
+ <result property="scope" column="scope" jdbcType="VARCHAR"/>
+ <result property="require" column="require" jdbcType="TINYINT"/>
+ <result property="description" column="description"
jdbcType="VARCHAR"/>
+ <result property="descriptionEn" column="description_en"
jdbcType="VARCHAR"/>
+ <result property="valueRegex" column="value_regex" jdbcType="VARCHAR"/>
+ <result property="refId" column="ref_id" jdbcType="BIGINT"/>
+ <result property="refValue" column="ref_value" jdbcType="VARCHAR"/>
+ <result property="dataSource" column="data_source" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time"
jdbcType="TIMESTAMP"/>
+ <result property="createTime" column="create_time"
jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
- `id`,`data_source_type_id`,`key`,
- `name`,`default_value`,`value_type`,
- `scope`,`require`,`description`,
- `value_regex`,`ref_id`,`ref_value`,
- `data_source`,`update_time`,`create_time`
+ id,data_source_type_id,`key`,
+ `name`,name_en,default_value,
+ value_type,`scope`,`require`,
+ description,description_en,value_regex,
+ ref_id,ref_value,data_source,
+ update_time,create_time
</sql>
<select id="getListByPage" resultMap="BaseResultMap">
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
index 217b81b2f..22b3d433a 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/domain/DatasourceTypeKeyEntity.java
@@ -45,6 +45,9 @@ public class DatasourceTypeKeyEntity implements Serializable {
@TableField(value = "`name`")
private String name;
+ /** */
+ private String nameEn;
+
/** */
private String defaultValue;
@@ -52,6 +55,7 @@ public class DatasourceTypeKeyEntity implements Serializable {
private String valueType;
/** */
+ @TableField(value = "`scope`")
private String scope;
/** */
@@ -61,6 +65,9 @@ public class DatasourceTypeKeyEntity implements Serializable {
/** */
private String description;
+ /** */
+ private String descriptionEn;
+
/** */
private String valueRegex;
@@ -122,6 +129,16 @@ public class DatasourceTypeKeyEntity implements
Serializable {
this.name = name;
}
+ /** */
+ public String getNameEn() {
+ return nameEn;
+ }
+
+ /** */
+ public void setNameEn(String nameEn) {
+ this.nameEn = nameEn;
+ }
+
/** */
public String getDefaultValue() {
return defaultValue;
@@ -172,6 +189,16 @@ public class DatasourceTypeKeyEntity implements
Serializable {
this.description = description;
}
+ /** */
+ public String getDescriptionEn() {
+ return descriptionEn;
+ }
+
+ /** */
+ public void setDescriptionEn(String descriptionEn) {
+ this.descriptionEn = descriptionEn;
+ }
+
/** */
public String getValueRegex() {
return valueRegex;
@@ -252,6 +279,9 @@ public class DatasourceTypeKeyEntity implements
Serializable {
&& (this.getName() == null
? other.getName() == null
: this.getName().equals(other.getName()))
+ && (this.getNameEn() == null
+ ? other.getNameEn() == null
+ : this.getNameEn().equals(other.getNameEn()))
&& (this.getDefaultValue() == null
? other.getDefaultValue() == null
: this.getDefaultValue().equals(other.getDefaultValue()))
@@ -267,6 +297,9 @@ public class DatasourceTypeKeyEntity implements
Serializable {
&& (this.getDescription() == null
? other.getDescription() == null
: this.getDescription().equals(other.getDescription()))
+ && (this.getDescriptionEn() == null
+ ? other.getDescriptionEn() == null
+ : this.getDescriptionEn().equals(other.getDescriptionEn()))
&& (this.getValueRegex() == null
? other.getValueRegex() == null
: this.getValueRegex().equals(other.getValueRegex()))
@@ -296,11 +329,13 @@ public class DatasourceTypeKeyEntity implements
Serializable {
prime * result + ((getDataSourceTypeId() == null) ? 0 :
getDataSourceTypeId().hashCode());
result = prime * result + ((getKey() == null) ? 0 : getKey().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+ result = prime * result + ((getNameEn() == null) ? 0 :
getNameEn().hashCode());
result = prime * result + ((getDefaultValue() == null) ? 0 :
getDefaultValue().hashCode());
result = prime * result + ((getValueType() == null) ? 0 :
getValueType().hashCode());
result = prime * result + ((getScope() == null) ? 0 :
getScope().hashCode());
result = prime * result + ((getRequire() == null) ? 0 :
getRequire().hashCode());
result = prime * result + ((getDescription() == null) ? 0 :
getDescription().hashCode());
+ result = prime * result + ((getDescriptionEn() == null) ? 0 :
getDescriptionEn().hashCode());
result = prime * result + ((getValueRegex() == null) ? 0 :
getValueRegex().hashCode());
result = prime * result + ((getRefId() == null) ? 0 :
getRefId().hashCode());
result = prime * result + ((getRefValue() == null) ? 0 :
getRefValue().hashCode());
@@ -320,11 +355,13 @@ public class DatasourceTypeKeyEntity implements
Serializable {
sb.append(", dataSourceTypeId=").append(dataSourceTypeId);
sb.append(", key=").append(key);
sb.append(", name=").append(name);
+ sb.append(", nameEn=").append(nameEn);
sb.append(", defaultValue=").append(defaultValue);
sb.append(", valueType=").append(valueType);
sb.append(", scope=").append(scope);
sb.append(", require=").append(require);
sb.append(", description=").append(description);
+ sb.append(", descriptionEn=").append(descriptionEn);
sb.append(", valueRegex=").append(valueRegex);
sb.append(", refId=").append(refId);
sb.append(", refValue=").append(refValue);
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
index d0b496d47..c3e5e1464 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
@@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -59,6 +61,15 @@ public class UdfTreeRestfulApi {
return Message.ok("").data("list", pageList);
}
+ @ApiOperation(value = "all", notes = "Query all data of UDF Tree",
httpMethod = "GET")
+ @RequestMapping(path = "/all", method = RequestMethod.GET)
+ public Message all(HttpServletRequest request, String searchName) {
+ ModuleUserUtils.getOperationUser(
+ request, "Query all data of UDF Tree,search name:" + searchName);
+ List<UdfTreeEntity> udfTreeEntityList = udfTreeService.list();
+ return Message.ok("").data("list", udfTreeEntityList);
+ }
+
@ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "long",
name = "id")})
@ApiOperation(value = "get", notes = "Get a UDF Tree Record by id",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index a97ba82bd..1c72ae406 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -476,7 +476,8 @@
"parent": "Parent",
"createTime": "Create Time",
"updateTime": "Update Time",
- "searchPlaceholder": "Name/Category/Desc/UserName"
+ "searchPlaceholder": "Name/Category/Desc/UserName",
+ "parentInfo": "Parent classification, Root is the root directory"
},
"datasourceEnv": {
"envName": "Env Name",
@@ -503,9 +504,15 @@
"datasourceTypeKey": {
"key": "Key",
"dataSourceType": "Datasource Type",
- "name": "Name",
+ "name": "Name(Chinese)",
+ "nameEn": "Name",
"valueType": "Value Type",
- "description": "Description",
+ "scope": "Scope",
+ "require": "Require",
+ "defaultValue": "Default Value",
+ "description": "Description(Chinese)",
+ "descriptionEn": "Description",
+ "valueRegex": "Value Regex",
"createTime": "Create Time",
"updateTime": "Update Time",
"searchPlaceholder": "Name",
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index f1bd5b4df..5aece92e1 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -475,10 +475,11 @@
"category": "分类",
"userName": "用户名",
"description": "描述",
- "parent": "父级Key",
+ "parent": "父级",
"createTime": "创建时间",
"updateTime": "更新时间",
- "searchPlaceholder": "名称/分类/描述/用户名"
+ "searchPlaceholder": "名称/分类/描述/用户名",
+ "parentInfo": "父级分类，Root为根目录"
},
"datasourceEnv": {
"envName": "环境名称",
@@ -506,8 +507,14 @@
"key": "键名",
"dataSourceType": "数据源类型",
"name": "名称",
+ "nameEn": "名称(英文)",
"valueType": "值类型",
+ "defaultValue": "默认值",
+ "scope": "范围",
+ "require": "必填",
"description": "描述",
+ "descriptionEn": "描述(英文)",
+ "valueRegex": "值校验",
"createTime": "创建时间",
"updateTime": "更新时间",
"searchPlaceholder": "名称",
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 ce517cd9f..d44a9db27 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
@@ -113,12 +113,20 @@ export default {
],
},
{
- type: 'input',
+ type: 'select',
title:
this.$t('message.linkis.basedataManagement.datasourceType.classifier'),
field: 'classifier',
value: '',
+ options: [
+ {label: "关系型数据库",value: "关系型数据库"},
+ {label: "消息队列",value: "消息队列"},
+ {label: "大数据存储",value: "大数据存储"},
+ {label: "olap",value: "olap"},
+ {label: "分布式全文索引",value: "分布式全文索引"},
+ ],
props: {
placeholder: "relational database",
+ "filterable": true
},
validate: [
{
diff --git
a/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
index f6d2073d2..c303f9c20 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/EditForm/index.vue
@@ -111,6 +111,24 @@ export default {
},
],
},
+ {
+ type: 'input',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.nameEn'),
+ field: 'nameEn',
+ value: '',
+ props: {
+ placeholder: "",
+ },
+ validate: [
+ {
+ required: true,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.nameEn'),
+ trigger: 'blur',
+ },
+ ],
+ },
{
type: 'select',
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.valueType'),
@@ -130,6 +148,62 @@ export default {
},
],
},
+ {
+ type: 'input',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.defaultValue'),
+ field: 'defaultValue',
+ value: '',
+ props: {
+ placeholder: "",
+ },
+ validate: [
+ {
+ required: false,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.defaultValue'),
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ type: 'input',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.scope'),
+ field: 'scope',
+ value: '',
+ props: {
+ placeholder: "",
+ },
+ validate: [
+ {
+ required: false,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.scope'),
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ type: 'switch',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.require'),
+ field: 'require',
+ value: 0,
+ props: {
+ placeholder: "",
+ trueValue: 1,
+ falseValue: 0,
+ },
+ validate: [
+ {
+ required: false,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.require'),
+ trigger: 'blur',
+ },
+ ],
+ },
{
type: 'input',
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.description'),
@@ -148,6 +222,42 @@ export default {
},
],
},
+ {
+ type: 'input',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.descriptionEn'),
+ field: 'descriptionEn',
+ value: '',
+ props: {
+ placeholder: "",
+ },
+ validate: [
+ {
+ required: true,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )} `
+this.$t('message.linkis.basedataManagement.datasourceTypeKey.descriptionEn'),
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ type: 'input',
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.valueRegex'),
+ field: 'valueRegex',
+ value: '',
+ props: {
+ placeholder: "",
+ },
+ validate: [
+ {
+ required: false,
+ message: `${this.$t(
+ 'message.linkis.datasource.pleaseInput'
+ )}
`+this.$t('message.linkis.basedataManagement.datasourceTypeKey.valueRegex'),
+ trigger: 'blur',
+ },
+ ],
+ },
]
}
},
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
index e18e24b5f..18a9a5450 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
@@ -142,6 +142,13 @@ export default {
tooltip: true,
align: 'center',
},
+ {
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.nameEn'),
+ key: 'nameEn',
+ minWidth: 50,
+ tooltip: true,
+ align: 'center',
+ },
{
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.valueType'),
key: 'valueType',
@@ -155,6 +162,13 @@ export default {
tooltip: true,
align: 'center',
},
+ {
+ title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.descriptionEn'),
+ key: 'descriptionEn',
+ minWidth: 50,
+ tooltip: true,
+ align: 'center',
+ },
{
title:
this.$t('message.linkis.basedataManagement.datasourceTypeKey.createTime'),
key: 'createTime',
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 8eb611a75..6f9648b2e 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -26,6 +26,8 @@
</template>
<script>
+import {getAll} from "../service";
+
export default {
props: {
mode: String,
@@ -137,17 +139,18 @@ export default {
],
},
{
- type: 'inputNumber',
+ type: 'select',
title: this.$t('message.linkis.basedataManagement.udfTree.parent'),
field: 'parent',
- value: '',
+ info:
this.$t('message.linkis.basedataManagement.udfTree.parentInfo'),
+ value: "",
props: {
placeholder: "",
},
+ options: [],
validate: [
{
required: true,
- type: "number",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)} `+this.$t('message.linkis.basedataManagement.udfTree.parent'),
@@ -158,5 +161,14 @@ export default {
]
}
},
+ created() {
+ getAll().then(res=>{
+ let list = res.list.map(m=>{
+ return {label: m.name,value: m.id}
+ });
+ list = [{label: "Root",value: -1},...list]
+ this.rule[this.rule.length-1].options = list
+ })
+ },
}
</script>
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index f88f54274..8f62c6fdc 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -202,6 +202,9 @@ export default {
this.pageDatalist = data.list.list
this.page.totalSize = data.list.total
})
+
+
+
},
changePage(value) {
this.page.pageNow = value
diff --git a/linkis-web/src/apps/linkis/module/udfTree/service.js
b/linkis-web/src/apps/linkis/module/udfTree/service.js
index 1849d5530..2f1400afb 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/service.js
+++ b/linkis-web/src/apps/linkis/module/udfTree/service.js
@@ -20,10 +20,14 @@ import api from '@/common/service/api';
const udfTreeBaseUrl = '/basedata-manager/udf-tree'
const getList = (params)=> {
- console.log(params)
return api.fetch(udfTreeBaseUrl, params , 'get')
}
+const getAll = ()=> {
+ return api.fetch(udfTreeBaseUrl+"/all", 'get')
+}
+
+
const add = (data)=> {
return api.fetch(udfTreeBaseUrl, data , 'post')
}
@@ -40,5 +44,6 @@ export{
getList,
add,
edit,
- del
+ del,
+ getAll
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
