gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-17 11:14:44 +08:00
Code

feat: 优化 nginx 编辑器代码高亮 (#6497)

Browse Source
This commit is contained in:
zhengkunwang 2024-09-14 16:03:33 +08:00 committed by GitHub
parent 417ad81aa4
commit 1bca3a182e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 240 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/codemirror-pro/index.vue
View File

@ -11,7 +11,7 @@ import { EditorState } from '@codemirror/state';
import { javascript } from '@codemirror/lang-javascript'; import { javascript } from '@codemirror/lang-javascript';
import { oneDark } from '@codemirror/theme-one-dark'; import { oneDark } from '@codemirror/theme-one-dark';
import { StreamLanguage } from '@codemirror/language'; import { StreamLanguage } from '@codemirror/language';
import { nginx } from '@codemirror/legacy-modes/mode/nginx'; import { nginx } from './nginx';
import { yaml } from '@codemirror/legacy-modes/mode/yaml'; import { yaml } from '@codemirror/legacy-modes/mode/yaml';
import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile'; import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
import { placeholder } from '@codemirror/view'; import { placeholder } from '@codemirror/view';

143
frontend/src/components/codemirror-pro/nginx.ts Normal file
View File

File diff suppressed because one or more lines are too long

20
frontend/src/views/website/website/config/basic/auth-basic/create/index.vue
View File

@ -1,16 +1,5 @@
<template> <template>
<el-drawer <DrawerPro v-model="open" :header="$t('commons.button.' + authBasic.operate)" :back="handleClose">
v-model="open"
:close-on-click-modal="false"
:close-on-press-escape="false"
size="40%"
:before-close="handleClose"
>
<template #header>
<DrawerHeader :header="$t('commons.button.' + authBasic.operate)" :back="handleClose" />
</template>
<el-row v-loading="loading">
<el-col :span="22" :offset="1">
<el-form-item> <el-form-item>
<el-alert <el-alert
v-if="authBasic.operate === 'edit'" v-if="authBasic.operate === 'edit'"
@ -45,21 +34,16 @@
<el-input v-model.trim="authBasic.remark"></el-input> <el-input v-model.trim="authBasic.remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col>
</el-row>
<template #footer> <template #footer>
<span class="dialog-footer">
<el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button> <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
<el-button type="primary" @click="submit(proxyForm)" :disabled="loading"> <el-button type="primary" @click="submit(proxyForm)" :disabled="loading">
{{ $t('commons.button.confirm') }} {{ $t('commons.button.confirm') }}
</el-button> </el-button>
</span>
</template> </template>
</el-drawer> </DrawerPro>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import DrawerHeader from '@/components/drawer-header/index.vue';
import { OperateAuthConfig, OperatePathAuthConfig } from '@/api/modules/website'; import { OperateAuthConfig, OperatePathAuthConfig } from '@/api/modules/website';
import { Rules } from '@/global/form-rules'; import { Rules } from '@/global/form-rules';
import i18n from '@/lang'; import i18n from '@/lang';

22
frontend/src/views/website/website/config/basic/redirect/create/index.vue
View File

@ -1,17 +1,6 @@
<template> <template>
<el-drawer <DrawerPro v-model="open" :header="$t('commons.button.' + redirect.operate)" :back="handleClose">
v-model="open" <el-form ref="redirectForm" label-position="top" :model="redirect" :rules="rules" v-loading="loading">
:close-on-click-modal="false"
:close-on-press-escape="false"
size="40%"
:before-close="handleClose"
>
<template #header>
<DrawerHeader :header="$t('commons.button.' + redirect.operate)" :back="handleClose" />
</template>
<el-row v-loading="loading">
<el-col :span="22" :offset="1">
<el-form ref="redirectForm" label-position="top" :model="redirect" :rules="rules">
<el-form-item :label="$t('commons.table.name')" prop="name"> <el-form-item :label="$t('commons.table.name')" prop="name">
<el-input <el-input
v-model.trim="redirect.name" v-model.trim="redirect.name"
@ -61,21 +50,16 @@
<el-switch v-model="redirect.keepPath"></el-switch> <el-switch v-model="redirect.keepPath"></el-switch>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col>
</el-row>
<template #footer> <template #footer>
<span class="dialog-footer">
<el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button> <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
<el-button type="primary" @click="submit(redirectForm)" :disabled="loading"> <el-button type="primary" @click="submit(redirectForm)" :disabled="loading">
{{ $t('commons.button.confirm') }} {{ $t('commons.button.confirm') }}
</el-button> </el-button>
</span>
</template> </template>
</el-drawer> </DrawerPro>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import DrawerHeader from '@/components/drawer-header/index.vue';
import { ListDomains, OperateRedirectConfig, GetRedirectConfig } from '@/api/modules/website'; import { ListDomains, OperateRedirectConfig, GetRedirectConfig } from '@/api/modules/website';
import { Rules } from '@/global/form-rules'; import { Rules } from '@/global/form-rules';
import i18n from '@/lang'; import i18n from '@/lang';