diff --git a/package.json b/package.json index 5149f77309..722eca77f0 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "lint:nofix": "vue-cli-service lint --no-fix" }, "dependencies": { - "@ant-design-vue/pro-layout": "^1.0.10", + "@ant-design-vue/pro-layout": "^1.0.11", "@antv/data-set": "^0.10.2", "ant-design-vue": "^1.7.6", "axios": ">=0.21.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af1f8cd987..f17707dc06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.3 specifiers: - '@ant-design-vue/pro-layout': ^1.0.10 + '@ant-design-vue/pro-layout': ^1.0.11 '@ant-design/colors': ^3.2.1 '@antv/data-set': ^0.10.2 '@vue/babel-helper-vue-jsx-merge-props': ^1.2.1 @@ -51,7 +51,7 @@ specifiers: webpack-theme-color-replacer: ^1.3.12 dependencies: - '@ant-design-vue/pro-layout': 1.0.10_9065e7474e033a8e4b95615fc8e6c36c + '@ant-design-vue/pro-layout': 1.0.11_9065e7474e033a8e4b95615fc8e6c36c '@antv/data-set': 0.10.2 ant-design-vue: 1.7.8_9065e7474e033a8e4b95615fc8e6c36c axios: 0.24.0 @@ -104,8 +104,8 @@ devDependencies: packages: - /@ant-design-vue/pro-layout/1.0.10_9065e7474e033a8e4b95615fc8e6c36c: - resolution: {integrity: sha512-G30F9G8dOjMw+LaNfzkHuOPOqdlnpqWDEi3CXv+Zw5GLpyVAYFNkSb2J2/3GgIKCIsBOE62S0DxRvh1nQk3FsQ==} + /@ant-design-vue/pro-layout/1.0.11_9065e7474e033a8e4b95615fc8e6c36c: + resolution: {integrity: sha512-8rn5eC2XC6DhialrGTVltxY/FgmHoRLJzVaPxPWlMV+RMNRH/Ppy8be9K1SsvH8stta5OQiF4Eu1GHnedeFhhA==} peerDependencies: vue: '>=2.6.0' vue-template-compiler: '>=2.6.0' diff --git a/src/components/Table/index.js b/src/components/Table/index.js index 831f944251..e270dbefda 100644 --- a/src/components/Table/index.js +++ b/src/components/Table/index.js @@ -142,7 +142,7 @@ export default { loadData (pagination, filters = this.filters, sorter = this.sorter) { this.filters = filters this.sorter = sorter - + this.localLoading = true const parameter = Object.assign({ pageNo: (pagination && pagination.current) || diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index c55e3aae87..67bd1394ae 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -14,7 +14,7 @@ export default { navTheme: 'dark', // theme for nav menu - primaryColor: '#F5222D', // primary color of ant design + primaryColor: '#1890ff', // '#F5222D', // primary color of ant design layout: 'sidemenu', // nav menu position: `sidemenu` or `topmenu` contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu fixedHeader: false, // sticky header