You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/03/20 13:07:50 UTC
[linkis] branch dev-1.3.2 updated: show udfManager and update datasource env (#4393)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 4ab2670fd show udfManager and update datasource env (#4393)
4ab2670fd is described below
commit 4ab2670fdd4df643942ae1e3576f47238a104f89
Author: aiceflower <ki...@gmail.com>
AuthorDate: Mon Mar 20 21:07:42 2023 +0800
show udfManager and update datasource env (#4393)
Co-authored-by: aiceflower <ki...@sina.com>
---
.../src/apps/linkis/module/datasourceEnv/EditForm/index.vue | 11 +++++++++--
linkis-web/src/apps/linkis/module/datasourceEnv/index.vue | 6 +++---
linkis-web/src/apps/linkis/view/linkis/index.vue | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue b/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
index 71f02e440..d54077ffd 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
@@ -239,13 +239,20 @@ export default {
})
},
hiddenHandler (newV) {
+ let dataSourceTypeName = '';
+ for(let i = 0;i < this.typeOptions.length; i++) {
+ if (this.typeOptions[i].value === newV.datasourceTypeId) {
+ dataSourceTypeName = this.typeOptions[i].label
+ }
+ }
// radio
- this.rule[4].hidden = !(newV.datasourceTypeId === 4);
+ this.rule[4].hidden = !(['hive', 'kafka'].includes(dataSourceTypeName))
+
// keytab value
this.rule[6].hidden = !newV.keytab;
// upload
this.rule[5].hidden = !this.rule[6].hidden;
- if (!newV.hasKeyTab || newV.datasourceTypeId !== 4){
+ if (!newV.hasKeyTab || !['hive', 'kafka'].includes(dataSourceTypeName)){
this.rule[5].hidden = true;
this.rule[6].hidden = true;
this.rule[8].hidden = true;
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 5a2666f15..c3e291338 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -70,7 +70,7 @@
<Button type="text" size="large" @click="onModalCancel()">{{$t('message.linkis.basedataManagement.modal.cancel')}}</Button>
<Button type="primary" size="large" @click="onModalOk('userConfirm')">{{$t('message.linkis.basedataManagement.modal.confirm')}}</Button>
</div>
- <EditForm ref="editForm" :data="modalEditData" :typeOptions=datasourceTypeOptions></EditForm>
+ <EditForm ref="editForm" :data="modalEditData" :typeOptions="datasourceTypeOptions"></EditForm>
</Modal>
<div style="margin: 10px; overflow: hidden; textAlign: center">
<div>
@@ -212,7 +212,7 @@ export default {
}
getAllEnv().then((res) => {
let options = [...res.typeList].sort((a, b) => a.id - b.id)
- .map(item => { return {value: +item.id, label: item.name, disabled: ![2, 4].includes(+item.id)}})
+ .map(item => { return {value: +item.id, label: item.name, disabled: !['hive', 'kafka'].includes(item.name)}})
this.datasourceTypeOptions= options
// 获取列表
getList(params).then((data) => {
@@ -223,7 +223,7 @@ export default {
let filter = options.filter(optionsItem=>{
return optionsItem.value === item.datasourceTypeId
})
- item.name = filter[0].label
+ item.name = filter[0]?.label || '';
})
})
})
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index 1721688f3..e848ed1b3 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -284,7 +284,7 @@ export default {
),
path: '/console/urm/functionManagement',
},
- // {key: '1-9-3', name: this.$t('message.linkis.sideNavList.function.children.udfManager'), path: '/console/udfManager' },
+ {key: '1-9-3', name: this.$t('message.linkis.sideNavList.function.children.udfManager'), path: '/console/udfManager' },
{key: '1-9-4', name: this.$t('message.linkis.sideNavList.function.children.udfTree'), path: '/console/udfTree' },
],
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org