优化一些东西

README.md

@@ -78,8 +78,6 @@ js-fast-way 文档
 `build:test` 为一键打包，然后自动上传到测试服务器上并自动部署的方式
 `build:test:wgt` 为一键打包，然后自动上传到测试服务器上并自动部署的方式（不包含 `/public/plugins` 文件夹）
 
-`build:prod` 为一键打包，然后自动上传到正式服务器上并自动部署的方式
-`build:prod:wgt` 为一键打包，然后自动上传到正式服务器上并自动部署的方式（不包含 `/public/plugins` 文件夹）
 
 ### 其它说明
 

package.json

@@ -8,8 +8,7 @@
         "build:zip": "sh ./scripts/build.sh all",
         "build:zip:wgt": "sh ./scripts/build.sh wgt",
         "build:test": "sh ./scripts/build.sh all test",
-        "build:test:wgt": "sh ./scripts/build.sh wgt test",
-        "test": "node ./public/backup.js"
+        "build:test:wgt": "sh ./scripts/build.sh wgt test"
     },
     "dependencies": {
         "axios": "^1.4.0",

src/App.vue

@@ -7,7 +7,7 @@
 <script setup>
 import {nextTick, ref, watch} from "vue";
 import {useAppStore} from "~src/store";
-import {useOsTheme} from '~src/plugins/useOsTheme';
+import {useOsTheme} from 'hc-vue3-ui'
 import {setElementMainColor, getObjValue} from "js-fast-way"
 import {getStoreValue, setStoreValue} from "~uti/storage";
 import {getVersionJson} from "~api/other";
@@ -69,7 +69,7 @@ const setUserTheme = (theme, appColor) => {
     //设置主题
     let val = UserTheme.value
     if (val === 'auto') {
-        theme = useOsTheme().value;
+        theme = useOsTheme();
     }
     if (theme === '') {
         theme = val;

src/api/request/httpApi.js

@@ -24,14 +24,17 @@ const getResData = async (response, error = false) => {
             disposition: headersx['content-disposition'], message: getMsgVal(response), error: error
         }
         //处理延迟响应
-        const {startTime, endTime} = config.metadata
-        if (config.isDelay) {
-            const duration = endTime - startTime
-            if (duration < 500) {
-                setTimeout(() => {
-                    console.log('duration:', duration, '延迟请求:', endTime - new Date())
+        if (!error) {
+            const {startTime, endTime} = config.metadata
+            if (config.isDelay) {
+                const duration = endTime - startTime
+                if (duration < 500) {
+                    setTimeout(() => {
+                        resolve(httpData)
+                    }, 1000 - duration)
+                } else {
                     resolve(httpData)
-                }, 1000 - duration)
+                }
             } else {
                 resolve(httpData)
             }

src/plugins/useOsTheme.js

@@ -1,75 +0,0 @@
-import {ref, onBeforeMount, onBeforeUnmount, getCurrentInstance} from 'vue'
-
-let usedCount = 0, darks, lights, managable = true
-
-const osTheme = ref(null)
-const supportMatchMedia = typeof window !== 'undefined' && window.matchMedia !== undefined
-
-//获取系统主题
-export const useOsTheme = () => {
-    if (process.env.NODE_ENV !== 'test' && !supportMatchMedia) {
-        return osTheme.value
-    }
-    if (process.env.NODE_ENV === 'test' && window.matchMedia === undefined) {
-        return osTheme.value
-    }
-    if (usedCount === 0) init()
-    if (managable && (managable = hasInstance())) {
-        onBeforeMount(() => {
-            usedCount += 1
-        })
-        onBeforeUnmount(() => {
-            usedCount -= 1
-            if (usedCount === 0) clean()
-        })
-    }
-    return osTheme.value
-}
-
-const handleDarkMqlChange = (e) => {
-    if (e.matches) {
-        osTheme.value = 'dark'
-    }
-}
-
-const handleLightMqlChange = (e) => {
-    if (e.matches) {
-        osTheme.value = 'light'
-    }
-}
-
-const init = () => {
-    darks = window.matchMedia('(prefers-color-scheme: dark)')
-    lights = window.matchMedia('(prefers-color-scheme: light)')
-    if (darks.matches) {
-        osTheme.value = 'dark'
-    } else if (lights.matches) {
-        osTheme.value = 'light'
-    } else {
-        osTheme.value = null
-    }
-    if (darks.addEventListener) {
-        darks.addEventListener('change', handleDarkMqlChange)
-        lights.addEventListener('change', handleLightMqlChange)
-    } else if (darks.addListener) {
-        darks.addListener(handleDarkMqlChange)
-        lights.addListener(handleLightMqlChange)
-    }
-}
-
-const clean = () => {
-    if ('removeEventListener' in darks) {
-        darks.removeEventListener('change', handleDarkMqlChange)
-        lights?.removeEventListener('change', handleLightMqlChange)
-    } else if ('removeListener' in darks) {
-        darks?.removeListener(handleDarkMqlChange)
-        lights?.removeListener(handleLightMqlChange)
-    }
-
-    darks = undefined
-    lights = undefined
-}
-
-export const hasInstance = () => {
-    return getCurrentInstance() !== null
-}

src/store/modules/user.js

@@ -8,7 +8,7 @@ import {setStoreValue} from "~src/utils/storage";
 import {userLogin, refreshToken, logout} from '~api/user';
 import {userConfigInfo, userConfigSave} from "~api/other";
 import {ArrToOneObj, getArrValue, arrIndex, getObjValue} from "js-fast-way"
-import {useOsTheme} from '~src/plugins/useOsTheme';
+import {useOsTheme} from 'hc-vue3-ui'
 
 //初始变量
 const store = useAppStore(pinia)
@@ -44,7 +44,7 @@ export const initUserConfigInfo = async () => {
         store.setTheme(theme)
         //设置模式
         if (theme === 'auto') {
-            store.setThemeVal(useOsTheme().value)
+            store.setThemeVal(useOsTheme())
         } else {
             store.setThemeVal(theme)
         }

src/views/user/config.vue

@@ -79,7 +79,7 @@ import {userConfigSave} from "~api/other";
 import ImgTheme from "~src/assets/images/theme.png";
 import ImgColor from "~src/assets/images/color.png";
 import {setElementMainColor} from "js-fast-way"
-import {useOsTheme} from '~src/plugins/useOsTheme';
+import {useOsTheme} from 'hc-vue3-ui'
 
 //初始变量
 const router = useRouter()
@@ -117,7 +117,7 @@ const ThemeTabsUpdate = (val) => {
     UserTheme.value = val
     useAppState.setTheme(val)
     if (val === 'auto') {
-        useAppState.setThemeVal(useOsTheme().value)
+        useAppState.setThemeVal(useOsTheme())
     } else {
         useAppState.setThemeVal(val)
     }