blackteay/vue-antd-admin
1
0
Fork 0
mirror of https://github.com/iczer/vue-antd-admin synced 2025-04-06 04:00:06 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'basic' of https://github.com/iczer/vue-antd-admin into basic

Browse Source
This commit is contained in:
iczer 2020-07-29 09:38:47 +08:00
commit 07ba9a11cf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/table/StandardTable.vue
View File

@ -45,7 +45,10 @@ export default {
type: [String, Function], type: [String, Function],
default: 'key' default: 'key'
}, },
pagination: Object, pagination: {
type: [Object, Boolean],
default: true
},
selectedRows: Array selectedRows: Array
}, },
data () { data () {

2
src/utils/colors.js
View File

@ -1,5 +1,5 @@
const varyColor = require('webpack-theme-color-replacer/client/varyColor') const varyColor = require('webpack-theme-color-replacer/client/varyColor')
const generate = require('@ant-design/colors/lib/generate').default const generate = require('@ant-design/colors').generate
const {ADMIN, ANTD} = require('../config/default') const {ADMIN, ANTD} = require('../config/default')
const Config = require('../config') const Config = require('../config')