hotgo2.1.3版本发布

web/src/views/system/config/BasicSetting.vue

@@ -157,17 +157,10 @@
   function formSubmit() {
     formRef.value.validate((errors) => {
       if (!errors) {
-        console.log('formValue.value:' + JSON.stringify(formValue.value));
-
-        updateConfig({ group: group.value, list: formValue.value })
-          .then((res) => {
-            console.log('res:' + JSON.stringify(res));
-            message.success('更新成功');
-            load();
-          })
-          .catch((error) => {
-            message.error(error.toString());
-          });
+        updateConfig({ group: group.value, list: formValue.value }).then((_res) => {
+          message.success('更新成功');
+          load();
+        });
       } else {
         message.error('验证失败，请填写完整信息');
       }
@@ -192,14 +185,10 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
-          // state.formValue.watermarkClarity = res;
           formValue.value = res.list;
-          console.log('res:' + JSON.stringify(res));
         })
-        .catch((error) => {
+        .finally(() => {
           show.value = false;
-          message.error(error.toString());
         });
     });
   }

web/src/views/system/config/EmailSetting.vue

@@ -23,7 +23,19 @@
             </n-form-item>
 
             <n-form-item label="SMTP密码" path="smtpPass">
-              <n-input v-model:value="formValue.smtpPass" placeholder="" type="password" />
+              <n-input
+                v-model:value="formValue.smtpPass"
+                placeholder=""
+                type="password"
+                show-password-on="click"
+              >
+                <template #password-visible-icon>
+                  <n-icon :size="16" :component="GlassesOutline" />
+                </template>
+                <template #password-invisible-icon>
+                  <n-icon :size="16" :component="Glasses" />
+                </template>
+              </n-input>
               <template #feedback>填写您的密码</template>
             </n-form-item>
 
@@ -120,6 +132,7 @@
   import { onMounted, ref } from 'vue';
   import { useMessage } from 'naive-ui';
   import { getConfig, sendTestEmail, updateConfig } from '@/api/sys/config';
+  import { GlassesOutline, Glasses } from '@vicons/ionicons5';
 
   const group = ref('smtp');
   const show = ref(false);
@@ -194,7 +207,6 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
           res.list.smtpTemplate = JSON.parse(res.list.smtpTemplate);
           formValue.value = res.list;
         })

web/src/views/system/config/GeoSetting.vue

@@ -5,7 +5,19 @@
         <n-grid-item>
           <n-form :label-width="100" :model="formValue" :rules="rules" ref="formRef">
             <n-form-item label="高德Web服务key" path="geoAmapWebKey">
-              <n-input v-model:value="formValue.geoAmapWebKey" placeholder="" type="password" />
+              <n-input
+                v-model:value="formValue.geoAmapWebKey"
+                placeholder=""
+                type="password"
+                show-password-on="click"
+              >
+                <template #password-visible-icon>
+                  <n-icon :size="16" :component="GlassesOutline" />
+                </template>
+                <template #password-invisible-icon>
+                  <n-icon :size="16" :component="Glasses" />
+                </template>
+              </n-input>
               <template #feedback> 申请地址：https://console.amap.com/dev/key/app</template>
             </n-form-item>
 
@@ -25,6 +37,7 @@
   import { ref, onMounted } from 'vue';
   import { useMessage } from 'naive-ui';
   import { getConfig, updateConfig } from '@/api/sys/config';
+  import { GlassesOutline, Glasses } from '@vicons/ionicons5';
 
   const group = ref('geo');
   const show = ref(false);
@@ -47,17 +60,10 @@
   function formSubmit() {
     formRef.value.validate((errors) => {
       if (!errors) {
-        console.log('formValue.value:' + JSON.stringify(formValue.value));
-
-        updateConfig({ group: group.value, list: formValue.value })
-          .then((res) => {
-            console.log('res:' + JSON.stringify(res));
-            message.success('更新成功');
-            load();
-          })
-          .catch((error) => {
-            message.error(error.toString());
-          });
+        updateConfig({ group: group.value, list: formValue.value }).then((_res) => {
+          message.success('更新成功');
+          load();
+        });
       } else {
         message.error('验证失败，请填写完整信息');
       }
@@ -73,14 +79,10 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
-          // state.formValue.watermarkClarity = res;
           formValue.value = res.list;
-          console.log('res:' + JSON.stringify(res));
         })
-        .catch((error) => {
+        .finally(() => {
           show.value = false;
-          message.error(error.toString());
         });
     });
   }

web/src/views/system/config/RevealSetting.vue

@@ -179,10 +179,6 @@
         });
       }
 
-      function resetForm() {
-        formRef.value.restoreValidation();
-      }
-
       return {
         formRef,
         ...toRefs(state),
@@ -191,7 +187,6 @@
         pricePreciseNumList,
         rules,
         formSubmit,
-        resetForm,
       };
     },
   });

web/src/views/system/config/SmsSetting.vue

@@ -184,15 +184,10 @@
   function formSubmit() {
     formRef.value.validate((errors) => {
       if (!errors) {
-        updateConfig({ group: group.value, list: formValue.value })
-          .then((res) => {
-            console.log('res:' + JSON.stringify(res));
-            message.success('更新成功');
-            load();
-          })
-          .catch((error) => {
-            message.error(error.toString());
-          });
+        updateConfig({ group: group.value, list: formValue.value }).then((_res) => {
+          message.success('更新成功');
+          load();
+        });
       } else {
         message.error('验证失败，请填写完整信息');
       }
@@ -209,13 +204,11 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
           res.list.smsAliyunTemplate = JSON.parse(res.list.smsAliyunTemplate);
           formValue.value = res.list;
         })
-        .catch((error) => {
+        .finally(() => {
           show.value = false;
-          message.error(error.toString());
         });
     });
   }

web/src/views/system/config/ThemeSetting.vue

@@ -58,17 +58,10 @@
   function formSubmit() {
     formRef.value.validate((errors) => {
       if (!errors) {
-        console.log('formValue.value:' + JSON.stringify(formValue.value));
-
-        updateConfig({ group: group.value, list: formValue.value })
-          .then((res) => {
-            console.log('res:' + JSON.stringify(res));
-            message.success('更新成功');
-            load();
-          })
-          .catch((error) => {
-            message.error(error.toString());
-          });
+        updateConfig({ group: group.value, list: formValue.value }).then((_res) => {
+          message.success('更新成功');
+          load();
+        });
       } else {
         message.error('验证失败，请填写完整信息');
       }
@@ -84,14 +77,10 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
-          // state.formValue.watermarkClarity = res;
           formValue.value = res.list;
-          console.log('res:' + JSON.stringify(res));
         })
-        .catch((error) => {
+        .finally(() => {
           show.value = false;
-          message.error(error.toString());
         });
     });
   }

web/src/views/system/config/UploadSetting.vue

@@ -19,7 +19,7 @@
                 placeholder="请输入"
                 v-model:value="formValue.uploadImageSize"
               >
-                <template #suffix> MB </template>
+                <template #suffix> MB</template>
               </n-input-number>
             </n-form-item>
             <n-form-item label="图片类型限制" path="uploadImageType">
@@ -32,7 +32,7 @@
                 placeholder="请输入"
                 v-model:value="formValue.uploadFileSize"
               >
-                <template #suffix> MB </template>
+                <template #suffix> MB</template>
               </n-input-number>
             </n-form-item>
             <n-form-item label="文件类型限制" path="uploadFileType">
@@ -48,19 +48,33 @@
             <n-divider title-placement="left">UCloud存储</n-divider>
             <n-form-item label="公钥" path="uploadUCloudPublicKey">
               <n-input
-                v-model:value="formValue.uploadUCloudPublicKey"
-                placeholder=""
                 type="password"
-              />
+                v-model:value="formValue.uploadUCloudPublicKey"
+                show-password-on="click"
+              >
+                <template #password-visible-icon>
+                  <n-icon :size="16" :component="GlassesOutline" />
+                </template>
+                <template #password-invisible-icon>
+                  <n-icon :size="16" :component="Glasses" />
+                </template>
+              </n-input>
               <template #feedback>获取地址：https://console.ucloud.cn/ufile/token</template>
             </n-form-item>
 
             <n-form-item label="私钥" path="uploadUCloudPrivateKey">
               <n-input
-                v-model:value="formValue.uploadUCloudPrivateKey"
-                placeholder=""
                 type="password"
-              />
+                v-model:value="formValue.uploadUCloudPrivateKey"
+                show-password-on="click"
+              >
+                <template #password-visible-icon>
+                  <n-icon :size="16" :component="GlassesOutline" />
+                </template>
+                <template #password-invisible-icon>
+                  <n-icon :size="16" :component="Glasses" />
+                </template>
+              </n-input>
             </n-form-item>
             <n-form-item label="存储路径" path="uploadUCloudPath">
               <n-input v-model:value="formValue.uploadUCloudPath" placeholder="" />
@@ -94,9 +108,10 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, onMounted } from 'vue';
+  import { onMounted, ref } from 'vue';
   import { useMessage } from 'naive-ui';
   import { getConfig, updateConfig } from '@/api/sys/config';
+  import { Glasses, GlassesOutline } from '@vicons/ionicons5';
 
   const group = ref('upload');
   const show = ref(false);
@@ -142,10 +157,7 @@
   function formSubmit() {
     formRef.value.validate((errors) => {
       if (!errors) {
-        console.log('formValue.value:' + JSON.stringify(formValue.value));
-
-        updateConfig({ group: group.value, list: formValue.value }).then((res) => {
-          console.log('res:' + JSON.stringify(res));
+        updateConfig({ group: group.value, list: formValue.value }).then((_res) => {
           message.success('更新成功');
           load();
         });
@@ -164,13 +176,10 @@
     new Promise((_resolve, _reject) => {
       getConfig({ group: group.value })
         .then((res) => {
-          show.value = false;
           formValue.value = res.list;
-          console.log('res:' + JSON.stringify(res));
         })
-        .catch((error) => {
+        .finally(() => {
           show.value = false;
-          message.error(error.toString());
         });
     });
   }