flat:代码合并

pages/chat/components/ai-paging.vue

@@ -210,7 +210,6 @@
                     <view class="uploadfiles-list">
                         <view
                             class="file-uploadsend"
-                            :class="{ 'file-border': isImage(file.type) }"
                             v-for="(file, index) in filesList"
                             :key="index"
                         >
@@ -219,7 +218,7 @@
                                 @click="preViewImage(file)"
                                 v-if="isImage(file.type)"
                                 :src="file.url"
-                                mode="scaleToFill"
+                                mode="heightFix"
                             ></image>
                             <view class="file-doc" @click="jumpUrl(file)" v-else>
                                 <FileIcon class="doc-icon" :type="file.type"></FileIcon>
@@ -1107,22 +1106,23 @@ image-margin-top = 40rpx
                 padding: 16rpx 20rpx 18rpx 20rpx
                 height: calc(100% - 40rpx)
                 .doc-icon
-                    width: 60rpx
+                    width: 60rpx;
-                    height: 76rpx
+                    height: 76rpx;
-                    margin-right: 20rpx
+                    margin-right: 20rpx;
                 .doc-con
-                    flex: 1
+                    max-width:320rpx;
-                    width: 0
+                    overflow :hidden;
+                    padding-right:40rpx;
+                    box-sizing:border-box;
             .file-uploadsend
                 margin: 10rpx 18rpx 0 0;
                 height: 100%
                 font-size: 24rpx
                 position: relative
-                min-width: 460rpx;
                 height: 160rpx;
                 border-radius: 12rpx 12rpx 12rpx 12rpx;
                 border: 2rpx solid #E2E2E2;
-                overflow: hidden
+                flex-shrink: 0;
                 .file-del
                     position: absolute
                     right: 25rpx
@@ -1155,8 +1155,8 @@ image-margin-top = 40rpx
                     color: #7B7B7B;
                     max-width: 100%
                 .file-iconImg
-                    // height: 100%
+                    height: 100%
-                    width: 100%
+                    // width: 100%
                 .filerow
                     display: flex
                     align-items: center
@@ -1166,8 +1166,6 @@ image-margin-top = 40rpx
                         height: 20rpx
                         width: 2rpx
                         background: rgba(226, 226, 226, .9)
-            .file-border
-                width: 160rpx !important;
 
 @keyframes ai-circle {
     0% {

static/upload.html

@@ -18,7 +18,7 @@
       body {
         font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
           'Microsoft YaHei', sans-serif;
-        background: linear-gradient(to bottom, #4995FF 0%, #ffffff 100%);
+        background: linear-gradient(to bottom, #4995ff 0%, #ffffff 100%);
         min-height: 100vh;
         padding: 0;
         color: #333;
@@ -291,7 +291,7 @@
       }
 
       .upload-btn {
-        background: linear-gradient(135deg, #4191FE 0%, #a5c6f7 100%);
+        background: linear-gradient(135deg, #4191fe 0%, #a5c6f7 100%);
         color: white;
         box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
       }
@@ -723,11 +723,13 @@
 
       // 检查已上传的文件数量
       function checkUploadedCount() {
-        // 使用sessionStorage存储当前会话的上传数量
+        if (sessionStorage.getItem('sessionId') && sessionStorage.getItem('sessionId') != sessionId) {
-        // 如果要永久存储，可以改用localStorage
+          sessionStorage.setItem('uploadedFileCount', '0');
+        }
+        // // 使用sessionStorage存储当前会话的上传数量
+        // // 如果要永久存储，可以改用localStorage
         const storedCount = sessionStorage.getItem('uploadedFileCount');
         uploadedCount = storedCount ? parseInt(storedCount) : 0;
-        
         // 更新警告提示
         updateWarningText();
       }
@@ -736,7 +738,7 @@
       function updateWarningText() {
         if (MAX_FILE_COUNT > 0 && uploadedCount >= MAX_FILE_COUNT) {
           limitWarningInfo.classList.add('show');
-          limitWarningText.textContent = `已超过文件上传总数限制（${MAX_FILE_COUNT}个）`;
+          limitWarningText.textContent = `已达文件上传总数限制（${MAX_FILE_COUNT}个）`;
         } else {
           limitWarningInfo.classList.remove('show');
         }
@@ -821,7 +823,7 @@
           }
 
           // 检查是否会导致超过总数限制
-          if (MAX_FILE_COUNT > 0 && (uploadedCount + selectedFiles.length) >= MAX_FILE_COUNT) {
+          if (MAX_FILE_COUNT > 0 && uploadedCount + selectedFiles.length >= MAX_FILE_COUNT) {
             showError(`已超过文件上传总数限制（${MAX_FILE_COUNT}个）`);
             break;
           }
@@ -1047,9 +1049,9 @@
         // 更新上传按钮文本
         if (hasFiles && !isTotalLimitReached) {
           const totalSize = selectedFiles.reduce((sum, file) => sum + file.size, 0);
-          uploadBtn.innerHTML = `<span>⬆️</span> 上传 (${selectedFiles.length}/${MAX_FILE_COUNT}, ${formatFileSize(
+          uploadBtn.innerHTML = `<span>⬆️</span> 上传 (${
-            totalSize
+            selectedFiles.length
-          )})`;
+          }/${MAX_FILE_COUNT}, ${formatFileSize(totalSize)})`;
         } else {
           uploadBtn.innerHTML = `<span>⬆️</span> 开始上传`;
         }
@@ -1129,6 +1131,7 @@
             clearAllFiles();
             // 更新UI
             updateUI();
+            sessionStorage.setItem('sessionId', sessionId);
           } else {
             showError('文件上传失败，请重试');
           }

utils/fileValidator.js

@@ -1,6 +1,6 @@
 /**
  * FileValidator.js
- * 封装好的文件安全校验类 (ES Module)
+ * 封装好的文件安全校验类
  */
 
 // ==========================================
@@ -141,7 +141,7 @@ export class FileValidator {
                     // 获取文件头 Hex (读取足够长的字节以覆盖最长的魔数，PNG需8字节)
                     const fileHeader = this._bufferToHex(buffer.slice(0, 8));
 
-                    // 使用 startsWith 匹配 (兼容 4字节或8字节魔数)
+                    // 使用 startsWith 匹配
                     if (fileHeader.startsWith(expectedMagic)) {
                         isSafe = true;
                     } else {
@@ -154,7 +154,7 @@ export class FileValidator {
 
             reader.onerror = () => reject('文件读取失败，无法校验');
 
-            // 读取前 1KB 足够进行判断
+            // 读取前 1KB 进行判断
             reader.readAsArrayBuffer(file.slice(0, 1024));
         });
     }
@@ -170,12 +170,12 @@ export class FileValidator {
 // imageValidator
 //     .validate(file)
 //     .then(() => {
-//         statusDiv.textContent = `✅ 检测通过: ${file.name}`;
+//         statusDiv.textContent = `检测通过: ${file.name}`;
 //         statusDiv.style.color = 'green';
 //         console.log('图片校验通过，开始上传...');
 //         // upload(file)...
 //     })
 //     .catch((err) => {
-//         statusDiv.textContent = `❌ 检测失败: ${err}`;
+//         statusDiv.textContent = `检测失败: ${err}`;
 //         statusDiv.style.color = 'red';
 //     });