From 17e7df68609d7521f86f256811c18355c893e520 Mon Sep 17 00:00:00 2001 From: chenghongxing <1126263215@qq.com> Date: Wed, 29 Jul 2020 09:09:43 +0800 Subject: [PATCH 1/2] chore: add boolean type support for props pagination of StandardTable.vue ; :star2: --- src/components/table/StandardTable.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 () { From b468b9d87b7c42bac3c937346833f2f59c91d7bd Mon Sep 17 00:00:00 2001 From: chenghongxing <1126263215@qq.com> Date: Wed, 29 Jul 2020 09:21:31 +0800 Subject: [PATCH 2/2] fix: solve the problem of @ant-design/colors dependency when using npm or cnpm; :bug: #93 --- src/utils/colors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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')