删除文件列表缩略图字段；样式小调整

bookshelfplus-frontend/views/dashboard/admin/FileManage.html

@@ -1,5 +1,23 @@
+<style>
+    /* 限制 来源 列的宽度 */
+    tr>*:nth-child(8),
+    td>*:nth-child(8) {
+        max-width: 100px;
+    }
+    /* 限制 哈希 列的宽度 */
+    tr>*:nth-child(10),
+    td>*:nth-child(10) {
+        max-width: 100px;
+    }
+    /* 限制 时间 列的宽度 */
+    tr>*:nth-child(11),
+    td>*:nth-child(11) {
+        max-width: 100px;
+    }
+</style>
 <p>
-    <a href="<%= pageUrl %>upload">上传文件</a>
+    <a href="<%= pageUrl %>upload">上传文件</a><br>
+    删除文件前必须先删除该文件关联的所有文件对象
 </p>
 <script>
     list({
@@ -21,18 +39,23 @@
                         console.log(element);
                         renderData.push({
                             编号: `${element.id}`,
-                            关联书籍Id: `<a target="_blank" href="/admin/book-manage/detail?id=${element.bookId}">${element.bookId}</a>`,
+                            关联书籍: `<span class="overflow-omit" style="margin: 0 auto;">
+                                        ID: ${element.bookId}
+                                        <a href="/book?id=${element.bookId}">查看</a>
+                                        <a href="/dashboard/admin/book-manage/detail?id=${element.bookId}">修改</a>
+                                    </span>`,
                             文件名: `${element.fileDisplayName}`,
                             格式: `${element.fileFormat}`,
                             页数: `${element.numberOfPages}`,
                             水印: `${element.watermark}`,
                             广告: `${element.advertising}`,
-                            来源: `${element.bookOrigin}`,
+                            来源: `<span class="overflow-omit" style="font-size: 10px;">${element.bookOrigin}</span>`,
                             大小: `${element.fileSize}`,
-                            哈希: `${element.hashSha1}`,
+                            "哈希(双击全选)": `<span class="overflow-omit" style="font-size: 10px;">${element.hashSha1}</span>`,
-                            缩略图: `${element.thumbnail}`,
+                            时间: `<span class="overflow-omit" style="font-size: 12px; line-height: 1.2em; display: block;"><nobr>
-                            创建时间: `${element.fileCreateAt}`,
+                                        创建: ${new Date(element.fileCreateAt).toLocaleString()}<br>
-                            修改时间: `${element.fileModifiedAt}`,
+                                        修改: ${new Date(element.fileModifiedAt).toLocaleString()}
+                                    </nobr></span>`,
                             管理: `<span class="overflow-omit" style="margin: 0 auto;">
                                         <a href="<%= pageUrl %>detail?id=${element.id}">修改</a>
                                         <a href="javascript:deleteBook(${element.id});">删除</a>

bookshelfplus-frontend/views/dashboard/table.html

@@ -18,6 +18,10 @@
             border: 1px solid black;
         }
 
+        tr {
+            white-space: nowrap;
+        }
+
         tr:hover {
             background-color: #f5f5f5;
         }

bookshelfplus-frontend/views/search.html

@@ -14,6 +14,10 @@
             line-height: 2.3em;
         }
 
+        tr {
+            white-space: nowrap;
+        }
+
         tr:hover {
             background-color: #f5f5f5;
         }

bookshelfplus.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50726
  File Encoding         : 65001
 
- Date: 10/04/2022 15:44:26
+ Date: 10/04/2022 17:11:27
 */
 
 SET NAMES utf8mb4;
@@ -145,7 +145,6 @@ CREATE TABLE `file_info`  (
   `watermark` tinyint(1) NOT NULL DEFAULT 0,
   `advertising` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1为已删除项',
   `book_origin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `thumbnail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
   `file_create_at` datetime NOT NULL,
   `file_modified_at` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP,
   `file_size` bigint(20) UNSIGNED NOT NULL DEFAULT 0,

bookshelfplus/src/main/java/plus/bookshelf/Controller/VO/FileVO.java

@@ -34,9 +34,6 @@ public class FileVO {
     // 文件来源 电子版/扫描版
     String bookOrigin;
 
-    // 缩略图
-    private String thumbnail;
-
     // 文件创建时间
     long fileCreateAt;
 

bookshelfplus/src/main/java/plus/bookshelf/Dao/DO/FileDO.java

@@ -84,15 +84,6 @@ public class FileDO {
      */
     private String bookOrigin;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column file_info.thumbnail
-     *
-     * @mbg.generated
-     */
-    private String thumbnail;
-
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -345,30 +336,6 @@ public class FileDO {
         this.bookOrigin = bookOrigin == null ? null : bookOrigin.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column file_info.thumbnail
-     *
-     * @return the value of file_info.thumbnail
-     *
-     * @mbg.generated
-     */
-    public String getThumbnail() {
-        return thumbnail;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column file_info.thumbnail
-     *
-     * @param thumbnail the value for file_info.thumbnail
-     *
-     * @mbg.generated
-     */
-    public void setThumbnail(String thumbnail) {
-        this.thumbnail = thumbnail == null ? null : thumbnail.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column file_info.file_create_at

bookshelfplus/src/main/java/plus/bookshelf/Service/Model/FileModel.java

@@ -34,9 +34,6 @@ public class FileModel {
     // 文件来源 电子版/扫描版
     String bookOrigin;
 
-    // 缩略图
-    private String thumbnail;
-
     // 文件创建时间
     Date fileCreateAt;
 

bookshelfplus/src/main/resources/mapping/FileDOMapper.xml

@@ -15,7 +15,6 @@
     <result column="watermark" jdbcType="BIT" property="watermark" />
     <result column="advertising" jdbcType="BIT" property="advertising" />
     <result column="book_origin" jdbcType="VARCHAR" property="bookOrigin" />
-    <result column="thumbnail" jdbcType="VARCHAR" property="thumbnail" />
     <result column="file_create_at" jdbcType="TIMESTAMP" property="fileCreateAt" />
     <result column="file_modified_at" jdbcType="TIMESTAMP" property="fileModifiedAt" />
     <result column="file_size" jdbcType="BIGINT" property="fileSize" />
@@ -27,8 +26,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, book_id, file_display_name, file_name, file_format, number_of_pages, watermark, 
-    advertising, book_origin, thumbnail, file_create_at, file_modified_at, file_size, 
+    advertising, book_origin, file_create_at, file_modified_at, file_size, hash_sha1
-    hash_sha1
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
@@ -56,13 +54,13 @@
     insert into file_info (id, book_id, file_display_name, 
       file_name, file_format, number_of_pages, 
       watermark, advertising, book_origin, 
-      thumbnail, file_create_at, file_modified_at, 
+      file_create_at, file_modified_at, file_size, 
-      file_size, hash_sha1)
+      hash_sha1)
     values (#{id,jdbcType=INTEGER}, #{bookId,jdbcType=INTEGER}, #{fileDisplayName,jdbcType=VARCHAR}, 
       #{fileName,jdbcType=VARCHAR}, #{fileFormat,jdbcType=VARCHAR}, #{numberOfPages,jdbcType=INTEGER}, 
       #{watermark,jdbcType=BIT}, #{advertising,jdbcType=BIT}, #{bookOrigin,jdbcType=VARCHAR}, 
-      #{thumbnail,jdbcType=VARCHAR}, #{fileCreateAt,jdbcType=TIMESTAMP}, #{fileModifiedAt,jdbcType=TIMESTAMP}, 
+      #{fileCreateAt,jdbcType=TIMESTAMP}, #{fileModifiedAt,jdbcType=TIMESTAMP}, #{fileSize,jdbcType=BIGINT}, 
-      #{fileSize,jdbcType=BIGINT}, #{hashSha1,jdbcType=VARCHAR})
+      #{hashSha1,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="plus.bookshelf.Dao.DO.FileDO">
     <!--
@@ -98,9 +96,6 @@
       <if test="bookOrigin != null">
         book_origin,
       </if>
-      <if test="thumbnail != null">
-        thumbnail,
-      </if>
       <if test="fileCreateAt != null">
         file_create_at,
       </if>
@@ -142,9 +137,6 @@
       <if test="bookOrigin != null">
         #{bookOrigin,jdbcType=VARCHAR},
       </if>
-      <if test="thumbnail != null">
-        #{thumbnail,jdbcType=VARCHAR},
-      </if>
       <if test="fileCreateAt != null">
         #{fileCreateAt,jdbcType=TIMESTAMP},
       </if>
@@ -190,9 +182,6 @@
       <if test="bookOrigin != null">
         book_origin = #{bookOrigin,jdbcType=VARCHAR},
       </if>
-      <if test="thumbnail != null">
-        thumbnail = #{thumbnail,jdbcType=VARCHAR},
-      </if>
       <if test="fileCreateAt != null">
         file_create_at = #{fileCreateAt,jdbcType=TIMESTAMP},
       </if>
@@ -222,7 +211,6 @@
       watermark = #{watermark,jdbcType=BIT},
       advertising = #{advertising,jdbcType=BIT},
       book_origin = #{bookOrigin,jdbcType=VARCHAR},
-      thumbnail = #{thumbnail,jdbcType=VARCHAR},
       file_create_at = #{fileCreateAt,jdbcType=TIMESTAMP},
       file_modified_at = #{fileModifiedAt,jdbcType=TIMESTAMP},
       file_size = #{fileSize,jdbcType=BIGINT},