You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/05/26 03:24:08 UTC
[linkis] branch dev-1.4.0 updated: optimization for web
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new aee1e1795 optimization for web
aee1e1795 is described below
commit aee1e179509c33e4074188e29ea11d75d740b87b
Author: Yonghao Mei <73...@users.noreply.github.com>
AuthorDate: Fri May 26 11:24:02 2023 +0800
optimization for web
Fixing pages encoding issues
Fixing fetching timing issues
Ignoring whitespace when search ecm instances
Other optimization for web
---
.../src/apps/linkis/assets/styles/console.scss | 7 +-
linkis-web/src/apps/linkis/i18n/common/en.json | 5 +-
linkis-web/src/apps/linkis/i18n/common/zh.json | 5 +-
.../src/apps/linkis/module/ECM/engineConn.vue | 2 +-
linkis-web/src/apps/linkis/module/ECM/index.vue | 2 +-
.../apps/linkis/module/datasourceAccess/index.vue | 3 +-
.../linkis/module/datasourceEnv/EditForm/index.vue | 15 ++-
.../src/apps/linkis/module/datasourceEnv/index.vue | 11 ++-
.../apps/linkis/module/datasourceType/index.vue | 3 +-
.../apps/linkis/module/datasourceTypeKey/index.vue | 2 +-
.../src/apps/linkis/module/errorCode/index.vue | 2 +-
.../apps/linkis/module/gatewayAuthToken/index.vue | 2 +-
.../module/globalHistoryManagement/index.vue | 2 +-
.../linkis/module/microServiceManagement/index.vue | 2 +-
.../module/resourceManagement/engineConn.vue | 2 +-
.../module/rmExternalResourceProvider/index.vue | 2 +-
.../linkis/module/tenantTagManagement/index.vue | 2 +-
.../src/apps/linkis/module/udfManager/index.vue | 2 +-
.../apps/linkis/module/udfTree/EditForm/index.vue | 109 ++++++++++++++++++---
.../src/apps/linkis/module/udfTree/index.vue | 23 +++--
.../src/apps/linkis/module/udfTree/service.js | 4 +-
linkis-web/src/apps/linkis/view/linkis/index.vue | 2 +-
22 files changed, 159 insertions(+), 50 deletions(-)
diff --git a/linkis-web/src/apps/linkis/assets/styles/console.scss b/linkis-web/src/apps/linkis/assets/styles/console.scss
index 4f8998844..45a7a4a6d 100644
--- a/linkis-web/src/apps/linkis/assets/styles/console.scss
+++ b/linkis-web/src/apps/linkis/assets/styles/console.scss
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-@import '@/common/style/variables.scss';
+ @charset "UTF-8";
+ @import '@/common/style/variables.scss';
+
.console-page{
position: $relative;
width: $percent-all;
@@ -45,6 +47,9 @@
}
}
.content-body-side-right {
+ .ivu-page-item-jump-next:after, .ivu-page-item-jump-prev:after {
+ content: "\2022\2022\2022";
+ }
flex: 1;
background: $body-background;
border-radius: $border-radius-small;
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json b/linkis-web/src/apps/linkis/i18n/common/en.json
index aba5ff0c6..c2a692250 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -90,6 +90,7 @@
"linkText": "View result set",
"largeResultTips": "The front end displays only 5000 pieces of data"
},
+ "needPre": "Need to select category and input username before",
"warning": {
"api": "Requesting API, please hold on!",
"data": "Requesting data, please hold on!",
@@ -188,7 +189,8 @@
"datasourceTypeKey": "Datasource Config Options",
"EnginePluginManagement": "Engine Plugin Management",
"basedataManagement": "Basic Data Management",
- "codeQuery": "Code Retrieval"
+ "codeQuery": "Code Retrieval",
+ "EngineConnList": "Engine Conn List"
}
}
},
@@ -463,6 +465,7 @@
"searchPlaceholder": "Please enter your search",
"search": "Search",
"action": "Action",
+ "categoryMaxLength": "The length cannot exceed 100",
"modal":{
"confirm": "Confirm",
"cancel": "Cancel",
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json b/linkis-web/src/apps/linkis/i18n/common/zh.json
index 49950288c..9e9182ea1 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -90,6 +90,7 @@
"linkText": "点击查看结果集",
"largeResultTips": "前端只展示5000条数据"
},
+ "needPre": "需要先选择分类和输入用户名",
"warning": {
"api": "接口请求中，请稍候！",
"data": "数据请求中，请稍候！",
@@ -188,7 +189,8 @@
"EnginePluginManagement": "引擎物料管理",
"basedataManagement": "基础数据管理",
"codeQuery": "代码检索",
- "engineConfigurationTemplate": "引擎配置模板"
+ "engineConfigurationTemplate": "引擎配置模板",
+ "EngineConnList": "引擎列表"
}
}
},
@@ -441,6 +443,7 @@
"searchPlaceholder": "请输入搜索内容",
"search": "搜索",
"action": "操作",
+ "categoryMaxLength": "分类名长度不能超过100",
"modal":{
"confirm": "确定",
"cancel": "取消",
diff --git a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
index 5fd9c221c..3f19ff3a8 100644
--- a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
@@ -472,7 +472,7 @@ export default {
instance: this.instance,
}
},
- emInstance: e.instance,
+ emInstance: e.instance.replace(/ /g, ''),
nodeStatus: e.nodeHealthy,
owner: e.owner,
engineType: e.engineType
diff --git a/linkis-web/src/apps/linkis/module/ECM/index.vue b/linkis-web/src/apps/linkis/module/ECM/index.vue
index f38588c8f..4794cdf8f 100644
--- a/linkis-web/src/apps/linkis/module/ECM/index.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/index.vue
@@ -402,7 +402,7 @@ export default {
// search(搜索)
search(e) {
let param = {
- instance: e.instance,
+ instance: e.instance.replace(/ /g, ''),
nodeHealthy: e.nodeHealthy,
owner: e.owner,
tenantLabel: e.tenant,
diff --git a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
index 33f30de9b..f0fda1cb4 100644
--- a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
@@ -219,6 +219,8 @@ export default {
duration: 3,
content: "删除成功"
})
+
+ this.load()
}else{
this.$Message.success({
duration: 3,
@@ -226,7 +228,6 @@ export default {
})
}
})
- this.load()
}
})
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 ca19bd336..6d7838d59 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/EditForm/index.vue
@@ -118,7 +118,7 @@ export default {
],
on: {
'on-change': () => {
- this.rule[8].hidden = !this.rule[8].hidden;
+ this.rule[8].hidden = !this.rule[4].value;
}
}
},
@@ -199,7 +199,7 @@ export default {
title: "principle",
field: 'principle',
value: '',
- hidden: true,
+ hidden: false,
props: {
placeholder: 'hadoop@APACHE.COM',
},
@@ -208,7 +208,7 @@ export default {
type: 'v-jsoneditor',
title: this.$t('message.linkis.basedataManagement.datasourceEnv.parameter'),
field: 'hadoopConf',
- value: {},
+ value: JSON.stringify({}),
props: {
type: 'form-create',
height: "280px",
@@ -251,12 +251,9 @@ export default {
// keytab value
this.rule[6].hidden = !newV.keytab;
// upload
- this.rule[5].hidden = !this.rule[6].hidden;
- if (!newV.hasKeyTab || !['hive', 'kafka'].includes(dataSourceTypeName)){
- this.rule[5].hidden = true;
- this.rule[6].hidden = true;
- this.rule[8].hidden = true;
- }
+ this.rule[5].hidden = !this.rule[6].hidden || !['hive', 'kafka'].includes(dataSourceTypeName) || !this.rule[4].value;
+ this.rule[8].hidden = (!newV.hasKeyTab || !['hive', 'kafka'].includes(dataSourceTypeName));
+
},
keyTabValidator(rule, val, cb) {
if (!this.formData.keytab) {
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 553817e8c..854d4d343 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -239,6 +239,8 @@ export default {
this.modalShow = true
},
onTableEdit(row){
+ // console.log(this.$refs.editForm);
+ this.$refs.editForm.formModel.reload()
row.hasKeyTab = JSON.parse(row.parameter).keytab ? true : false;
this.modalEditData = {...row}
// format parameter for modal
@@ -267,6 +269,8 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+
+ this.load()
}else{
this.$Message.success({
duration: 3,
@@ -274,7 +278,6 @@ export default {
})
}
})
- this.load()
}
})
@@ -282,9 +285,9 @@ export default {
clearForm(){
for(let key in this.modalEditData) {
this.modalEditData[key] = ''
- this.modalEditData.parameter = {}
- window.console.log(key);
}
+ this.modalEditData.parameter = {}
+ this.modalEditData.hadoopConf = JSON.stringify({})
this.modalEditData.hasKeyTab = false;
},
async onModalOk(){
@@ -345,7 +348,7 @@ export default {
}
})
}
- window.console.log(formData);
+ // window.console.log(formData);
this.modalLoading=false
this.modalShow = false
})
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index 5dbb8bf6f..8d8e5b077 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -221,6 +221,8 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+
+ this.load()
}else{
this.$Message.success({
duration: 3,
@@ -228,7 +230,6 @@ export default {
})
}
})
- this.load()
}
})
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
index 124faa352..d47eef8d0 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
@@ -270,13 +270,13 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteFail')
})
}
- this.load()
})
}
})
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index cd0439499..b274cc2d3 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -199,13 +199,13 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteFail')
})
}
- this.load()
})
}
})
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 91a3eaaf0..19fb808ea 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -245,13 +245,13 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteFail')
})
}
- this.load()
})
}
})
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index 929fd62c2..8a35fa869 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -393,7 +393,7 @@ export default {
pageSize: this.pageSetting.pageSize,
proxyUser: this.searchBar.proxyUser,
isAdminView: this.isAdminModel,
- instance: this.searchBar.instance
+ instance: this.searchBar.instance?.replace(/ /g, '') || ''
}
if (!this.isAdminModel) {
delete params.proxyUser
diff --git a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
index 71ff29f36..74addbbc5 100644
--- a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
@@ -253,7 +253,7 @@ export default {
});
},
searchAction() {
- this.search(this.instance, this.applicationName);
+ this.search(this.instance?.replace(/ /g, '') || '', this.applicationName);
},
//Jump to Microservices(跳转到微服务)
handleTabsJump() {
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue b/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
index f8da125f7..25b87391f 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -330,7 +330,7 @@ export default {
// search(搜索)
search(e) {
let url = '/linkisManager/ecinfo/ecrHistoryList?';
- if (e.instance) url += `instance=${e.instance}&`
+ if (e.instance) url += `instance=${e.instance?.replace(/ /g, '') || ''}&`
if (e.owner) url += `creator=${e.owner}&`
if (e.shortcut[0]) url += `startDate=${moment(new Date(e.shortcut[0])).format('YYYY-MM-DD HH:mm:ss')}&`
if (e.shortcut[1]) {
diff --git a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
index 9e2f175e9..ed84a8e11 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
@@ -207,6 +207,7 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
@@ -214,7 +215,6 @@ export default {
})
}
})
- this.load()
}
})
diff --git a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
index a7aab7740..75aea5c91 100644
--- a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
@@ -328,7 +328,7 @@ export default {
if (res.exist) {
this.$Message.error(this.$t('message.linkis.tenantTagManagement.userIsExisted'))
}
- this.tagIsExist = !res.exist;
+ this.tagIsExist = res.exist;
})
this.isRequesting = false
} catch (err) {
diff --git a/linkis-web/src/apps/linkis/module/udfManager/index.vue b/linkis-web/src/apps/linkis/module/udfManager/index.vue
index b1f425acb..483d261fd 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/index.vue
@@ -188,13 +188,13 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteFail')
})
}
- this.load()
})
}
})
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 fb4f2e2c0..382bebe97 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -21,13 +21,14 @@
:rule="rule"
v-model="formModel"
:option="options"
+ :value.sync="formData"
+ ref="formRef"
/>
</div>
</template>
<script>
import {getAll} from "../service";
-
export default {
props: {
mode: String,
@@ -40,6 +41,8 @@ export default {
options: {
submitBtn: false,
},
+ avoidMultiTime: new Date().getTime(),
+ formRef: null,
rule: [
{
type: 'hidden',
@@ -75,6 +78,11 @@ export default {
)} `+this.$t('message.linkis.basedataManagement.udfTree.name'),
trigger: 'blur',
},
+ {
+ max: 100,
+ message: this.$t('message.linkis.basedataManagement.categoryMaxLength'),
+ trigger: 'change',
+ },
],
},
{
@@ -101,6 +109,9 @@ export default {
trigger: 'blur',
},
],
+ on: {
+ 'on-change': this.handleChange
+ }
},
{
type: 'input',
@@ -119,6 +130,9 @@ export default {
trigger: 'blur',
},
],
+ on: {
+ 'on-change': this.handleChange
+ }
},
{
type: 'input',
@@ -139,15 +153,21 @@ export default {
],
},
{
- type: 'select',
+ type: 'tree',
title: this.$t('message.linkis.basedataManagement.udfTree.parent'),
field: 'parent',
info: this.$t('message.linkis.basedataManagement.udfTree.parentInfo'),
value: "",
props: {
placeholder: "",
+ data: [],
+ },
+ nativeEmit: ['click'],
+ on: {
+ 'on-select-change': (val) => {
+ this.formData.parent = val[0].id;
+ }
},
- options: [],
validate: [
{
required: true,
@@ -162,14 +182,81 @@ 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
- })
+ methods: {
+ async handleFetch(category, userName) {
+ if(!category || !userName) {
+ this.rule[this.rule.length-1].props.data = [];
+ return;
+ }
+ try {
+ await getAll({ category, searchName: userName }).then(res=>{
+ let list = res.list;
+ this.formatTree(list, this.rule[this.rule.length - 1].value)
+ this.rule[this.rule.length-1].props.data = list;
+ })
+ } catch(err) {
+ // console.warn(err);
+ }
+
+ },
+ async handleChange() {
+ this.rule[this.rule.length-1].value = '';
+ this.rule[this.rule.length-1].props.data = [];
+ if(this.rule[3].value && this.rule[2].value) {
+ await this.handleFetch(this.rule[2].value, this.rule[3].value)
+ }
+ },
+ async parentClick () {
+ const { category, userName } = this.$refs.formRef.value
+ if(!category || !userName) {
+ if(new Date().getTime() - this.avoidMultiTime > 3000) {
+ this.$Message.warning(this.$t('message.linkis.needPre'))
+ this.avoidMultiTime = new Date().getTime()
+ }
+ }
+ },
+ formatTree (tree, curId) {
+ let expand = false;
+ tree.forEach((item) => {
+
+ item.title = item.name;
+ item.children = item.childrenList
+ if(item.children && item.children.length > 0) {
+ item.expand = this.formatTree(item.children, curId)
+ if(item.expand) {
+ expand = item.expand
+ }
+
+ }
+ if(curId === item.id) {
+ item.selected = true;
+ expand = true;
+ }
+ })
+ return expand
+ }
+ },
+ mounted() {
+ this.formModel.on('native-parent-click', this.parentClick)
},
+ watch: {
+ data: {
+ handler(newVal) {
+ this.handleFetch(newVal.category, newVal.userName)
+ },
+ deep: true,
+ immediate: true
+ },
+ }
}
</script>
+<style lang="scss" scoped>
+
+/deep/ .ivu-tree {
+ .ivu-tree-children {
+ li {
+ margin: 0px
+ }
+ }
+}
+</style>
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index 214ed2fff..5966cd208 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -83,7 +83,8 @@
<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>
- <ErrorCodeForm ref="errorCodeForm" :data="modalEditData"></ErrorCodeForm>
+ <ErrorCodeForm
+ v-if="modalShow" ref="errorCodeForm" :data="modalEditData"></ErrorCodeForm>
</Modal>
</div>
</template>
@@ -210,22 +211,30 @@ export default {
this.page.pageNow = value
this.load()
},
- onAdd(){
+ async onAdd(){
+
+ this.modalEditData = {}
+ this.modalShow = true
+ await this.$nextTick()
this.$refs.errorCodeForm.formModel.resetFields()
+ this.$refs.errorCodeForm.formModel.setValue({})
this.modalAddMode = 'add'
- this.modalShow = true
},
- onTableEdit(row){
+ async onTableEdit(row){
+
+ this.modalEditData = row
+ this.modalShow = true
+ await this.$nextTick()
+ this.$refs.errorCodeForm.formModel.resetFields()
this.$refs.errorCodeForm.formModel.setValue(row)
this.modalAddMode = 'edit'
- this.modalShow = true
},
onTableDelete(row){
this.$Modal.confirm({
title: this.$t('message.linkis.basedataManagement.modal.modalTitle'),
content: this.$t('message.linkis.basedataManagement.modal.modalDelete', {name: row.name}),
- onOk: ()=>{
+ onOk: async ()=>{
let params = {
id: row.id
}
@@ -235,6 +244,7 @@ export default {
duration: 3,
content: this.$t('message.linkis.basedataManagement.modal.modalDeleteSuccess')
})
+ this.load()
}else{
this.$Message.success({
duration: 3,
@@ -242,7 +252,6 @@ export default {
})
}
})
- this.load()
}
})
diff --git a/linkis-web/src/apps/linkis/module/udfTree/service.js b/linkis-web/src/apps/linkis/module/udfTree/service.js
index 2f1400afb..f4d7ea2b7 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/service.js
+++ b/linkis-web/src/apps/linkis/module/udfTree/service.js
@@ -23,8 +23,8 @@ const getList = (params)=> {
return api.fetch(udfTreeBaseUrl, params , 'get')
}
-const getAll = ()=> {
- return api.fetch(udfTreeBaseUrl+"/all", 'get')
+const getAll = (params)=> {
+ return api.fetch(udfTreeBaseUrl+"/all", params, 'get')
}
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index 671da9e06..1494e9a05 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -76,7 +76,7 @@
</BreadcrumbItem>
<template v-if="$route.name === 'EngineConnList'">
<BreadcrumbItem>{{ $route.query.instance }}</BreadcrumbItem>
- <BreadcrumbItem>EngineConnList</BreadcrumbItem>
+ <BreadcrumbItem>{{$t('message.linkis.sideNavList.function.children.EngineConnList')}}</BreadcrumbItem>
</template>
</Breadcrumb>
<Tabs v-if="$route.name === 'resource' || $route.name === 'resourceEngineConnList'"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org