diff --git a/frontend/src/api/interface/app.ts b/frontend/src/api/interface/app.ts index 5ca77dec4de1..855f97abcad9 100644 --- a/frontend/src/api/interface/app.ts +++ b/frontend/src/api/interface/app.ts @@ -290,6 +290,7 @@ export namespace App { required?: boolean; multiple?: boolean; label: Locale; + showPassword: boolean; } export interface AppConfig { diff --git a/frontend/src/views/app-store/installed/detail/index.vue b/frontend/src/views/app-store/installed/detail/index.vue index 5014c5d4dcf8..ebf5871faf67 100644 --- a/frontend/src/views/app-store/installed/detail/index.vue +++ b/frontend/src/views/app-store/installed/detail/index.vue @@ -28,11 +28,33 @@ - - + + ******** + {{ param.showValue && param.showValue != '' ? param.showValue : param.value }} - + + @@ -47,6 +69,19 @@ v-model.number="paramModel.params[p.key]" :disabled="!p.edit" > + + + { await get(); open.value = true; openConfig.value = false; + console.log('params', params.value); }; const handleClose = () => { @@ -304,6 +340,7 @@ const get = async () => { multiple: d.multiple, label: d.label, required: d.required, + showPassword: false, }); if (d.required) { rules.params[d.key] = [Rules.requiredInput]; @@ -437,4 +474,8 @@ defineExpose({ acceptParams }); .change-button { margin-top: 5px; } +.system-label { + width: 40% !important; + white-space: nowrap !important; +} diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index 4338ceba3701..60f57a76b9a9 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -651,7 +651,7 @@ - + diff --git a/frontend/src/xpack-ee b/frontend/src/xpack-ee new file mode 160000 index 000000000000..329f2b121b9c --- /dev/null +++ b/frontend/src/xpack-ee @@ -0,0 +1 @@ +Subproject commit 329f2b121b9cbe556ac8abe323d8cac273263f61