Commit Graph

2850 Commits

Author SHA1 Message Date
@thinkinggis caea26168c Merge pull request #378 from antvis/District
District
2020-05-20 11:28:51 +08:00
@thinkinggis 0f182de4ab
Merge pull request #380 from antvis/use-antd-less
style: import antd less
2020-05-20 11:24:25 +08:00
afc163 5e6a77b447 style: import antd less 2020-05-20 11:06:51 +08:00
@thinkinggis 2ef32575ed
Merge pull request #378 from antvis/District
District
2020-05-20 10:19:49 +08:00
thinkinggis 9dce2c63c2 chore: merge master 2020-05-20 01:05:36 +08:00
@thinkinggis 33e06ab905
Merge pull request #379 from antvis/fix-duplicated-css
docs: fix duplicated antd css
2020-05-20 01:00:41 +08:00
thinkinggis 58e7be3554 test(render): update model test 2020-05-20 00:00:45 +08:00
thinkinggis 5b4779c2da docs(storybook): color 2020-05-19 21:00:31 +08:00
thinkinggis 125f4685ea fix(district): event spell mistake 2020-05-19 16:43:34 +08:00
afc163 3f0757c12a chore: fix eslint 2020-05-19 16:42:44 +08:00
afc163 978bd76d2b docs: fix duplicated antd css 2020-05-19 16:02:42 +08:00
thinkinggis a40b4fa421 chore: update babel-eslint version 2020-05-19 15:10:08 +08:00
thinkinggis 1a75ea7c2d chore(package): update babel-eslint version 2020-05-19 14:15:34 +08:00
thinkinggis f0f9db8c18 chore(package): update babel-eslint version 2020-05-19 11:06:01 +08:00
thinkinggis 7c0b4b881f Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 21:09:21 +08:00
thinkinggis de0fedb7e7 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 21:08:44 +08:00
thinkinggis c4093d1a75 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 21:01:47 +08:00
thinkinggis 5aedca23f7 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 20:59:50 +08:00
thinkinggis 9095690ab5 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 20:40:57 +08:00
thinkinggis d4b94ca5df Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 20:40:27 +08:00
thinkinggis 5efefb76b9 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 20:22:35 +08:00
thinkinggis fddddaa89c Merge branch 'master' into District 2020-05-18 20:14:44 +08:00
thinkinggis 64ad549633 Merge branch 'master' into District 2020-05-18 19:37:40 +08:00
thinkinggis e373beb475 fix(demo): fix eslint error 2020-05-18 19:36:01 +08:00
thinkinggis 17cca419a7 Merge branch 'master' of github.com:antvis/L7 2020-05-18 18:00:58 +08:00
thinkinggis 6cdf711969 chore: publish 2020-05-18 17:49:08 +08:00
thinkinggis 71be4d994f chore: publish 2020-05-18 16:23:02 +08:00
@thinkinggis daab4549c6
Merge pull request #369 from antvis/District
feat(distict): add bubble map
2020-05-18 14:32:00 +08:00
thinkinggis d404c36434 fix(demo): fix eslint error 2020-05-18 14:19:09 +08:00
thinkinggis d5732a40d6 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 13:59:29 +08:00
thinkinggis 72f9a6da9e Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 13:57:23 +08:00
thinkinggis 9c4ee4d6e0 Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 11:10:07 +08:00
thinkinggis 95130a01fb Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 11:04:49 +08:00
thinkinggis 9bc8cdbafa Merge branch 'District' of github.com:antvis/L7 into District 2020-05-18 10:43:32 +08:00
thinkinggis fece0cb156 chore: merge conflict 2020-05-18 10:43:13 +08:00
thinkinggis 496bdbc3be chore: merge conflict 2020-05-18 10:26:56 +08:00
thinkinggis cc4292ff2f feat(distict): add bubble map 2020-05-16 10:50:59 +08:00
thinkinggis d3910e3471 feat(distict): add bubble map 2020-05-15 21:07:04 +08:00
@thinkinggis d7d200bd30
Merge pull request #343 from antvis/dependabot/npm_and_yarn/supercluster-7.0.0
build(deps): bump supercluster from 6.0.2 to 7.0.0
2020-05-13 10:38:34 +08:00
@thinkinggis 3d17ce7fe0
Merge pull request #346 from antvis/dependabot/npm_and_yarn/gatsby-2.21.22
build(deps-dev): bump gatsby from 2.20.25 to 2.21.22
2020-05-13 10:38:01 +08:00
@thinkinggis 65a9445f52
Merge pull request #353 from antvis/dependabot/npm_and_yarn/cross-env-7.0.2
build(deps-dev): bump cross-env from 6.0.3 to 7.0.2
2020-05-13 10:31:26 +08:00
@thinkinggis 9584c4dd9f
Merge pull request #345 from antvis/dependabot/npm_and_yarn/tslint-react-5.0.0
build(deps-dev): bump tslint-react from 4.1.0 to 5.0.0
2020-05-13 10:30:24 +08:00
dependabot-preview[bot] e2502c00cb
build(deps-dev): bump cross-env from 6.0.3 to 7.0.2
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-12 21:28:49 +00:00
thinkinggis 760a044023 Merge branch 'master' of github.com:antvis/L7 2020-05-13 00:01:01 +08:00
thinkinggis bb64bf3a98 chore: publish 2.2.5 2020-05-12 23:57:26 +08:00
thinkinggis 7c74f3d287 chore: publish 2020-05-12 23:49:26 +08:00
@thinkinggis d86fc2a967
Merge pull request #348 from antvis/District
fix(layer): 数据映射设置成不存在字段时,不能正常渲染
2020-05-12 23:26:42 +08:00
thinkinggis 17a791223f fix: draw polygon 编辑已有数据 & roullup alias 回滚到2.2.0 2020-05-12 23:03:01 +08:00
thinkinggis a13369eeca Merge branch 'master' into District 2020-05-12 18:06:01 +08:00
thinkinggis 8e5224113c docs(site): add site district example 2020-05-12 17:59:42 +08:00