Merge branch 'client_sync' into v2

# Conflicts:
#	packages/ui/certd-client/.env
#	packages/ui/certd-client/CHANGELOG.md
#	packages/ui/certd-client/index.html
#	packages/ui/certd-client/package.json
#	packages/ui/certd-client/public/images/logo/rect-black.svg
#	packages/ui/certd-client/public/images/logo/square.svg
#	packages/ui/certd-client/src/layout/components/theme/index.vue
#	packages/ui/certd-client/src/layout/layout-framework.vue
#	packages/ui/certd-client/src/layout/layout-outside.vue
#	packages/ui/certd-client/src/main.ts
#	packages/ui/certd-client/src/plugin/fast-crud/index.tsx
#	packages/ui/certd-client/src/router/source/header.ts
#	packages/ui/certd-client/src/store/modules/settings.ts
#	packages/ui/certd-client/src/style/common.less
#	packages/ui/certd-client/src/views/crud/form/independent/index.vue
#	packages/ui/certd-client/src/views/framework/login/index.vue
#	packages/ui/certd-client/src/views/framework/register/index.vue
#	packages/ui/certd-client/vite.config.ts

packages/ui/certd-client/src/views/framework/error/404.vue

@@ -12,7 +12,6 @@ export default {
   name: "Exception404",
   methods: {
     toHome() {
-      //@ts-ignore
       this.$router.push({ path: "/" });
     }
   }

packages/ui/certd-client/src/views/framework/home/page-cover/index.vue

@@ -2,11 +2,11 @@
   <div class="d2-page-cover">
     <div class="d2-page-cover__title">
       <div class="title-line">
-        <img width="50" src="./image/logo.svg" />
-        FsAdmin v{{ version }}
+        <img width="50" :src="envRef.LOGO_PATH" />
+        {{ envRef.TITLE }} v{{ version }}
       </div>
     </div>
-    <p class="d2-page-cover__sub-title">面向配置的crud编程，快速开发crud功能</p>
+    <p class="d2-page-cover__sub-title">{{ envRef.SLOGAN }}</p>
     <div class="exampleBox">
       <div class="left">
         <fs-highlight :code="helperRef.crud" lang="javascript" />
@@ -32,16 +32,19 @@
 import { defineComponent, ref } from "vue";
 import { useUi } from "@fast-crud/fast-crud";
 import helper from "./helper";
+import { env } from "../../../../utils/util.env";
 export default defineComponent({
   name: "PageCover",
   setup() {
     const version = ref(import.meta.env.VITE_APP_VERSION);
     const helperRef = ref(helper);
     const { ui } = useUi();
+    const envRef = ref(env);
     return {
       ui,
       version,
-      helperRef
+      helperRef,
+      envRef
     };
   }
 });

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -75,6 +75,7 @@
 import { defineComponent, reactive, ref, toRaw, computed } from "vue";
 import { useUserStore } from "/src/store/modules/user";
 import { useSettingStore } from "/@/store/modules/settings";
+import {utils} from "@fast-crud/fast-crud";
 export default defineComponent({
   name: "LoginPage",
   setup() {
@@ -131,7 +132,7 @@ export default defineComponent({
     };
 
     const handleFinish = async (values: any) => {
-      console.log(values, formState);
+      utils.logger.log(values, formState);
       loading.value = true;
       try {
         const userInfo = await userStore.login(toRaw(formState));
@@ -141,7 +142,7 @@ export default defineComponent({
     };
 
     const handleFinishFailed = (errors: any) => {
-      console.log(errors);
+      utils.logger.log(errors);
     };
 
     const resetForm = () => {

packages/ui/certd-client/src/views/framework/register/index.vue

@@ -39,6 +39,7 @@
 <script lang="ts">
 import { defineComponent, reactive, ref, toRaw } from "vue";
 import { useUserStore } from "/src/store/modules/user";
+import {utils} from "@fast-crud/fast-crud";
 export default defineComponent({
   name: "RegisterPage",
   setup() {
@@ -92,7 +93,7 @@ export default defineComponent({
     };
 
     const handleFinishFailed = (errors: any) => {
-      console.log(errors);
+      utils.logger.log(errors);
     };
 
     const resetForm = () => {