fix: 修复上传json文件上传问题

v2.25.0

package.json

@@ -38,7 +38,7 @@
     "krry-transfer": "^1.7.3",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
     "lodash.frompairs": "^4.0.1",
     "lodash.get": "^4.4.2",

src/components/FormFields/UploadKey.vue

@@ -50,7 +50,7 @@ export default {
       const reader = new FileReader()
       reader.onload = function() {
         let result = this.result
-        if (vm.toFormat === 'object') {
+        if (vm.toFormat === 'object' && vm.fileName.endsWith('.json')) {
           result = JSON.parse(result)
         }
         vm.$emit('input', result)

src/i18n/langs/en.json

@@ -424,6 +424,7 @@
       "downloadImportTemplateMsg": "Download import template",
       "downloadUpdateTemplateMsg": "Download update template",
       "onlyCSVFilesTips": "Only csv supported",
+      "ImportFail": "Import fail",
       "updateSuccessMsg": "Update success, total: {count}",
       "dragUploadFileInfo": "Drag file here or click here to upload",
       "uploadCsvLth10MHelpText": "csv/xlsx files with a size less than 10M",

src/i18n/langs/ja.json

@@ -435,6 +435,7 @@
       "downloadImportTemplateMsg": "作成テンプレートのダウンロード",
       "downloadUpdateTemplateMsg": "更新テンプレートのダウンロード",
       "onlyCSVFilesTips": "Csvファイルのインポートのみサポート",
+      "ImportFail": "インポートに失敗しました",
       "updateSuccessMsg": "更新のインポートに成功しました。合計:{count}",
       "uploadCsvLth10MHelpText": "Csv/xlsxのみアップロードでき、10m以下です",
       "dragUploadFileInfo": "ここにファイルをドラッグするか、ここをクリックしてアップロードしてください",

src/i18n/langs/zh.json

@@ -435,6 +435,7 @@
       "downloadImportTemplateMsg": "下载创建模板",
       "downloadUpdateTemplateMsg": "下载更新模板",
       "onlyCSVFilesTips": "仅支持csv文件导入",
+      "ImportFail": "导入失败",
       "updateSuccessMsg": "导入更新成功，总共：{count}",
       "uploadCsvLth10MHelpText": "只能上传 csv/xlsx, 且不超过 10M",
       "dragUploadFileInfo": "将文件拖到此处，或点击此处上传",

src/views/assets/Cloud/Account/AccountCreateUpdate.vue

@@ -91,13 +91,17 @@ export default {
         const attrs = values.attrs
         for (const item of encryptedFields) {
           const value = attrs[item]
-          if (value) {
+          if (!value) {
-            attrs[item] = encryptPassword(value)
+            continue
           }
+          attrs[item] = encryptPassword(value)
         }
         const toListFields = ['ip_group']
         for (const item of toListFields) {
           let value = attrs[item]
+          if (!value) {
+            continue
+          }
           value = value?.split(',') || []
           value = value.filter((value, index) => { if (value) return true })
           attrs[item] = value

src/views/settings/Ldap/ImportDialog.vue

@@ -28,6 +28,7 @@
 import ListTable from '@/components/ListTable'
 import Dialog from '@/components/Dialog'
 import { importLdapUser, refreshLdapUserCache, startLdapUserCache } from '@/api/settings'
+import { getErrorResponseMsg } from '@/utils/common'
 
 export default {
   name: 'ImportDialog',
@@ -103,7 +104,12 @@ export default {
         importLdapUser(data).then(res => {
           this.$message.success(res.msg)
           // eslint-disable-next-line no-return-assign
-        }).finally(() => this.dialogLdapUserImportLoginStatus = false)
+        }).catch(error => {
+          const errorMessage = getErrorResponseMsg(error) || this.$t('common.imExport.ImportFail')
+          this.$message.error(errorMessage)
+        }).finally(() => {
+          this.dialogLdapUserImportLoginStatus = false
+        })
       }
     },
     importAllUserClick() {