Merge branch 'jxxghp:v2' into v2

2026-05-30 21:00:43 +08:00 · 2025-05-08 23:28:18 +08:00
parent 4dce1c94a3 4e3a61b8a8
commit 11cb2eb0f8
36 changed files with 716 additions and 112 deletions
--- a/src/components/dialog/AlistConfigDialog.vue
+++ b/src/components/dialog/AlistConfigDialog.vue
@@ -69,7 +69,7 @@ async function savaAlistConfig() {

 <template>
  <VDialog width="50rem" scrollable max-height="85vh">
-    <VCard :title="t('dialog.alistConfig.title')" class="rounded-t">
+    <VCard :title="t('dialog.alistConfig.title')">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText>
        <VRow>
@@ -119,7 +119,7 @@ async function savaAlistConfig() {
      </VCardText>
      <VCardActions>
        <VSpacer />
-        <VBtn variant="elevated" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
+        <VBtn variant="tonal" color="error" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
          {{ t('dialog.alistConfig.reset') }}
        </VBtn>
        <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3">
--- a/src/components/dialog/AliyunAuthDialog.vue
+++ b/src/components/dialog/AliyunAuthDialog.vue
@@ -107,7 +107,7 @@ onUnmounted(() => {

 <template>
  <VDialog width="40rem" scrollable max-height="85vh">
-    <VCard :title="t('dialog.aliyunAuth.loginTitle')" class="rounded-t">
+    <VCard :title="t('dialog.aliyunAuth.loginTitle')">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText class="pt-2 flex flex-col items-center">
        <div class="my-6 rounded text-center p-3 border">
@@ -125,7 +125,7 @@ onUnmounted(() => {
      </VCardText>
      <VCardActions>
        <VSpacer />
-        <VBtn variant="elevated" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
+        <VBtn variant="tonal" color="error" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
          {{ t('dialog.aliyunAuth.reset') }}
        </VBtn>
        <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3">
--- a/src/components/dialog/ImportCodeDialog.vue
+++ b/src/components/dialog/ImportCodeDialog.vue
@@ -25,7 +25,7 @@ function handleImport() {

 <template>
  <VDialog width="40rem" scrollable max-height="85vh">
-    <VCard :title="props.title" class="rounded-t">
+    <VCard :title="props.title">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText class="pt-2">
        <VTextarea v-model="codeString" />
--- a/src/components/dialog/PluginConfigDialog.vue
+++ b/src/components/dialog/PluginConfigDialog.vue
@@ -150,11 +150,7 @@ onBeforeMount(async () => {
 <template>
  <VDialog scrollable max-width="60rem" :fullscreen="!display.mdAndUp.value">
    <!-- Vuetify 渲染模式 -->
-    <VCard
-      v-if="renderMode === 'vuetify'"
-      :title="`${props.plugin?.plugin_name} - ${t('dialog.pluginConfig.title')}`"
-      class="rounded-t"
-    >
+    <VCard v-if="renderMode === 'vuetify'" :title="`${props.plugin?.plugin_name} - ${t('dialog.pluginConfig.title')}`">
      <VDialogCloseBtn @click="emit('close')" />
      <VDivider />
      <LoadingBanner v-if="!isRefreshed" class="mt-5" />
@@ -182,16 +178,19 @@ onBeforeMount(async () => {
      </VCardActions>
    </VCard>
    <!-- Vue 渲染模式 -->
-    <div v-else-if="renderMode === 'vue'">
-      <component
-        :is="dynamicComponent"
-        :initial-config="pluginConfigForm"
-        :api="api"
-        @save="handleVueComponentSave"
-        @switch="emit('switch')"
-        @close="emit('close')"
-      />
-    </div>
+    <VCard v-else-if="renderMode === 'vue'">
+      <VCardText class="pa-0">
+        <component
+          :is="dynamicComponent"
+          :initial-config="pluginConfigForm"
+          :api="api"
+          @save="handleVueComponentSave"
+          @switch="emit('switch')"
+          @close="emit('close')"
+        />
+      </VCardText>
+    </VCard>
+
    <!-- 进度框 -->
    <ProgressDialog v-if="progressDialog" v-model="progressDialog" :text="progressText" />
  </VDialog>
--- a/src/components/dialog/PluginDataDialog.vue
+++ b/src/components/dialog/PluginDataDialog.vue
@@ -120,7 +120,7 @@ onMounted(() => {
 <template>
  <VDialog scrollable max-width="80rem" :fullscreen="!display.mdAndUp.value">
    <!-- Vuetify 渲染模式 -->
-    <VCard v-if="renderMode === 'vuetify'" :title="`${props.plugin?.plugin_name}`" class="rounded-t">
+    <VCard v-if="renderMode === 'vuetify'" :title="`${props.plugin?.plugin_name}`">
      <VDialogCloseBtn @click="emit('close')" />
      <LoadingBanner v-if="!isRefreshed" class="mt-5" />
      <VCardText v-else class="min-h-40">
@@ -141,8 +141,16 @@ onMounted(() => {
      />
    </VCard>
    <!-- Vue 渲染模式 -->
-    <div v-else-if="renderMode === 'vue'">
-      <component :is="dynamicComponent" :api="api" @action="handleAction" @switch="emit('switch')" @close="emit('close')" />
-    </div>
+    <VCard v-else-if="renderMode === 'vue'">
+      <VCardText class="pa-0">
+        <component
+          :is="dynamicComponent"
+          :api="api"
+          @action="handleAction"
+          @switch="emit('switch')"
+          @close="emit('close')"
+        />
+      </VCardText>
+    </VCard>
  </VDialog>
 </template>
--- a/src/components/dialog/PluginMarketSettingDialog.vue
+++ b/src/components/dialog/PluginMarketSettingDialog.vue
@@ -45,7 +45,7 @@ onMounted(() => {

 <template>
  <VDialog width="50rem" scrollable max-height="85vh">
-    <VCard class="rounded-t">
+    <VCard>
      <VCardItem>
        <VCardTitle>
          <VIcon icon="mdi-store-cog" class="me-2" />
--- a/src/components/dialog/RcloneConfigDialog.vue
+++ b/src/components/dialog/RcloneConfigDialog.vue
@@ -44,12 +44,7 @@ async function handleReset() {
  try {
    const result: { [key: string]: any } = await api.get('/storage/reset/rclone')
    if (result.success) {
-      // 重置成功
-      alertType.value = 'success'
      handleDone()
-    } else {
-      alertType.value = 'error'
-      text.value = result.message
    }
  } catch (e) {
    console.error(e)
@@ -59,7 +54,7 @@ async function handleReset() {

 <template>
  <VDialog width="50rem" scrollable max-height="85vh">
-    <VCard :title="t('dialog.rcloneConfig.title')" class="rounded-t">
+    <VCard :title="t('dialog.rcloneConfig.title')">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText>
        <VRow>
@@ -80,7 +75,7 @@ async function handleReset() {
      </VCardText>
      <VCardActions>
        <VSpacer />
-        <VBtn variant="elevated" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
+        <VBtn variant="tonal" color="error" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
          {{ t('dialog.rcloneConfig.reset') }}
        </VBtn>
        <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3">
--- a/src/components/dialog/ReorganizeDialog.vue
+++ b/src/components/dialog/ReorganizeDialog.vue
@@ -250,7 +250,7 @@ onUnmounted(() => {

 <template>
  <VDialog scrollable max-width="45rem" :fullscreen="!display.mdAndUp.value">
-    <VCard :title="dialogTitle" class="rounded-t">
+    <VCard :title="dialogTitle">
      <VDialogCloseBtn @click="emit('close')" />
      <VDivider />
      <VCardText>
--- a/src/components/dialog/SiteAddEditDialog.vue
+++ b/src/components/dialog/SiteAddEditDialog.vue
@@ -152,7 +152,6 @@ onMounted(async () => {
      :title="`${props.oper === 'add' ? t('site.actions.add') : t('site.actions.edit')}${t('site.title')}${
        props.oper !== 'add' ? ` - ${siteForm.name}` : ''
      }`"
-      class="rounded-t"
    >
      <VDialogCloseBtn @click="emit('close')" />
      <VDivider />
--- a/src/components/dialog/SiteUserDataDialog.vue
+++ b/src/components/dialog/SiteUserDataDialog.vue
@@ -283,7 +283,7 @@ onBeforeMount(async () => {

 <template>
  <VDialog scrollable eager max-width="80rem" :fullscreen="!display.mdAndUp.value">
-    <VCard class="rounded-t">
+    <VCard>
      <VCardItem>
        <VCardTitle
          >{{ t('dialog.siteUserData.title') }} - {{ props.site?.name }}
--- a/src/components/dialog/SubscribeEditDialog.vue
+++ b/src/components/dialog/SubscribeEditDialog.vue
@@ -292,7 +292,6 @@ onMounted(() => {
                : '',
            })
      "
-      class="rounded-t"
    >
      <VCardText>
        <VDialogCloseBtn @click="emit('close')" />
--- a/src/components/dialog/SubscribeFilesDialog.vue
+++ b/src/components/dialog/SubscribeFilesDialog.vue
@@ -80,7 +80,7 @@ onBeforeMount(() => {
 </script>
 <template>
  <VDialog scrollable max-width="80rem" :fullscreen="!display.mdAndUp.value">
-    <VCard class="rounded-t">
+    <VCard>
      <VCardItem class="my-2">
        <VDialogCloseBtn @click="emit('close')" />
      </VCardItem>
--- a/src/components/dialog/SubscribeShareDialog.vue
+++ b/src/components/dialog/SubscribeShareDialog.vue
@@ -60,7 +60,6 @@ const $toast = useToast()
      :title="`${t('dialog.subscribeShare.shareSubscription')} - ${props.sub?.name} ${
        props.sub?.season ? t('dialog.subscribeShare.season', { number: props.sub?.season }) : ''
      }`"
-      class="rounded-t"
    >
      <VCardText>
        <VDialogCloseBtn @click="emit('close')" />
--- a/src/components/dialog/U115AuthDialog.vue
+++ b/src/components/dialog/U115AuthDialog.vue
@@ -112,7 +112,7 @@ onUnmounted(() => {

 <template>
  <VDialog width="40rem" scrollable max-height="85vh">
-    <VCard :title="t('dialog.u115Auth.loginTitle')" class="rounded-t">
+    <VCard :title="t('dialog.u115Auth.loginTitle')">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText class="pt-2 flex flex-col items-center">
        <div class="my-6 rounded text-center p-3 border">
@@ -124,7 +124,7 @@ onUnmounted(() => {
      </VCardText>
      <VCardActions>
        <VSpacer />
-        <VBtn variant="elevated" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
+        <VBtn variant="tonal" color="error" @click="handleReset" prepend-icon="mdi-restore" class="px-5 me-3">
          {{ t('dialog.u115Auth.reset') }}
        </VBtn>
        <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3">
--- a/src/components/dialog/UserAddEditDialog.vue
+++ b/src/components/dialog/UserAddEditDialog.vue
@@ -295,7 +295,6 @@ onMounted(() => {
      :title="`${props.oper === 'add' ? t('dialog.userAddEdit.add') : t('dialog.userAddEdit.edit')}${
        props.oper !== 'add' ? ` - ${userName}` : ''
      }`"
-      class="rounded-t"
    >
      <VDialogCloseBtn @click="emit('close')" />
      <VDivider />
--- a/src/components/dialog/UserAuthDialog.vue
+++ b/src/components/dialog/UserAuthDialog.vue
@@ -134,7 +134,7 @@ onMounted(async () => {

 <template>
  <VDialog width="40rem" max-height="85vh">
-    <VCard :title="t('dialog.userAuth.title')" class="rounded-t">
+    <VCard :title="t('dialog.userAuth.title')">
      <VDialogCloseBtn @click="emit('close')" />
      <VCardText>
        <VRow>
--- a/src/components/dialog/WorkflowAddEditDialog.vue
+++ b/src/components/dialog/WorkflowAddEditDialog.vue
@@ -86,7 +86,7 @@ async function editWorkflow() {

 <template>
  <VDialog scrollable :close-on-back="false" eager max-width="30rem" :fullscreen="!display.mdAndUp.value">
-    <VCard :title="title" class="rounded-t">
+    <VCard :title="title">
      <VDialogCloseBtn @click="emit('close')" />
      <VDivider />
      <VCardText>