Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

lihao16 6 mēneši atpakaļ
vecāks
revīzija
bf201ec161

+ 1 - 0
smsb-plus-ui/package.json

@@ -47,6 +47,7 @@
     "vue-i18n": "9.10.2",
     "vue-router": "4.3.2",
     "vue-types": "5.1.1",
+    "vuedraggable": "^4.1.0",
     "vxe-table": "4.5.22"
   },
   "devDependencies": {

+ 315 - 263
smsb-plus-ui/src/views/smsb/item/index.vue

@@ -1,30 +1,31 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover" :style="{ height: '70px' }">
           <el-row :gutter="20" align="middle">
             <!-- 节目总数 -->
-            <el-col :span="8" style="display: flex; justify-content: center; align-items: center">
+            <el-col :span="8" class="statistic-col">
               <el-statistic :value="totalNum">
                 <template #title>
-                  <div style="display: inline-flex; align-items: center">节目总数</div>
+                  <div class="stat-title">节目总数</div>
                 </template>
               </el-statistic>
             </el-col>
             <!-- 轮播总数 -->
-            <el-col :span="8" style="display: flex; justify-content: center; align-items: center">
+            <el-col :span="8" class="statistic-col">
               <el-statistic :value="lbNum">
                 <template #title>
-                  <div style="display: inline-flex; align-items: center">轮播总数</div>
+                  <div class="stat-title">轮播总数</div>
                 </template>
               </el-statistic>
             </el-col>
-            <!-- 节目总数 -->
-            <el-col :span="8" style="display: flex; justify-content: center; align-items: center">
+            <!-- 分屏总数 -->
+            <el-col :span="8" class="statistic-col">
               <el-statistic :value="jmNum">
                 <template #title>
-                  <div style="display: inline-flex; align-items: center">节目总数</div>
+                  <div class="stat-title">分屏总数</div>
                 </template>
               </el-statistic>
             </el-col>
@@ -33,7 +34,8 @@
         <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="40px">
             <el-form-item label="名称" prop="itemName">
-              <el-input v-model="queryParams.itemName" style="width: 150px" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.itemName" style="width: 150px" placeholder="请输入名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="类型" prop="itemType">
               <el-select v-model="queryParams.itemType" style="width: 150px" placeholder="请选择类型" clearable>
@@ -41,28 +43,26 @@
               </el-select>
             </el-form-item>
             <el-form-item label="时间" style="width: 250px">
-              <el-date-picker
-                v-model="dateRangeCreateTime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              ></el-date-picker>
+              <el-date-picker v-model="dateRangeCreateTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain icon="Plus" @click="handleAddL" v-hasPermi="['source:item:add']"> 新增轮播组 </el-button>
-              <el-button type="primary" plain icon="Plus" @click="handleAddJ" v-hasPermi="['source:item:add']"> 新增分屏组 </el-button>
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['source:item:edit']"
-                >修改
+              <el-button type="primary" plain icon="Plus" @click="handleAddL" v-hasPermi="['source:item:add']"> 新增轮播组
+              </el-button>
+              <el-button type="primary" plain icon="Plus" @click="handleAddJ" v-hasPermi="['source:item:add']"> 新增分屏组
+              </el-button>
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                v-hasPermi="['source:item:edit']">修改
               </el-button>
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['source:item:remove']"
-                >删除
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                v-hasPermi="['source:item:remove']">删除
+              </el-button>
+              <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['source:item:export']">
+                导出
               </el-button>
-              <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['source:item:export']"> 导出 </el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -70,91 +70,105 @@
     </transition>
 
     <el-card shadow="never">
-      <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="ID" align="left" prop="id" v-if="true" width="180" :show-overflow-tooltip="true" />
-        <el-table-column label="名称" align="left" prop="itemName" />
-        <el-table-column label="类型" align="center" prop="itemType" width="100">
+      <el-table v-loading="mainLoading" :data="itemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" header-align="center" />
+        <el-table-column label="ID" header-align="left" prop="id" v-if="true" width="180"
+          :show-overflow-tooltip="true" />
+        <el-table-column label="名称" header-align="left" prop="itemName" />
+        <el-table-column label="类型" header-align="center" prop="itemType" width="100">
           <template #default="scope">
             <dict-tag :options="smsb_item_type" :value="scope.row.itemType" />
           </template>
         </el-table-column>
-        <el-table-column label="分屏" align="center" prop="splitScreen" width="100">
+        <el-table-column label="分屏" header-align="center" prop="splitScreen" width="100">
           <template #default="scope">
             <dict-tag :options="smsb_split_screen" :value="scope.row.splitScreen" />
           </template>
         </el-table-column>
-        <el-table-column label="资源数量" align="center" prop="sourceNum" width="100" />
-        <el-table-column label="创建人" align="left" prop="createUser" width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="创建时间" align="left" prop="createTime" width="160" />
-        <el-table-column label="更新时间" align="left" prop="updateTime" width="160" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+        <el-table-column label="资源数量" header-align="center" prop="sourceNum" width="100" />
+        <el-table-column label="创建人" header-align="left" prop="createUser" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="创建时间" header-align="left" prop="createTime" width="160" />
+        <el-table-column label="更新时间" header-align="left" prop="updateTime" width="160" />
+        <el-table-column label="操作" header-align="center" class-name="small-padding fixed-width" width="120">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['source:item:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['source:item:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['source:item:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['source:item:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改轮播组对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body @close="onDialogClose">
       <div class="dialog-container">
         <!-- 左侧文件列表 -->
         <div class="table-container">
           <!-- 界面名称输入框 -->
           <el-input v-model="itemName" placeholder="请输入轮播组名称" class="interface-input"></el-input>
 
-          <el-table :data="minioDataList" reserve-selection row-key="id" @selection-change="handleSelectionFile">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="类型" align="center" prop="type" width="80">
+          <el-table v-loading="dialogLoading" ref="fileTable" :data="minioDataList" reserve-selection row-key="id"
+            @selection-change="handleSelectionFile" @select="handleSelect" @select-all="handleSelectAll">
+            <el-table-column type="selection" width="55" header-align="center" />
+            <el-table-column label="类型" header-align="center" prop="type" width="80">
               <template #default="scope">
                 <dict-tag :options="smsb_source_type" :value="scope.row.type" />
               </template>
             </el-table-column>
-            <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
-            <el-table-column label="大小" align="center" prop="size" />
-            <el-table-column label="时长" align="center" prop="duration" />
-            <el-table-column label="截图" align="center" prop="screenshot">
+            <el-table-column label="原名" header-align="left" prop="originalName" width="150"
+              :show-overflow-tooltip="true" />
+            <el-table-column label="大小" header-align="center" prop="size" />
+            <el-table-column label="时长" header-align="center" prop="duration" />
+            <el-table-column label="截图" header-align="center" prop="screenshot">
               <template #default="scope">
                 <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer" />
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            v-show="fileTotal > 0"
-            :total="fileTotal"
-            v-model:page="dialogQueryParams.pageNum"
-            v-model:limit="dialogQueryParams.pageSize"
-            @pagination="getFileList"
-          />
+          <pagination v-show="fileTotal > 0" :total="fileTotal" v-model:page="dialogQueryParams.pageNum"
+            v-model:limit="dialogQueryParams.pageSize" @pagination="getFileList" />
         </div>
 
         <!-- 右侧选中文件列表 -->
         <div class="selected-container">
-          <el-table ref="selectedTable" :data="selectedFiles" border>
-            <!-- 显示排序数字 -->
-            <el-table-column label="排序" width="80">
-              <template #default="{ row }">
-                <span class="order-number">{{ row.order }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="文件名">
-              <template #default="{ row }">
-                <span>{{ row.name }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="播放时长">
-              <template #default="{ row }">
-                <el-input-number :disabled="row.type !== 1" v-model="row.duration" :min="1" :max="300"></el-input-number>
-              </template>
-            </el-table-column>
-          </el-table>
+          <!-- 自定义表头 -->
+          <div class="draggable-header"
+            style="display: flex; align-items: center; background: #fafafa; border-bottom: 1px solid #eee; min-height: 48px; font-weight: bold">
+            <span style="width: 80px; text-align: center">排序</span>
+            <span style="flex: 1">文件名</span>
+            <span style="width: 120px; margin-left: 8px">播放时长</span>
+          </div>
+          <!-- 拖拽列表体 -->
+          <draggable v-model="selectedFiles" item-key="id" @end="onSelectedFilesDragEnd" :animation="200" tag="div">
+            <template #item="{ element, index }">
+              <div class="draggable-row" :draggable="true"
+                style="display: flex; align-items: center; border-bottom: 1px solid #eee; min-height: 48px; cursor: move">
+                <span class="order-number" style="width: 80px; text-align: center">{{ element.order }}</span>
+                <el-tooltip effect="dark" :content="element.name" placement="top">
+                  <span style="
+                      flex: 1;
+                      max-width: 240px;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                      display: inline-block;
+                      vertical-align: middle;
+                    ">{{ element.name }}</span>
+                </el-tooltip>
+                <el-input-number :disabled="element.type !== 1" v-model="element.duration" :min="1" :max="300"
+                  style="width: 120px; margin-left: 8px" />
+              </div>
+            </template>
+          </draggable>
+          <!-- 空数据提示 -->
+          <div v-if="selectedFiles.length === 0" style="text-align: center; color: #999; padding: 16px 0">暂无数据</div>
         </div>
       </div>
       <template #footer>
@@ -180,26 +194,14 @@
             <el-row>
               <el-col :span="10">
                 <el-form-item label="分辨率" prop="width">
-                  <el-input-number
-                    v-model="form.width"
-                    controls-position="right"
-                    placeholder="请输入宽度"
-                    :min="0"
-                    style="width: 180px"
-                    maxlength="6"
-                  />
+                  <el-input-number v-model="form.width" controls-position="right" placeholder="请输入宽度" :min="0"
+                    style="width: 180px" maxlength="6" />
                 </el-form-item>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="" prop="height" width="10px">
-                  <el-input-number
-                    v-model="form.height"
-                    controls-position="right"
-                    placeholder="请输入高度"
-                    :min="0"
-                    style="width: 180px"
-                    maxlength="6"
-                  />
+                  <el-input-number v-model="form.height" controls-position="right" placeholder="请输入高度" :min="0"
+                    style="width: 180px" maxlength="6" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -213,49 +215,24 @@
             <el-form-item label="坐标" prop="position">
               <el-row>
                 <el-col :span="12">
-                  <el-input-number
-                    v-model="position1"
-                    controls-position="right"
-                    placeholder="请输入坐标1"
-                    :min="0"
-                    style="width: 180px"
-                    maxlength="6"
-                  />
+                  <el-input-number v-model="position1" controls-position="right" placeholder="请输入坐标1" :min="0"
+                    style="width: 180px" maxlength="6" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input-number
-                    v-model="position2"
-                    controls-position="right"
-                    placeholder="请输入坐标2"
-                    :min="0"
-                    style="width: 180px; margin-left: 15px"
-                    maxlength="6"
-                    v-if="form.splitScreen !== 2"
-                  />
+                  <el-input-number v-model="position2" controls-position="right" placeholder="请输入坐标2" :min="0"
+                    style="width: 180px; margin-left: 15px" maxlength="6" v-if="form.splitScreen !== 2" />
                 </el-col>
               </el-row>
             </el-form-item>
             <el-form-item label="宽高" prop="position" v-if="form.splitScreen === 4">
               <el-row>
                 <el-col :span="12">
-                  <el-input-number
-                    v-model="positionW"
-                    controls-position="right"
-                    placeholder="请输入坐标1"
-                    :min="0"
-                    style="width: 180px"
-                    maxlength="6"
-                  />
+                  <el-input-number v-model="positionW" controls-position="right" placeholder="请输入坐标1" :min="0"
+                    style="width: 180px" maxlength="6" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input-number
-                    v-model="positionH"
-                    controls-position="right"
-                    placeholder="请输入坐标2"
-                    :min="0"
-                    style="width: 180px; margin-left: 15px"
-                    maxlength="6"
-                  />
+                  <el-input-number v-model="positionH" controls-position="right" placeholder="请输入坐标2" :min="0"
+                    style="width: 180px; margin-left: 15px" maxlength="6" />
                 </el-col>
               </el-row>
             </el-form-item>
@@ -263,7 +240,9 @@
               <el-col :span="12">
                 <el-form-item label="跑马灯" prop="hasPmd">
                   <el-radio-group v-model="form.hasPmd">
-                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }} </el-radio>
+                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label
+                      }}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -283,14 +262,18 @@
               <el-col :span="12">
                 <el-form-item label="天气" prop="hasWeather">
                   <el-radio-group v-model="form.hasWeather">
-                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }} </el-radio>
+                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label
+                      }}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="时间" prop="hasTime">
                   <el-radio-group v-model="form.hasTime">
-                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }} </el-radio>
+                    <el-radio v-for="dict in smsb_yes_no" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label
+                      }}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -309,12 +292,14 @@
 </template>
 
 <script setup name="Item" lang="ts">
+import draggable from 'vuedraggable';
+import { onActivated } from 'vue';
 import { listItem, getItem, delItem, addItem, updateItem, itemStatistics } from '@/api/smsb/source/item';
 import { ItemVO, ItemQuery, ItemForm } from '@/api/smsb/source/item_type';
 import { MinioDataQuery, MinioDataVO } from '@/api/smsb/source/minioData_type';
 import { listMinioData } from '@/api/smsb/source/minioData';
-import Sortable from 'sortablejs';
 import { nextTick } from 'vue';
+import type { ElTable } from 'element-plus';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { smsb_item_type, smsb_split_screen, smsb_source_type, smsb_yes_no } = toRefs<any>(
@@ -323,7 +308,8 @@ const { smsb_item_type, smsb_split_screen, smsb_source_type, smsb_yes_no } = toR
 
 const itemList = ref<ItemVO[]>([]);
 const buttonLoading = ref(false);
-const loading = ref(true);
+const mainLoading = ref(true); // 主表 loading
+const dialogLoading = ref(false); // dialog loading
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
 const single = ref(true);
@@ -340,6 +326,7 @@ const positionH = ref(0);
 const itemName = ref<string>('');
 const queryFormRef = ref<ElFormInstance>();
 const itemFormRef = ref<ElFormInstance>();
+const fileTable = ref<InstanceType<typeof ElTable>>();
 const minioDataList = ref<MinioDataVO[]>([]);
 const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
 
@@ -370,59 +357,113 @@ const initFormData: ItemForm = {
   hasWeather: 0,
   hasTime: 0
 };
-const data = reactive<PageData<ItemForm, ItemQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    itemName: undefined,
-    itemType: undefined,
-    splitScreen: undefined,
-    createUser: undefined,
-    params: {}
-  },
-  rules: {}
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  itemName: undefined,
+  itemType: undefined,
+  splitScreen: undefined,
+  createUser: undefined,
+  params: {}
 });
 
-const dialogData = reactive<DialogPageData<MinioDataQuery>>({
-  dialogQueryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    params: {}
-  }
-});
+const form = ref({ ...initFormData });
+const rules = {
+  itemName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+  itemType: [{ required: true, message: '请选择类型', trigger: 'change' }]
+  // 可按需补充其它字段校验
+};
 
-const { queryParams, form, rules } = toRefs(data);
-const { dialogQueryParams } = toRefs(dialogData);
+const dialogQueryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  params: {}
+});
 
 /** 查询节目管理列表 */
 const getList = async () => {
-  loading.value = true;
-  // const res = await listItem(queryParams.value);
-  const res = await listItem(proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime'));
-  itemList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  mainLoading.value = true;
+  try {
+    const res = await listItem(proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime'));
+    console.log('getList result:', res);
+    itemList.value = res.rows;
+    total.value = res.total;
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '获取列表失败');
+  } finally {
+    mainLoading.value = false;
+  }
 };
 /** 查询文件资源列表 */
 const getFileList = async () => {
-  const res = await listMinioData(dialogQueryParams.value);
-  /*minioDataList.value = res.rows;
-  minioDataList.value.forEach((data) => {
-    data.size = parseFloat(data.size / 1024).toFixed(3) + 'MB';
-  });*/
-  minioDataList.value = res.rows.map((data) => ({
-    ...data,
-    size: parseFloat(data.size / 1024).toFixed(3) + 'MB'
-  }));
-  fileTotal.value = res.total;
+  dialogLoading.value = true;
+  try {
+    const res = await listMinioData(dialogQueryParams.value);
+    minioDataList.value = res.rows.map((data) => ({
+      ...data,
+      size: (parseFloat(data.size) / 1024).toFixed(3) + 'MB'
+    }));
+    fileTotal.value = res.total;
+    // After data loads, restore selections
+    nextTick(() => {
+      if (selectedFiles.value?.length) {
+        const selectedIds = new Set(selectedFiles.value.map((f) => f.id));
+        minioDataList.value.forEach((row) => {
+          if (selectedIds.has(row.id)) {
+            fileTable.value?.toggleRowSelection(row, true);
+          }
+        });
+      }
+    });
+  } finally {
+    dialogLoading.value = false;
+  }
+};
+
+/** 多选框选中文件数据 */
+// selection-change 只做新增
+const handleSelectionFile = (selection: MinioDataVO[]) => {
+  selection.forEach((item) => {
+    if (!selectedFiles.value.some((f) => String(f.id) === String(item.id))) {
+      selectedFiles.value.push({
+        id: item.id,
+        name: item.originalName,
+        type: item.type,
+        duration: item.type === 1 ? 10 : item.duration,
+        order: 0
+      });
+    }
+  });
+  // 重新排序
+  selectedFiles.value = selectedFiles.value.map((f, idx) => ({ ...f, order: idx + 1 }));
+};
+
+// 取消单个选中
+const handleSelect = (selection: MinioDataVO[], row: MinioDataVO) => {
+  if (!selection.some((item) => String(item.id) === String(row.id))) {
+    selectedFiles.value = selectedFiles.value.filter((f) => String(f.id) !== String(row.id));
+    selectedFiles.value = selectedFiles.value.map((f, idx) => ({ ...f, order: idx + 1 }));
+  }
+};
+
+// 取消全选
+const handleSelectAll = (selection: MinioDataVO[]) => {
+  const currentPageIds = new Set(minioDataList.value.map((item) => String(item.id)));
+  const selectedIds = new Set(selection.map((item) => String(item.id)));
+  selectedFiles.value = selectedFiles.value.filter((f) => !currentPageIds.has(String(f.id)) || selectedIds.has(String(f.id)));
+  selectedFiles.value = selectedFiles.value.map((f, idx) => ({ ...f, order: idx + 1 }));
 };
 
-/** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
   splitDialog.visible = false;
+  onDialogClose();
+};
+
+/** 新建轮播组弹窗关闭时清空选中文件 */
+const onDialogClose = () => {
+  selectedFiles.value = [];
 };
 
 /** 表单重置 */
@@ -451,29 +492,6 @@ const handleSelectionChange = (selection: ItemVO[]) => {
   multiple.value = !selection.length;
 };
 
-/** 多选框选中文件数据 */
-const handleSelectionFile = (selection: MinioDataVO[]) => {
-  selectedFiles.value = selection.map((item: any, index: number) => ({
-    id: item.id,
-    name: item.originalName,
-    type: item.type,
-    duration: item.type === 1 ? 10 : item.duration, // 默认播放时长 10s
-    order: index + 1 // 默认排序号
-  }));
-};
-
-// 重新编号排序
-const updateOrder = () => {
-  selectedFiles.value.forEach((item, index) => {
-    item.order = index + 1;
-  });
-};
-
-// 删除选中文件
-const removeFile = (file: any) => {
-  selectedFiles.value = selectedFiles.value.filter((f) => f.id !== file.id);
-};
-
 /** 新增轮播按钮操作 */
 const handleAddL = () => {
   reset();
@@ -494,80 +512,104 @@ const handleAddJ = () => {
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ItemVO) => {
   reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getItem(_id);
-  if (1 === res.data.itemType) {
-    Object.assign(form.value, res.data);
-    dialog.visible = true;
-    dialog.title = '修改节目管理';
-  } else {
-    // 跳转页面进行数据关联
-    proxy.$router.push('/source/split/edit/' + res.data.id);
+  try {
+    const _id = row?.id || ids.value[0];
+    const res = await getItem(_id);
+    if (1 === res.data.itemType) {
+      Object.assign(form.value, res.data);
+      dialog.visible = true;
+      dialog.title = '修改节目管理';
+    } else {
+      // 跳转页面进行数据关联
+      proxy.$router.push('/source/split/edit/' + res.data.id);
+    }
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '获取详情失败');
   }
 };
 
 /** 提交按钮 */
 const submitForm = async () => {
   buttonLoading.value = true;
-  if (form.value.id) {
-    await updateItem(form.value).finally(() => (buttonLoading.value = false));
-  } else {
-    if (form.value.itemType === 1) {
-      form.value.selectedFiles = selectedFiles.value;
-      form.value.itemName = itemName.value;
+  try {
+    if (form.value.id) {
+      await updateItem(form.value);
+    } else {
+      if (form.value.itemType === 1) {
+        form.value.selectedFiles = selectedFiles.value;
+        form.value.itemName = itemName.value;
+      }
+      await addItem(form.value);
     }
-    await addItem(form.value).finally(() => (buttonLoading.value = false));
+    proxy?.$modal.msgSuccess('操作成功');
+    dialog.visible = false;
+    await getList();
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '提交失败');
+  } finally {
+    buttonLoading.value = false;
   }
-  proxy?.$modal.msgSuccess('操作成功');
-  dialog.visible = false;
-  await getList();
 };
 
 const submitSplit = async () => {
-  // 根据分辨率判断横屏还是竖屏
-  const isWidth = form.value.width > form.value.height;
-  // 2分屏的坐标
-  if (form.value.splitScreen === 2) {
-    if (isWidth) {
-      form.value.position = '(0,' + position1.value + '),(' + form.value.height + ',' + position1.value + ')';
-    } else {
-      form.value.position = '(0,' + position1.value + '),(' + form.value.width + ',' + position1.value + ')';
+  buttonLoading.value = true;
+  try {
+    // 根据分辨率判断横屏还是竖屏
+    const isWidth = form.value.width > form.value.height;
+    // 2分屏的坐标
+    if (form.value.splitScreen === 2) {
+      if (isWidth) {
+        form.value.position = '(0,' + position1.value + '),(' + form.value.height + ',' + position1.value + ')';
+      } else {
+        form.value.position = '(0,' + position1.value + '),(' + form.value.width + ',' + position1.value + ')';
+      }
     }
-  }
-  // 3分屏的坐标
-  if (form.value.splitScreen === 3) {
-    if (isWidth) {
-      const xy1 = '(0,' + position1.value + '),(' + form.value.height + ',' + position1.value + ')';
-      const xy2 = '(0,' + position2.value + '),(' + form.value.height + ',' + position2.value + ')';
-      form.value.position = xy1 + ',' + xy2;
-    } else {
-      const xy1 = '(0,' + position1.value + '),(' + form.value.width + ',' + position1.value + ')';
-      const xy2 = '(0,' + position2.value + '),(' + form.value.width + ',' + position2.value + ')';
-      form.value.position = xy1 + ',' + xy2;
+    // 3分屏的坐标
+    if (form.value.splitScreen === 3) {
+      if (isWidth) {
+        const xy1 = '(0,' + position1.value + '),(' + form.value.height + ',' + position1.value + ')';
+        const xy2 = '(0,' + position2.value + '),(' + form.value.height + ',' + position2.value + ')';
+        form.value.position = xy1 + ',' + xy2;
+      } else {
+        const xy1 = '(0,' + position1.value + '),(' + form.value.width + ',' + position1.value + ')';
+        const xy2 = '(0,' + position2.value + '),(' + form.value.width + ',' + position2.value + ')';
+        form.value.position = xy1 + ',' + xy2;
+      }
     }
+    // 播放框
+    if (form.value.splitScreen === 4) {
+      const xy1 = '(' + (position1.value - positionW.value / 2) + ',' + (position2.value + positionH.value / 2) + ')';
+      const xy2 = '(' + (position1.value + positionW.value / 2) + ',' + (position2.value + positionH.value / 2) + ')';
+      const xy3 = '(' + (position1.value - positionW.value / 2) + ',' + (position2.value - positionH.value / 2) + ')';
+      const xy4 = '(' + (position1.value + positionW.value / 2) + ',' + (position2.value - positionH.value / 2) + ')';
+      form.value.position = xy1 + ',' + xy2 + ',' + xy3 + ',' + xy4;
+    }
+    const res = await addItem(form.value);
+    proxy?.$modal.msgSuccess('操作成功');
+    splitDialog.visible = false;
+    const itemId = res.data;
+    // 跳转页面进行数据关联
+    proxy.$router.push('/source/split/edit/' + itemId);
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '提交分屏失败');
+  } finally {
+    buttonLoading.value = false;
   }
-  // 播放框
-  if (form.value.splitScreen === 4) {
-    const xy1 = '(' + (position1.value - positionW.value / 2) + ',' + (position2.value + positionH.value / 2) + ')';
-    const xy2 = '(' + (position1.value + positionW.value / 2) + ',' + (position2.value + positionH.value / 2) + ')';
-    const xy3 = '(' + (position1.value - positionW.value / 2) + ',' + (position2.value - positionH.value / 2) + ')';
-    const xy4 = '(' + (position1.value + positionW.value / 2) + ',' + (position2.value - positionH.value / 2) + ')';
-    form.value.position = xy1 + ',' + xy2 + ',' + xy3 + ',' + xy4;
-  }
-  const res = await addItem(form.value).finally(() => (buttonLoading.value = false));
-  proxy?.$modal.msgSuccess('操作成功');
-  splitDialog.visible = false;
-  const itemId = res.data;
-  // 跳转页面进行数据关联
-  proxy.$router.push('/source/split/edit/' + itemId);
 };
 /** 删除按钮操作 */
 const handleDelete = async (row?: ItemVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除节目管理编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
-  await delItem(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
+  loading.value = true;
+  try {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除节目管理编号为"' + _ids + '"的数据项?');
+    await delItem(_ids);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '删除失败');
+  } finally {
+    loading.value = false;
+  }
 };
 
 /** 导出按钮操作 */
@@ -582,29 +624,29 @@ const handleExport = () => {
 };
 
 const getItemStatistics = async () => {
-  const res = await itemStatistics();
-  console.log(res.data);
-  totalNum.value = res.data.totalNum;
-  lbNum.value = res.data.lbNum;
-  jmNum.value = res.data.jmNum;
+  try {
+    const res = await itemStatistics();
+    totalNum.value = res.data.totalNum;
+    lbNum.value = res.data.lbNum;
+    jmNum.value = res.data.jmNum;
+  } catch (e: any) {
+    proxy?.$modal.msgError(e?.message || '获取统计数据失败');
+  }
+};
+
+/** 拖拽排序结束时,重排 order 字段 */
+const onSelectedFilesDragEnd = () => {
+  selectedFiles.value = selectedFiles.value.map((f, idx) => ({ ...f, order: idx + 1 }));
 };
 
 onMounted(() => {
   getList();
   getItemStatistics();
-  nextTick(() => {
-    const tableEl = document.querySelector('.selected-container .el-table__body-wrapper tbody') as HTMLElement;
-    Sortable.create(tableEl, {
-      animation: 150,
-      handle: '.order-number', // 允许拖拽
-      onEnd(event) {
-        const { oldIndex, newIndex } = event;
-        const movedItem = selectedFiles.value.splice(oldIndex!, 1)[0];
-        selectedFiles.value.splice(newIndex!, 0, movedItem);
-        updateOrder(); // 拖拽后重新排序
-      }
-    });
-  });
+});
+
+onActivated(() => {
+  getList();
+  getItemStatistics();
 });
 </script>
 <style scoped>
@@ -626,10 +668,20 @@ onMounted(() => {
 }
 
 .order-number {
-  cursor: grab;
   display: inline-block;
   width: 30px;
   text-align: center;
   font-weight: bold;
 }
+
+.stat-title {
+  display: inline-flex;
+  align-items: center;
+}
+
+.statistic-col {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>

+ 195 - 151
smsb-plus-ui/src/views/smsb/item/split.vue

@@ -1,132 +1,126 @@
 <template>
-  <div class="p-2 flex">
-    <!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">-->
-    <!--      <div v-show="showSearch" class="mb-[10px]"></div>-->
-    <!-- 左侧示意图 -->
-    <div class="w-1/3 p-2 border-r">示意图</div>
-    <!-- 中间 Table -->
-    <div class="w-1/3 p-2 border-r table-container">
-      <el-radio-group v-model="screenNum" @change="screenChange">
-        <el-radio-button label="第一屏" value="1" v-if="splitScreen !== 4" />
-        <el-radio-button label="第二屏" value="2" v-if="splitScreen !== 4" />
-        <el-radio-button label="第三屏" value="3" v-if="splitScreen === 3" />
-        <el-radio-button label="播放框" value="4" v-if="splitScreen === 4" />
-      </el-radio-group>
-      <el-table :data="minioDataList" ref="minioTable" @selection-change="handleSelectionFile" style="margin-top: 20px">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
-        <el-table-column label="类型" align="center" prop="type" width="80">
-          <template #default="scope">
-            <dict-tag :options="smsb_source_type" :value="scope.row.type" />
-          </template>
-        </el-table-column>
-        <el-table-column label="大小" align="center" prop="size" />
-        <el-table-column label="时长" align="center" prop="duration" />
-        <el-table-column label="截图" align="center" prop="screenshot">
-          <template #default="scope">
-            <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer" />
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="fileTotal > 0"
-        :total="fileTotal"
-        v-model:page="dialogQueryParams.pageNum"
-        v-model:limit="dialogQueryParams.pageSize"
-        @pagination="getFileList"
-      />
-    </div>
-    <!-- 右侧内容 -->
-    <div class="w-1/3 p-2">
-      <div v-if="screenNum === '1'" class="table-container">
-        <el-table ref="selectedTable" :data="selectedFiles1" border>
-          <!-- 显示排序数字 -->
-          <el-table-column label="排序" width="80">
-            <template #default="{ row }">
-              <span class="order-number">{{ row.order }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="文件名">
-            <template #default="{ row }">
-              <span>{{ row.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="播放时长">
-            <template #default="{ row }">
-              <el-input-number v-model="row.duration" :min="1" :max="300"></el-input-number>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-if="screenNum === '2'" class="table-container">
-        <el-table ref="selectedTable" :data="selectedFiles2" border>
-          <!-- 显示排序数字 -->
-          <el-table-column label="排序" width="80">
-            <template #default="{ row }">
-              <span class="order-number">{{ row.order }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="文件名">
-            <template #default="{ row }">
-              <span>{{ row.name }}</span>
+  <div class="split-root">
+    <div class="p-2 flex">
+      <!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">-->
+      <!--      <div v-show="showSearch" class="mb-[10px]"></div>-->
+      <!-- 左侧示意图 -->
+      <div class="w-1/3 p-2 border-r">示意图</div>
+      <!-- 中间 Table -->
+      <div class="w-1/3 p-2 border-r table-container">
+        <el-radio-group v-model="screenNum" @change="screenChange">
+          <el-radio-button label="第一屏" value="1" v-if="splitScreen !== 4" />
+          <el-radio-button label="第二屏" value="2" v-if="splitScreen !== 4" />
+          <el-radio-button label="第三屏" value="3" v-if="splitScreen === 3" />
+          <el-radio-button label="播放框" value="4" v-if="splitScreen === 4" />
+        </el-radio-group>
+        <el-table :data="minioDataList" ref="minioTable"
+          @selection-change="handleSelectionFile"
+          @select="handleSelect"
+          @select-all="handleSelectAll"
+          style="margin-top: 20px">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
+          <el-table-column label="类型" align="center" prop="type" width="80">
+            <template #default="scope">
+              <dict-tag :options="smsb_source_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="播放时长">
-            <template #default="{ row }">
-              <el-input-number v-model="row.duration" :min="1" :max="300"></el-input-number>
+          <el-table-column label="大小" align="center" prop="size" />
+          <el-table-column label="时长" align="center" prop="duration" />
+          <el-table-column label="截图" align="center" prop="screenshot">
+            <template #default="scope">
+              <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer" />
             </template>
           </el-table-column>
         </el-table>
+        <pagination v-show="fileTotal > 0" :total="fileTotal" v-model:page="dialogQueryParams.pageNum"
+          v-model:limit="dialogQueryParams.pageSize" @pagination="getFileList" />
       </div>
-      <div v-if="screenNum === '3'" class="table-container">
-        <el-table ref="selectedTable" :data="selectedFiles3" border>
-          <!-- 显示排序数字 -->
-          <el-table-column label="排序" width="80">
-            <template #default="{ row }">
-              <span class="order-number">{{ row.order }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="文件名">
-            <template #default="{ row }">
-              <span>{{ row.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="播放时长">
-            <template #default="{ row }">
-              <el-input-number v-model="row.duration" :min="1" :max="300"></el-input-number>
+      <!-- 右侧内容 -->
+      <div class="w-1/3 p-2">
+        <div v-if="screenNum === '1'" class="table-container">
+          <div class="draggable-header" style="display: flex; align-items: center; background: #fafafa; border-bottom: 1px solid #eee; min-height: 48px; font-weight: bold">
+            <span style="width: 80px; text-align: center">排序</span>
+            <span style="flex: 1">文件名</span>
+            <span style="width: 120px; margin-left: 8px">播放时长</span>
+          </div>
+          <draggable v-model="selectedFiles1" item-key="id" @end="onSelectedFilesDragEnd('1')" :animation="200" tag="div">
+            <template #item="{ element, index }">
+              <div class="draggable-row" :draggable="true" style="display: flex; align-items: center; border-bottom: 1px solid #eee; min-height: 48px; cursor: move">
+                <span class="order-number" style="width: 80px; text-align: center">{{ index + 1 }}</span>
+                <span style="flex: 1; max-width: 240px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;">{{ element.name }}</span>
+                <el-input-number v-model="element.duration" :min="1" :max="300" style="width: 120px; margin-left: 8px" />
+              </div>
             </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-if="screenNum === '4'" class="table-container">
-        <el-table ref="selectedTable" :data="selectedFiles4" border>
-          <!-- 显示排序数字 -->
-          <el-table-column label="排序" width="80">
-            <template #default="{ row }">
-              <span class="order-number">{{ row.order }}</span>
+          </draggable>
+          <div v-if="selectedFiles1.length === 0" style="text-align: center; color: #999; padding: 16px 0">暂无数据</div>
+        </div>
+        <div v-if="screenNum === '2'" class="table-container">
+          <div class="draggable-header" style="display: flex; align-items: center; background: #fafafa; border-bottom: 1px solid #eee; min-height: 48px; font-weight: bold">
+            <span style="width: 80px; text-align: center">排序</span>
+            <span style="flex: 1">文件名</span>
+            <span style="width: 120px; margin-left: 8px">播放时长</span>
+          </div>
+          <draggable v-model="selectedFiles2" item-key="id" @end="onSelectedFilesDragEnd('2')" :animation="200" tag="div">
+            <template #item="{ element, index }">
+              <div class="draggable-row" :draggable="true" style="display: flex; align-items: center; border-bottom: 1px solid #eee; min-height: 48px; cursor: move">
+                <span class="order-number" style="width: 80px; text-align: center">{{ index + 1 }}</span>
+                <span style="flex: 1; max-width: 240px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;">{{ element.name }}</span>
+                <el-input-number v-model="element.duration" :min="1" :max="300" style="width: 120px; margin-left: 8px" />
+              </div>
             </template>
-          </el-table-column>
-          <el-table-column label="文件名">
-            <template #default="{ row }">
-              <span>{{ row.name }}</span>
+          </draggable>
+          <div v-if="selectedFiles2.length === 0" style="text-align: center; color: #999; padding: 16px 0">暂无数据</div>
+        </div>
+        <div v-if="screenNum === '3'" class="table-container">
+          <div class="draggable-header" style="display: flex; align-items: center; background: #fafafa; border-bottom: 1px solid #eee; min-height: 48px; font-weight: bold">
+            <span style="width: 80px; text-align: center">排序</span>
+            <span style="flex: 1">文件名</span>
+            <span style="width: 120px; margin-left: 8px">播放时长</span>
+          </div>
+          <draggable v-model="selectedFiles3" item-key="id" @end="onSelectedFilesDragEnd('3')" :animation="200" tag="div">
+            <template #item="{ element, index }">
+              <div class="draggable-row" :draggable="true" style="display: flex; align-items: center; border-bottom: 1px solid #eee; min-height: 48px; cursor: move">
+                <span class="order-number" style="width: 80px; text-align: center">{{ index + 1 }}</span>
+                <span style="flex: 1; max-width: 240px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;">{{ element.name }}</span>
+                <el-input-number v-model="element.duration" :min="1" :max="300" style="width: 120px; margin-left: 8px" />
+              </div>
             </template>
-          </el-table-column>
-          <el-table-column label="播放时长">
-            <template #default="{ row }">
-              <el-input-number v-model="row.duration" :min="1" :max="300"></el-input-number>
+          </draggable>
+          <div v-if="selectedFiles3.length === 0" style="text-align: center; color: #999; padding: 16px 0">暂无数据</div>
+        </div>
+        <div v-if="screenNum === '4'" class="table-container">
+          <div class="draggable-header" style="display: flex; align-items: center; background: #fafafa; border-bottom: 1px solid #eee; min-height: 48px; font-weight: bold">
+            <span style="width: 80px; text-align: center">排序</span>
+            <span style="flex: 1">文件名</span>
+            <span style="width: 120px; margin-left: 8px">播放时长</span>
+          </div>
+          <draggable v-model="selectedFiles4" item-key="id" @end="onSelectedFilesDragEnd('4')" :animation="200" tag="div">
+            <template #item="{ element, index }">
+              <div class="draggable-row" :draggable="true" style="display: flex; align-items: center; border-bottom: 1px solid #eee; min-height: 48px; cursor: move">
+                <span class="order-number" style="width: 80px; text-align: center">{{ index + 1 }}</span>
+                <span style="flex: 1; max-width: 240px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;">{{ element.name }}</span>
+                <el-input-number v-model="element.duration" :min="1" :max="300" style="width: 120px; margin-left: 8px" />
+              </div>
             </template>
-          </el-table-column>
-        </el-table>
+          </draggable>
+          <div v-if="selectedFiles4.length === 0" style="text-align: center; color: #999; padding: 16px 0">暂无数据</div>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="button-container">
-    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-    <el-button @click="cancel">关 闭</el-button>
+    <div class="button-container">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">关 闭</el-button>
+    </div>
+    <div class="button-container">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">关 闭</el-button>
+    </div>
   </div>
 </template>
 
 <script setup name="ItemSplit" lang="ts">
+import draggable from 'vuedraggable';
 import { MinioDataQuery, MinioDataVO } from '@/api/smsb/source/minioData_type';
 import { splitItemInfo, updateItem, updateItemSplit } from '@/api/smsb/source/item';
 import { listMinioData } from '@/api/smsb/source/minioData';
@@ -189,48 +183,84 @@ const getItemInfo = async () => {
   }
 };
 
+// 多选框选中文件数据(与 index.vue 保持一致,支持增量、去重、排序)
 const handleSelectionFile = (selection: MinioDataVO[]) => {
-  if (screenNum.value === '1') {
-    selectedFiles1.value = selection.map((item: any, index: number) => ({
-      id: item.id,
-      name: item.originalName,
-      duration: 10, // 默认播放时长 10s
-      order: index + 1 // 默认排序号
-    }));
-  }
-  if (screenNum.value === '2') {
-    selectedFiles2.value = selection.map((item: any, index: number) => ({
-      id: item.id,
-      name: item.originalName,
-      duration: 10, // 默认播放时长 10s
-      order: index + 1 // 默认排序号
-    }));
-  }
-  if (screenNum.value === '3') {
-    selectedFiles3.value = selection.map((item: any, index: number) => ({
-      id: item.id,
-      name: item.originalName,
-      duration: 10, // 默认播放时长 10s
-      order: index + 1 // 默认排序号
-    }));
-  }
-  if (screenNum.value === '4') {
-    selectedFiles4.value = selection.map((item: any, index: number) => ({
-      id: item.id,
-      name: item.originalName,
-      duration: 10, // 默认播放时长 10s
-      order: index + 1 // 默认排序号
-    }));
+  let selectedFilesRef;
+  if (screenNum.value === '1') selectedFilesRef = selectedFiles1;
+  if (screenNum.value === '2') selectedFilesRef = selectedFiles2;
+  if (screenNum.value === '3') selectedFilesRef = selectedFiles3;
+  if (screenNum.value === '4') selectedFilesRef = selectedFiles4;
+  if (!selectedFilesRef) return;
+
+  selection.forEach((item) => {
+    if (!selectedFilesRef.value.some((f) => String(f.id) === String(item.id))) {
+      selectedFilesRef.value.push({
+        id: item.id,
+        name: item.originalName,
+        type: item.type,
+        duration: item.type === 1 ? 10 : item.duration,
+        order: 0
+      });
+    }
+  });
+  // 重新排序
+  selectedFilesRef.value = selectedFilesRef.value.map((f, idx) => ({ ...f, order: idx + 1 }));
+};
+
+// 取消单个选中
+const handleSelect = (selection: MinioDataVO[], row: MinioDataVO) => {
+  let selectedFilesRef;
+  if (screenNum.value === '1') selectedFilesRef = selectedFiles1;
+  if (screenNum.value === '2') selectedFilesRef = selectedFiles2;
+  if (screenNum.value === '3') selectedFilesRef = selectedFiles3;
+  if (screenNum.value === '4') selectedFilesRef = selectedFiles4;
+  if (!selectedFilesRef) return;
+
+  if (!selection.some((item) => String(item.id) === String(row.id))) {
+    selectedFilesRef.value = selectedFilesRef.value.filter((f) => String(f.id) !== String(row.id));
+    selectedFilesRef.value = selectedFilesRef.value.map((f, idx) => ({ ...f, order: idx + 1 }));
   }
 };
+
+// 取消全选
+const handleSelectAll = (selection: MinioDataVO[]) => {
+  let selectedFilesRef;
+  if (screenNum.value === '1') selectedFilesRef = selectedFiles1;
+  if (screenNum.value === '2') selectedFilesRef = selectedFiles2;
+  if (screenNum.value === '3') selectedFilesRef = selectedFiles3;
+  if (screenNum.value === '4') selectedFilesRef = selectedFiles4;
+  if (!selectedFilesRef) return;
+
+  const currentPageIds = new Set(minioDataList.value.map((item) => String(item.id)));
+  const selectedIds = new Set(selection.map((item) => String(item.id)));
+  selectedFilesRef.value = selectedFilesRef.value.filter((f) => !currentPageIds.has(String(f.id)) || selectedIds.has(String(f.id)));
+  selectedFilesRef.value = selectedFilesRef.value.map((f, idx) => ({ ...f, order: idx + 1 }));
+};
 /** 查询文件资源列表 */
 const getFileList = async () => {
   const res = await listMinioData(dialogQueryParams.value);
-  minioDataList.value = res.rows;
-  minioDataList.value.forEach((data) => {
-    data.size = parseFloat(data.size / 1024).toFixed(3) + 'MB';
-  });
+  minioDataList.value = res.rows.map((data) => ({
+    ...data,
+    size: (parseFloat(data.size) / 1024).toFixed(3) + 'MB'
+  }));
   fileTotal.value = res.total;
+  // 加载后自动恢复选中(与 index.vue 保持一致)
+  nextTick(() => {
+    let selectedFilesRef;
+    if (screenNum.value === '1') selectedFilesRef = selectedFiles1;
+    if (screenNum.value === '2') selectedFilesRef = selectedFiles2;
+    if (screenNum.value === '3') selectedFilesRef = selectedFiles3;
+    if (screenNum.value === '4') selectedFilesRef = selectedFiles4;
+    if (!selectedFilesRef) return;
+    if (selectedFilesRef.value?.length) {
+      const selectedIds = new Set(selectedFilesRef.value.map((f) => f.id));
+      minioDataList.value.forEach((row) => {
+        if (selectedIds.has(row.id)) {
+          minioTable.value?.toggleRowSelection(row, true);
+        }
+      });
+    }
+  });
 };
 
 /** 提交按钮 */
@@ -251,6 +281,16 @@ const cancel = () => {
   proxy.$router.push('/source/item');
 };
 
+const onSelectedFilesDragEnd = (screen: string) => () => {
+  let selectedFilesRef;
+  if (screen === '1') selectedFilesRef = selectedFiles1;
+  if (screen === '2') selectedFilesRef = selectedFiles2;
+  if (screen === '3') selectedFilesRef = selectedFiles3;
+  if (screen === '4') selectedFilesRef = selectedFiles4;
+  if (!selectedFilesRef) return;
+  selectedFilesRef.value = selectedFilesRef.value.map((f, idx) => ({ ...f, order: idx + 1 }));
+};
+
 onMounted(() => {
   getParamItemId();
   getFileList();
@@ -258,8 +298,10 @@ onMounted(() => {
 </script>
 <style scoped>
 .table-container {
-  height: 900px; /* 设置固定高度,根据需要调整 */
-  overflow-y: auto; /* 当内容超出时显示滚动条 */
+  height: 900px;
+  /* 设置固定高度,根据需要调整 */
+  overflow-y: auto;
+  /* 当内容超出时显示滚动条 */
 }
 
 .button-container {
@@ -270,7 +312,9 @@ onMounted(() => {
   left: 0;
   right: 0;
   padding: 10px 0;
-  background-color: white; /* 可选:根据需要设置背景色 */
-  box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 可选:添加阴影效果 */
+  background-color: white;
+  /* 可选:根据需要设置背景色 */
+  box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);
+  /* 可选:添加阴影效果 */
 }
 </style>