Browse Source

Merge pull request #4392 from ant-design/change-to-es

change lib to es
pull/4399/head
陈帅 7 years ago
committed by GitHub
parent
commit
ef63e38ea0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      config/plugin.config.ts
  2. 2
      src/components/GlobalFooter/index.less
  3. 2
      src/components/GlobalHeader/AvatarDropdown.tsx
  4. 2
      src/components/GlobalHeader/index.less
  5. 2
      src/components/HeaderDropdown/index.less
  6. 2
      src/components/HeaderSearch/index.less
  7. 2
      src/components/NoticeIcon/NoticeList.less
  8. 2
      src/components/NoticeIcon/index.less
  9. 2
      src/components/SelectLang/index.less
  10. 2
      src/global.less
  11. 2
      src/layouts/UserLayout.less
  12. 4
      src/pages/Welcome.tsx

2
config/plugin.config.ts

@ -64,7 +64,7 @@ export default (config: any) => {
// { // {
// antDir: path.join(__dirname, '../node_modules/antd'), // antDir: path.join(__dirname, '../node_modules/antd'),
// stylesDir, // stylesDir,
// varFile: path.join(__dirname, '../node_modules/antd/lib/style/themes/default.less'), // varFile: path.join(__dirname, '../node_modules/antd/es/style/themes/default.less'),
// mainLessFile: outFile, // themeVariables: ['@primary-color'], // mainLessFile: outFile, // themeVariables: ['@primary-color'],
// indexFileName: 'index.html', // indexFileName: 'index.html',
// generateOne: true, // generateOne: true,

2
src/components/GlobalFooter/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.globalFooter { .globalFooter {
margin: 48px 0 24px 0; margin: 48px 0 24px 0;

2
src/components/GlobalHeader/AvatarDropdown.tsx

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Avatar, Menu, Spin, Icon } from 'antd'; import { Avatar, Menu, Spin, Icon } from 'antd';
import { FormattedMessage } from 'umi-plugin-react/locale'; import { FormattedMessage } from 'umi-plugin-react/locale';
import { ClickParam } from 'antd/lib/menu'; import { ClickParam } from 'antd/es/menu';
import { ConnectProps, ConnectState } from '@/models/connect'; import { ConnectProps, ConnectState } from '@/models/connect';
import { CurrentUser } from '@/models/user'; import { CurrentUser } from '@/models/user';
import { connect } from 'dva'; import { connect } from 'dva';

2
src/components/GlobalHeader/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
@pro-header-hover-bg: rgba(0, 0, 0, 0.025); @pro-header-hover-bg: rgba(0, 0, 0, 0.025);

2
src/components/HeaderDropdown/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.container > * { .container > * {
background-color: #fff; background-color: #fff;

2
src/components/HeaderSearch/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.headerSearch { .headerSearch {
:global(.anticon-search) { :global(.anticon-search) {

2
src/components/NoticeIcon/NoticeList.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.list { .list {
max-height: 400px; max-height: 400px;

2
src/components/NoticeIcon/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.popover { .popover {
position: relative; position: relative;

2
src/components/SelectLang/index.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.menu { .menu {
:global(.anticon) { :global(.anticon) {

2
src/global.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
html, html,
body, body,

2
src/layouts/UserLayout.less

@ -1,4 +1,4 @@
@import '~antd/lib/style/themes/default.less'; @import '~antd/es/style/themes/default.less';
.container { .container {
display: flex; display: flex;

4
src/pages/Welcome.tsx

@ -3,8 +3,8 @@ import React from 'react';
export default () => ( export default () => (
<p style={{ textAlign: 'center' }}> <p style={{ textAlign: 'center' }}>
Want to add more pages? Please refer to{' '} Want to add more pages? Please refer to{' '}
<a href="https://umijs.org/guide/block.html" target="_blank" rel="noopener noreferrer"> <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
umi block use block
</a> </a>
。 。
</p> </p>

Loading…
Cancel
Save