Skip to content

Commit

Permalink
look v1.6.1 update log
Browse files Browse the repository at this point in the history
  • Loading branch information
jzfai committed Jun 12, 2022
1 parent 6f9ca1f commit ccb53be
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 38 deletions.
6 changes: 2 additions & 4 deletions .env.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
VITE_APP_ENV = 'prod'
#自动获取地址推荐
#VITE_APP_BASE_URL = '/micro-service-api'
VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api'
VITE_APP_BASE_WS_URL = ''
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'

#image or oss address
VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080'
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
4 changes: 2 additions & 2 deletions .env.build-test
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VITE_APP_ENV = 'test'
#自动获取地址推荐
#VITE_APP_BASE_URL = '/micro-service-api'
VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api'
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'
VITE_APP_BASE_WS_URL = ''

#image or oss address
VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080'
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'
6 changes: 3 additions & 3 deletions .env.serve-dev
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#The defined variable must start with VITE_APP_
VITE_APP_ENV = 'dev'
VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api'
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'

#image or oss address
VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080'
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'

#proxy, use this to test proxy
#VITE_APP_BASE_URL = '/api'
#VITE_APP_PROXY_URL = 'http://8.135.1.141/micro-service-api'
#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api'
6 changes: 3 additions & 3 deletions .env.serve-test
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#The defined variable must start with VITE_APP_
VITE_APP_ENV = 'test'
VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api'
VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api'

#image or oss address
VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080'
VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image'

#proxy, use this to test proxy
#VITE_APP_BASE_URL = '/api'
#VITE_APP_PROXY_URL = 'http://8.135.1.141/micro-service-api'
#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api'
16 changes: 8 additions & 8 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ update element-plus vite2 vue3 version ,add func of element-svg icon for side me
add domo of 'import export download template' in CRUD
//11-26
update vue3 version and so on;
add keep-alive use demo and router using demo ,look for "http://8.135.1.141/vue3-admin-template/#/writing-demo/keep-alive"
add keep-alive use demo and router using demo ,look for "https://github.jzfai.top/vue3-admin-template/#/writing-demo/keep-alive"
add the param cachePage and leaveRmCachePage to route for keep-alive,look for https://github.com/jzfai/vue3-admin-template/blob/master/src/router/index.js
add collection the error log of img loading fail,look for "http://8.135.1.141/vue3-admin-template/#/error-log/log"
add collection the error log of img loading fail,look for "https://github.jzfai.top/vue3-admin-template/#/error-log/log"
in router page you need add root element,such as div, but is not necessary for children component
fix some issue
```
Expand All @@ -30,20 +30,20 @@ fix some issue

[github address](https://github.com/jzfai/vue3-admin-ts.git)

[Access address](http://8.135.1.141/vue3-admin-ts)
[Access address](https://github.jzfai.top/vue3-admin-ts)

github 地址: https://github.com/jzfai/vue3-admin-ts.git

国内体验地址:http://8.135.1.141/vue3-admin-ts
国内体验地址:https://github.jzfai.top/vue3-admin-ts


## 例子

---- 我们先看看加载速度和构建后的包大小:

![template-speed-analysis](http://8.135.1.141/file/images/template-speed-analysis.png)
![template-speed-analysis](https://github.jzfai.top/file/images/template-speed-analysis.png)

![template-demo](http://8.135.1.141/file/images/plus-demo.png)
![template-demo](https://github.jzfai.top/file/images/plus-demo.png)

## 相关项目

Expand Down Expand Up @@ -92,7 +92,7 @@ git clone https://github.com/jzfai/vue3-admin-ts.git
cd vue3-admin-ts

# 安装依赖(建议用pnpm)
# 你可以运行npm i -g pnpm 去安装pnpm
# 你可以运行npm i -g pnpm@6.32.3 去安装pnpm
pnpm

# 启动服务
Expand Down Expand Up @@ -207,7 +207,7 @@ Modern browsers and Internet Explorer 11+.
|Edge| last 2 versions| last 2 versions| last 2 versions

## 讨论和交流(含vue3+ts视频教程)
[WeChat group](http://8.135.1.141/file/images/wx-groud.png)
[WeChat group](https://github.jzfai.top/file/images/wx-groud.png)

## 版本

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ Use eslint+prettier+gitHooks format and verification code to improve code standa

[github address](https://github.com/jzfai/vue3-admin-ts.git)

[Access address](http://8.135.1.141/vue3-admin-ts)
[Access address](https://github.jzfai.top/vue3-admin-ts)

国内体验地址:http://8.135.1.141/vue3-admin-ts
国内体验地址:https://github.jzfai.top/vue3-admin-ts

github 地址: https://github.com/jzfai/vue3-admin-ts.git

## Demo

---- Let's look at the loading speed and the size of the built package first.:

![template-speed-analysis](http://8.135.1.141/file/images/template-speed-analysis.png)
![template-speed-analysis](https://github.jzfai.top/file/images/template-speed-analysis.png)

![template-demo](http://8.135.1.141/file/images/plus-demo.png)
![template-demo](https://github.jzfai.top/file/images/plus-demo.png)


## Related items
Expand Down Expand Up @@ -71,7 +71,7 @@ git clone https://github.com/jzfai/vue3-admin-ts.git
cd vue3-admin-ts

# install dependency(Recommend use pnpm)
#you can run npm i -g pnpm to install it
#you can run npm i -g pnpm@6.32.3 to install it
pnpm

# develop
Expand Down Expand Up @@ -117,7 +117,7 @@ Modern browsers and Internet Explorer 11+.
|Edge| last 2 versions| last 2 versions| last 2 versions

## Discussion and Communication
[WeChat group](http://8.135.1.141/file/images/wx-groud.png)
[WeChat group](https://github.jzfai.top/file/images/wx-groud.png)

## License

Expand Down
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"name": "vue3-admin-ts",
"version": "1.5.5",
"version": "1.6.1",
"license": "ISC",
"author": "kuanghua([email protected])",
"packageManager": "[email protected]",
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "vite --mode serve-dev --host",
"test": "vite --mode serve-test --host",
"build:test": "vite build --mode build-test",
Expand All @@ -21,19 +23,19 @@
"vue": "^3.2.26"
},
"dependencies": {
"@element-plus/icons-vue": "1.1.4",
"@element-plus/icons-vue": "2.0.4",
"axios": "0.21.3",
"echarts": "5.3.2",
"element-plus": "2.1.9",
"js-errorlog-collection": "^1.0.5",
"element-plus": "2.2.5",
"js-error-collection": "^1.0.7",
"mitt": "3.0.0",
"moment-mini": "^2.22.1",
"nprogress": "0.2.0",
"path": "0.12.7",
"path-to-regexp": "^6.2.0",
"pinia": "2.0.13",
"tinymce": "6.0.1",
"vue": "3.2.33",
"vue": "3.2.37",
"vue-router": "4.0.14"
},
"devDependencies": {
Expand Down Expand Up @@ -61,7 +63,7 @@
"typescript": "4.5.4",
"unplugin-auto-import": "^0.5.11",
"unplugin-vue-components": "^0.17.14",
"vite": "2.9.7",
"vite": "2.9.12",
"vite-plugin-html": "^3.2.0",
"vite-plugin-mock": "^2.9.6",
"vite-plugin-style-import": "1.2.1",
Expand Down Expand Up @@ -90,6 +92,6 @@
"not op_mini all"
],
"engines": {
"node": ">= 14"
"node": ">= 14<18"
}
}
2 changes: 1 addition & 1 deletion src/hooks/useErrorLog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import setting from '@/settings'
import bus from '@/utils/bus'
import pack from '../../package.json'
import { ObjTy } from '~/common'
import { jsErrorCollection } from 'js-errorlog-collection'
import { jsErrorCollection } from 'js-error-collection'
const errorLogReq = (errLog: string) => {
request({
url: '/integration-front/errorCollection/insert',
Expand Down
2 changes: 1 addition & 1 deletion src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const setting: SettingTy = {
* vite.config.js base config
* such as
* */
viteBasePath: '/vue3-admin-ts/'
viteBasePath: './'
}

export default setting
2 changes: 1 addition & 1 deletion src/views/error-log/ErrorLog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ let usertableData = ref([])
import packages from '/package.json'
let searchForm: ObjTy = reactive({
errorLog: '',
pageUrl: `8.135.1.141/${packages.name}`,
pageUrl: `https://github.jzfai.top/${packages.name}`,
createTime: '',
id: ''
})
Expand Down
4 changes: 4 additions & 0 deletions src/views/login/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ $light_gray: #eee;
<style lang="scss">
//css 样式重置 增加个前缀避免全局污染
.login-container {
.el-input__wrapper {
background-color: transparent;
box-shadow: none;
}
.el-form-item {
border: 1px solid rgba(255, 255, 255, 0.1);
background: rgba(0, 0, 0, 0.1);
Expand Down
4 changes: 2 additions & 2 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default ({ command, mode }: any) => {
/*
* "/vue3-admin-plus" nginx deploy folder
* detail to look https://vitejs.cn/config/#base
* how to config, such as http://8.135.1.141/vue3-admin-plus/#/dashboard
* how to config, such as https://github.jzfai.top/vue3-admin-plus/#/dashboard
* "/vue3-admin-plus/" --> config to base is you need
* http://8.135.1.141 --> if you config "/" , you can visit attached to http://8.135.1.141
* https://github.jzfai.top --> if you config "/" , you can visit attached to https://github.jzfai.top
* */
base: setting.viteBasePath,
//define global var
Expand Down

0 comments on commit ccb53be

Please sign in to comment.