From dab87ae97ed26f528848628e6a73fcfdc0332262 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 10 Sep 2023 17:10:38 +0800
Subject: [PATCH] Improve file bar

---
 web/src/FileTree.js | 48 +++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/web/src/FileTree.js b/web/src/FileTree.js
index e16ce0c..cff37f5 100644
--- a/web/src/FileTree.js
+++ b/web/src/FileTree.js
@@ -811,30 +811,40 @@ class FileTree extends React.Component {
           <Descriptions.Item label={i18next.t("factorset:File name")}>
             {file.title}
           </Descriptions.Item>
-          <Descriptions.Item label={i18next.t("store:File type")}>
-            {Setting.getExtFromFile(file)}
-          </Descriptions.Item>
+          {
+            !Conf.EnableExtraPages ? null : (
+              <Descriptions.Item label={i18next.t("store:File type")}>
+                {Setting.getExtFromFile(file)}
+              </Descriptions.Item>
+            )
+          }
           <Descriptions.Item label={i18next.t("factorset:File size")}>
             {Setting.getFriendlyFileSize(file.size)}
           </Descriptions.Item>
           <Descriptions.Item label={i18next.t("general:Created time")}>
             {Setting.getFormattedDate(file.createdTime)}
           </Descriptions.Item>
-          <Descriptions.Item label={i18next.t("store:Collected time")}>
-            {Setting.getFormattedDate(Setting.getCollectedTime(file.title))}
-            <DatePicker key={file.key} showTime defaultValue={this.getMomentTime(this.getPropertyValue(file, "collectedTime"))} onChange={(value, dateString) => {
-              this.setPropertyValue(file, "collectedTime", value.format());
-            }} onOk={(value) => {}} />
-          </Descriptions.Item>
-          <Descriptions.Item label={i18next.t("store:Subject")}>
-            <Select virtual={false} style={{width: "120px"}} value={getSubjectDisplayName(this.getPropertyValue(file, "subject"))} onChange={(value => {
-              this.setPropertyValue(file, "subject", value);
-            })}>
-              {
-                subjectOptions.map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
-              }
-            </Select>
-          </Descriptions.Item>
+          {
+            !Conf.EnableExtraPages ? null : (
+              <React.Fragment>
+                <Descriptions.Item label={i18next.t("store:Collected time")}>
+                  {Setting.getFormattedDate(Setting.getCollectedTime(file.title))}
+                  <DatePicker key={file.key} showTime defaultValue={this.getMomentTime(this.getPropertyValue(file, "collectedTime"))} onChange={(value, dateString) => {
+                    this.setPropertyValue(file, "collectedTime", value.format());
+                  }} onOk={(value) => {}} />
+                </Descriptions.Item>
+                <Descriptions.Item label={i18next.t("store:Subject")}>
+                  <Select virtual={false} style={{width: "120px"}} value={getSubjectDisplayName(this.getPropertyValue(file, "subject"))} onChange={(value => {
+                    this.setPropertyValue(file, "subject", value);
+                  })}>
+                    {
+                      subjectOptions.map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>
+                </Descriptions.Item>
+              </React.Fragment>
+            )
+          }
         </Descriptions>
       </div>
     );
@@ -847,7 +857,7 @@ class FileTree extends React.Component {
       filePaneHeight = 0;
     }
 
-    return `calc(100vh - ${filePaneHeight + 186}px)`;
+    return `calc(100vh - ${filePaneHeight + 186 - (Conf.EnableExtraPages ? 0 : 50)}px)`;
   }
 
   render() {