From a439f79785d2365203c49c1e5d7e715c81874857 Mon Sep 17 00:00:00 2001
From: doctor <360434467@qq.com>
Date: Tue, 6 Feb 2024 03:29:09 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A7=A3=E5=AF=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 enc-webui/src/views/encrypt-local/index.vue | 2 +-
 node-proxy/src/utils/convertFile.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/enc-webui/src/views/encrypt-local/index.vue b/enc-webui/src/views/encrypt-local/index.vue
index 7f8ccaf..065f015 100644
--- a/enc-webui/src/views/encrypt-local/index.vue
+++ b/enc-webui/src/views/encrypt-local/index.vue
@@ -25,7 +25,7 @@
       <el-form-item label="密码">
         <el-input v-model="folderForm.password" style="max-width: 260px; margin-right: 10px" placeholder="12341234" />
       </el-form-item>
-      <el-form-item v-if="folderForm.operation == 'enc'" label="文件名">
+      <el-form-item label="文件名">
         加密
         <el-switch
           v-model="folderForm.encName"
diff --git a/node-proxy/src/utils/convertFile.ts b/node-proxy/src/utils/convertFile.ts
index 71b0bae..f701a9e 100644
--- a/node-proxy/src/utils/convertFile.ts
+++ b/node-proxy/src/utils/convertFile.ts
@@ -66,7 +66,7 @@ export async function encryptFile(
       const newFileName = encodeName(password, encType, fileName) + ext
       relativePath = path.join(childPath, newFileName)
     }
-    if (enc === 'dec') {
+    if (enc === 'dec' && encName) {
       const newFileName = decodeName(password, encType, ext !== '' ? fileName.substring(0, fileName.length - ext.length) : fileName)
       if (newFileName) {
         relativePath = path.join(childPath, newFileName)