From 394d2634d77bb05f90fac834b30b48fb1ef39613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 8 Jun 2023 17:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=AD=98=E5=82=A8=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/models.py    |  2 +-
 web/src/config/d2p-extends/types.js | 24 ++++++++++++++++--------
 web/src/install.js                  |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 8cac84c..1e4170f 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -306,7 +306,7 @@ class FileList(CoreModel):
     file_url = models.CharField(max_length=255, blank=True, verbose_name="文件地址", help_text="文件地址")
     engine = models.CharField(max_length=100, default='local', blank=True, verbose_name="引擎", help_text="引擎")
     mime_type = models.CharField(max_length=100, blank=True, verbose_name="Mime类型", help_text="Mime类型")
-    size = models.CharField(max_length=36, blank=True, verbose_name="文件大小", help_text="文件大小")
+    size = models.BigIntegerField(default=0, blank=True, verbose_name="文件大小", help_text="文件大小")
     md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
 
     def save(self, *args, **kwargs):
diff --git a/web/src/config/d2p-extends/types.js b/web/src/config/d2p-extends/types.js
index 38224e6..69c7ea7 100644
--- a/web/src/config/d2p-extends/types.js
+++ b/web/src/config/d2p-extends/types.js
@@ -13,9 +13,11 @@ export default {
       if (value != null) {
         if (value.length >= 0) {
           if (value instanceof Array) {
-            row[col.key] = value.toString()
+            // 剔除前缀
+            row[col.key] = value.map(str => str.replace(util.baseURL(), '')).toString()
           } else {
-            row[col.key] = value
+            // 剔除前缀
+            row[col.key] = value.replace(util.baseURL(), '')
           }
         } else {
           row[col.key] = null
@@ -53,9 +55,11 @@ export default {
       if (value != null) {
         if (value.length >= 0) {
           if (value instanceof Array) {
-            row[col.key] = value.toString()
+            // 剔除前缀
+            row[col.key] = value.map(str => str.replace(util.baseURL(), '')).toString()
           } else {
-            row[col.key] = value
+            // 剔除前缀
+            row[col.key] = value.replace(util.baseURL(), '')
           }
         } else {
           row[col.key] = null
@@ -89,9 +93,11 @@ export default {
       if (value != null) {
         if (value.length >= 0) {
           if (value instanceof Array) {
-            row[col.key] = value.toString()
+            // 剔除前缀
+            row[col.key] = value.map(str => str.replace(util.baseURL(), '')).toString()
           } else {
-            row[col.key] = value
+            // 剔除前缀
+            row[col.key] = value.replace(util.baseURL(), '')
           }
         } else {
           row[col.key] = null
@@ -129,9 +135,11 @@ export default {
       if (value != null) {
         if (value.length >= 0) {
           if (value instanceof Array) {
-            row[col.key] = value.toString()
+            // 剔除前缀
+            row[col.key] = value.map(str => str.replace(util.baseURL(), '')).toString()
           } else {
-            row[col.key] = value
+            // 剔除前缀
+            row[col.key] = value.replace(util.baseURL(), '')
           }
         } else {
           row[col.key] = null
diff --git a/web/src/install.js b/web/src/install.js
index 3bfc11e..4d3cc45 100644
--- a/web/src/install.js
+++ b/web/src/install.js
@@ -186,7 +186,7 @@ Vue.use(D2pUploader, {
       if (ret.data === null || ret.data === '') {
         throw new Error('上传失败')
       }
-      return { url: util.baseURL() + ret.data.url, key: option.data.key, id: ret.data.id }
+      return { url: ret.data.url, key: option.data.key, id: ret.data.id }
     },
     withCredentials: false // 是否带cookie
   }