From 976c68199d28595ac2f57fbf0b9585316c31599f Mon Sep 17 00:00:00 2001
From: xiang <27800734@qq.com>
Date: Fri, 9 May 2025 17:59:44 +0800
Subject: [PATCH] 1

---
 .../Areas/Admin/Pages/Theme/Import.cshtml     |  14 ++++----
 Yes.Blog/wwwroot/admin/images/zip.png         | Bin 0 -> 3272 bytes
 Yes.Blog/wwwroot/admin/js/theme/import.js     |  31 ++++++++----------
 3 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 Yes.Blog/wwwroot/admin/images/zip.png

diff --git a/Yes.Blog/Areas/Admin/Pages/Theme/Import.cshtml b/Yes.Blog/Areas/Admin/Pages/Theme/Import.cshtml
index ac66c8d..d3ea61b 100644
--- a/Yes.Blog/Areas/Admin/Pages/Theme/Import.cshtml
+++ b/Yes.Blog/Areas/Admin/Pages/Theme/Import.cshtml
@@ -37,19 +37,19 @@
                     <div class="form-group">
                         <label>选择要导入的模板文件</label>
                         <div id="img-container">
-                            <template x-if="config.logo">
+                            <template x-if="uploadFile">
                                 <div class="img-thumb img-item">
-                                    <img class="thumb-icon" :src="config.logo" />
-                                    <a href="javascript:;" class="img-remove" x-on:click="config.logo='';tempfile=null">x</a>
+                                    <img class="thumb-icon" src="/admin/images/zip.png" />
+                                    <a href="javascript:;" class="img-remove" x-on:click="uploadFile='';tempfile=null">x</a>
                                 </div>
                             </template>
-                            <template x-if="!config.logo">
+                            <template x-if="!uploadFile">
                                 <div class="img-up-add  img-item">
-                                    <span class="img-add-icon" x-on:click="addIcon()">+</span>
+                                    <span class="img-add-icon" x-on:click="addFile()">+</span>
                                 </div>
                             </template>
-                            <input type="hidden" x-model="config.logo">
-                            <input type="file" name="files" id="img-file-input" x-model="tempfile" x-on:change="handleThemeUpload($event.target.files[0],function(url){ config.logo=url; })">
+                            <input type="hidden" x-model="uploadFile">
+                            <input type="file" name="files" id="img-file-input" x-model="tempfile" x-on:change="handleThemeUpload($event.target.files[0])">
                         </div>
                     </div>
 
diff --git a/Yes.Blog/wwwroot/admin/images/zip.png b/Yes.Blog/wwwroot/admin/images/zip.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b469ae61083ea2950c0b3c45d0418a7069c371
GIT binary patch
literal 3272
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

literal 0
HcmV?d00001

diff --git a/Yes.Blog/wwwroot/admin/js/theme/import.js b/Yes.Blog/wwwroot/admin/js/theme/import.js
index 9cf3ca1..e55ceae 100644
--- a/Yes.Blog/wwwroot/admin/js/theme/import.js
+++ b/Yes.Blog/wwwroot/admin/js/theme/import.js
@@ -14,6 +14,7 @@
             isSubmitting: false,
             themeName: "",
             fileName: "",
+            uploadFile:"",
             loadFiles() {
 
                 axios.get('/themes/' + themeName +'/files')
@@ -29,9 +30,20 @@
                     });
                 return this;
             },
+            isZipFile(filename) {
+                if (typeof filename !== 'string') return false;
+                return /\.zip$/i.test(filename);
+            },
             handleThemeUpload(file) {
+                if (!this.isZipFile(file.name)) {
+                    window.pushError("请上传zip文件");
+                    return;
+                }
+                this.uploadFile = file;
+            },
+            save() {
                 const formData = new FormData();
-                formData.append('file', file);
+                formData.append('file', this.uploadFile);
 
                 axios.post('/themes/upload', formData, {
                     headers: {
@@ -42,22 +54,7 @@
                     location.href = "/admin/theme";
                 })
             },
-            editFile() {
-                if (this.isSubmitting) {
-                    return;
-                }
-                this.isSubmitting = true;
-                axios.put('/themes/' + themeName + '/files/' + fileName, { content: this.file.content })
-                    .then(data => {
-                        console.log('data:', data);
-                        location.href = "/admin/theme/detail?themeName=" + themeName + "&fileName=" + fileName + "";
-                    })
-                    .finally(() => {
-                        this.isSubmitting = false;
-                    });
-
-            },
-            addIcon() {
+            addFile() {
                 const fileinput = document.getElementById('img-file-input');
                 if (fileinput) {
                     fileinput.click();