Commit Graph

2824 Commits

Author SHA1 Message Date
thinkinggis 6a6fa222a3 Merge branch 'master' into fix_storybook 2020-05-27 15:08:29 +08:00
thinkinggis 6113c46617 fix(utils): merge conflict 2020-05-27 15:04:04 +08:00
thinkinggis eab1f6edda fix(district): contry layer 2020-05-27 15:00:36 +08:00
thinkinggis 3aa1c2ef19 fix(district): contry layer 2020-05-27 14:57:09 +08:00
thinkinggis 3996a22292 Merge branch 'master' of github.com:antvis/L7 2020-05-27 00:59:50 +08:00
thinkinggis 271499dd9f chore: publish 2020-05-27 00:59:16 +08:00
thinkinggis 4b834efcf7 chore: publish 2020-05-27 00:57:33 +08:00
@thinkinggis a080ff7c2d
Merge pull request #389 from antvis/fix_storybook
fix(layer): fix sum statistic
2020-05-27 00:37:56 +08:00
thinkinggis 4dc0cfac3c fix(layer): fix sum statistic 2020-05-27 00:21:09 +08:00
@thinkinggis 243d555968
Merge pull request #388 from antvis/fix_storybook
fix(district): 边界不契合的问题
2020-05-25 19:32:48 +08:00
thinkinggis 064917c37b fix(district): udpate china bin data 2020-05-25 18:23:01 +08:00
thinkinggis 53810ead69 fix(district): 边界不契合的问题 2020-05-25 14:17:49 +08:00
@thinkinggis 4ff7fd0f94
Merge pull request #386 from antvis/fix_storybook
fix(storybook): 移除使用antd的demo,解决storybook ts 编译报错问题
2020-05-22 12:52:16 +08:00
thinkinggis 5d1bddaa62 fix(storybook): 移除使用antd的demo,解决storybook ts 编译报错问题 2020-05-22 12:18:37 +08:00
thinkinggis f89b84f92e Merge branch 'master' of github.com:antvis/L7 2020-05-21 15:34:43 +08:00
thinkinggis 0a91065fa0 chore: publish 2020-05-21 15:34:17 +08:00
thinkinggis e98614dbe2 chore: publish 2020-05-21 15:32:36 +08:00
@thinkinggis b0691c6c60
Merge pull request #382 from antvis/docs
refactor(district): 对行政区划进行抽稀处理
2020-05-21 15:14:31 +08:00
thinkinggis 0beb1405b7 Merge branch 'master' into docs 2020-05-21 14:57:25 +08:00
thinkinggis 948446f000 refactor(district): 对行政区划进行抽稀处理 2020-05-21 14:28:37 +08:00
thinkinggis f89d460bd0 Merge branch 'master' of github.com:antvis/L7 2020-05-20 11:49:46 +08:00
thinkinggis f00a72c61f chore: publish 2020-05-20 11:49:09 +08:00
thinkinggis 220bdd8a9f chore: publish 2020-05-20 11:42:08 +08:00
thinkinggis 95648676cf Merge branch 'master' of github.com:antvis/L7 2020-05-20 11:29:28 +08:00
@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