fix(frontend): improve directory and timestamp display

2026-06-15 09:57:27 +00:00 · 2026-06-10 21:22:29 +08:00
parent cbb442ceb6
commit 6ae5d998e6
4 changed files with 129 additions and 27 deletions
--- a/web-front/public/list.html
+++ b/web-front/public/list.html
@@ -511,6 +511,7 @@
            
            files.forEach(file => {
                const item = document.createElement('div');
+                const metaText = fileMetaText(file);
                
                if (file.fileType === 'folder') {
                    // 文件夹
@@ -520,9 +521,7 @@
                            <i class="fas fa-folder"></i>
                        </div>
                        <div class="item-name">${file.fileName || '未命名文件夹'}</div>
-                        <div class="item-meta">
-                            ${file.sizeStr || '0B'} · ${formatDate(file.createTime)}
-                        </div>
+                        ${metaText ? `<div class="item-meta">${metaText}</div>` : ''}
                    `;
                    folderCount++;
                    
@@ -541,9 +540,7 @@
                            <i class="fas ${fileTypeInfo.icon}"></i>
                        </div>
                        <div class="item-name">${file.fileName}</div>
-                        <div class="item-meta">
-                            ${file.sizeStr || '0B'} · ${formatDate(file.createTime)}
-                        </div>
+                        ${metaText ? `<div class="item-meta">${metaText}</div>` : ''}
                    `;
                    fileCount++;
                    
@@ -675,19 +672,65 @@
            renderBreadcrumb();
        }

+        // 文件元信息
+        function fileMetaText(file) {
+            const parts = [];
+            if (file.fileType !== 'folder') {
+                parts.push(file.sizeStr || '0B');
+            }
+            const dateText = formatDate(file.createTime);
+            if (dateText) {
+                parts.push(dateText);
+            }
+            return parts.join(' · ');
+        }
+
+        function hasValidTime(value) {
+            if (value === null || value === undefined) return false;
+            if (typeof value !== 'string') return true;
+            const trimmedValue = value.trim();
+            return trimmedValue !== '' && trimmedValue !== 'null' && trimmedValue !== 'undefined';
+        }
+
+        function formatDateOnly(yearValue, monthValue, dayValue) {
+            const year = Number(yearValue);
+            const month = Number(monthValue);
+            const day = Number(dayValue);
+            const date = new Date(year, month - 1, day);
+            if (
+                date.getFullYear() !== year ||
+                date.getMonth() !== month - 1 ||
+                date.getDate() !== day
+            ) {
+                return '';
+            }
+            return `${yearValue}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+        }
+
        // 格式化日期
        function formatDate(dateString) {
-            if (!dateString) return '未知日期';
+            if (!hasValidTime(dateString)) return '';
            
            try {
-                const date = new Date(dateString);
+                const value = typeof dateString === 'string' ? dateString.trim() : dateString;
+                if (typeof value === 'string') {
+                    const dateOnly = value.match(/^(\d{4})[-/](\d{1,2})[-/](\d{1,2})$/);
+                    if (dateOnly) {
+                        return formatDateOnly(dateOnly[1], dateOnly[2], dateOnly[3]);
+                    }
+                    const cnDateOnly = value.match(/^(\d{4})年\s*(\d{1,2})月\s*(\d{1,2})日$/);
+                    if (cnDateOnly) {
+                        return formatDateOnly(cnDateOnly[1], cnDateOnly[2], cnDateOnly[3]);
+                    }
+                }
+                const date = new Date(value);
                return isNaN(date.getTime()) 
-                    ? '未知日期' 
+                    ? ''
                    : `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
            } catch {
-                return '未知日期';
+                return '';
            }
        }
    </script>
 </body>
-</html>
+</html>
--- a/web-front/src/components/DirectoryTree.vue
+++ b/web-front/src/components/DirectoryTree.vue
@@ -32,8 +32,8 @@
              <i :class="getFileIcon(file)"></i>
            </div>
            <div class="file-name">{{ file.fileName }}</div>
-            <div class="file-meta">
-              <template v-if="file.fileType !== 'folder'">{{ file.sizeStr || '0B' }} · </template>{{ formatDate(file.createTime) }}
+            <div v-if="fileMetaText(file)" class="file-meta">
+              {{ fileMetaText(file) }}
            </div>
          </div>
          <div v-if="!loading && (!currentFileList || currentFileList.length === 0)" class="empty-state">
@@ -168,7 +168,8 @@
                  <div v-if="selectedNode.fileType !== 'folder'" class="file-detail-meta">
                    <p>类型: {{ getFileTypeClass(selectedNode) }}</p>
                    <p>大小: {{ selectedNode.sizeStr || '0B' }}</p>
-                    <p v-if="selectedNode.createTime">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
+                    <p v-if="formatDate(selectedNode.createTime)">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
+                    <p v-if="formatDate(selectedNode.updateTime)">更新时间: {{ formatDate(selectedNode.updateTime) }}</p>
                  </div>
                  <div class="file-detail-actions">
                    <el-button v-if="selectedNode.parserUrl" size="small" @click="previewFile(selectedNode)">
@@ -244,7 +245,8 @@
                <div v-if="selectedNode.fileType !== 'folder'" class="file-detail-meta">
                  <p>类型: {{ getFileTypeClass(selectedNode) }}</p>
                  <p>大小: {{ selectedNode.sizeStr || '0B' }}</p>
-                  <p v-if="selectedNode.createTime">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
+                  <p v-if="formatDate(selectedNode.createTime)">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
+                  <p v-if="formatDate(selectedNode.updateTime)">更新时间: {{ formatDate(selectedNode.updateTime) }}</p>
                </div>
                <div class="file-detail-actions">
                  <el-button v-if="selectedNode.parserUrl" size="small" @click="previewFile(selectedNode)">
@@ -314,8 +316,9 @@
        <div class="file-dialog-content">
          <p><strong>{{ selectedFile?.fileName || '未命名文件' }}</strong></p>
          <p class="file-info">
-            大小: {{ selectedFile?.sizeStr || '0B' }}<br>
-            创建时间: {{ formatDate(selectedFile?.createTime) }}
+            <template v-for="(line, index) in selectedFileInfoLines" :key="index">
+              {{ line }}<br v-if="index < selectedFileInfoLines.length - 1">
+            </template>
          </p>
        </div>
        
@@ -444,6 +447,19 @@ export default {
      if (this.batchProgress.failed > 0) return 'exception'
      if (this.batchProgress.current >= this.batchProgress.total && this.batchProgress.total > 0) return 'success'
      return ''
+    },
+    selectedFileInfoLines() {
+      if (!this.selectedFile) return []
+      const lines = [`大小: ${this.selectedFile.sizeStr || '0B'}`]
+      const createTime = this.formatDate(this.selectedFile.createTime)
+      const updateTime = this.formatDate(this.selectedFile.updateTime)
+      if (createTime) {
+        lines.push(`创建时间: ${createTime}`)
+      }
+      if (updateTime) {
+        lines.push(`更新时间: ${updateTime}`)
+      }
+      return lines
    }
  },
  watch: {
@@ -815,11 +831,54 @@ export default {
        document.body.removeChild(a)
      }
    },
+    hasValidTime(value) {
+      if (value === null || value === undefined) return false
+      if (typeof value !== 'string') return true
+      const trimmedValue = value.trim()
+      return trimmedValue !== '' && trimmedValue !== 'null' && trimmedValue !== 'undefined'
+    },
+    formatDateOnly(yearValue, monthValue, dayValue) {
+      const year = Number(yearValue)
+      const month = Number(monthValue)
+      const day = Number(dayValue)
+      const date = new Date(year, month - 1, day)
+      if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+      ) {
+        return ''
+      }
+      return `${yearValue}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`
+    },
    formatDate(timestamp) {
-      if (!timestamp) return '未知时间'
-      const date = new Date(timestamp)
+      if (!this.hasValidTime(timestamp)) return ''
+      const value = typeof timestamp === 'string' ? timestamp.trim() : timestamp
+      if (typeof value === 'string') {
+        const dateOnly = value.match(/^(\d{4})[-/](\d{1,2})[-/](\d{1,2})$/)
+        if (dateOnly) {
+          return this.formatDateOnly(dateOnly[1], dateOnly[2], dateOnly[3])
+        }
+        const cnDateOnly = value.match(/^(\d{4})年\s*(\d{1,2})月\s*(\d{1,2})日$/)
+        if (cnDateOnly) {
+          return this.formatDateOnly(cnDateOnly[1], cnDateOnly[2], cnDateOnly[3])
+        }
+      }
+      const date = new Date(value)
+      if (Number.isNaN(date.getTime())) return ''
      return date.toLocaleString('zh-CN')
    },
+    fileMetaText(file) {
+      const parts = []
+      if (file.fileType !== 'folder') {
+        parts.push(file.sizeStr || '0B')
+      }
+      const timeText = this.formatDate(file.createTime)
+      if (timeText) {
+        parts.push(timeText)
+      }
+      return parts.join(' · ')
+    },
    checkTheme() {
      this.isDarkTheme = document.documentElement.classList.contains('dark')
    },
--- a/web-front/src/parserUrl1.js
+++ b/web-front/src/parserUrl1.js
@@ -238,8 +238,8 @@
            storage: 'hash'
        },
        'ctfile': {
-            reg: /((?:https?:\/\/)?(?:[a-zA-Z\d-.]+)?(?:ctfile|545c|u062|ghpym|474b)\.com\/\w+\/[a-zA-Z\d-]+)/,
-            host: /(?:[a-zA-Z\d-.]+)?(?:ctfile|545c|u062|474b)\.com/,
+            reg: /((?:https?:\/\/)?(?:[a-zA-Z\d-.]+)?(?:ctfile|545c|u062|ghpym|474b)\.com\/(?:f(?:ile)?|d)\/[a-zA-Z\d_-]+\/?(?:\?[^#\s]*)?)/,
+            host: /(?:[a-zA-Z\d-.]+)?(?:ctfile|545c|u062|ghpym|474b)\.com/,
            input: ['#passcode'],
            button: ['.card-body button'],
            name: '城通网盘',
--- a/web-front/src/utils/monacoTypes.js
+++ b/web-front/src/utils/monacoTypes.js
@@ -83,9 +83,9 @@ function registerTypeDefinitions(monaco) {
      clearHeaders(): JsHttpClient;
      getHeaders(): Record<string, string>;
      setTimeout(seconds: number): JsHttpClient;
-      sendForm(data: Record<string, any>): JsHttpResponse;
+      sendForm(url: string, data: Record<string, any>): JsHttpResponse;
      sendMultipartForm(url: string, data: Record<string, any>): JsHttpResponse;
-      sendJson(data: any): JsHttpResponse;
+      sendJson(url: string, data: any): JsHttpResponse;
      urlEncode(str: string): string;
      urlDecode(str: string): string;
    }
@@ -244,17 +244,17 @@ function registerCompletionProvider(monaco) {
          range
        },
        {
-          label: 'http.sendForm(data)',
+          label: 'http.sendForm(url, data)',
          kind: monaco.languages.CompletionItemKind.Method,
-          insertText: 'http.sendForm(${1:data})',
+          insertText: 'http.sendForm(${1:url}, ${2:data})',
          insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
          documentation: '发送表单数据',
          range
        },
        {
-          label: 'http.sendJson(data)',
+          label: 'http.sendJson(url, data)',
          kind: monaco.languages.CompletionItemKind.Method,
-          insertText: 'http.sendJson(${1:data})',
+          insertText: 'http.sendJson(${1:url}, ${2:data})',
          insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
          documentation: '发送JSON数据',
          range