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 7396bbceb fix dev-1.3.1-web bug (#4060)
7396bbceb is described below
commit 7396bbceb88620c4bf9e9110925c09ad17d8d6e7
Author: Yonghao Mei <[email protected]>
AuthorDate: Sat Dec 24 15:18:08 2022 +0800
fix dev-1.3.1-web bug (#4060)
---
linkis-web/src/apps/linkis/i18n/common/en.json | 6 ++++-
linkis-web/src/apps/linkis/i18n/common/zh.json | 6 ++++-
.../linkis/module/EnginePluginManagement/index.vue | 31 +++++++++++++++++-----
.../src/apps/linkis/module/datasourceEnv/index.vue | 3 ++-
.../module/gatewayAuthToken/EditForm/index.vue | 11 +++++---
.../apps/linkis/module/gatewayAuthToken/index.vue | 4 +++
.../apps/linkis/module/udfTree/EditForm/index.vue | 1 +
7 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index 42dadd62a..3ad87e5ea 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -549,7 +549,11 @@
"rollback": "Rollback",
"action": "Operate",
"checkEngineConnTypeAndVersion": "Please select the engine type and
version",
- "upload": "Please click the button to upload the engine plug-in"
+ "upload": "Please click the button to upload the engine plug-in",
+ "hasUpload": "The file has been uploaded, you can click to upload
again",
+ "force": "Whether to overwrite",
+ "yes": "Yes",
+ "no": "No"
}
}
}
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index e0022c46d..b38b9e7f0 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -551,7 +551,11 @@
"rollback": "回滚",
"action": "操作",
"checkEngineConnTypeAndVersion": "请选择引擎类型及版本",
- "upload": "请点击上传引擎插件"
+ "upload": "请点击上传引擎插件",
+ "hasUpload": "文件已上传，可以点击按钮重新上传",
+ "force": "是否覆盖",
+ "yes": "是",
+ "no": "否"
}
}
}
diff --git a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
index bdeeb93c2..ff60717be 100644
--- a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
@@ -44,14 +44,14 @@
{{ $t('message.linkis.EnginePluginManagement.rollback') }}
</Button>
- <Button
+ <!-- <Button
v-if="row.resourceVersion != currentResourcebmlVersion"
size="primary"
type="error"
@click="deleteCurrentbml(row)"
>
{{ $t('message.linkis.EnginePluginManagement.deleteCurrentbml')
}}
- </Button>
+ </Button> -->
</ButtonGroup>
</template>
@@ -75,8 +75,16 @@
<form style="width: 200px;height: 200px" v-show="false">
<input ref="upload" type="file" @change="getFile($event)"
accept=".zip"/>
</form>
- <Button type="default" style="width: 100%; height: 70%; font-size:
50px;" size="large" icon="ios-cloud-upload-outline"
@click="handleClick"></Button>
- <span style="margin-top: 30px; text-align: center; display:
inline-block; width:100%;
font-size:14px">{{$t('message.linkis.EnginePluginManagement.upload')}}</span>
+ <Button type="default" style="width: 100%; height: 70%; font-size:
50px;" size="large" :icon="hasFile ? 'ios-cloud-done-outline':
'ios-cloud-upload-outline'" @click="handleClick"></Button>
+ <span style="margin-top: 30px; text-align: center; display:
inline-block; width:100%; font-size:14px">{{!hasFile ?
$t('message.linkis.EnginePluginManagement.upload') :
$t('message.linkis.EnginePluginManagement.hasUpload')}}</span>
+ <div style="justify-content:center; margin-top:5px; display: flex;
align-item: center;">
+ <span style="display:inline-block; margin-right:
10px">{{$t('message.linkis.EnginePluginManagement.force')}}</span>
+ <RadioGroup v-model="force">
+ <Radio
label="yes">{{$t('message.linkis.EnginePluginManagement.yes')}}</Radio>
+ <Radio
label="no">{{$t('message.linkis.EnginePluginManagement.no')}}</Radio>
+ </RadioGroup>
+ </div>
+
</div>
<div slot="footer">
@@ -86,7 +94,7 @@
type="primary"
@click="handleCancel"
>{{ $t('message.linkis.cancel') }}</Button>
- <Button type="primary" @click="onSubmit">{{
+ <Button type="primary" @click="onSubmit" :disabled="!hasFile"
:loading="isUploading">{{
$t('message.linkis.complete')}}</Button>
</div>
</div>
@@ -121,7 +129,7 @@
<Button type="primary" class="button" :style="{width: '60px',
marginRight: '5px', marginLeft: '5px', padding: '5px'}"
@click="initECMList()">{{
$t('message.linkis.search') }}</Button>
<Button type="primary" :style="{width: '60px', marginRight: '5px',
padding: '5px'}" @click="resetSearch">{{
- $t('message.linkis.EnginePluginManagement.Reset')}}</Button>
+ $t('message.linkis.EnginePluginManagement.Reset')}}</Button>
<!-- <Button type="primary" :style="{width: '120px', marginRight:
'5px', padding: '5px'}" @click="createOrUpdate(1)">{{
$t('message.linkis.EnginePluginManagement.update')}}</Button>
<Button type="error" :style="{width: '120px', marginRight: '5px',
padding: '5px'}" @click="deleteBML">{{
@@ -197,6 +205,9 @@ export default {
loadingForm: false,
tableLoading: false,
updWay: '',
+ hasFile: false,
+ isUploading: false,
+ force: 'no',
tableColumnNum: [
{
title: "ID",
@@ -343,17 +354,21 @@ export default {
},
getFile(event) {
this.file = event.target.files[0];
+ this.hasFile = true;
},
onSubmit() {
var formData = new FormData();
+ let force = this.force === 'yes';
if(this.actionNum === 0){
formData.append('file', this.file);
+ this.isUploading = true;
api.fetch('/engineplugin/uploadEnginePluginBML', formData, {method:
'post', 'Content-Type': 'multipart/form-data'}).then(response => {
console.log(response);
this.$Message.success(response.msg);
this.getTypeList();
this.showFileOperate = false;
}).catch(e => {
+ this.isUploading = false
console.log(e);
this.$Message.error(e);
this.showFileOperate = false;
@@ -363,6 +378,8 @@ export default {
formData.append('file', this.file);
formData.append('ecType', this.ecType);
formData.append('version', this.version);
+ formData.append('force', force);
+ this.isUploading = true;
api.fetch('/engineplugin/updateEnginePluginBML', formData, {methed:
'post', 'Content-Type': 'multipart/form-data'}).then(response => {
this.$Message.success(response.msg);
if(this.updWay === 'table') {
@@ -373,10 +390,12 @@ export default {
this.getTypeList();
this.initECMList();
this.showFileOperate = false;
+ this.isUploading = false;
}).catch(e => {
console.log(e);
this.$Message.error(e);
this.showFileOperate = false;
+ this.isUploading = false;
})
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 4fb9ddf12..2913efbac 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -182,7 +182,7 @@ export default {
id: '',
modifyTime: '',
modifyUser: '',
- parameter: '',
+ parameter: {},
uris: '',
keytab: '',
principle: '',
@@ -282,6 +282,7 @@ export default {
clearForm(){
for(let key in this.modalEditData) {
this.modalEditData[key] = ''
+ this.modalEditData.parameter = {}
console.log(key);
}
this.modalEditData.hasKeyTab = false;
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 1bd7c2488..a9defcb69 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
@@ -32,7 +32,10 @@ export default {
},
data() {
return {
- formModel: {},
+ formModel: {
+ elapseDay: 1,
+ permanentlyValid: false,
+ },
// formData: {},
options: {
submitBtn: false,
@@ -140,10 +143,10 @@ export default {
on: {
'on-change': () => {
this.rule[5].hidden = !this.rule[5].hidden;
- if(this.rule[5].hidden) {
- this.formModel.elapseDay = -1;
+ if(!this.rule[5].hidden) {
+ this.rule[5].value = 1;
} else {
- this.formModel.elapseDay = 1;
+ this.rule[5].value = -1;
}
}
}
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 171b7f101..9c85f6dbb 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -216,6 +216,10 @@ export default {
this.modalShow = true
},
onTableEdit(row){
+ if(row.elapseDay === -1) {
+ row.permanentlyValid = true;
+ this.$refs.editForm.formModel.rule[5].hidden = true;
+ }
this.$refs.editForm.formModel.setValue(row)
this.modalAddMode = 'edit'
this.modalShow = true
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 6f9648b2e..fb4f2e2c0 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -155,6 +155,7 @@ export default {
'message.linkis.datasource.pleaseInput'
)} `+this.$t('message.linkis.basedataManagement.udfTree.parent'),
trigger: 'blur',
+ type: 'number'
},
],
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
