diff --git a/src/components/table/StandardTable.vue b/src/components/table/StandardTable.vue index a66a4b7..642bf8a 100644 --- a/src/components/table/StandardTable.vue +++ b/src/components/table/StandardTable.vue @@ -45,7 +45,10 @@ export default { type: [String, Function], default: 'key' }, - pagination: Object, + pagination: { + type: [Object, Boolean], + default: true + }, selectedRows: Array }, data () { diff --git a/src/utils/colors.js b/src/utils/colors.js index a273875..7a960b9 100644 --- a/src/utils/colors.js +++ b/src/utils/colors.js @@ -1,5 +1,5 @@ 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 Config = require('../config')