gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

fix: 解决 Pr 导致的代码冲突 (#3949)

Browse Source
This commit is contained in:
ssongliu 2024-02-22 15:34:07 +08:00 committed by GitHub
parent b668f55222
commit 1b47e8dd63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/app-store/detail/params/index.vue
View File

@ -42,7 +42,7 @@
{{ $t('app.toInstall') }} {{ $t('app.toInstall') }}
</el-link> </el-link>
</span> </span>
<el-select v-model="form[p.envKey]" v-if="p.type == 'select'"> <el-select v-model="form[p.envKey]" v-if="p.type == 'select'" :multiple="p.multiple">
<el-option <el-option
v-for="service in p.values" v-for="service in p.values"
:key="service.label" :key="service.label"

7
frontend/src/views/app-store/installed/detail/index.vue
View File

@ -30,7 +30,11 @@
v-model.number="paramModel.params[p.key]" v-model.number="paramModel.params[p.key]"
:disabled="!p.edit" :disabled="!p.edit"
></el-input> ></el-input>
<el-select v-model="paramModel.params[p.key]" v-else-if="p.type == 'select'"> <el-select
v-model="paramModel.params[p.key]"
v-else-if="p.type == 'select'"
:multiple="p.multiple"
>
<el-option <el-option
v-for="value in p.values" v-for="value in p.values"
:key="value.label" :key="value.label"
@ -201,6 +205,7 @@ const get = async () => {
type: d.type, type: d.type,
values: d.values, values: d.values,
showValue: d.showValue, showValue: d.showValue,
multiple: d.multiple,
}); });
rules.params[d.key] = [Rules.requiredInput]; rules.params[d.key] = [Rules.requiredInput];
if (d.rule) { if (d.rule) {