Merge remote-tracking branch 'origin/main' into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.2.6",
+  "version": "1.2.7-2",
   "private": true,
   "scripts": {
     "dev": "vite --host",

src/components/filebrowser/List.vue

@@ -622,6 +622,7 @@ onMounted(() => {
       </IconBtn>
     </template>
     <VCard :title="`文件整理 - ${currentItem?.name}`">
+      <DialogCloseBtn @click="transferPopper = false" />
       <VCardText class="pt-2">
         <VForm @submit.prevent="() => {}">
           <VRow>
@@ -669,6 +670,7 @@ onMounted(() => {
             >
               <VTextField
                 v-model="transferForm.tmdbid"
+                :disabled="transferForm.type_name === ''"
                 label="TMDBID"
                 placeholder="留空自动识别"
                 :rules="[numberValidator]"

src/components/render/FormRender.vue

@@ -5,6 +5,7 @@ import { type PropType, ref } from 'vue'
 interface RenderProps {
   component: string
   text: string
+  html: string
   content?: any
   props?: any
 }
@@ -16,9 +17,10 @@ const elementProps = defineProps({
 })
 
 // 配置元素
-const formItem = ref<RenderProps>(elementProps.config || {
+const formItem = ref<RenderProps>(elementProps.config ?? {
   component: 'div',
   text: '',
+  html: '',
   props: {},
   content: [],
 })
@@ -30,6 +32,7 @@ const formData = ref<any>(elementProps.form || {})
 <template>
   <Component
     :is="formItem.component"
+    v-if="!formItem.html"
     v-bind="formItem.props"
     v-model="formData[formItem.props?.model || '']"
   >
@@ -42,4 +45,10 @@ const formData = ref<any>(elementProps.form || {})
       :form="formData"
     />
   </Component>
+  <Component
+    :is="formItem.component"
+    v-if="formItem.html"
+    v-bind="formItem.props"
+    v-html="formItem.html"
+  />
 </template>

src/components/render/PageRender.vue

@@ -13,11 +13,10 @@ interface RenderProps {
 // 输入参数
 const elementProps = defineProps({
   config: Object as PropType<RenderProps>,
-  handler: Boolean,
 })
 
 // 配置元素
-const formItem = ref<RenderProps>(elementProps.config || {
+const formItem = ref<RenderProps>(elementProps.config ?? {
   component: 'div',
   text: '',
   html: '',

src/views/reorganize/TransferHistoryView.vue

@@ -227,6 +227,7 @@ async function retransferBatch() {
   currentHistory.value = undefined
   // 打开识别弹窗
   redoType.value = ''
+  redoTmdbId.value = ''
   redoDialog.value = true
 }
 
@@ -461,6 +462,7 @@ const dropdownItems = ref([
               v-model="redoTmdbId"
               label="TMDB编号"
               placeholder="留空自动识别"
+              :disabled="redoType === ''"
               :rules="[numberValidator]"
               append-inner-icon="mdi-magnify"
               @click:append-inner.stop="tmdbSelectorDialog = true"
@@ -532,9 +534,9 @@ const dropdownItems = ref([
       <VCardTitle class="pe-10">
         {{ confirmTitle }}
       </VCardTitle>
-      <div class="d-flex  flex-column flex-md-row justify-center my-3">
+      <div class="d-flex  flex-column flex-lg-row justify-center my-3">
         <VBtn
-          color="info"
+          color="primary"
           class="mb-2 mx-2"
           @click="deleteConfirmHandler(false, false)"
         >
@@ -543,6 +545,13 @@ const dropdownItems = ref([
         <VBtn
           color="warning"
           class="mb-2 mx-2"
+          @click="deleteConfirmHandler(true, false)"
+        >
+          删除历史记录和源文件
+        </VBtn>
+        <VBtn
+          color="info"
+          class="mb-2 mx-2"
           @click="deleteConfirmHandler(false, true)"
         >
           删除历史记录和媒体库文件