feat: support window.GLOBAL_CONFIG

qmhc · qmhc · commit bdb059b6c792 · 2023-07-10T00:53:38.000+08:00
diff --git a/.env.development b/.env.development
@@ -4,6 +4,6 @@ VITE_BASE_PATH = /
 
 VITE_DROP_CONSOLE = false
 
-VITE_BASE_SERVER = http://192.168.1.39:5888
+VITE_BASE_SERVER = http://127.0.0.1
 
-VITE_RESOURCE_SERVER = http://192.168.1.39:7800
+VITE_RESOURCE_SERVER = http://127.0.0.1
diff --git a/.env.production b/.env.production
@@ -3,7 +3,3 @@ VITE_USE_MOCK = true
 VITE_BASE_PATH = /
 
 VITE_DROP_CONSOLE = true
-
-VITE_BASE_SERVER = http://www.cnqisoft.com:5918
-
-VITE_RESOURCE_SERVER = http://www.cnqisoft.com:5917
diff --git a/.eslintcache b/.eslintcache
diff --git a/build/plugins/icon.ts b/build/plugins/icon.ts
@@ -1,5 +1,6 @@
 import { relative } from 'node:path'
 import { readFileSync } from 'node:fs'
+
 import glob from 'fast-glob'
 import { normalizePath } from 'vite'
 
@@ -101,13 +102,14 @@ export function createIconPlugin(options: IconPluginOptions = {}): Plugin {
       isBuild = config.command === 'build'
     },
     resolveId(id) {
-      return ICON_REGISTER === id ? id : null
+      return ICON_REGISTER === id ? `\0${id}` : null
     },
     async load(id, ssr) {
-      if (!isBuild || ICON_REGISTER !== id) return null
-      if (ssr && !isBuild) return 'export default {}'
+      if (!isBuild && !ssr) return null
 
-      return await renderModuleCode()
+      if (id.endsWith(ICON_REGISTER)) {
+        return ssr && !isBuild ? 'export default {}' : await renderModuleCode()
+      }
     },
     configureServer: ({ middlewares }) => {
       // middlewares.use(cors({ origin: '*' }))
diff --git a/build/utils.ts b/build/utils.ts
@@ -1,6 +1,7 @@
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { bgYellow, bgCyan, bgGreen, bgRed, yellow, cyan, green, red } from 'kolorist'
+
+import { bgCyan, bgGreen, bgRed, bgYellow, cyan, green, red, yellow } from 'kolorist'
 
 import type { Config } from 'prettier'
 
diff --git a/index.html b/index.html
@@ -9,6 +9,10 @@
   </head>
   <body>
     <div id="app"></div>
+    <script src="/global-config.js"></script>
+    <script>
+      if (!window.GLOBAL_CONFIG) window.GLOBAL_CONFIG = {}
+    </script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/mock/article.ts b/mock/article.ts
@@ -1,9 +1,10 @@
 import { Random } from 'mockjs'
-import { mockCommonRequests, createBusinessBase } from './common'
+import { createBusinessBase, mockCommonRequests } from './common'
 
 import type { Article } from '@/service/article'
 
-const richText = '<p>Some content for testing.</p><p><img src="https://www.vexipui.com/picture-4.jpg" alt="" data-href="" style="width: 610.00px;height: 381.25px;"/></p><p>Some content for testing.</p>'
+const richText =
+  '<p>Some content for testing.</p><p><img src="https://www.vexipui.com/picture-4.jpg" alt="" data-href="" style="width: 610.00px;height: 381.25px;"/></p><p>Some content for testing.</p>'
 
 mockCommonRequests('/api/article', (): Article[] => {
   return Array.from({ length: 20 }, (_, index) => {
@@ -14,9 +15,11 @@ mockCommonRequests('/api/article', (): Article[] => {
       author: Random.first(),
       date: Random.datetime(),
       summary: Random.sentence(5, 15),
-      cover: [{
-        url: 'https://www.vexipui.com/picture-1.jpg'
-      }],
+      cover: [
+        {
+          url: 'https://www.vexipui.com/picture-1.jpg'
+        }
+      ],
       content: richText
     }
   })
diff --git a/mock/common.ts b/mock/common.ts
@@ -1,4 +1,4 @@
-import Mock, { mock, Random } from 'mockjs'
+import Mock, { Random, mock } from 'mockjs'
 import { getUsers } from './user'
 
 import type { Result } from '@/service/common'
diff --git a/mock/resource.ts b/mock/resource.ts
@@ -1,4 +1,4 @@
-import { mock, Random } from 'mockjs'
+import { Random, mock } from 'mockjs'
 
 mock('/resource/file', async ({ body }) => {
   if (body instanceof FormData) {
diff --git a/mock/user.ts b/mock/user.ts
@@ -1,6 +1,6 @@
 import { mock } from 'mockjs'
 
-import type { User, LoginParams } from '@/service/user'
+import type { LoginParams, User } from '@/service/user'
 import type { MockParams } from './common'
 
 export function getUsers(): Array<User & { password: string, token: string }> {
@@ -14,9 +14,7 @@ export function getUsers(): Array<User & { password: string, token: string }> {
       avatar: '',
       email: 'root@vexipui.com',
       lastLogin: Date.now(),
-      roles: [
-        { name: 'Admin', auth: 'admin' }
-      ]
+      roles: [{ name: 'Admin', auth: 'admin' }]
     },
     {
       id: '2',
@@ -27,9 +25,7 @@ export function getUsers(): Array<User & { password: string, token: string }> {
       avatar: 'https://www.vexipui.com/qmhc.jpg',
       email: '544022268@qq.com',
       lastLogin: '2022-06-14T07:54:03.880+00:00',
-      roles: [
-        { name: 'Guest', auth: 'guest' }
-      ]
+      roles: [{ name: 'Guest', auth: 'guest' }]
     }
   ]
 }
diff --git a/package.json b/package.json
@@ -6,14 +6,14 @@
   "license": "MIT",
   "private": false,
   "description": "A management system template for Vexip UI",
-  "packageManager": "pnpm@7.14.2",
+  "packageManager": "pnpm@8.3.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "lint": "eslint --fix --ext .js,.cjs,.mjs,.ts,.tsx,.vue src/** types/**",
-    "lint:style": "stylelint **/*.{vue,css,scss} --fix",
-    "prettier": "prettier --write \"src/**/*.{ts,js,json,css,pcss,scss,vue,html,md}\"",
+    "lint": "eslint --cache --fix --ext \"**/*.{js,cjs,mjs,ts,tsx,vue}\"",
+    "lint:style": "stylelint --cache --fix \"**/*.{vue,css,scss}\"",
+    "prettier": "prettier --write \"**/*.{ts,js,json,css,pcss,scss,vue,html,md}\"",
     "precommit": "lint-staged -c ./.husky/.lintstagedrc -q --allow-empty",
     "prepare": "is-ci || husky install",
     "create-business": "tsx scripts/create-business.ts"
diff --git a/public/global-config.js b/public/global-config.js
@@ -0,0 +1,6 @@
+window.GLOBAL_CONFIG = {
+  serverUrls: {
+    base: '/api',
+    resource: '/resource'
+  }
+}
diff --git a/scripts/create-business.ts b/scripts/create-business.ts
@@ -1,12 +1,13 @@
-import { resolve, dirname } from 'node:path'
+import { dirname, resolve } from 'node:path'
+
 import fs from 'fs-extra'
 import minimist from 'minimist'
 import prettier from 'prettier'
 import { ESLint } from 'eslint'
 import stylelint from 'stylelint'
 import prompts from 'prompts'
 import { toCamelCase, toCapitalCase, toKebabCase } from '@vexip-ui/utils'
-import { rootDir, prettierConfig, logger } from '../build/utils'
+import { logger, prettierConfig, rootDir } from '../build/utils'
 
 const { existsSync, ensureDir, writeFile } = fs
 
diff --git a/src/components/list-container.vue b/src/components/list-container.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { noop, transformListToMap } from '@vexip-ui/utils'
 
-import type { PropType } from 'vue'
 import { Table } from 'vexip-ui'
 
+import type { PropType } from 'vue'
+
 interface FilterField<T = any> {
   key: string,
   name: string | (() => string),
diff --git a/src/components/rich-editor.vue b/src/components/rich-editor.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { useFieldStore } from 'vexip-ui'
-import { createToolbar, createEditor } from '@wangeditor/editor'
+import { createEditor, createToolbar } from '@wangeditor/editor'
 import { isDefined } from '@vexip-ui/utils'
 
 import type { PropType } from 'vue'
 import type { ComponentState } from 'vexip-ui'
-import type { IToolbarConfig, IEditorConfig, SlateDescendant, IDomEditor } from '@wangeditor/editor'
+import type { IDomEditor, IEditorConfig, IToolbarConfig, SlateDescendant } from '@wangeditor/editor'
 
 const {
   idFor,
diff --git a/src/layouts/view/view-layout.vue b/src/layouts/view/view-layout.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { useAccessStore, useUserStore, useNavTabStore } from '@/store'
+import { useAccessStore, useNavTabStore, useUserStore } from '@/store'
+
 import { callIfFunc } from '@vexip-ui/utils'
 
 import type { LayoutHeaderAction } from 'vexip-ui'
diff --git a/src/locale/index.ts b/src/locale/index.ts
@@ -1,4 +1,5 @@
 import { createI18n } from 'vue-i18n'
+
 import { languages, setHtmlLanguage } from './helper'
 
 import type { LocaleOptions } from 'vexip-ui'
diff --git a/src/main.ts b/src/main.ts
@@ -3,6 +3,7 @@ import './style/index.scss'
 import 'virtual:icon-register'
 
 import { createApp } from 'vue'
+
 import { Confirm, Toast } from 'vexip-ui'
 import App from './app.vue'
 import { i18n, initPromise } from './locale'
@@ -17,13 +18,7 @@ async function init() {
   await initPromise
 
   useRouterGuards(router)
-  createApp(App)
-    .use(Confirm)
-    .use(Toast)
-    .use(pinia)
-    .use(i18n)
-    .use(router)
-    .mount('#app')
+  createApp(App).use(Confirm).use(Toast).use(pinia).use(i18n).use(router).mount('#app')
 }
 
 init()
diff --git a/src/router/guard.ts b/src/router/guard.ts
@@ -1,7 +1,9 @@
-import { useGlobalStore, useUserStore, useAccessStore, useNavTabStore } from '@/store'
-import { LoginRoute, NotFoundRoute, RootRoute } from './routes/common'
+import { useAccessStore, useGlobalStore, useNavTabStore, useUserStore } from '@/store'
+
 import { getAccessToken } from '@/utils/auth'
 
+import { LoginRoute, NotFoundRoute, RootRoute } from './routes/common'
+
 import type { Router } from 'vue-router'
 
 export function useRouterGuards(router: Router) {
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,5 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import { staticRoutes, RoutePath } from './routes'
+
+import { RoutePath, staticRoutes } from './routes'
 import { useRouterGuards } from './guard'
 
 export { RoutePath, useRouterGuards }
diff --git a/src/router/routes/async/components.ts b/src/router/routes/async/components.ts
@@ -1,6 +1,7 @@
-import { AsyncViewLayout } from '../helper'
 import { t } from '@/locale'
 
+import { AsyncViewLayout } from '../helper'
+
 import type { RouteRecordRaw } from 'vue-router'
 
 export const ComponentsRoute: RouteRecordRaw = {
diff --git a/src/router/routes/async/demos.ts b/src/router/routes/async/demos.ts
@@ -1,6 +1,7 @@
-import { AsyncViewLayout } from '../helper'
 import { t } from '@/locale'
 
+import { AsyncViewLayout } from '../helper'
+
 import type { RouteRecordRaw } from 'vue-router'
 
 export const DemosRoute: RouteRecordRaw = {
diff --git a/src/router/routes/async/home.ts b/src/router/routes/async/home.ts
@@ -1,6 +1,7 @@
-import { AsyncViewLayout } from '../helper'
 import { t } from '@/locale'
 
+import { AsyncViewLayout } from '../helper'
+
 import type { RouteRecordRaw } from 'vue-router'
 
 export const ProjectNoteRoute: RouteRecordRaw = {
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
@@ -1,4 +1,4 @@
-import { LoginRoute, RootRoute, NotFoundRoute } from './common'
+import { LoginRoute, NotFoundRoute, RootRoute } from './common'
 import { ensureArray } from '@vexip-ui/utils'
 
 import type { RouteRecordRaw } from 'vue-router'
@@ -19,8 +19,4 @@ for (const module of Object.values(asyncRouteModules)) {
   }
 }
 
-export const staticRoutes = [
-  LoginRoute,
-  RootRoute,
-  NotFoundRoute
-]
+export const staticRoutes = [LoginRoute, RootRoute, NotFoundRoute]
diff --git a/src/service/common/config.ts b/src/service/common/config.ts
@@ -1,5 +1,3 @@
-const isProd = import.meta.env.PROD
+export const BASE_SERVER = window.GLOBAL_CONFIG.serverUrls.base
 
-export const BASE_SERVER = isProd ? import.meta.env.VITE_BASE_SERVER : '/api'
-
-export const RESOURCE_SERVER = isProd ? import.meta.env.VITE_RESOURCE_SERVER : '/resource'
+export const RESOURCE_SERVER = window.GLOBAL_CONFIG.serverUrls.resource
diff --git a/src/service/common/request.ts b/src/service/common/request.ts
@@ -1,9 +1,11 @@
+import { clearAccessToken, getAuthorization } from '@/utils/auth'
+
 import Axios, { AxiosHeaders } from 'axios'
-import { addSeconds, differenceMilliseconds, deepClone } from '@vexip-ui/utils'
+
+import { addSeconds, deepClone, differenceMilliseconds } from '@vexip-ui/utils'
 import { BASE_SERVER } from './config'
-import { getAuthorization, clearAccessToken } from '@/utils/auth'
 
-import type { AxiosRequestConfig, AxiosAdapter, AxiosResponse } from 'axios'
+import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'
 import type { RequestInstance, Result } from './helper'
 
 const defaultAdapter = Axios.defaults.adapter as AxiosAdapter
diff --git a/src/service/common/resource.ts b/src/service/common/resource.ts
@@ -3,7 +3,7 @@ import { commonInstance } from './request'
 import { parseResult } from './helper'
 
 import type { AxiosRequestConfig } from 'axios'
-import type { Result, BusinessBase } from './helper'
+import type { BusinessBase, Result } from './helper'
 
 export interface Resource extends BusinessBase {
   url: string,
diff --git a/src/store/access.ts b/src/store/access.ts
@@ -1,10 +1,14 @@
-import { defineStore } from 'pinia'
 import { asyncRoutes } from '@/router/routes'
+
+import { createIconRenderer } from '@/utils/component'
+
+import { filterTree } from '@/utils/transform'
+
+import { defineStore } from 'pinia'
+
 import { pinia } from './pinia'
 import { useUserStore } from './user'
 import { callIfFunc } from '@vexip-ui/utils'
-import { createIconRenderer } from '@/utils/component'
-import { filterTree } from '@/utils/transform'
 
 import type { RouteRecordRaw } from 'vue-router'
 import type { MenuOptions } from 'vexip-ui'
diff --git a/src/store/global.ts b/src/store/global.ts
@@ -1,4 +1,5 @@
 import { defineStore } from 'pinia'
+
 import { pinia } from './pinia'
 
 interface GlobalState {
diff --git a/src/store/nav-tab.ts b/src/store/nav-tab.ts
@@ -1,10 +1,14 @@
-import { defineStore } from 'pinia'
-import { pinia } from './pinia'
 import { LoginRoute, NotFoundRoute } from '@/router/routes/common'
+
 import { createIconRenderer } from '@/utils/component'
+
+import { defineStore } from 'pinia'
+
+import { pinia } from './pinia'
+
 import { isClient } from '@vexip-ui/utils'
 
-import type { RouteLocationNormalized, RouteParams, LocationQuery } from 'vue-router'
+import type { LocationQuery, RouteLocationNormalized, RouteParams } from 'vue-router'
 import type { IconMinorProps } from 'vexip-ui'
 
 export interface TabOptions {
diff --git a/src/store/user.ts b/src/store/user.ts
@@ -1,10 +1,13 @@
+import { getCurrentUser, login, logout } from '@/service/user'
+import { RoutePath, router } from '@/router'
+
+import { clearAccessToken, getAccessToken, setAccessToken } from '@/utils/auth'
+
 import { defineStore } from 'pinia'
-import { login, logout, getCurrentUser } from '@/service/user'
-import { router, RoutePath } from '@/router'
+
 import { pinia } from './pinia'
-import { setAccessToken, getAccessToken, clearAccessToken } from '@/utils/auth'
 
-import type { User, LoginParams } from '@/service/user'
+import type { LoginParams, User } from '@/service/user'
 
 interface UserState {
   currentUser: User | null
diff --git a/src/utils/transform.ts b/src/utils/transform.ts
diff --git a/src/views/demos/article/form.vue b/src/views/demos/article/form.vue
diff --git a/src/views/demos/article/list.vue b/src/views/demos/article/list.vue
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
diff --git a/types/components.d.ts b/types/components.d.ts
diff --git a/types/global.d.ts b/types/global.d.ts
diff --git a/vite.config.ts b/vite.config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Mock, { mock, Random } from 'mockjs'`
	`1`	`+import Mock, { Random, mock } from 'mockjs'`
`2`	`2`	`import { getUsers } from './user'`
`3`	`3`
`4`	`4`	`import type { Result } from '@/service/common'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { mock, Random } from 'mockjs'`
	`1`	`+import { Random, mock } from 'mockjs'`
`2`	`2`
`3`	`3`	`mock('/resource/file', async ({ body }) => {`
`4`	`4`	`if (body instanceof FormData) {`