This is an automated email from the ASF dual-hosted git repository.
peacewong 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 2afadfc24 Fix some bugs in the front end page (#3528)
2afadfc24 is described below
commit 2afadfc2420c8cd6ea563517e52649a4b8d771d1
Author: Beacontownfc <[email protected]>
AuthorDate: Wed Oct 5 22:21:27 2022 +0800
Fix some bugs in the front end page (#3528)
* fix some bug
* recover
* upload keytab function
* modify according to casion
* modify according to casion
* limit ord users
---
linkis-web/src/apps/linkis/i18n/common/en.json | 4 +-
linkis-web/src/apps/linkis/i18n/common/zh.json | 4 +-
.../apps/linkis/module/datasourceAccess/index.vue | 65 +++---
.../linkis/module/datasourceEnv/EditForm/index.vue | 73 +++++--
.../src/apps/linkis/module/datasourceEnv/index.vue | 130 +++++++-----
.../apps/linkis/module/datasourceEnv/service.js | 9 +-
.../apps/linkis/module/datasourceType/index.vue | 99 ++++++----
.../src/apps/linkis/module/errorCode/index.vue | 2 +-
.../apps/linkis/module/gatewayAuthToken/index.vue | 2 +-
.../module/rmExternalResourceProvider/index.vue | 2 +-
.../src/apps/linkis/module/udfManager/index.vue | 2 +-
.../src/apps/linkis/module/udfTree/index.vue | 2 +-
linkis-web/src/apps/linkis/router.js | 218 ++++++++++-----------
linkis-web/src/apps/linkis/view/linkis/index.vue | 20 +-
14 files changed, 382 insertions(+), 250 deletions(-)
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index 71096cb5b..c6ebd0aa9 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -329,7 +329,9 @@
},
"basedata": {
"add": "add",
- "remove": "remove"
+ "remove": "remove",
+ "edit": "edit",
+ "addUDFAdmin": "add UDF administrator"
}
}
}
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index b14b2d03e..6d46ba137 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -330,7 +330,9 @@
},
"basedata": {
"add": "新增",
- "remove": "删除"
+ "remove": "删除",
+ "edit": "编辑",
+ "addUDFAdmin": "新增UDF管理员"
},
"EnginePluginManagement": {
"engineConnType": "引擎类型",
diff --git a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
index 1ca327f87..c311e1e71 100644
--- a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
@@ -34,39 +34,50 @@
<Col span="15">
</Col>
</Row>
- <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="420"
- class="table-content">
- <template slot-scope="{ row,index }" slot="action">
- <ButtonGroup size="small">
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableEdit(row, index)"
- >{{ $t('message.linkis.edit') }}
- </Button
- >
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableDelete(row, index)"
- >
- {{ $t('message.linkis.basedata.remove') }}
- </Button>
- </ButtonGroup>
- </template>
- </Table>
- <div style="margin: 10px; overflow: hidden">
- <div style="float: right">
- <Page :page-size="page.pageSize" :total="page.totalSize"
:current="page.pageNow" @on-change="changePage"></Page>
+ <div style="height: 600px">
+ <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="420"
+ class="table-content">
+ <template slot-scope="{ row,index }" slot="action">
+ <ButtonGroup size="small">
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableEdit(row, index)"
+ >{{ $t('message.linkis.edit') }}
+ </Button
+ >
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableDelete(row, index)"
+ >
+ {{ $t('message.linkis.basedata.remove') }}
+ </Button>
+ </ButtonGroup>
+ </template>
+ </Table>
+ </div>
+ <div style="margin: 10px; overflow: hidden; textAlign: center">
+ <div>
+ <Page
+ :page-size="page.pageSize"
+ :total="page.totalSize"
+ :current="page.pageNow"
+ @on-change="changePage"
+ size="small"
+ show-total
+ show-elevator
+ :prev-text="$t('message.linkis.previousPage')"
:next-text="$t('message.linkis.nextPage')"
+ ></Page>
</div>
</div>
<Modal
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add' ? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
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 1637d1cb3..00ad38c5f 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
@@ -34,6 +34,7 @@ export default {
},
data() {
return {
+ keyToName: {},
formModel: {},
formData: {},
options: {
@@ -95,23 +96,53 @@ export default {
],
},
{
- type: 'input',
- title: "数据源ID",
- field: 'datasourceTypeId',
- value: '',
- props: {
- placeholder: "",
- },
+ type: "select",
+ field: "datasourceTypeId",
+ title: "数据源环境",
+ value: 1,
+ options: [],
validate: [
{
required: true,
message: `${this.$t(
'message.linkis.datasource.pleaseInput'
- )}"数据源ID"`,
- trigger: 'blur',
+ )}"数据源环境"`
},
],
},
+ {
+ type: "radio",
+ title: "kerboros认证",
+ field: "keytab",
+ value: false,
+ options: [
+ {value: false,label: "否",disabled: false},
+ {value: true,label: "是",disabled: false},
+ ],
+ on: {
+ 'on-change': () => {
+ this.rule[5].hidden = !this.rule[5].hidden;
+ }
+ }
+ },
+ {
+ type: "upload",
+ field: "pic",
+ title: "keytab",
+ value: [],
+ hidden: true,
+ props: {
+ uploadType: 'file',
+ action: "/api/rest_j/v1/bml/upload",
+ maxLength: 1,
+ multiple: false,
+ onSuccess: (res) =>{
+ let tmpParameter = this.formData.parameter ?
JSON.parse(this.formData.parameter) : {};
+ tmpParameter.keytab = res.data.resourceId;
+ this.formData.parameter = JSON.stringify(tmpParameter);
+ }
+ },
+ },
{
type: 'input',
title: "参数",
@@ -131,7 +162,7 @@ export default {
trigger: 'blur',
},
],
- }
+ },
]
}
},
@@ -141,15 +172,35 @@ export default {
methods: {
getData(data){
this.formData = {...data}
- }
+ },
+ changeSelector(options){
+ console.log('test', options)
+ this.rule[3].options = [...options];
+ options.forEach(ele=> {
+ this.keyToName[ele.value] = ele.label;
+ })
+ },
},
watch: {
data: {
handler(newV) {
+ this.rule[4].hidden = this.keyToName[newV.datasourceTypeId] == 'hive'
? false : true;
+ this.rule[5].hidden = !this.formData.keytab;
+ if(this.rule[4].hidden) this.rule[5].hidden = true;
this.getData(newV)
},
deep: true,
},
+ formData: {
+ handler(newV){
+ console.log(this.keyToName)
+ this.rule[4].hidden = this.keyToName[newV.datasourceTypeId] == 'hive'
? false : true;
+ if(this.rule[4].hidden) this.rule[5].hidden = true;
+ else if(this.formData.keytab && newV.datasourceTypeId == 4)
this.rule[5].hidden = false;
+ else this.rule[5].hidden = true;
+ },
+ deep: true
+ }
},
}
</script>
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 5dc0e3538..a6d727991 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -34,39 +34,36 @@
<Col span="15">
</Col>
</Row>
- <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="420"
- class="table-content">
- <template slot-scope="{ row,index }" slot="action">
- <ButtonGroup size="small">
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableEdit(row, index)"
- >{{ $t('message.linkis.edit') }}
- </Button
- >
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableDelete(row, index)"
- >
- {{ $t('message.linkis.basedata.remove') }}
- </Button>
- </ButtonGroup>
- </template>
- </Table>
- <div style="margin: 10px; overflow: hidden">
- <div style="float: right">
- <Page :page-size="page.pageSize" :total="page.totalSize"
:current="page.pageNow" @on-change="changePage"></Page>
- </div>
+ <div style="height: 600px">
+ <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="420"
+ class="table-content">
+ <template slot-scope="{ row,index }" slot="action">
+ <ButtonGroup size="small">
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableEdit(row, index)"
+ >{{ $t('message.linkis.edit') }}
+ </Button
+ >
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableDelete(row, index)"
+ >
+ {{ $t('message.linkis.basedata.remove') }}
+ </Button>
+ </ButtonGroup>
+ </template>
+ </Table>
</div>
<Modal
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add' ? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
@@ -75,12 +72,26 @@
</div>
<ErrorCodeForm ref="errorCodeForm" :data="modalEditData"></ErrorCodeForm>
</Modal>
+ <div style="margin: 10px; overflow: hidden; textAlign: center">
+ <div>
+ <Page
+ :page-size="page.pageSize"
+ :total="page.totalSize"
+ :current="page.pageNow"
+ @on-change="changePage"
+ size="small"
+ show-total
+ show-elevator
+ :prev-text="$t('message.linkis.previousPage')"
:next-text="$t('message.linkis.nextPage')"
+ ></Page>
+ </div>
+ </div>
</div>
</template>
<script>
import mixin from '@/common/service/mixin';
import ErrorCodeForm from './EditForm/index'
-import {add, del, edit, getList} from "./service";
+import {add, del, edit, getList, getAllEnv} from "./service";
import {formatDate} from "iview/src/components/date-picker/util";
export default {
mixins: [mixin],
@@ -115,8 +126,8 @@ export default {
align: 'center',
},
{
- title: "数据源ID",
- key: 'datasourceTypeId',
+ title: "数据源名称",
+ key: 'name',
tooltip: true,
align: 'center',
},
@@ -171,9 +182,22 @@ export default {
],
pageDatalist: [],
+ allEnv: [],
modalShow: false,
modalAddMode: 'add',
- modalEditData: {},
+ modalEditData: {
+ createTime: '',
+ createUser: '',
+ datasourceTypeId: '',
+ envDesc: '',
+ envName: '',
+ id: '',
+ modifyTime: '',
+ modifyUser: '',
+ parameter: '',
+ _index: '',
+ _rowKey: ''
+ },
modalLoading: false
};
},
@@ -185,7 +209,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ this.load();
},
load() {
let params = {
@@ -193,9 +217,20 @@ export default {
currentPage: this.page.pageNow,
pageSize: this.page.pageSize
}
- getList(params).then((data) => {
- this.pageDatalist = data.list.list
- this.page.totalSize = data.list.total
+ getAllEnv().then((res) => {
+ this.allEnv = [...res.typeList]
+ this.allEnv.sort((a, b) => a.id - b.id)
+ getList(params).then((data) => {
+ this.pageDatalist = data.list.list
+ this.page.totalSize = data.list.total
+ let options = []
+ //console.log(this.pageDatalist)
+ this.pageDatalist.map(item => { item.name =
this.allEnv[item.datasourceTypeId - 1].name})
+ this.allEnv.map(item => {
+ options.push({value: +item.id, label: item.name})
+ })
+ this.$refs['errorCodeForm'].changeSelector(options)
+ })
})
},
changePage(value) {
@@ -203,17 +238,14 @@ export default {
this.load()
},
onAdd(){
- this.modalEditData={
- id: "",
- errorCode: "",
- errorDesc: "",
- errorRegex: '',
- }
+ this.clearForm();
this.modalAddMode = 'add'
this.modalShow = true
},
onTableEdit(row){
- this.modalEditData = row
+ row.keytab = JSON.parse(row.parameter).keytab ? true : false;
+ this.modalEditData = {...row}
+ //console.log(this.modalEditData)
this.modalAddMode = 'edit'
this.modalShow = true
},
@@ -244,12 +276,20 @@ export default {
})
},
+ clearForm(){
+ for(let key in this.modalEditData) {
+ this.modalEditData[key] = ''
+ }
+ this.modalEditData.keytab = false;
+ },
onModalOk(){
this.$refs.errorCodeForm.formModel.submit((formData)=>{
+ if('keytab' in formData) delete formData['keytab'];
+ if('pic' in formData) delete formData['pic'];
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ //console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -264,7 +304,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ //console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
b/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
index 4a757e0cf..ad3091922 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const dataSourceEnvBaseUrl = '/basedata-manager/datasource-env'
const getList = (params)=> {
- console.log(params)
+ //console.log(params)
return api.fetch(dataSourceEnvBaseUrl, params , 'get')
}
@@ -36,9 +36,14 @@ const del = (params)=> {
return api.fetch(`${dataSourceEnvBaseUrl}/${params.id}`,'delete')
}
+const getAllEnv = () => {
+ return api.fetch(`/data-source-manager/type/all`, 'get')
+}
+
export{
getList,
add,
edit,
- del
+ del,
+ getAllEnv
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index 4972bdb24..27258ab2c 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -34,39 +34,50 @@
<Col span="15">
</Col>
</Row>
- <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="420"
- class="table-content">
- <template slot-scope="{ row,index }" slot="action">
- <ButtonGroup size="small">
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableEdit(row, index)"
- >{{ $t('message.linkis.edit') }}
- </Button
- >
- <Button
- :disabled="row.expire"
- size="small"
- type="primary"
- @click="onTableDelete(row, index)"
- >
- {{ $t('message.linkis.basedata.remove') }}
- </Button>
- </ButtonGroup>
- </template>
- </Table>
- <div style="margin: 10px; overflow: hidden">
- <div style="float: right">
- <Page :page-size="page.pageSize" :total="page.totalSize"
:current="page.pageNow" @on-change="changePage"></Page>
+ <div style="height: 600px">
+ <Table border size="small" align="center" :columns="tableColumnNum"
:data="pageDatalist" max-height="450"
+ class="table-content">
+ <template slot-scope="{ row,index }" slot="action">
+ <ButtonGroup size="small">
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableEdit(row, index)"
+ >{{ $t('message.linkis.edit') }}
+ </Button
+ >
+ <Button
+ :disabled="row.expire"
+ size="small"
+ type="primary"
+ @click="onTableDelete(row, index)"
+ >
+ {{ $t('message.linkis.basedata.remove') }}
+ </Button>
+ </ButtonGroup>
+ </template>
+ </Table>
+ </div>
+ <div style="margin: 10px; overflow: hidden; textAlign: center">
+ <div>
+ <Page
+ :page-size="page.pageSize"
+ :total="page.totalSize"
+ :current="page.pageNow"
+ @on-change="changePage"
+ size="small"
+ show-total
+ show-elevator
+ :prev-text="$t('message.linkis.previousPage')"
:next-text="$t('message.linkis.nextPage')"
+ ></Page>
</div>
</div>
<Modal
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
@@ -145,10 +156,18 @@ export default {
},
],
+ modalEditData: {
+ classifier: '',
+ description: '',
+ icon: '',
+ id: '',
+ layers: '',
+ name: '',
+ option: ''
+ },
pageDatalist: [],
modalShow: false,
modalAddMode: 'add',
- modalEditData: {},
modalLoading: false
};
},
@@ -160,7 +179,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ //console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -178,25 +197,22 @@ export default {
this.load()
},
onAdd(){
- this.modalEditData={
- id: "",
- errorCode: "",
- errorDesc: "",
- errorRegex: '',
- }
+ console.log(this.modalEditData)
this.modalAddMode = 'add'
this.modalShow = true
+ this.clearForm()
},
onTableEdit(row){
- this.modalEditData = row
+ this.modalEditData = {...row}
+ //console.log(this.modalEditData)
this.modalAddMode = 'edit'
this.modalShow = true
},
onTableDelete(row){
-
+ //console.log(row)
this.$Modal.confirm({
title: "提示信息",
- content: "确认是否删除该记录?",
+ content: `确定删除 ${row.name} 这条记录?`,
onOk: ()=>{
let params = {
id: row.id
@@ -239,7 +255,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+
if(data.result) {
this.$Message.success({
duration: 3,
@@ -261,6 +277,11 @@ export default {
onModalCancel(){
this.modalLoading=false
this.modalShow = false
+ },
+ clearForm(){
+ for(let key in this.modalEditData) {
+ this.modalEditData[key] = ''
+ }
}
},
};
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue
b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index 4733a76a9..745f8f067 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -66,7 +66,7 @@
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index d97b4f830..2a2efe7ad 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -66,7 +66,7 @@
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
diff --git
a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
index 91bc5608d..5aa95f351 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
@@ -66,7 +66,7 @@
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'?$t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
diff --git a/linkis-web/src/apps/linkis/module/udfManager/index.vue
b/linkis-web/src/apps/linkis/module/udfManager/index.vue
index 4d407b514..caca2aa88 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/index.vue
@@ -66,7 +66,7 @@
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'? $t('message.linkis.basedata.addUDFAdmin') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue
b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index d45eb7a51..c7cd6d0b0 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -66,7 +66,7 @@
width="800"
class="modal"
v-model="modalShow"
- :title="modalAddMode=='add'?'新增':'编辑'"
+ :title="modalAddMode=='add'? $t('message.linkis.basedata.add') :
$t('message.linkis.basedata.edit')"
:loading="modalLoading"
>
<div slot="footer">
diff --git a/linkis-web/src/apps/linkis/router.js
b/linkis-web/src/apps/linkis/router.js
index f0ed4e68a..5adabb6e1 100644
--- a/linkis-web/src/apps/linkis/router.js
+++ b/linkis-web/src/apps/linkis/router.js
@@ -138,116 +138,116 @@ export default [
publicPage: true,
},
},
- {
- name: 'microService',
- path: 'microService',
- component: () =>
- import('./module/microServiceManagement/index.vue'),
- meta: {
- title: 'microServiceManagement',
- publicPage: true,
- },
- },
- {
- name: 'datasource',
- path: 'datasource',
- component: () =>
- import('./module/datasource/index.vue'),
- meta: {
- title: 'datasourceManagement',
- publicPage: true,
- },
- },
- {
- name: 'errorCode',
- path: 'errorCode',
- component: () =>
- import('./module/errorCode/index.vue'),
- meta: {
- title: 'errorCode',
- publicPage: true,
- },
- },
- {
- name: 'gatewayAuthToken',
- path: 'gatewayAuthToken',
- component: () =>
- import('./module/gatewayAuthToken/index.vue'),
- meta: {
- title: 'gatewayAuthToken',
- publicPage: true,
- },
- },
- {
- name: 'rmExternalResourceProvider',
- path: 'rmExternalResourceProvider',
- component: () =>
- import('./module/rmExternalResourceProvider/index.vue'),
- meta: {
- title: 'rmExternalResourceProvider',
- publicPage: true,
- },
- },
- {
- name: 'udfManager',
- path: 'udfManager',
- component: () =>
- import('./module/udfManager/index.vue'),
- meta: {
- title: 'udfManager',
- publicPage: true,
- },
- },
- {
- name: 'udfTree',
- path: 'udfTree',
- component: () =>
- import('./module/udfTree/index.vue'),
- meta: {
- title: 'udfTree',
- publicPage: true,
- },
- },
- {
- name: 'datasourceAccess',
- path: 'datasourceAccess',
- component: () =>
- import('./module/datasourceAccess/index.vue'),
- meta: {
- title: 'datasourceAccess',
- publicPage: true,
- },
- },
- {
- name: 'datasourceEnv',
- path: 'datasourceEnv',
- component: () =>
- import('./module/datasourceEnv/index.vue'),
- meta: {
- title: 'datasourceEnv',
- publicPage: true,
- },
- },
- {
- name: 'datasourceType',
- path: 'datasourceType',
- component: () =>
- import('./module/datasourceType/index.vue'),
- meta: {
- title: 'datasourceType',
- publicPage: true,
- }
- },
- {
- name: 'EnginePluginManagement',
- path: 'EnginePluginManagement',
- component: () =>
- import('./module/EnginePluginManagement/index.vue'),
- meta: {
- title: 'EnginePluginManagement',
- publicPage: true,
- },
+ {
+ name: 'microService',
+ path: 'microService',
+ component: () =>
+ import('./module/microServiceManagement/index.vue'),
+ meta: {
+ title: 'microServiceManagement',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'datasource',
+ path: 'datasource',
+ component: () =>
+ import('./module/datasource/index.vue'),
+ meta: {
+ title: 'datasourceManagement',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'errorCode',
+ path: 'errorCode',
+ component: () =>
+ import('./module/errorCode/index.vue'),
+ meta: {
+ title: 'errorCode',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'gatewayAuthToken',
+ path: 'gatewayAuthToken',
+ component: () =>
+ import('./module/gatewayAuthToken/index.vue'),
+ meta: {
+ title: 'gatewayAuthToken',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'rmExternalResourceProvider',
+ path: 'rmExternalResourceProvider',
+ component: () =>
+ import('./module/rmExternalResourceProvider/index.vue'),
+ meta: {
+ title: 'rmExternalResourceProvider',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'udfManager',
+ path: 'udfManager',
+ component: () =>
+ import('./module/udfManager/index.vue'),
+ meta: {
+ title: 'udfManager',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'udfTree',
+ path: 'udfTree',
+ component: () =>
+ import('./module/udfTree/index.vue'),
+ meta: {
+ title: 'udfTree',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'datasourceAccess',
+ path: 'datasourceAccess',
+ component: () =>
+ import('./module/datasourceAccess/index.vue'),
+ meta: {
+ title: 'datasourceAccess',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'datasourceEnv',
+ path: 'datasourceEnv',
+ component: () =>
+ import('./module/datasourceEnv/index.vue'),
+ meta: {
+ title: 'datasourceEnv',
+ publicPage: true,
+ },
+ },
+ {
+ name: 'datasourceType',
+ path: 'datasourceType',
+ component: () =>
+ import('./module/datasourceType/index.vue'),
+ meta: {
+ title: 'datasourceType',
+ publicPage: true,
}
+ },
+ {
+ name: 'EnginePluginManagement',
+ path: 'EnginePluginManagement',
+ component: () =>
+ import('./module/EnginePluginManagement/index.vue'),
+ meta: {
+ title: 'EnginePluginManagement',
+ publicPage: true,
+ },
+ }
],
},
]
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue
b/linkis-web/src/apps/linkis/view/linkis/index.vue
index 51c01ca26..305916eee 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -53,11 +53,13 @@
v-for="(item3, index3) in (item.key === '1-9' ?
urmSideNavList.children : item.key === '1-8'
?datasourceNavList.children:basedataNavList.children)"
:key="index3"
@on-click="clickToRoute">
- <Cell
- :key="index3"
- :class="{ crrentItem: crrentItem === item3.key }"
- :title="item3.name"
- :name="item3.key"/>
+ <div v-if="isLogAdmin ? true : item3.key === '1-8-1' ||
item3.key === '1-9-2' || item3.key === '1-9-3'">
+ <Cell
+ :key="index3"
+ :class="{ crrentItem: crrentItem === item3.key }"
+ :title="item3.name"
+ :name="item3.key"/>
+ </div>
</CellGroup>
</div>
</div>
@@ -110,10 +112,9 @@ export default {
{ key: '1-4', name:
this.$t('message.linkis.sideNavList.function.children.dateReport'), path:
'/console/globalValiable' },
{ key: '1-6', name:
this.$t('message.linkis.sideNavList.function.children.ECMManage'), path:
'/console/ECM' },
{ key: '1-7', name:
this.$t('message.linkis.sideNavList.function.children.microserviceManage'),
path: '/console/microService' },
- // { key: '1-8', name:
this.$t('message.linkis.sideNavList.function.children.dataSourceManage'), path:
'/console/dataSource' },
- { key: '1-8', name:
this.$t('message.linkis.sideNavList.function.children.dataSourceManage'),
showSubMenu: false },
- { key: '1-9', name:
this.$t('message.linkis.sideNavList.function.children.udfFunctionTitle'), path:
'/console/urm/udfManagement', showSubMenu: false},
- { key: '1-11', name:
this.$t('message.linkis.sideNavList.function.children.basedataManagement'),
showSubMenu: false},
+ { key: '1-8', name:
this.$t('message.linkis.sideNavList.function.children.dataSourceManage'),
showSubMenu: true },
+ { key: '1-9', name:
this.$t('message.linkis.sideNavList.function.children.udfFunctionTitle'), path:
'/console/urm/udfManagement', showSubMenu: true},
+ { key: '1-11', name:
this.$t('message.linkis.sideNavList.function.children.basedataManagement'),
showSubMenu: true},
],
},
datasourceNavList: {
@@ -180,7 +181,6 @@ export default {
this.isLogAdmin = res.admin;
storage.set('isLogAdmin',res.admin,'session');
})
- //console.log(this.sideNavList);
},
methods: {
handleCellClick(index) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
