liyang
|
08b37db740
|
去掉没用的代码
Former-commit-id: fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly 4a7762aded9043a5399419e26d290be536062b6e [formerly 1fed2b0c71992e1c71db85dc3b50bf291e49b7b3]]]]]
Former-commit-id: a9866dff1ed147e4e8d14afe7f9a099cf2dc97b4
Former-commit-id: e4e72e484190486e76da71a5ce940793cee5aacc
Former-commit-id: 7e71b32d0e43af89a3fe8b0186f015d93a2098ec [formerly 7061988e02c8889f8835450fe568c9fee851924c]
Former-commit-id: 2996c6d457f31d784faa7fbc5dae84d7854c8c62
Former-commit-id: 4822fea0354118865b066a45fbd704128e86da5b
Former-commit-id: d52eee31ebe4717d8953e277750e966a5fbcd92c
Former-commit-id: 54682d51bb436fbca90adfaefcb2f97c0f535776
Former-commit-id: 12b9d8eceea4554ecad99d00fa166d51924efeac
|
2018-12-13 13:31:53 +08:00 |
|
liyang
|
aac8020433
|
Merge remote-tracking branch 'origin/master' into develop
Former-commit-id: b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly 5d2850b106dc1b50203c5ccd07aeaaf5e64abefb [formerly c47bfaf61c987bdcbd67d5ff33cee57ceb85520e]]]]]
Former-commit-id: 88ba97f79d648bb483a7c17f2b5acc9f52094937
Former-commit-id: 0abca3842a16aec2ddac7b1f4c87ee075e14cf82
Former-commit-id: 577aa39857ded4d6c2ebabb1908ec4774522fb9b [formerly 3e1b8940baf7bef31499565c7b3176816622652d]
Former-commit-id: aaced5d0b59d752cd9ae2509f4ac0c9ca53801d4
Former-commit-id: 1d26b050bb8a3d4c0b0ec52ff1b293ac916c9196
Former-commit-id: 5cff9c3ba978c84e295085e17ac0bfaa0094679c
Former-commit-id: d6b793809fb85991daf546fb57ce4618b0136edc
Former-commit-id: b38f8d0b0f421d1b2ab672ec9e02c701bbb1b79c
|
2018-12-13 13:24:28 +08:00 |
|
liyang
|
15c4cffc65
|
Merge branch 'hotfix/mock-suit' into develop
Former-commit-id: b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly 3b2dabf1723cce258edce353af9df1dbc560a390 [formerly 3b9658bc2cabeab6f2c44868a3dd33ab4d8ac754 [formerly 40cccd4355392058b00a4dce4a086ee86bab225d]]]]]
Former-commit-id: 7ea6c9718088202c6d577ead38b43ba276f40631
Former-commit-id: 4b2804be3735ddc0c801e55e6c7631143059c163
Former-commit-id: 1e9c1f8c221ad56e77a7981d2875346ea1b5baff [formerly 3d1495e181f44f7b3f5f7aae6d9367be4f1eee5f]
Former-commit-id: a5aa79828b945130298a22cacd54317d720bceb6
Former-commit-id: 6807140cea1ab7e4a382bd1e99eff3fd1a498313
Former-commit-id: e21532c43a3134e7087974b1ffb35948eaa9e66d
Former-commit-id: c2252a6adad80610f2350963d72bf06b159da443
Former-commit-id: 4d0f698aefaedc4daf248b96e768683487c10b29
|
2018-12-13 10:30:04 +08:00 |
|
liyang
|
b2d52bb33c
|
Merge branch 'hotfix/mock-suit'
Former-commit-id: e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly 3233bbf8231b1e63f7c978ae1214ed48224eafc9 [formerly 937e9349ba90ec03e639e8d63539a7f384c385d3]]]]]
Former-commit-id: 473c82c143373f5f21f3e12772ad96b12039bb84
Former-commit-id: b158a89addbc07d8a29e73197d7425d6343d45e4
Former-commit-id: 74f425887c251da3e748588971a9c551ad0e7c00 [formerly 266c889c322fbdc108ff0b7a749571e02353375f]
Former-commit-id: 384dfc188d100face6f5f3b7947adb3675fa9d2b
Former-commit-id: 33becace2f0f845ae5797e2e1a732fac9a6dfa9b
Former-commit-id: 661e031b1ca40b556fcdd0a988844ab890181372
Former-commit-id: 43f6dc48ec6c87ac463610a05ff7e547569c5484
Former-commit-id: d5fda10a9e425941d452926776ba6004044a0617
|
2018-12-13 10:30:04 +08:00 |
|
liyang
|
56223d9195
|
更新 mock 设置
Former-commit-id: 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4 [formerly a995dd4aa6a5745242d449c1114d41592437d318 [formerly 84ceaffec1514357a65944b2b2af6ad55eed82cd]]]]]
Former-commit-id: 7fff6c3cca28a5b09ebbdb395fb250487bee6da3
Former-commit-id: ed647717531cb8a8d9ccb276c01986b5f8af7653
Former-commit-id: 7afd7c7718a1302fe0adc74bd06a1af0992fc305 [formerly fe10b57a2e3e9738867df9c88ec22d51d271891a]
Former-commit-id: 8ad7dd5c5e2ecf759e0ffd82e296658b5d735dd1
Former-commit-id: 289a192ca0d76c1e99dc1a9786a71580f705a1bd
Former-commit-id: 06de0f519d511e893333553a3a25d4388308e1b0
Former-commit-id: 0f21f9ff42abc15714f0622b0de1770509e19052
Former-commit-id: bbef35694d434bab48f2fcf49d7ae459fe7bff2b
|
2018-12-13 10:29:56 +08:00 |
|
liyang
|
b1afe31a05
|
更新mock设置
Former-commit-id: 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly ac1af8ddc9819b789fd70b8da10ee223faed6e69 [formerly 22a45253b3ddb18715a39500f9bf5b56e1b37c6e]]]]]
Former-commit-id: acba007c5344dce6a0122676027ba0266c5636b0
Former-commit-id: 33b90caaf8810a029cf1f051b4b0f30f7c328309
Former-commit-id: 6d602d737c16c5eda5f8e2448acb7c83c8df8c4c [formerly 415683706be473d2888806175eec075c57798e0e]
Former-commit-id: c5285636ff550374708ba4346fc6e98eb08d32e3
Former-commit-id: 0ed99aac2efee06256bc94d52eac820ca24dda35
Former-commit-id: d8a75b3f1da2a75645e0965f2b278bde10ef16cb
Former-commit-id: 8b424ac8ef5df06cb89d76e4ba3a3fcdeb34f113
Former-commit-id: 93f866cbfcf129ed0f0393c4bf567a45c6a17568
|
2018-12-12 22:58:18 +08:00 |
|
liyang
|
82c7f98e7c
|
优化 d2-icon-select d2-icon-svg-select
Former-commit-id: 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 275123feb74c1c623162bbc40297f0aa7bc86fe0 [formerly 61a358238bfa2687b4af53abb16f97ed66000360]]]]]
Former-commit-id: 49fe5afc42637c517173105f33df8c8870d7fe88
Former-commit-id: 9f9153a76016993bdedfd6e6f7732e668b2047ea
Former-commit-id: cf1a0a4bf0e33deb3167c3583a4b98b18dc3246e [formerly 9612610849efccc456868c65de8f6d78fe1eb690]
Former-commit-id: 57967a2dcda29767e87196b4d82e433e4246e653
Former-commit-id: 85c96b419d24a43117c75a34fcc8454b57f72336
Former-commit-id: e58a7e88a7925b5e0761f919fa2f2160a350b681
Former-commit-id: 94635a1b758e730f362bf40949676cc2b320bf55
Former-commit-id: 6f412615cab141a24d32e1c259f949c13f78c6b9
|
2018-12-12 22:01:27 +08:00 |
|
liyang
|
d7a2b04f45
|
select-svg 基本完成
Former-commit-id: 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e6796da5ea041da9ed2fcbf89e84c91e2b7b230 [formerly 226e52a0e20b8a9cd011e2a2b0b0da2c25b9db4b]]]]]
Former-commit-id: 4fd47532611745f6cefcbbb3f9f9409c6cbb978c
Former-commit-id: 4a9f59b88aa4d6a164010e2cf80a20a6ad704efb
Former-commit-id: 8b2408f7205cf68a8920e6287ad7cdc6da541d13 [formerly 50abaafae7d85ed49404b471297543a95c773e68]
Former-commit-id: e9c5c24e393c7cc06f275b8249a1ff10e5aea3e2
Former-commit-id: 133e32b20973babb6cb2815c5f88f925e1d68cf2
Former-commit-id: 5b4528bd6e10f53f5ca19948af5fbe40a18ae4d3
Former-commit-id: 429cc57574024a3d073657f7c773104ec29ced39
Former-commit-id: b78065290d0d26c7fe4c6b2fd41288fb115686df
|
2018-12-12 20:57:40 +08:00 |
|
rongxingsun
|
96cc681731
|
layout取消动态加载组件
layout的组件动态加载会在刷新的时候出现先后顺序问题
Former-commit-id: 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5 [formerly af8c9b2260b28367beee903d7107ecfdefdd250d [formerly 31e6128abd4cdf44d8bfbb026c6846642582d32b]]]]]
Former-commit-id: 03dbfbb36f897504d6376a471967c5cd031b757e
Former-commit-id: cf7475f76a0fe43fa7001f4c25d75d0145c1ddab
Former-commit-id: 6e1cb39513ee655df40e66ee7ee586deffef1cc8 [formerly cf6873c601be9b5bfe0ea7aa4fc32a2410cc2393]
Former-commit-id: 6d41c5b53915640ea03e07263af12886d47ad46e
Former-commit-id: 7314042040ddea1b9edfe9216fe56cf8b4b0b881
Former-commit-id: 7f8078fbc20b2f048548217642c9fca1565d6fbd
Former-commit-id: bed1f60c17d2d6f3479e2d64e6cb0813c29d051c
Former-commit-id: e6d4357369acbd102fecfcf316e3842ec9f5f7b0
|
2018-12-12 14:37:46 +08:00 |
|
rongxingsun
|
28e8bcb897
|
Revert "尺寸刷新的bug"
This reverts commit 328a9aec42 [formerly 85cfbb927a6158ff2b48a75473e4b15e42e60ebe] [formerly 82d76084b5209a2fa5a8cc99cc4903d94b74d193] [formerly 03982b2b77c19c0688b96a3cc44522067f20702d] [formerly ff33ba85b39233d96d91f6abaeeb23f270031d97] [formerly 2c828d157eced3bfe3e44466e34f25be78175819] [formerly a2683dca11a10f4761e9192f46a1d7c9361e979c [formerly 4616fa95c3efaf5e84edd754cff9fa213e2f17ed]] [formerly b9ea8d1cffa6c02ea9e9bed2f13dfa9361927c7e] [formerly 49b1f49e3164183b67899541dfced086ecf4b806] [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly bb735b1c6dedb0243f3cf9fe2f5abdb30c91a86d [formerly 8e127fdb34322627d335af65e8e559cdb76a92fb]]]]]].
Former-commit-id: f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly e2922802b27a664b07de229beb8dbf7d8126d18d [formerly 7bae0f13cca1ee2f3963f19af11ac3ea2584fd6f [formerly 6adad48ad4a5865e68e22b32f2e08865ea45ecf8]]]]]
Former-commit-id: 95a2606465d49d7de1adac0d48747039c68b8849
Former-commit-id: 4348615c4834deb9a5ee495d891e64ea997fb79b
Former-commit-id: c1bbf20c099d1e3e9596530814a31ddeffc2bbb6 [formerly 54bf5a72159c71256b5d077a25b7fef9acc47d4f]
Former-commit-id: ee7bdea10532029c70c6b538ea74037413b5cdfa
Former-commit-id: 383ac7c2a1090834695385c36c187b6e0e0276eb
Former-commit-id: 106561c387c996a73af122b9f9f354ec5de920ee
Former-commit-id: 7a0a7f903e0455c74d6978c9443095c7fb2c99b8
Former-commit-id: eba9c0a7d34ca58138f80f4c14cbc2aa1ab76e2a
|
2018-12-12 14:23:15 +08:00 |
|
rongxingsun
|
328a9aec42
|
尺寸刷新的bug
用户设置了尺寸，但是刷新之后第一个页面尺寸还是默认的，页面切换之后就有的
Former-commit-id: 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly bb735b1c6dedb0243f3cf9fe2f5abdb30c91a86d [formerly 8e127fdb34322627d335af65e8e559cdb76a92fb]]]]]
Former-commit-id: 49b1f49e3164183b67899541dfced086ecf4b806
Former-commit-id: b9ea8d1cffa6c02ea9e9bed2f13dfa9361927c7e
Former-commit-id: a2683dca11a10f4761e9192f46a1d7c9361e979c [formerly 4616fa95c3efaf5e84edd754cff9fa213e2f17ed]
Former-commit-id: 2c828d157eced3bfe3e44466e34f25be78175819
Former-commit-id: ff33ba85b39233d96d91f6abaeeb23f270031d97
Former-commit-id: 03982b2b77c19c0688b96a3cc44522067f20702d
Former-commit-id: 82d76084b5209a2fa5a8cc99cc4903d94b74d193
Former-commit-id: 85cfbb927a6158ff2b48a75473e4b15e42e60ebe
|
2018-12-12 10:09:22 +08:00 |
|
liyang
|
08127b0719
|
Merge branch 'hotfix/api_flat' into develop
Former-commit-id: 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 7f04c6f9bafb20b7c2686be90078e478919661c4 [formerly 521ff85eb96bdc3e49504d948e09085a96caa38e]]]]]
Former-commit-id: fda8c40ccd993f75cf8492ebc288abc39cfceeb5
Former-commit-id: f568cbba4c3d7c1e405e58a03041d56e2671817b
Former-commit-id: cc65b229be1d9e9063de60b85be5f3d4e05395ea [formerly e7ed80a376965f5a69a315e870ff77010d7eeb71]
Former-commit-id: 8ee1941d990e14d54a0616cddbde319bf9ceea50
Former-commit-id: 60b97a2aa47bf6f38cd512e2691caec81d0294ac
Former-commit-id: 423e0f3150ee79ca2782295c327f85fdc188314b
Former-commit-id: 040f18b7392ce5f1f83962a243432ed90ff3c27e
Former-commit-id: 9fa197cd41b3fdfab4cba826c6a05be207b10485
|
2018-12-11 08:48:45 +08:00 |
|
liyang
|
8104fb1db6
|
Merge branch 'hotfix/api_flat'
Former-commit-id: 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 3b01361156a8b46b4f4fdf0d352ed95f4dffd090 [formerly 7279190907d6f3e08cc0fa139c807db633a90266]]]]]
Former-commit-id: 02c0d67963b8e9b44a3eb8f47af3acc0b792f5c6
Former-commit-id: 7927a43ea565f1212d8c9afd8443ace54fcaa0ed
Former-commit-id: 837ad74b2bb69eeb4596363c8fcebe9504d0e472 [formerly 655f9f32999ef86372f9b6444f83a8e6e2b2fb5b]
Former-commit-id: f2d5d6a409633d26d3d071bdddc59b946f04687d
Former-commit-id: 55882fd86649094099af5d2ff48ea14064665417
Former-commit-id: 811fe296d0b6ce21122386c693beb7d5bd1824cb
Former-commit-id: 0fed6d95efc7f8b87da04a0483772fd6448e77bb
Former-commit-id: 917b93d2011ced4b3ddec5376c5718cc1337143b
|
2018-12-11 08:48:45 +08:00 |
|
liyang
|
3e9adc118d
|
flat folder
Former-commit-id: 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5 [formerly dddeab643660d9536ccca28a7b131064862a0956 [formerly a60252b4bb0f8e4357c8fb5d96baa92b34348fd2]]]]]
Former-commit-id: 95c2b6d11f3fca5c35355f6e4462fc48bd75b837
Former-commit-id: 859b43e95cd2d96a6fbccadef42b5ccf030aec0b
Former-commit-id: e095e2d838b165bae833f949655dcd0616dd36a8 [formerly 4457c0c04c4c7dc570cc2fdc8b6c1d9ab63d4e7b]
Former-commit-id: 268d04b33f65537fed5e70f86a765e9d65569458
Former-commit-id: 6895dc7270ebceb21c77c2663ab3ad912b26a02c
Former-commit-id: bb41e9fc1a708ff94371c4c2a7cc14bd6ed40049
Former-commit-id: 5170da37ca33777f225f5ce6e2387ed6d0b1741d
Former-commit-id: c617fbc5781e40482af82fa6bb8ea5105c3e5d9c
|
2018-12-11 08:48:38 +08:00 |
|
liyang
|
9ea2ca80ec
|
Merge branch 'hotfix/mock_flat' into develop
Former-commit-id: 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 023d3df30a12391b09825cedf5bf9c64501bd8ab [formerly 235bb7b12ddbf799880031aa01077f415171cc23]]]]]
Former-commit-id: 358d8e104fd4c92f8237db9f4b662f0b29996ffa
Former-commit-id: 8a3821fb8292c16ec93b759fe69eaf476417aeb3
Former-commit-id: a908004402917c9b7f049ae253ac1ae2f789f5aa [formerly cd226fb245fda6648f52caefa9d6d2d3edfa38bf]
Former-commit-id: b934c1367c98ea47e7dd9e8d8571a2a401ed1c9d
Former-commit-id: 3e87e32d0766b09cc9c5b7375511e8612ebe519e
Former-commit-id: 2ce4bff0d9e276b303241386079a251094b76cf4
Former-commit-id: 8ffad4aa0d4255a84023e04670424fa9d1df0217
Former-commit-id: a1f754aac9edbe5669178dd8b1100b24c02a722c
|
2018-12-10 11:04:53 +08:00 |
|
liyang
|
a86c55eb89
|
Merge branch 'hotfix/mock_flat'
Former-commit-id: 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly d65ae43963842bdc56b7d63b97db3eaa1907c686 [formerly 1119195197803dd3a3316de917dd02899add4d83]]]]]
Former-commit-id: fcc844dab0e8242436a6520fc241ebfb92079323
Former-commit-id: 94200ee18983b3a2b3d82b35d293625cc1c631af
Former-commit-id: 800f78f70bf9638edff6f274f7d914af1ac7650d [formerly dc26df92d7e7217855f9eb20a4b7fc91100ad841]
Former-commit-id: a9cb0fb421e2e43ef279ada047f91d256435dfe1
Former-commit-id: fdd71672b20dd5068ddfffac18adcc39a975e7d9
Former-commit-id: 76e470db75c164f3b52f55cb914d833eeb62b5ff
Former-commit-id: b39460780aa788015fd0ced2ef3b989e36f409b6
Former-commit-id: 16cd632f68d46f7f63e9e2f74ea5391339bcb556
|
2018-12-10 11:04:53 +08:00 |
|
liyang
|
0cf23cba57
|
扁平 mock 文件夹结构
Former-commit-id: edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly 43d43484c561dfb366be8753aa5b461102e522f4 [formerly ce97e5f40c2e049145cace63cdc33c1032d444de]]]]]
Former-commit-id: 089a1e97d20d590cd810555ddb5093be36c4927e
Former-commit-id: 396e69f142ab127168c1ddc23351700d3f950b10
Former-commit-id: 9d77bdac87df7ec8c2e89a91218039cf4782f7fb [formerly 3c3cb317e3111c161c3e0f7edd33f881c23a56af]
Former-commit-id: 594a6423a0489a0c45c995390472f8ccf9aaaa4b
Former-commit-id: 2ce9acf12176cdeddbd0abfe54919e4cbdbd046c
Former-commit-id: 9fac2de7e4e93f2c107443b2e4cf7d9d15e2c3a7
Former-commit-id: f8fba332b2c45d1249fcf9aa4037262afa6028bb
Former-commit-id: 06b541ec993f9fb02646bbb8cc01099a45371c94
|
2018-12-10 11:04:46 +08:00 |
|
liyang
|
c10be83ac9
|
Merge branch 'hotfix/module_index' into develop
Former-commit-id: b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly ae693b883d03b6dbeaf890b8f8399bc00613eb7b [formerly 3d0f191ed00bb60c35da9e4795be45c12ae94cce]]]]]
Former-commit-id: 8ee0b500f9f4c47fdf2bad0df25c31dbd6c5345a
Former-commit-id: 21d4c18d67d7ff8eb52479e84169fa1a2b5f2c95
Former-commit-id: b5cfa4558659b07d6b35494b127593b2fa3f9949 [formerly 7704295cccd6d36b7942d5e1bf1130dfbe85bc1b]
Former-commit-id: a3ccbc558530a951ae4924753bcfe39ac87be22d
Former-commit-id: 0fcc97a04f2481eb65b406f279d192870eb3b1b6
Former-commit-id: ac1b85539ad90ae766524c2c9b4d49999c7d6b7f
Former-commit-id: 877e491cd7e24d3daabe677c7a52654d778f36dc
Former-commit-id: f608cc6fccdb5522d2e61c9fada5d4db89857106
|
2018-12-08 18:52:25 +08:00 |
|
liyang
|
d4197f4569
|
Merge branch 'hotfix/module_index'
Former-commit-id: 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 8a994fbbeb86000f86c396c8a3ca9e3498870958 [formerly b744466759f626e749132ebf2c5e81ef4e34e3f0]]]]]
Former-commit-id: e3c27c70ebbd5778dfeab31833b336a25304f2d0
Former-commit-id: 74db91270cd182f86139f5aaad6ceebde256129a
Former-commit-id: e3427a7ef289292fc00fc321297b4479c2135ab3 [formerly 870b67918e12046862770453d36b7d26291ff583]
Former-commit-id: e87d609da789038a96c9252cd87f38e21e34ec49
Former-commit-id: 10f0981446128b2f6e70a0ecab9ca253664e18fd
Former-commit-id: ec9c288d34a5d66429ce07f0788e920559f40d32
Former-commit-id: fd2f0dd665cae772458868da11f9faaee40d99d6
Former-commit-id: c1b03e3ae0b6533aacb7112d8ba1c3604a829c81
|
2018-12-08 18:52:25 +08:00 |
|
liyang
|
00d9b3dba8
|
module index 和菜单使用相同的路由跳转逻辑
Former-commit-id: 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly e996a77cf10a373f0e0d81721424667dca65af31 [formerly 6c1273298c08f1b9cf2505992ac7b6f0de8e4588 [formerly f64555e2dd133fe8d1b61c4502c91bdc546171e2]]]]]
Former-commit-id: aaec64a1729363181302bb856fcbe64e243f9871
Former-commit-id: 5cfded1e6acf2610eb1dc9ca11f84fcee0def4ab
Former-commit-id: 6db2d4d93f7809ff59f36381d18e660d74f73d4c [formerly 73a93e0b15176202f143a9a57794370a58d0f9cf]
Former-commit-id: 626c50b4a567eb2621e7e071aa24aa274b4d8dd4
Former-commit-id: 3f89e6c8f9e483b8b6cbab944cff1b808db6e4ef
Former-commit-id: 5d356777464c6aa5ff849c622c87ccbbc3831249
Former-commit-id: c01dae77899fdf8a5f12c0edd1d369458ccd767b
Former-commit-id: 611bd3819a80713ab49e28f4bb609eaac1f3bf01
|
2018-12-08 18:52:17 +08:00 |
|
思维空间
|
7c12c19499
|
Update page.js
关闭不缓存页面时将导致findIndex返回-1,从而影响到可能需要缓存的页面.
Former-commit-id: b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly daa045df580eea9044533854db79c4e1d2df8e81 [formerly 2376d2ff14a8d7f390957e7fc188ef969c95e233]]]]]
Former-commit-id: d96a65bf3fce18605161d186097966b5f03171c9
Former-commit-id: a20a3689e188b55e6b559bdab3706d66bc502bda
Former-commit-id: d9703316b304cbc1c67492cecd3de57252865861 [formerly 0535a169e91d3af3104f0e0ad6ca5e81de09e909]
Former-commit-id: e7eef6f66b4867bbc28ae2e369f3bfeebe213391
Former-commit-id: fd23177aa47c13b7d28e253ede8cf0e9e2f482fd
Former-commit-id: 7ef86e92237fb24d70eee9f79729b580125c909d
Former-commit-id: c608e97d7e6687a0ab67d17c750f736cf512136a
Former-commit-id: 67df9fdb44662647029a97be4f23c0277c799f60
|
2018-12-07 14:25:06 +08:00 |
|
liyang
|
9f67008854
|
Merge branch 'hotfix/contributor' into develop
Former-commit-id: a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly ea3026beeaf90868c2c63e057bc0e7b2b3273150 [formerly a527e5a27605575e9b4a9b485ed17073db4bf9d5]]]]]
Former-commit-id: 56eafec4afa3a841b35ecd61398cba8a49698877
Former-commit-id: 3811c17f54b211e62786caab390dd8dbf10d18bf
Former-commit-id: c483be9312351f0ed87cbd0187cb4a1421b5d845 [formerly 762cce6de374b8dd8073b6b26954915091892bd6]
Former-commit-id: 2625e4927927b68653091af3cef6b26a879cfbea
Former-commit-id: 5587e09155495ba35d733ed6e4bce1a7cce31005
Former-commit-id: 1ed2eeba0032e762247539a39141a68b180089d2
Former-commit-id: 24087ac0d5cea5b0f91dc75383f592eb1e35d0d9
Former-commit-id: 7d8bcc74aa959d3bee0be7f16a52ebfbc7f27015
|
2018-12-06 20:11:42 +08:00 |
|
liyang
|
b8e33d0013
|
Merge branch 'hotfix/contributor'
Former-commit-id: 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13 [formerly 5e0d2fef774c1b3aca1ad8ca3a4b486751539d1d [formerly 13393e66e71ed38eb93435e4cc626e753bb6d048]]]]]
Former-commit-id: e12fe642a940b18f9fabcb62318627b983ca647f
Former-commit-id: da4a020a242a88b97c47f6ff78122a9967504233
Former-commit-id: 5d5d0ae9b46e5d6ab1165b2514e79cd2dbcad3f2 [formerly 58eaed862638ed9faf047c97c7364dcc58eb523c]
Former-commit-id: 204e9c55b9f8f4ad41ed765ae57e2eaac746ffa2
Former-commit-id: 95a4c8c9cad0dcf2c94ab653114874921e42ac23
Former-commit-id: f60f62c5e936edc8ddc86db3c2983d57b7c003a1
Former-commit-id: fd76fc25a4eb992f6536ba2687b4a648602d1289
Former-commit-id: d69f3b1fdbd620ea793c0f9af34e3a68fdb0ff1a
|
2018-12-06 20:11:42 +08:00 |
|
liyang
|
8ddadadaee
|
Important contributors
Former-commit-id: 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 6e1f0523d51dd33958dd54cbcac3257252bf6e2b [formerly 22bd945a395aeed408f28e280a8e33545619231f]]]]]
Former-commit-id: 6fed1b84a5662646773af56a4bf97315b478c74a
Former-commit-id: b1c879e14bc8860d766ca82c70e096e75e32b40d
Former-commit-id: 924e38621f0b12e39415d2000691f846a9c928cb [formerly a9596b62e63452abdc3b5c17f46437775c8a38a5]
Former-commit-id: d43c7059f24a5db7eb677ae60cc5f8877256b6e2
Former-commit-id: d1d1f213f620541fa8c76e209b2945feb06355dd
Former-commit-id: eaaed17fd7a13c94fca9d35bea4a29af05d35f90
Former-commit-id: 31134849fec18c630527c73c0fb540e1bf74dd46
Former-commit-id: 03f9a4cc2988eb4c0fbd165d48ad3e0300febaaa
|
2018-12-06 20:11:34 +08:00 |
|
liyang
|
40a79e66f2
|
Merge branch 'hotfix/requireAuth' into develop
Former-commit-id: bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly 767f24a44cbf4c52d6572a4fb0498372688efd1c [formerly 4ec154f1633d84d570d65da4dc973da075089fb5]]]]]
Former-commit-id: d9b628aa1678e2ec10ab420fb76fb6ce181102cb
Former-commit-id: 87e71a1ac8e4683e43fe914ab23bb82ac5e83a57
Former-commit-id: e31f2c8ea0b4085b93faac92a80c2ebe200faa0c [formerly b1d399ec58010f847ad7087107b2a7e92e8bbdb1]
Former-commit-id: 8ba07021a8c1747a3d81f15c137b25877079b133
Former-commit-id: 951a4aee02ef60bdef59cf30dec8f48633f5c2e1
Former-commit-id: f865aa1eeade023c7f9e69d8aa30e35c2e22ae90
Former-commit-id: cab6ad9316cc583d9c09a6902278a7bb537b5f31
Former-commit-id: 2e41c18b173ea3f2034cf11bacc8de5a002864ed
|
2018-12-04 10:18:49 +08:00 |
|
liyang
|
cbf246d05b
|
Merge branch 'hotfix/requireAuth'
Former-commit-id: 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 6f241ee65a6bef976421bfdde133e002a4eae935 [formerly 49ef89c90ec29ae88beb5fff944a9f9a529d5e56]]]]]
Former-commit-id: dbfd6018a3d0aec848d2d5a3464be2526a4b9f8f
Former-commit-id: 779518ca8fc707c1642f88cd80bc3a6ee4c4976e
Former-commit-id: 993f58ec14d0bb701c97efdca02f07cc27c040af [formerly 5e87d739d1a5d07e68d24c97adc0483a35d5666b]
Former-commit-id: c2ca454b036d3d2d47618a8c9ef1bc811cc99b7a
Former-commit-id: 841f7beb6f666e47284b12c3af261f19aef2be8a
Former-commit-id: 739d84e318361239f59cef7222dcdd782515b96d
Former-commit-id: 904361087f17d22181fa60f18388544362d041ac
Former-commit-id: e8d465ad7a13a142e8db85b84b33adbca7c1b5dd
|
2018-12-04 10:18:49 +08:00 |
|
liyang
|
084e5312c0
|
更新字段名
Former-commit-id: d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2 [formerly 40082eb66b073a0210c319efb825d8e2ae5d9395 [formerly 163984d5d800002566d5786c1a9208bc7510ddee]]]]]
Former-commit-id: 5648ca2139a3afb28c175f8f27f2c8d9795a6477
Former-commit-id: cb08d3616c4256748cc7f8a7aeaa890827abf352
Former-commit-id: 2b76bf9ddd8166b47f9dec5275baf2fa09f5b82f [formerly e0ec8a7e3d8189c6067842d1ad61e943eefbc2ec]
Former-commit-id: f8b49ece9798cc72c3757c6e0527a7af234ae86e
Former-commit-id: f6d5e4de14a194e3bf23eb29c5eb27be99049728
Former-commit-id: e3bfd6aad4ed5d573b6a8a94c21bbab34df4bc7d
Former-commit-id: 4f54ba5c2ee7c8a71ede1ca8cc835782c25337de
Former-commit-id: b982ab172bcf73fa784067855b4c20f6a2756b03
|
2018-12-04 10:18:41 +08:00 |
|
liyang
|
6302db5c6f
|
Merge branch 'hotfix/模块首页优化' into develop
Former-commit-id: 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 9a5371a06f04aa9946e6de3bd6c3efe2c71e7392 [formerly 44e7b946805355d595b83ffe32a028f7c3705930]]]]]
Former-commit-id: 2b2aec25712f225c0b8557b929be977cd9bf5427
Former-commit-id: 4cba1ea1fe912fa3d7b91c6f3c9862a04adf3b6d
Former-commit-id: bf23d3ad70043e00ed5d8080a7ebdf71f7342797 [formerly 164b51dd80b07b0d1386e06ec7a3bfe6e38abd94]
Former-commit-id: 07f4356585c63b53dac55bfd082c45db1d79bec6
Former-commit-id: 3d13f1de8313c00781e54605e0fa17c2b401b283
Former-commit-id: 2a3efa70f407f219db41532ef5ee4a36bceed3d9
Former-commit-id: de005ac828ab5aff0b111c17b4065618006ce33a
Former-commit-id: 37c6b11cc919a73f77247c2e534ec4fdbb67216c
|
2018-12-03 11:35:53 +08:00 |
|
liyang
|
4df0913890
|
Merge branch 'hotfix/模块首页优化'
Former-commit-id: d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly acd4d69e70969268b4d01736275e754cef250d0e [formerly 949b9993d3a15549bdde4929ebb1459dc2c9ca95 [formerly 58293760d71d4cba9e939a2b499d3749fb3f5b15]]]]]
Former-commit-id: e928c12862dd7d62e651f3e0ffe12f547826f8b9
Former-commit-id: f1792ae75e9cbc7d18e1a95f64e180ada2ab037d
Former-commit-id: fad0c7c7c343975f457922043b061cbfb035674b [formerly 0346a76cce69e1cb08dc3ad5df4c746ec04d0a54]
Former-commit-id: 646f987fb1814b4fb1d46986bb151532adebcae6
Former-commit-id: 4c1abf97a90560fe281480f228320ef3e7a6880c
Former-commit-id: 0688efeb710b2b40aa2bb2d35f663de51222fefe
Former-commit-id: 9093ceb90221c73019427e0535df2d643955141c
Former-commit-id: 7d728af0fc5dfa4463c50c2819c315e629962f78
|
2018-12-03 11:35:52 +08:00 |
|
liyang
|
4e59b30666
|
在每个模块的首页显示链接列表
Former-commit-id: 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly beab075483c86b86dcf8088652d47d10d17e791b [formerly aa0a4c06e6e6c365614a38137e570322db6356f5]]]]]
Former-commit-id: e27ebca4c2bb81ef3930d2a2744b569e3ba0c47e
Former-commit-id: 05ab8b935658496dbb83ebd1726fd7abdb85b4a5
Former-commit-id: 9fe99c61fd2c812e7ac86a65ef7a96fb77e2555a [formerly 8448054abcfec1aeb5d29b6b3ab9bb7994a0e5d3]
Former-commit-id: c40b050f64112493e7ea738e8cac1b3ec32839d6
Former-commit-id: cdb02c46bc4ec0dd38a15c7682acbe4da3f4ffe2
Former-commit-id: 6e620c8a7bf1f4feae914af55a3d4e48f2527adc
Former-commit-id: 46e4a65d456e1159c9bb5d4c34d4c171ea38c145
Former-commit-id: 90f1ebb055ffc14de13d90d00dc7bb14545c34c8
|
2018-12-03 11:35:37 +08:00 |
|
liyang
|
4fd9435365
|
d2-module-banner
Former-commit-id: b53a4efdd302cab2c73a41bad81210c2aa0a9864 [formerly b53a4efdd302cab2c73a41bad81210c2aa0a9864 [formerly b53a4efdd302cab2c73a41bad81210c2aa0a9864 [formerly b53a4efdd302cab2c73a41bad81210c2aa0a9864 [formerly 692391c0606eb9b8ceb0bbb998083d5a605bb457 [formerly 0f1375984c7b0fe29eed44313886a9f146c44b48]]]]]
Former-commit-id: 2f97e9d04cc2e84454f130a56e5b1d48dd759588
Former-commit-id: 0452f03d06fda0d273e6fcb3ae788362da6af03c
Former-commit-id: aadfa6d6ef46a6a8c20f4041cdbeaa413af27930 [formerly cd4a60f2d7e470c99e1752c73c7bca3f51f92ec2]
Former-commit-id: e9520901ef28488e1f894071acfaa62cd2085cbf
Former-commit-id: 0ba7f79490f12fdbcf6d480ae29842c3ad5d1ca7
Former-commit-id: 4c45c39fab8805b190d2b684b2069f7e60f04f9b
Former-commit-id: 946e1a7eaa37e78409f08cf239b16638509cb9f4
Former-commit-id: e42aa962374f75e0fa23f86c801fa80489b2861c
|
2018-12-01 14:18:20 +08:00 |
|
liyang
|
c304e1fb78
|
Merge branch 'develop'
Former-commit-id: 8aacea240e82c49069e6f020ed311a8b0402c541 [formerly 8aacea240e82c49069e6f020ed311a8b0402c541 [formerly 8aacea240e82c49069e6f020ed311a8b0402c541 [formerly 8aacea240e82c49069e6f020ed311a8b0402c541 [formerly 3dec34ba137641397de6918132ca0fd3bf2398d1 [formerly d6f34220958f26a89411a2f548998e5e5a0db72e]]]]]
Former-commit-id: 81711a9431ba5987031759b9d557560b9a486baa
Former-commit-id: 58b789159dea7f5f4c5b7b4529e80f5b8b26c7f5
Former-commit-id: 01df0f56c519113b64c17089a138f4524130e568 [formerly b321d95a8c13a6d11bd2789d931e57998f669898]
Former-commit-id: c29bdb00dc5190588e2c1aa74223f81474a21d7d
Former-commit-id: 9ba0159522fb05545320516ab5ab66a738a62704
Former-commit-id: 29008eecdb152e2a85b6eb6affdfe69f894af6a1
Former-commit-id: d1a9a1be5c97ffcda2be01108232fe3ba9ef6d5a
Former-commit-id: 45f4f68e546e745dafb25eddff5df198c217fe9d
|
2018-12-01 09:04:52 +08:00 |
|
liyang
|
63476a9dc0
|
每个模块首页更新
Former-commit-id: d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly 1d08416010fed1f2f67f487d4c93ced2334e5bd9 [formerly a2250bf183540eb016a76fe6891d4930f7aeaec3]]]]]
Former-commit-id: 9a5f6e3a97a23ad6734a87e93284351eff9cfa9a
Former-commit-id: 48e636d6f3a252a6c3c89ecbbdc36b4b969d78e9
Former-commit-id: 0aa75a50770886d77d4f4660e11c9874819c3d01 [formerly 66c909149fc309b1715821d6512cc3288c3e0ac6]
Former-commit-id: de834b5ea328ac1aa664371f6d5c7044b96e8d4d
Former-commit-id: a049a32d41ac698119dafdde87842963097357a8
Former-commit-id: b17192706355ac212cd0224006f76c1ba47d50ea
Former-commit-id: d70f7c1eb4ac0b5941003faabfab4bd1342035c8
Former-commit-id: 3f00dfc99f25c34d7033fabcf98a0f8784b7f4ae
|
2018-12-01 09:04:29 +08:00 |
|
liyang
|
82d73a8599
|
Merge branch 'hotfix/filename'
Former-commit-id: 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 68018585c7e714ed1f34a9d724098a135ee843df [formerly 392ccd1d794efa1d2889171b3361a5e3a308f7b8 [formerly 6b1308e9aa93690c3ff47ee6e76e4bd3de0b5221]]]]]
Former-commit-id: 7cb998be55945671c1651492b4d462ba7345c63f
Former-commit-id: 30322a8fc03b28df45cb7787c0d39a5a234cde64
Former-commit-id: 288dde9afab6bf3dcb0e7e15e1b06de4a69571a9 [formerly 0f929557369af143620e0753a57d0120549a1dd7]
Former-commit-id: 73ee3f1fb69aeed9b4b2328b7965359824133528
Former-commit-id: 49155c6ff49b80edf9524268915ee571893d7798
Former-commit-id: d0a727f5d55ed7861e51a5913f6d96198318f543
Former-commit-id: 9eed6eafe82db5ab8fd4dce98ef307a6789fd512
Former-commit-id: 6daff6abc5ee7e73c3f6936ce38bba15a2661c52
|
2018-11-29 10:59:10 +08:00 |
|
liyang
|
d00fa6e120
|
Merge branch 'hotfix/filename' into develop
Former-commit-id: 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly 2a2095d4b3a58d1d4a78a87b274d710d6d27b02d [formerly feedfcba6fea93e9ca82911f586c73e0fbd4b041 [formerly c68b2d5e6dc5dfb6ee75d97ffbf7520d060a448f]]]]]
Former-commit-id: 1aeb991435afc53135bb2aa115454a438a218f41
Former-commit-id: df1208898cd1ea8bf9b5f1188845c47bcaae93dc
Former-commit-id: c505b2be3cc68c21d16df1d6556ce981211f4006 [formerly 99585e0dc55b78ce79110b1de07fa1c41fecd8fc]
Former-commit-id: 7057f09b61edfc6ff9b561f61435cdc65ec547cc
Former-commit-id: d89eccce8671cc3c1e5edd1b20c2927a1945768d
Former-commit-id: 79384a9cabff63136ed616c91d26c8ecc0a23e8c
Former-commit-id: eea7eab821e2143fce6b864205f9ade03d7d5a24
Former-commit-id: d6229a3a199390d6665db39578652911aed17f96
|
2018-11-29 10:59:10 +08:00 |
|
liyang
|
30aeb5b3c0
|
add filename
Former-commit-id: a837bc696f6375f9e16fe4841cb9abb257f31b78 [formerly 7d01c644068c3fdc3b67fd82c04807e6693b1986] [formerly a837bc696f6375f9e16fe4841cb9abb257f31b78 [formerly 7d01c644068c3fdc3b67fd82c04807e6693b1986] [formerly a837bc696f6375f9e16fe4841cb9abb257f31b78 [formerly 7d01c644068c3fdc3b67fd82c04807e6693b1986] [formerly 7d01c644068c3fdc3b67fd82c04807e6693b1986 [formerly e56c8a77e4bd3535427d82a0a18b973c62f7e4b2 [formerly 2df942e137264d8adf7fd1445bf31b111674ec5c]]]]]
Former-commit-id: b1516af5b237f99782835b65cd39684763eddee0
Former-commit-id: 4693907e76bde35e318f7c9316ce39baee7e23c0
Former-commit-id: 3d7a9f2a0093ee77d9e591c3ca06fa513fa1c92d [formerly 36c01f7a346633e2bc7d75156882e61e9b6c7697]
Former-commit-id: 1724330f1249c50ff5f14f259881f2e0b1ee93c0
Former-commit-id: bae7daa8303dd92ad7569d18ad879ecbca5ac025
Former-commit-id: b80589241689ae786f1054358aa42fe0f407e260
Former-commit-id: 1de740d464fa48e4f9af48c8d52bf6729c1d628b
Former-commit-id: 30f34a4df1ff706c890f177370f159698ac912d5
|
2018-11-29 10:59:02 +08:00 |
|
liyang
|
6b25a739c5
|
Merge branch 'develop'
Former-commit-id: c391581d1f50dc0007c1a41023c7b7d0e342086d [formerly c391581d1f50dc0007c1a41023c7b7d0e342086d [formerly c391581d1f50dc0007c1a41023c7b7d0e342086d [formerly c391581d1f50dc0007c1a41023c7b7d0e342086d [formerly 6714fbb0fcc90ed3d84deb9bedc81896085be224 [formerly 83c236d7cb6290a6b3273384b7fa56629cd05792]]]]]
Former-commit-id: f4024fb79b2e7e24dab7820cebb4fdc390936b41
Former-commit-id: 4b18cf78f2cc743a4f081159e938df041da5d02a
Former-commit-id: fbd05b9241aea06f3c8a9fd49afa771de3ee860a [formerly 14c0160a16ee5b784d5b7920f44e8e448bf700e6]
Former-commit-id: d60aa850fd3fa367c6a6df35b2d26517fcb7aeb9
Former-commit-id: c86f483c9a7a732bad5f8b1d4229aac1a4757ff1
Former-commit-id: a3a50396b004402749acccb22e4bc95577a333f2
Former-commit-id: eb0dca74c604a1edba3e307e58a4e50f4e647b66
Former-commit-id: 5a0e0551a20cb3bac5fd0046b3ec4fbe4da18e8e
|
2018-11-29 10:18:56 +08:00 |
|
liyang
|
6b018528d3
|
Merge branch 'feature/issues_demo' into develop
Former-commit-id: 079aee337ef64cadaa2c1eac9630bb9d136392a0 [formerly 079aee337ef64cadaa2c1eac9630bb9d136392a0 [formerly 079aee337ef64cadaa2c1eac9630bb9d136392a0 [formerly 079aee337ef64cadaa2c1eac9630bb9d136392a0 [formerly 3d22155e64acd9ea43777d6556c3acc7051eb3e0 [formerly ae0c18fb69c1ef99e3ad8157cad6eadeb6d88fe3]]]]]
Former-commit-id: ed558424e7e63c592ea687b33944d1030a6e564c
Former-commit-id: 682f832a0969a4c935a27e17f53064b50d638b0a
Former-commit-id: c0f7ccbcf711c79e5a1299b51c29d4cf96106672 [formerly a04bd44de9515eb0b27dffacd043d76a4ab1870b]
Former-commit-id: 8b9b528e5a19b505cddf1e48a79a58f0ec060cf9
Former-commit-id: f7b074a76d8f649ddad4868ba4c476d494fa425a
Former-commit-id: 6ec2423243ea85f89d88d55645df550b400fc36d
Former-commit-id: eec237ac6de9c57f04caae5dc47feec99e6a69fe
Former-commit-id: fcc45edcbeff474c56a4c6f59bc0d1435ad41d6f
|
2018-11-29 10:18:26 +08:00 |
|
liyang
|
13a13e3335
|
完成数据持久化方式缓存示例
Former-commit-id: ad9918157b0f25f353e218870a1486fd111c76b3 [formerly ad9918157b0f25f353e218870a1486fd111c76b3 [formerly ad9918157b0f25f353e218870a1486fd111c76b3 [formerly ad9918157b0f25f353e218870a1486fd111c76b3 [formerly 5ab32ee88ba0cbb71499514202fa88131944b6cf [formerly 8b6298bcec0cf00eda1342846fa3f8ff3fea5192]]]]]
Former-commit-id: fca6f35a71568c622756ce2341ca4c8d6a043fa9
Former-commit-id: ec6ab591de18bd6c57c3e4e93f708686a2d75386
Former-commit-id: d3153bca1972183e08a4e709c98cbb525914a8cd [formerly 051d39ec9aa2aa953143b2bb6f10fcb74f53d8b3]
Former-commit-id: 76b941703caef91041247018a11b1cf10999d440
Former-commit-id: f39e54960b15eb225abb0019219895f1d3864bb8
Former-commit-id: 0c790b19d0b4040413cdb16dacb11ce3db465694
Former-commit-id: 929843b780f1309638bdd31aa00965806820b41d
Former-commit-id: e5609aee97279c71ed2963f67f9521aef2fb86b1
|
2018-11-29 10:14:44 +08:00 |
|
liyang
|
c40ffd28eb
|
无缓存编辑方案
Former-commit-id: 6883d69fa575d23f2b84d87c98837513ce80796d [formerly d5db79752e5291211213ee25de648bef17890514] [formerly 6883d69fa575d23f2b84d87c98837513ce80796d [formerly d5db79752e5291211213ee25de648bef17890514] [formerly 6883d69fa575d23f2b84d87c98837513ce80796d [formerly d5db79752e5291211213ee25de648bef17890514] [formerly d5db79752e5291211213ee25de648bef17890514 [formerly 4e406142b9bb6080e9e1762c0a4bef23a1e50cd6 [formerly 1bf019d5133f11592485fa0f7cb1de7efec5b445]]]]]
Former-commit-id: d51db872aaf542f2b43a961e33072c072776506c
Former-commit-id: c5894cf9c1ee7748390cb62af232866c51c3c134
Former-commit-id: 65920a88a0ad59b76a722014c50fa26c2e72335d [formerly 69b2ad233bdca2af18a802eb70d8fc8f4f9b8c18]
Former-commit-id: a1bf30ad771fa9ebfd93f0d0176db83b8cbc761a
Former-commit-id: 01b20064c86040c27526f032537f393e4d45616e
Former-commit-id: 0c7c844d38c24679b82ed3b9c5eee402a835dd8e
Former-commit-id: 5221a9aa5913d25224c3a9060881124e90cc3876
Former-commit-id: 3712bbcc1f0c6bb7cb660871b9e14797146e596c
|
2018-11-28 19:43:04 +08:00 |
|
孙昊翔
|
ec29c3a6b9
|
Merge branch 'develop'
Former-commit-id: 1564670d72f2cfe6dac21706d0d821a780436d86 [formerly 1564670d72f2cfe6dac21706d0d821a780436d86 [formerly 1564670d72f2cfe6dac21706d0d821a780436d86 [formerly 1564670d72f2cfe6dac21706d0d821a780436d86 [formerly 19cd21cdebe1823db143a9f5520d82a302316544 [formerly 56af30f145cd456e8db497ca9fa98bafa7714389]]]]]
Former-commit-id: 0c2c1d697e0cd531277c5f027f3cf04cd02f6eeb
Former-commit-id: 5acaf89f29738f7196cd64fd8b1b77e4511555cc
Former-commit-id: cd3150dc1a59311b731294f09618585e68500d5d [formerly 7aacab7a274cc8c539e4f3e8b5ddc24e4cdb833b]
Former-commit-id: 3c380d9229e02ee21b9039f316054410d43e04e8
Former-commit-id: 157520535bf6c04b245ee62f97a3b1d7828977fd
Former-commit-id: 8e3578265f5f2920aa3e6503b58e13e73aa55fca
Former-commit-id: d30b8f3de65e3bee674b015ad68037b5bbcae0eb
Former-commit-id: 9ce8e3feb922cec426915bd6c11f30b6d665f6c8
|
2018-11-28 18:01:39 +08:00 |
|
孙昊翔
|
ae08232e67
|
更新crud示例
Former-commit-id: 6d09fe57501596731f9a3eafe99e4429e218957f [formerly 6d09fe57501596731f9a3eafe99e4429e218957f [formerly 6d09fe57501596731f9a3eafe99e4429e218957f [formerly 6d09fe57501596731f9a3eafe99e4429e218957f [formerly 5f1477b2188e51b1b56cf6a51ae947862f99c03d [formerly f3ad7a92540b96c2ef65a5a047ae4490c78ead31]]]]]
Former-commit-id: 4215bae97958c3c981ef35c98c99250429162ea5
Former-commit-id: f6baadd5b17f1bdb9ea5fc09c71b5184c07aa497
Former-commit-id: 71e6157c845860bfae5fc0f67687b67693fca044 [formerly f2ae5418b8a410f6694a91984450e3578a1eedd0]
Former-commit-id: 19df64f2e7361341a825659d0e26c44384f30179
Former-commit-id: 3cec5aa0a74a8a3f20ac838cda6904a1bfc6308a
Former-commit-id: 5cc251d3a2f189ee5c9cab94ba1bbbf7ff5ac140
Former-commit-id: f438a7bd215785594e400641cf587bd03222ac04
Former-commit-id: e4bf9030f71582dfe59740f32940e4d3d6577fda
|
2018-11-28 18:01:17 +08:00 |
|
liyang
|
947475bdc1
|
复现了问题 等待结局
Former-commit-id: 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly ecb763d008a589ee3b83854517804b1468ca7a09 [formerly b18b87cc41e0c54a93a2f5021fe6022a6fa2c5fb]]]]]
Former-commit-id: 51a327f9f3d7a018f099f72ad564d6604aa5e9d7
Former-commit-id: 81c578d9cef74d8513c8a3c65107cfdfd3c6dfb7
Former-commit-id: caad4b29ff03d5878996ce52ff20252336128d97 [formerly 42d8aa2c0c3332d2c07057d6f4cdf21388c08fb9]
Former-commit-id: a81ea126d2fa05ae5555f872669792a08f9f2ff0
Former-commit-id: d27d0e66ed023c621d2cd2711664f498a21bb8ad
Former-commit-id: 61e0719ea25d0c67c1c38ded8cf41be50c17d7b5
Former-commit-id: 17291fab193dcf38a91f44137fa271d8f2d4ee56
Former-commit-id: 5218d72d35fb2d088198c37187d662eca768bd7b
|
2018-11-28 16:49:46 +08:00 |
|
liyang
|
63befd33c6
|
add html demo
Former-commit-id: c96e7e73b5577d17be818020b7746c08b6258a3b [formerly c96e7e73b5577d17be818020b7746c08b6258a3b [formerly c96e7e73b5577d17be818020b7746c08b6258a3b [formerly c96e7e73b5577d17be818020b7746c08b6258a3b [formerly b8366a6d8947acf1a7236d2fcbe70fdde5eea560 [formerly e7d024c7319241b098239cecf544f3f506f2b522]]]]]
Former-commit-id: 56e1427ccdd3d3b96508b36e900b26949636206b
Former-commit-id: 41a84ffb578b100e70a0351c4de9b18255defb07
Former-commit-id: 031c4afbae818b08a3dae04ee9bc2cf7ee68a331 [formerly 8d68981562d608faf36fde7a1fea18d6b2b7570a]
Former-commit-id: 5f2d083f639d0b5b33ad0ab389ada692d14ca0a4
Former-commit-id: 4d165efbcac91e0bbcf794271b0562f436277ad8
Former-commit-id: 9e8bf683f1d5cedb7d6969e8006bfd35ab019e8d
Former-commit-id: 7ab7d18d389176b555ea53d20798647ea7d4f65f
Former-commit-id: 337861057a4ab74d8142525448bcbcf58f7617aa
|
2018-11-27 22:33:37 +08:00 |
|
han_feng
|
4f693eac6a
|
Merge branch 'develop' of https://github.com/d2-projects/d2-admin into develop
Former-commit-id: 15521a541e310de74912065cc1133ce08889930f [formerly 15521a541e310de74912065cc1133ce08889930f [formerly 15521a541e310de74912065cc1133ce08889930f [formerly 15521a541e310de74912065cc1133ce08889930f [formerly fc5a9256e27633eb60140995bd09a70eb7037f8d [formerly e86afd83b9e26d408b3669111bebb523af3287ae]]]]]
Former-commit-id: 73a4445708bd5e494fc4bf4a22a3229608d8deec
Former-commit-id: fa73feb8fe3476cdfcd12fdff3440042eaba697f
Former-commit-id: 8f56f14f1fda56bf23287caafeb93d7c235ed01a [formerly bc0f4255c0b67ef9c52764b9f25663b214566d88]
Former-commit-id: b9c4ca9c944a3652ee5bc6b6774f02fb8e678472
Former-commit-id: a5fc194dd772cb7adcc875880812c76de3850b00
Former-commit-id: fa1d1395d478a92d9303d8ad7efc1b6f6bddf48e
Former-commit-id: 8e5e69c4e2c519a1abd11e40d7501fa4168be8a8
Former-commit-id: 06cc77f59f1c407d925251345c2ad1e0cdcef859
|
2018-11-27 12:06:10 +08:00 |
|
han_feng
|
cf88407794
|
完善带参路由数据缓存案例
Former-commit-id: cf663fb2365102070ae5833803509e54cc6d8fa5 [formerly cf663fb2365102070ae5833803509e54cc6d8fa5 [formerly cf663fb2365102070ae5833803509e54cc6d8fa5 [formerly cf663fb2365102070ae5833803509e54cc6d8fa5 [formerly 5d3de55f1b3e944e154873794e9c427248fc60e2 [formerly 2ada62f9c7a52c41dcb34558f4b2666222d3d0aa]]]]]
Former-commit-id: 02c29c75895f6c43a3a4e1566e417725622aceed
Former-commit-id: f3838ec28879abf6836ce0709a455bbcdac9c1c8
Former-commit-id: d0a5abbdb2b10e8fda7934542ea9cbd42834e4e6 [formerly 782ff584d75016f13f86477cbb28e4b943043538]
Former-commit-id: 66ff5411c711194e790c9e04d5d954f47eda321a
Former-commit-id: 18244d2e4276b5fd315438c9b6fbef5c20b1cedb
Former-commit-id: 0689add39f32302ae4b4013f15342b9a3da4441a
Former-commit-id: 779aac8c587496eec2e54be7fe2e5f35e01daa33
Former-commit-id: ec613125c710f1bdabc19c10f5f164fb7f7b9db1
|
2018-11-27 12:04:52 +08:00 |
|
liyang
|
8ce0de0951
|
Merge branch 'develop'
Former-commit-id: 7fefc69c68a0e9f23333db069683e2bee8d27da6 [formerly a852c00ca2f5e90cc4098e373d5b0f3d84e0dbe6] [formerly 7fefc69c68a0e9f23333db069683e2bee8d27da6 [formerly a852c00ca2f5e90cc4098e373d5b0f3d84e0dbe6] [formerly 7fefc69c68a0e9f23333db069683e2bee8d27da6 [formerly a852c00ca2f5e90cc4098e373d5b0f3d84e0dbe6] [formerly a852c00ca2f5e90cc4098e373d5b0f3d84e0dbe6 [formerly 345a66f4a8e154e39ca05587990e6b947db3dc2c [formerly e8f1797db804a2440b697ff0aabb0e5caf399f4c]]]]]
Former-commit-id: 22cccceab3769675b29d57f7b0d131f5489539f1
Former-commit-id: 12e4b512b9e2eb813a7eb1be06a33798512052df
Former-commit-id: 5e19b1899ba86a754e4fb20497e8064deb470527 [formerly 5208fa3bfb4fe8f83864ede218797f4103156155]
Former-commit-id: 18201c79e13f64dc5d111cb3042cc46a42863ee2
Former-commit-id: df5f4bd61da699e59830bb90fef11d84479160d9
Former-commit-id: 1b19e0479fa42b93940161ce83f31d8f962dc49e
Former-commit-id: 8b2bebffa8e693a8cc90a4e94f4d3e26ad45b0cd
Former-commit-id: 6506596dd86e5b1116d07ba7a10b7238583a3942
|
2018-11-27 11:09:28 +08:00 |
|
liyang
|
34bb5b2247
|
style update
Former-commit-id: 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 0ef1248ceb32233e1ed42b77a65ad7ddf41e8177 [formerly cf4ab6894049d703a0803733c849ccfce06ab88f]]]]]
Former-commit-id: 24952048b53521d643c886f35c32695bc8402c22
Former-commit-id: 1d47626364f3dc04fe56fd93d9d5573639b648b3
Former-commit-id: 87c60577b17f96fd65d761bc0ca1bff9724d9571 [formerly 41d351f2fa10922513a74e4ef54dde9a54200b31]
Former-commit-id: 01262fccc646299f95b64458579fd7d898b27cc4
Former-commit-id: c91dc2b2fc364da3c83bdc6c6239ca669c1586e4
Former-commit-id: 0fd692c1ce29dac70c596107f0d81fb841808637
Former-commit-id: 667db7e737956e7c99980f36e028739c29bbecf4
Former-commit-id: d04c370f8294274131b7459b9ee736d662e2700f
|
2018-11-27 11:09:20 +08:00 |
|
liyang
|
ca4747b7e9
|
Merge branch 'hotfix/v' into develop
Former-commit-id: 619e1843c6060da345bf8256fdcc7f3b43ce7f22 [formerly 619e1843c6060da345bf8256fdcc7f3b43ce7f22 [formerly 619e1843c6060da345bf8256fdcc7f3b43ce7f22 [formerly 619e1843c6060da345bf8256fdcc7f3b43ce7f22 [formerly 72ffd39f21fab118bf9319bdaba59c5591ac4dd5 [formerly 6df214d458bc99597a62217bf0f2f3cd64e542d4]]]]]
Former-commit-id: 798ae8e809d18d6140a43332b6bdc74a038e864c
Former-commit-id: e5d45a4909d8f48f4550afe6e766186589e24707
Former-commit-id: 597b8ed6ebd20b81a734448ee81be3273ac54fb6 [formerly b6622b495123656257f54f82ce30e5a29ba3ff47]
Former-commit-id: 699198f70684a5943a04eb0f8f6d50e9f794974a
Former-commit-id: 022f17f28de5374896e0eb65a2abbc167cd69141
Former-commit-id: c576a24b3bc93a23315ea73ef8c870e6acd21c30
Former-commit-id: 4c8d22290338f78557836d70203951b295e4ef9b
Former-commit-id: 7751d1fc01093a05c2100a82ecf2d98c62a6a6dd
|
2018-11-27 10:53:32 +08:00 |
|
liyang
|
903bd265c3
|
Merge branch 'hotfix/v'
Former-commit-id: 806066dd72a5f1c65265f67894c32a9f6aa121a1 [formerly 806066dd72a5f1c65265f67894c32a9f6aa121a1 [formerly 806066dd72a5f1c65265f67894c32a9f6aa121a1 [formerly 806066dd72a5f1c65265f67894c32a9f6aa121a1 [formerly ba1bc8194be36d69bd721478d1a72a8fa3dd0eaf [formerly ec859e347315a3a0d1ee3921ead47ad05ee9064f]]]]]
Former-commit-id: e2565926b37263fc5d9aa58e443086101aeec7e8
Former-commit-id: 1964786ae3b3e4aa0d715bfb34408c3a54126974
Former-commit-id: c822a2b394e46f08dcac269e2c5dd9432d0eb960 [formerly a348a6ac0c7b61d79a2f0ff9b0d66c666475df61]
Former-commit-id: ae2300b56c644d78f94332abd943d82e43edb43e
Former-commit-id: 833da65212c17cb6bf14290efcc3c022d67c9e5c
Former-commit-id: 9ec9a119c7f901318d4dc926d3c17ff8fca6feb8
Former-commit-id: 3fb80af191ad339affbf15cdf6bda85cd5a64817
Former-commit-id: 45c64a589ad1e49d81e57c064cc2fcb565143139
|
2018-11-27 10:53:31 +08:00 |
|