mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-27 20:49:03 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

feat: Compose 环境变量编辑增加是否 1Panel 创建校验 (#6605)

Browse Source
This commit is contained in:
ssongliu 2024-09-28 09:37:40 +08:00 committed by GitHub
parent c557b737f6
commit 634849c347
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/views/container/compose/edit/index.vue
View File

@ -19,7 +19,7 @@
placeholder="#Define or paste the content of your docker-compose file here" placeholder="#Define or paste the content of your docker-compose file here"
:indent-with-tab="true" :indent-with-tab="true"
:tabSize="4" :tabSize="4"
style="width: 100%; height: calc(100vh - 300px)" :style="{ width: '100%', height: `calc(100vh - ${loadHeight()})` }"
:lineWrapping="true" :lineWrapping="true"
:matchBrackets="true" :matchBrackets="true"
theme="cobalt" theme="cobalt"
@ -28,7 +28,12 @@
v-model="content" v-model="content"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('container.env')" prop="environmentStr" v-if="createdBy === '1Panel'"> <div v-if="createdBy === '1Panel'">
<el-form-item
:label="$t('container.env')"
prop="environmentStr"
v-if="createdBy === '1Panel'"
>
<el-input <el-input
type="textarea" type="textarea"
:placeholder="$t('container.tagHelper')" :placeholder="$t('container.tagHelper')"
@ -36,7 +41,9 @@
v-model="environmentStr" v-model="environmentStr"
/> />
</el-form-item> </el-form-item>
<span class="input-help whitespace-break-spaces">{{ $t('container.editComposeHelper') }}</span> <span class="input-help whitespace-break-spaces">
{{ $t('container.editComposeHelper') }}
</span>
<codemirror <codemirror
v-model="envFileContent" v-model="envFileContent"
:autofocus="true" :autofocus="true"
@ -48,6 +55,7 @@
:styleActiveLine="true" :styleActiveLine="true"
:extensions="extensions" :extensions="extensions"
></codemirror> ></codemirror>
</div>
</el-form> </el-form>
</el-col> </el-col>
</el-row> </el-row>
@ -120,6 +128,9 @@ interface DialogProps {
createdBy: string; createdBy: string;
} }
const loadHeight = () => {
return createdBy.value === '1Panel' ? '300px' : '200px';
};
const acceptParams = (props: DialogProps): void => { const acceptParams = (props: DialogProps): void => {
composeVisible.value = true; composeVisible.value = true;
path.value = props.path; path.value = props.path;