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 2dfa6d11f fix:optimize BaseDataManager frontend (#3867)
2dfa6d11f is described below
commit 2dfa6d11f675cb355b615e38c1f66079d27d461a
Author: jacktao007 <[email protected]>
AuthorDate: Tue Nov 22 09:36:03 2022 +0800
fix:optimize BaseDataManager frontend (#3867)
* fix:optimize datasource environment search placeholder
* fix:optimize datasource type search placeholder
* fix:optimize datasource type key search placeholder
* fix:optimize udf user manage search placeholder
* fix:optimize udf user tree search placeholder
* fix:optimize gateway auth token search placeholder
* fix:optimize error code search placeholder
* fix:optimize External Resource Provider search placeholder
* fix:fix token manage field order
* fix:restrict the layers field type to number
* fix:optimize the edit dialog for the datasource type
* fix:optimize the edit dialog for the token manage
* fix:Optimize the edit dialog field validation for token management
---
.../server/dao/mapper/UdfTreeMapper.xml | 1 +
linkis-web/src/apps/linkis/i18n/common/en.json | 24 ++++++++++-----
linkis-web/src/apps/linkis/i18n/common/zh.json | 24 ++++++++++-----
.../src/apps/linkis/module/datasourceEnv/index.vue | 2 +-
.../module/datasourceType/EditForm/index.vue | 19 +++++++-----
.../apps/linkis/module/datasourceType/index.vue | 4 +--
.../apps/linkis/module/datasourceTypeKey/index.vue | 2 +-
.../src/apps/linkis/module/errorCode/index.vue | 2 +-
.../module/gatewayAuthToken/EditForm/index.vue | 36 ++++++----------------
.../apps/linkis/module/gatewayAuthToken/index.vue | 25 ++++++---------
.../module/rmExternalResourceProvider/index.vue | 2 +-
.../src/apps/linkis/module/udfManager/index.vue | 2 +-
.../src/apps/linkis/module/udfTree/index.vue | 2 +-
13 files changed, 72 insertions(+), 73 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml
index cd2f8a25e..4012018fb 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/dao/mapper/UdfTreeMapper.xml
@@ -43,6 +43,7 @@
from linkis_ps_udf_tree
<if test="searchName != null and searchName!=''">
where user_name like concat('%',#{searchName},'%')
+ or name like concat('%',#{searchName},'%')
or description like concat('%',#{searchName},'%')
or category like concat('%',#{searchName},'%')
</if>
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index f92aa92d1..be937af74 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -431,21 +431,25 @@
"businessOwner": "Owner",
"createTime":"Create Time",
"updateTime": "Update Time",
- "updateBy": "Update By"
+ "updateBy": "Update By",
+ "searchPlaceholder": "TokenName/Users/Hosts"
},
"errorCode": {
"errorCode": "Code",
"errorDesc": "Desc",
- "errorRegex": "Regex"
+ "errorRegex": "Regex",
+ "searchPlaceholder": "Code/Desc/Regex"
},
"rmExternalResourceProvider": {
"resourceType": "Resource Type",
"name": "Name",
"labels": "Labels",
- "config": "Config"
+ "config": "Config",
+ "searchPlaceholder": "Name/Labels/Config"
},
"udfManager": {
- "userName": "User Name"
+ "userName": "User Name",
+ "searchPlaceholder": "UserName"
},
"udfTree": {
"name": "Name",
@@ -454,7 +458,8 @@
"description": "Description",
"parent": "Parent",
"createTime": "Create Time",
- "updateTime": "Update Time"
+ "updateTime": "Update Time",
+ "searchPlaceholder": "Name/Category/Desc/UserName"
},
"datasourceEnv": {
"envName": "Env Name",
@@ -466,7 +471,8 @@
"createTime": "Create Time",
"createUser": "Create User",
"updateTime": "Update Time",
- "modifyUser": "Modify User"
+ "modifyUser": "Modify User",
+ "searchPlaceholder": "EnvName/EnvDesc/Param"
},
"datasourceType": {
"name": "Name",
@@ -474,7 +480,8 @@
"option": "Option",
"classifier": "Classifier",
"icon": "Icon",
- "layers": "Layers"
+ "layers": "Layers",
+ "searchPlaceholder": "Name/Desc/Classifier"
},
"datasourceTypeKey": {
"key": "Key",
@@ -483,7 +490,8 @@
"valueType": "Value Type",
"description": "Description",
"createTime": "Create Time",
- "updateTime": "Update Time"
+ "updateTime": "Update Time",
+ "searchPlaceholder": "Name"
}
},
"EnginePluginManagement": {
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index 8057806f8..a2f96970d 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -432,21 +432,25 @@
"businessOwner": "所属者",
"createTime":"创建时间",
"updateTime": "更新时间",
- "updateBy": "更新人"
+ "updateBy": "更新人",
+ "searchPlaceholder": "令牌名称/用户/主机"
},
"errorCode": {
"errorCode": "错误代码",
"errorDesc": "错误描述",
- "errorRegex": "错误正则"
+ "errorRegex": "错误正则",
+ "searchPlaceholder": "代码/描述/正则"
},
"rmExternalResourceProvider": {
"resourceType": "资源类型",
"name": "名称",
"labels": "标签",
- "config": "配置信息"
+ "config": "配置信息",
+ "searchPlaceholder": "名称/标签/配置"
},
"udfManager": {
- "userName": "用户名"
+ "userName": "用户名",
+ "searchPlaceholder": "用户名"
},
"udfTree": {
"name": "名称",
@@ -455,7 +459,8 @@
"description": "描述",
"parent": "父级Key",
"createTime": "创建时间",
- "updateTime": "更新时间"
+ "updateTime": "更新时间",
+ "searchPlaceholder": "名称/分类/描述/用户名"
},
"datasourceEnv": {
"envName": "环境名称",
@@ -467,7 +472,8 @@
"createTime": "创建时间",
"createUser": "创建者",
"updateTime": "更新时间",
- "modifyUser": "更新者"
+ "modifyUser": "更新者",
+ "searchPlaceholder": "环境名称/环境描述/参数"
},
"datasourceType": {
"name": "名称",
@@ -475,7 +481,8 @@
"option": "选项",
"classifier": "分类",
"icon": "图标",
- "layers": "层级"
+ "layers": "层级",
+ "searchPlaceholder": "名称/描述/分类"
},
"datasourceTypeKey": {
"key": "键名",
@@ -484,7 +491,8 @@
"valueType": "值类型",
"description": "描述",
"createTime": "创建时间",
- "updateTime": "更新时间"
+ "updateTime": "更新时间",
+ "searchPlaceholder": "名称"
}
},
"EnginePluginManagement": {
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 77f0f65b3..3176fe320 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.datasourceEnv.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
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 a9cd3ccb2..0743c6910 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/EditForm/index.vue
@@ -64,7 +64,7 @@ export default {
field: 'name',
value: '',
props: {
- placeholder: "",
+ placeholder: "mysql",
},
validate: [
{
@@ -82,7 +82,7 @@ export default {
field: 'description',
value: '',
props: {
- placeholder: "",
+ placeholder: "mysql database",
},
validate: [
{
@@ -100,7 +100,7 @@ export default {
field: 'option',
value: '',
props: {
- placeholder: "",
+ placeholder: "mysql database",
},
validate: [
{
@@ -118,7 +118,7 @@ export default {
field: 'classifier',
value: '',
props: {
- placeholder: "",
+ placeholder: "relational database",
},
validate: [
{
@@ -134,13 +134,15 @@ export default {
type: 'input',
title:
this.$t('message.linkis.basedataManagement.datasourceType.icon'),
field: 'icon',
+ info: 'example：https://linkis.apache.org/img/logo.png',
value: '',
props: {
- placeholder: "",
+ placeholder: "eg. https://linkis.apache.org/img/logo.png";,
},
validate: [
{
- required: false,
+ required: true,
+ type: "url",
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}
`+this.$t('message.linkis.basedataManagement.datasourceType.icon'),
@@ -149,10 +151,13 @@ export default {
],
},
{
- type: 'input',
+ type: 'InputNumber',
title:
this.$t('message.linkis.basedataManagement.datasourceType.layers'),
field: 'layers',
value: 0,
+ props: {
+ placeholder: "eg. 1-3"
+ },
validate: [
{
required: true,
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index eae44354b..47fe1b422 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.datasourceType.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
@@ -131,7 +131,7 @@ export default {
align: 'center',
},
{
- title:
this.$t('message.linkis.basedataManagement.datasourceType.name'),
+ title:
this.$t('message.linkis.basedataManagement.datasourceType.classifier'),
key: 'classifier',
tooltip: true,
align: 'center',
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
index 59821abd4..6bed681cf 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.datasourceTypeKey.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue
b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index 222708bef..57e938f0e 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.errorCode.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
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 c15223eb2..3662ad771 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
@@ -21,7 +21,6 @@
:rule="rule"
v-model="formModel"
:option="options"
- :value.sync="formData"
/>
</div>
</template>
@@ -30,12 +29,11 @@
export default {
props: {
mode: String,
- data: Object,
},
data() {
return {
formModel: {},
- formData: {},
+ // formData: {},
options: {
submitBtn: false,
},
@@ -62,13 +60,15 @@ export default {
type: 'input',
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.tokenName'),
field: 'tokenName',
+ info: 'Token Name,Example: TEST-AUTH',
value: '',
props: {
- placeholder: "",
+ placeholder: "eg. TEST-AUTH",
},
validate: [
{
required: true,
+ pattern: /^[A-Za-z]+-[A-Za-z]+$/g,
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.tokenName'),
@@ -82,7 +82,7 @@ export default {
field: 'legalUsers',
value: '',
props: {
- placeholder: "",
+ placeholder: "eg. *",
},
validate: [
{
@@ -94,14 +94,13 @@ export default {
},
],
},
-
{
type: 'input',
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.legalHosts'),
field: 'legalHosts',
value: '',
props: {
- placeholder: "",
+ placeholder: "eg. *",
},
validate: [
{
@@ -114,16 +113,17 @@ export default {
],
},
{
- type: 'Input',
+ type: 'input',
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDay'),
field: 'elapseDay',
- value: -1,
+ value: '',
props: {
- placeholder: "",
+ placeholder: "eg . -1",
},
validate: [
{
required: true,
+ pattern: /^(\-|\+)?\d+(\.\d+)?$/,
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
)}`+this.$t('message.linkis.basedataManagement.gatewayAuthToken.elapseDay'),
@@ -134,21 +134,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/gatewayAuthToken/index.vue
b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 62b7c9f6b..142c76770 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.gatewayAuthToken.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
@@ -140,6 +140,12 @@ export default {
tooltip: true,
align: 'center',
},
+ {
+ title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.updateBy'),
+ key: 'updateBy',
+ tooltip: true,
+ align: 'center',
+ },
{
title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.createTime'),
key: 'createTime',
@@ -164,12 +170,6 @@ export default {
)
}
},
- {
- title:
this.$t('message.linkis.basedataManagement.gatewayAuthToken.updateBy'),
- key: 'updateBy',
- tooltip: true,
- align: 'center',
- },
{
title: this.$t('message.linkis.basedataManagement.action'),
width: 150,
@@ -211,20 +211,13 @@ export default {
this.load()
},
onAdd(){
- this.modalEditData={
- id: "",
- tokenName: "",
- legalUsers: "",
- legalHosts: "",
- elapseDay: '',
- }
+ this.$refs.editForm.formModel.resetFields ()
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
- console.log(row);
row.elapseDay = row.elapseDay+""
- this.modalEditData = row
+ this.$refs.editForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
},
diff --git
a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
index 58ffe03b6..7f0999340 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.rmExternalResourceProvider.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
diff --git a/linkis-web/src/apps/linkis/module/udfManager/index.vue
b/linkis-web/src/apps/linkis/module/udfManager/index.vue
index 098bc699b..674b4fd71 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.udfManager.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index 0e09eca16..04cd43005 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -20,7 +20,7 @@
<Row class="search-bar" type="flex">
<Col span="6">
<span :style="{ whiteSpace: 'nowrap', marginRight: '5px', fontSize:
'14px', lineHeight: '32px'}"
:title="$t('message.linkis.basedataManagement.searchLabel')">{{$t('message.linkis.basedataManagement.searchLabel')}}</span>
- <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.searchPlaceholder')"></Input>
+ <Input v-model="searchName" clearable suffix="ios-search"
class="input"
:placeholder="$t('message.linkis.basedataManagement.udfTree.searchPlaceholder')"></Input>
</Col>
<Col span="3">
<Button type="primary" class="Button" @click="load()">{{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://linkis.apache.org/img/logo.png"](https://linkis.apache.org/img/logo.png"){kind=link}