Merge branch 'local_dev_ft' into 'main'

pref:优化部分问题

See merge request yunteng/thingskit-front!475

@@ -182,12 +182,16 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '如：关',
       placeholder: '如：关',
     },
     },
+    defaultValue: '关',
     ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
     ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
     dynamicRules: ({ model }) => {
     dynamicRules: ({ model }) => {
       const close = model[FormField.BOOL_CLOSE];
       const close = model[FormField.BOOL_CLOSE];
       const open = model[FormField.BOOL_OPEN];
       const open = model[FormField.BOOL_OPEN];
       return [
       return [
         {
         {
+          required: true,
+        },
+        {
           validator() {
           validator() {
             if (open === close) return Promise.reject('布尔值不能相同');
             if (open === close) return Promise.reject('布尔值不能相同');
             return Promise.resolve();
             return Promise.resolve();
@@ -207,12 +211,16 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
     componentProps: {
       placeholder: '如：开',
       placeholder: '如：开',
     },
     },
+    defaultValue: '开',
     ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
     ifShow: ({ values }) => values[FormField.TYPE] === DataTypeEnum.IS_BOOL,
     dynamicRules: ({ model }) => {
     dynamicRules: ({ model }) => {
       const close = model[FormField.BOOL_CLOSE];
       const close = model[FormField.BOOL_CLOSE];
       const open = model[FormField.BOOL_OPEN];
       const open = model[FormField.BOOL_OPEN];
       return [
       return [
         {
         {
+          required: true,
+        },
+        {
           validator() {
           validator() {
             if (open === close) return Promise.reject('布尔值不能相同');
             if (open === close) return Promise.reject('布尔值不能相同');
             return Promise.resolve();
             return Promise.resolve();

@@ -80,7 +80,10 @@
   // import { useUserStore } from '/@/store/modules/user';
   // import { useUserStore } from '/@/store/modules/user';
   import { getPlatForm } from '/@/api/oem/index';
   import { getPlatForm } from '/@/api/oem/index';
   import defaultShowLogoImg from '/@/assets/svg/login-bg.svg';
   import defaultShowLogoImg from '/@/assets/svg/login-bg.svg';
+  import defaultShowLogoDarkImg from '/@/assets/svg/login-bg-dark.svg';
   import { useTitle } from '@vueuse/core';
   import { useTitle } from '@vueuse/core';
+  import { createLocalStorage } from '/@/utils/cache';
+  // import {usePlatform} from '/@/views/system/customize/hook/usePlatformInfo'
 
 
   defineProps({
   defineProps({
     sessionTimeout: {
     sessionTimeout: {
@@ -91,8 +94,14 @@
   const defaultTitle = ref('');
   const defaultTitle = ref('');
   const defaultLogo = ref('');
   const defaultLogo = ref('');
   const logoUrl = ref('');
   const logoUrl = ref('');
+  // const userStore = useUserStore();
+  const storage = createLocalStorage();
+
   onMounted(async () => {
   onMounted(async () => {
-    const res = await getPlatForm();
+    let res = storage.get('platformInfo');
+    if (res === '' || res === null) {
+      res = await getPlatForm();
+    }
     logoUrl.value = res?.background;
     logoUrl.value = res?.background;
     defaultTitle.value = res?.name || title;
     defaultTitle.value = res?.name || title;
     defaultLogo.value = res?.logo;
     defaultLogo.value = res?.logo;
@@ -100,13 +109,38 @@
       document.createElement('link')) as HTMLLinkElement;
       document.createElement('link')) as HTMLLinkElement;
     link.type = 'image/x-icon';
     link.type = 'image/x-icon';
     link.rel = 'shortcut icon';
     link.rel = 'shortcut icon';
-    link.href = res.icon ?? '/favicon.ico';
+    link.href = res?.icon ?? '/favicon.ico';
     document.getElementsByTagName('head')[0].appendChild(link);
     document.getElementsByTagName('head')[0].appendChild(link);
+    let defaultLogoBg = document.createElement('style');
+    let defaultLogoDarkBg = document.createElement('style');
     if (logoUrl.value !== undefined) {
     if (logoUrl.value !== undefined) {
+      //企业自定义
       ifCustom.value = false;
       ifCustom.value = false;
+      //默认图片
+      defaultLogoBg.innerHTML = `.vben-login::before{
+      background-image:url("");
+      position:absolute;
+    }`;
+      //切换黑暗模式图片
+      defaultLogoDarkBg.innerHTML = `html[data-theme='dark'] .vben-login::before{
+      background-image:url("");
+      position:absolute;
+    }`;
     } else {
     } else {
       logoUrl.value = 'url(' + defaultShowLogoImg + ')';
       logoUrl.value = 'url(' + defaultShowLogoImg + ')';
+      //默认图片
+      defaultLogoBg.innerHTML = `.vben-login::before{
+      background-image:url(${defaultShowLogoImg});
+      position:absolute;
+    }`;
+      //切换黑暗模式图片
+      defaultLogoDarkBg.innerHTML = `html[data-theme='dark'] .vben-login::before{
+      background-image:url(${defaultShowLogoDarkImg});
+      position:absolute;
+    }`;
     }
     }
+    document.head.appendChild(defaultLogoBg);
+    document.head.appendChild(defaultLogoDarkBg);
   });
   });
 
 
   // const userStore = useUserStore();
   // const userStore = useUserStore();
@@ -200,9 +234,8 @@
       width: 100%;
       width: 100%;
       height: 100%;
       height: 100%;
       margin-left: -48%;
       margin-left: -48%;
-      background-image: v-bind(logourl);
-      // background-image: url(/@/assets/svg/login-bg.svg);
       background-position: 100%;
       background-position: 100%;
+      // background-image: url(/@/assets/svg/login-bg.svg);
       background-repeat: no-repeat;
       background-repeat: no-repeat;
       background-size: auto 100%;
       background-size: auto 100%;
       content: '';
       content: '';

@@ -106,17 +106,20 @@ export const schemas: FormSchema[] = [
   },
   },
   {
   {
     field: 'nameCountry',
     field: 'nameCountry',
-    component: 'ApiSelect',
+    component: 'Select',
     label: '国家/地区',
     label: '国家/地区',
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
+    // componentProps: {
+    //   api: getAreaList,
+    //   params: { parentId: 0 },
+    //   labelField: 'name',
+    //   valueField: 'code',
+    //   placeholder: '国家/地区',
+    // },
     componentProps: {
     componentProps: {
-      api: getAreaList,
-      params: { parentId: 0 },
-      labelField: 'name',
-      valueField: 'code',
-      placeholder: '国家/地区',
+      options: [{ label: '中国', value: 1 }],
     },
     },
   },
   },
   {
   {

 import { getPlatForm } from '/@/api/oem';
 import { getPlatForm } from '/@/api/oem';
+import { createLocalStorage } from '/@/utils/cache';
 
 
 enum DefaultPlatform {
 enum DefaultPlatform {
   LOGO = '/resource/img/logo.png',
   LOGO = '/resource/img/logo.png',
@@ -8,6 +9,16 @@ enum DefaultPlatform {
 
 
 export const usePlatform = async () => {
 export const usePlatform = async () => {
   const platformInfo = await getPlatForm();
   const platformInfo = await getPlatForm();
+  const storage = createLocalStorage();
+  if (
+    platformInfo === '' ||
+    platformInfo === null ||
+    Object.getOwnPropertyNames(platformInfo).length === 0
+  ) {
+    storage.set('platformInfo', 1234);
+  } else {
+    storage.set('platformInfo', platformInfo);
+  }
 
 
   const createLoadingEffect = () => {
   const createLoadingEffect = () => {
     const wrap = document.createElement('div');
     const wrap = document.createElement('div');