mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-10-25 00:00:56 +00:00
feat: refactor auth and xpack integration
This commit is contained in:
committed by
zhengkunwang223
parent
69906046e8
commit
a917ca00a1
@@ -24,7 +24,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { getSettingInfo } from '@/api/modules/setting';
|
||||
import { getSettingBaseInfo } from '@/api/modules/setting';
|
||||
import { searchXpackSetting } from '@/extensions/xpack';
|
||||
|
||||
const open = ref(false);
|
||||
@@ -49,7 +49,7 @@ const acceptParams = async (props: DialogProps): Promise<void> => {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const res = await getSettingInfo();
|
||||
const res = await getSettingBaseInfo();
|
||||
if (res.data.proxyType === '' || res.data.proxyType === 'close') {
|
||||
emit();
|
||||
return;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { getSettingInfo } from '@/api/modules/setting';
|
||||
import { getSettingBaseInfo } from '@/api/modules/setting';
|
||||
import { searchXpackSetting } from '@/extensions/xpack';
|
||||
|
||||
const showOption = ref(false);
|
||||
@@ -26,7 +26,7 @@ const loadStatus = async () => {
|
||||
em('update:withDockerRestart', false);
|
||||
return;
|
||||
}
|
||||
await getSettingInfo()
|
||||
await getSettingBaseInfo()
|
||||
.then((res) => {
|
||||
if (res.data.proxyType === '' || res.data.proxyType === 'close') {
|
||||
em('update:withDockerRestart', false);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
@close="handleClose"
|
||||
:destroy-on-close="true"
|
||||
:before-close="beforeClose"
|
||||
append-to-body
|
||||
:size="isFull ? '100%' : size"
|
||||
:close-on-press-escape="autoClose"
|
||||
:close-on-click-modal="autoClose"
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { getSettingInfo, loadUpgradeInfo } from '@/api/modules/setting';
|
||||
import { getSettingBaseInfo, loadUpgradeInfo } from '@/api/modules/setting';
|
||||
import Upgrade from '@/components/system-upgrade/upgrade/index.vue';
|
||||
import Releases from '@/components/system-upgrade/releases/index.vue';
|
||||
import i18n from '@/lang';
|
||||
@@ -95,7 +95,7 @@ const props = defineProps({
|
||||
});
|
||||
|
||||
const search = async () => {
|
||||
const res = await getSettingInfo();
|
||||
const res = await getSettingBaseInfo();
|
||||
version.value = res.data.systemVersion;
|
||||
};
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
<script setup lang="ts">
|
||||
import MarkDownEditor from '@/components/mkdown-editor/index.vue';
|
||||
|
||||
import { getSettingInfo, listReleases, updateSetting } from '@/api/modules/setting';
|
||||
import { getSettingBaseInfo, listReleases, updateSetting } from '@/api/modules/setting';
|
||||
import { ref } from 'vue';
|
||||
import { GlobalStore } from '@/store';
|
||||
import { FormInstance } from 'element-plus';
|
||||
@@ -101,7 +101,7 @@ const acceptParams = (): void => {
|
||||
};
|
||||
|
||||
const loadInfo = async () => {
|
||||
const res = await getSettingInfo();
|
||||
const res = await getSettingBaseInfo();
|
||||
form.version = res.data.systemVersion;
|
||||
form.backupCopies = Number(res.data.upgradeBackupCopies) || 0;
|
||||
};
|
||||
|
||||
@@ -59,7 +59,7 @@ const initTerm = async () => {
|
||||
? `source=container&containerid=${containerID.value}&user=${user.value}&command=${command.value}`
|
||||
: `source=database&databaseType=${databaseType.value}&database=${database.value}`;
|
||||
terminalRef.value!.acceptParams({
|
||||
endpoint: '/api/v2/containers/exec',
|
||||
endpoint: '/api/v2/hosts/terminal/container',
|
||||
args,
|
||||
error: '',
|
||||
initCmd: initCmd.value,
|
||||
|
||||
@@ -556,7 +556,9 @@ onBeforeUnmount(() => {
|
||||
|
||||
.ai-notice-fade-enter-active,
|
||||
.ai-notice-fade-leave-active {
|
||||
transition: opacity 180ms ease, transform 180ms ease;
|
||||
transition:
|
||||
opacity 180ms ease,
|
||||
transform 180ms ease;
|
||||
}
|
||||
|
||||
.ai-mask-fade-enter-active,
|
||||
|
||||
Reference in New Issue
Block a user