Skip to content

Commit ca42b0d

Browse files
committed
deps: update pro-layout@1.0.1-0
1 parent 959eca9 commit ca42b0d

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

package-lock.json

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"analyz": "vue-cli-service build --mode analyz"
1111
},
1212
"dependencies": {
13-
"@ant-design-vue/pro-layout": "^0.3.12",
13+
"@ant-design-vue/pro-layout": "^1.0.1-0",
1414
"ant-design-vue": "^1.6.4",
1515
"axios": "^0.19.2",
1616
"core-js": "^3.6.5",
1717
"mockjs": "^1.1.0",
18-
"store": "^2.0.12",
1918
"nprogress": "^0.2.0",
19+
"store": "^2.0.12",
2020
"vue": "^2.6.11",
2121
"vue-i18n": "^8.20.0",
2222
"vue-router": "^3.2.0",

src/icons.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,12 @@ export {
9292
export {
9393
default as CloseCircleOutline,
9494
} from '@ant-design/icons/lib/outline/CloseCircleOutline'
95+
export {
96+
default as FullscreenOutline,
97+
} from '@ant-design/icons/lib/outline/FullscreenOutline'
98+
export {
99+
default as ColumnHeightOutline,
100+
} from '@ant-design/icons/lib/outline/ColumnHeightOutline'
101+
export {
102+
default as CheckCircleOutline,
103+
} from '@ant-design/icons/lib/outline/CheckCircleOutline'

src/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import router from './router'
88
import store from './store'
99
import i18n from './locales'
1010
import bootstrap from './core/bootstrap'
11-
import { ConfigProvider, Icon, Button, Tag, Menu, Dropdown, Avatar, Spin, Result, Form, Tabs, Input, Checkbox, Row, Col, Modal, Alert, notification, message } from 'ant-design-vue'
11+
import { ConfigProvider, Icon, Button, Tag, Menu, Dropdown, Avatar, Spin, Result, Form, Tabs, Input, Checkbox, Row, Col, Modal, Alert, Divider, notification, message } from 'ant-design-vue'
1212
import ProLayout, { PageHeaderWrapper } from '@ant-design-vue/pro-layout'
1313
import { PageLoading } from '@/components'
1414
import themeConfig from './config/theme.config.js'
@@ -36,6 +36,7 @@ Vue.use(Row)
3636
Vue.use(Col)
3737
Vue.use(Modal)
3838
Vue.use(Alert)
39+
Vue.use(Divider)
3940

4041
Vue.prototype.$confirm = Modal.confirm
4142
Vue.prototype.$message = message

src/views/user/Login.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
html-type="submit"
8888
class="login-button"
8989
:loading="state.loginBtn"
90-
:disabled="state.loginBtn"
9190
>
9291
确定
9392
</a-button>

0 commit comments

Comments
 (0)