Skip to content

Commit 1f1ba61

Browse files
committed
sync v2.1.0 η‰ˆζœ¬
1 parent 18bc6a1 commit 1f1ba61

File tree

138 files changed

+480
-6718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+480
-6718
lines changed

β€Ž.env.build

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
VITE_APP_ENV = 'prod'
2-
#θ‡ͺεŠ¨θŽ·ε–εœ°ε€ζŽ¨θ
3-
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'
1+
#The defined variable must start with VITE_APP_
2+
#notes: login use mock api
3+
4+
VITE_APP_ENV = 'dev'
5+
VITE_APP_BASE_URL = ''
46

57
#image or oss address
6-
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
8+
VITE_APP_IMAGE_URL = ''
9+
10+
#proxy, use this to test proxy
11+
#VITE_APP_BASE_URL = '/api'

β€Ž.env.build-test

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
VITE_APP_ENV = 'test'
2-
#θ‡ͺεŠ¨θŽ·ε–εœ°ε€ζŽ¨θ
3-
#VITE_APP_BASE_URL = '/micro-service-api'
4-
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'
5-
VITE_APP_BASE_WS_URL = ''
1+
#The defined variable must start with VITE_APP_
2+
#notes: login use mock api
3+
4+
VITE_APP_ENV = 'dev'
5+
VITE_APP_BASE_URL = ''
66

77
#image or oss address
8-
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
8+
VITE_APP_IMAGE_URL = ''
9+
10+
#proxy,use this to test proxy
11+
#VITE_APP_BASE_URL = '/api'

β€Ž.env.serve-dev

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#The defined variable must start with VITE_APP_
2+
#notes: login use mock api
3+
24
VITE_APP_ENV = 'dev'
3-
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'
5+
VITE_APP_BASE_URL = ''
46

57
#image or oss address
6-
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
8+
VITE_APP_IMAGE_URL = ''
79

810
#proxy, use this to test proxy
911
#VITE_APP_BASE_URL = '/api'
10-
#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api'

β€Ž.env.serve-test

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#The defined variable must start with VITE_APP_
2-
VITE_APP_ENV = 'test'
3-
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'
2+
#notes: login use mock api
43

5-
#image or oss address
6-
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
4+
VITE_APP_ENV = 'dev'
5+
VITE_APP_BASE_URL = ''
6+
7+
#image or oss address
8+
VITE_APP_IMAGE_URL = ''
79

810
#proxy, use this to test proxy
911
#VITE_APP_BASE_URL = '/api'
10-
#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api'

β€Ž.gitignore

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# compiled output
2-
dist
3-
dist-ssr
4-
node_modules
5-
electron-dist
2+
/dist
3+
/dist-ssr
4+
/node_modules
5+
66
#lock
77
pnpm-lock.yaml
88

@@ -45,5 +45,7 @@ yarn*
4545
pnpm*
4646

4747

48+
#.eslintrc-auto-import.json
49+
#auto-imports.d.ts
50+
#components.d.ts
4851
stats.html
49-
ts-out-dir

β€Žeslintrc/.eslintrc-auto-import.json

+1-13
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
"bus": true,
66
"buttonCodes": true,
77
"casHandleChange": true,
8-
"clickoutside": true,
98
"cloneDeep": true,
109
"closeElLoading": true,
1110
"codesPermission": true,
1211
"commonUtil": true,
1312
"computed": true,
14-
"copy": true,
1513
"copyValueToClipboard": true,
1614
"createApp": true,
1715
"customRef": true,
18-
"debounce": true,
1916
"defineAsyncComponent": true,
2017
"defineComponent": true,
2118
"directives": true,
@@ -43,11 +40,7 @@
4340
"isRef": true,
4441
"lang": true,
4542
"langTitle": true,
46-
"loginOutReq": true,
47-
"loginReq": true,
48-
"longpress": true,
4943
"markRaw": true,
50-
"mockAxiosReq": true,
5144
"nextTick": true,
5245
"onActivated": true,
5346
"onBeforeMount": true,
@@ -80,7 +73,6 @@
8073
"routerBack": true,
8174
"routerPush": true,
8275
"routerReplace": true,
83-
"searchUser": true,
8476
"shallowReactive": true,
8577
"shallowReadonly": true,
8678
"shallowRef": true,
@@ -89,7 +81,6 @@
8981
"toRaw": true,
9082
"toRef": true,
9183
"toRefs": true,
92-
"transactionList": true,
9384
"triggerRef": true,
9485
"unref": true,
9586
"useAttrs": true,
@@ -105,12 +96,9 @@
10596
"useSlots": true,
10697
"useTable": true,
10798
"useTagsViewStore": true,
108-
"userInfoReq": true,
10999
"watch": true,
110100
"watchEffect": true,
111101
"watchPostEffect": true,
112-
"watchSyncEffect": true,
113-
"watermark": true,
114-
"waves": true
102+
"watchSyncEffect": true
115103
}
116104
}

β€Žeslintrc/eslint-config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ module.exports = defineConfig({
77
node: true
88
},
99
globals: {
10-
defineOptions: true,
11-
$ref: true
10+
defineOptions: true
1211
},
1312
plugins: ['@typescript-eslint', 'prettier', 'unicorn'],
1413
extends: [
@@ -62,6 +61,7 @@ module.exports = defineConfig({
6261
// js/ts
6362
camelcase: ['error', { properties: 'never' }],
6463
'no-console': ['warn', { allow: ['error'] }],
64+
'@typescript-eslint/no-var-requires':'off',
6565
'no-debugger': 'warn',
6666
'no-constant-condition': ['error', { checkLoops: false }],
6767
'no-restricted-syntax': ['error', 'LabeledStatement', 'WithStatement'],
@@ -85,7 +85,6 @@ module.exports = defineConfig({
8585
'no-multi-str': 'error',
8686
'no-with': 'error',
8787
'no-void': 'error',
88-
'@typescript-eslint/no-var-requires': 'off',
8988

9089
'sort-imports': [
9190
'warn',

β€Žindex.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
<head>
44
<meta charset="UTF-8" />
55
<link rel="icon" href="/favicon.ico" />
6+
<link rel="stylesheet" href="src/styles/init-loading.css" />
67
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
78
<title><%= title %></title>
89
</head>
910
<body>
10-
<div id="app"></div>
11+
<div id="app">
12+
<div class="loader-wrapper">
13+
<img src="src/assets/gif/dianchi.gif" class="loading-gif">
14+
<div class="load_title">ζ­£εœ¨εŠ θ½½η³»η»Ÿθ΅„ζΊοΌŒθ―·θ€εΏƒη­‰εΎ…</div>
15+
</div>
16+
</div>
1117
<script type="module" src="/src/main.ts"></script>
1218
</body>
1319
</html>

β€Žmock/example.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export default [
2+
{
3+
url: '/getMapInfo',
4+
method: 'get',
5+
response: () => {
6+
return {
7+
code: 200,
8+
title: 'mock请求桋试'
9+
}
10+
}
11+
}
12+
]

β€Žmock/system.ts

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
const system = {
2+
url: '/mock/login',
3+
method: 'post',
4+
response: () => {
5+
return {
6+
code: 20000,
7+
jwtToken:"666666"
8+
}
9+
}
10+
}
11+
12+
const loginOut = {
13+
url: '/mock/loginOut',
14+
method: 'post',
15+
response: () => {
16+
return {
17+
code: 200,
18+
title: 'mock请求桋试'
19+
}
20+
}
21+
}
22+
23+
export default [
24+
system,loginOut
25+
]

β€Žsrc/api/remote-search.ts

-17
This file was deleted.

β€Žsrc/api/system.ts

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//θŽ·ε–η”¨ζˆ·δΏ‘ζ―
2+
import axiosReq from 'axios'
3+
// export const userInfoReq = (): Promise<any> => {
4+
// return new Promise((resolve) => {
5+
// const reqConfig = {
6+
// url: '/basis-func/user/getUserInfo',
7+
// params: { plateFormId: 2 },
8+
// method: 'post'
9+
// }
10+
// axiosReq(reqConfig).then(({ data }) => {
11+
// resolve(data)
12+
// })
13+
// })
14+
// }
15+
16+
//登录
17+
export const loginReq = (subForm) => {
18+
return axiosReq({
19+
url: '/mock/login',
20+
params: subForm,
21+
method: 'post'
22+
})
23+
}
24+
25+
//退出登录
26+
export const loginOutReq = () => {
27+
return axiosReq({
28+
url: '/mock/loginOut',
29+
method: 'post'
30+
})
31+
}

β€Žsrc/api/user.ts

-31
This file was deleted.

β€Žsrc/assets/gif/dianchi.gif

17.6 KB
Loading
-6.19 KB
Binary file not shown.

β€Žsrc/assets/layout/login-bg.svg

-1
This file was deleted.

β€Žsrc/assets/layout/login-front.svg

-6
This file was deleted.

β€Žsrc/assets/layout/login-top.svg

-21
This file was deleted.

β€Žsrc/assets/layout/login.svg

-1
This file was deleted.

β€Žsrc/assets/layout/logo.png

-10.3 KB
Binary file not shown.

β€Žsrc/directives/example/clickoutside.js

-21
This file was deleted.

0 commit comments

Comments
Β (0)