Merge branch 'main' into example

src/typings/app.d.ts

@@ -112,6 +112,8 @@ declare namespace App {
         visible: boolean;
         /** Watermark text */
         text: string;
+        /** Whether to use user name as watermark text */
+        enableUserName: boolean;
       };
       /** define some theme settings tokens, will transform to css variables */
       tokens: {
@@ -408,6 +410,7 @@ declare namespace App {
         watermark: {
           visible: string;
           text: string;
+          enableUserName: string;
         };
         themeDrawerTitle: string;
         pageFunTitle: string;

src/typings/vite-env.d.ts

@@ -25,7 +25,7 @@ declare namespace Env {
      *
      * This prefix is start with the icon prefix
      */
-    readonly VITE_ICON_LOCAL_PREFIX: 'local-icon';
+    readonly VITE_ICON_LOCAL_PREFIX: 'icon-local';
     /** backend service base url */
     readonly VITE_SERVICE_BASE_URL: string;
     /**