liyang
|
1f95a509b4
|
改render函数
Former-commit-id: 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 8cfcd3419c9b44e3edeb067671e3a0749d0f12ac [formerly 356bf94f5b44639d7234152de4ef3bcc661c8c1e [formerly 77a8e78b328f3bf242836af112ee9a44ee6da70a]]]]]
Former-commit-id: bb21dd6f8094541e6327de7d0b2a4f7aa8e9bd86
Former-commit-id: 64e39323bb4dff4094351421bf4276a7c6ef2dff
Former-commit-id: 8a99e9722e048ae344ea945e9370d92b4fa79f67 [formerly ef6332b0ef63c44e6497abb5a543c793e4f32671]
Former-commit-id: f1bf22bb6937aa327c1669fb085e33d58724ec76
Former-commit-id: 1d17a9877444121a766c4a18e15478c8763971d9
Former-commit-id: f65356f950b93b6322964aa69bdc4201368041e9
Former-commit-id: 52ee7737fbae59a6d259f8230c1f0a735981633f
Former-commit-id: 1acd5a9f5a29173099da32ae47f5357bb7313e5e
|
2018-11-16 15:59:56 +08:00 |
|
liyang
|
c5b6f90681
|
no message
Former-commit-id: 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 040614c2dda93964fc6d010f370fd9e397095fe3 [formerly 3b4891771d005aa23f093264fc027b1895a48989 [formerly 620d59dababe75abb8633f5af97cc374e79ad3b7]]]]]
Former-commit-id: 1313562edf3e3222c8ad31ee07bdcb5055bbcd17
Former-commit-id: e07df33f25e9f45462c5dc7063af91679861a186
Former-commit-id: 63e04aabda4d395c3d1494b4f8a0c970d68cd52d [formerly 95b22ff8bbedb278371141b158f394d9bc815897]
Former-commit-id: af89333a769f5237c523abf8dd4f7ad1062378e8
Former-commit-id: c2b89694631004ce86ef14e4e16ac09ae185b15d
Former-commit-id: e754a4651647b8f7e9fc498b0051f4c021f56a00
Former-commit-id: 8ad130f247cd96c0a65683736764586a550cefe6
Former-commit-id: 541a8b4649a9adfe5b68f84f7b38d39eee0c29e5
|
2018-11-16 15:59:56 +08:00 |
|
liyang
|
a7a2deac69
|
将滚动优化相关的参数写在一处
Former-commit-id: 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly 8a4af547cc41c73627b1d1afb0c3fb5d03abcf79 [formerly a61bfaa5a9d0c07e348620940c7ca7ec18c60236 [formerly cdbeee7f3d70d6c62310c4167750764870ee2c8e]]]]]
Former-commit-id: fa5b732c526004e736253476f361bb45a3484eec
Former-commit-id: 183e72233dc07dc53004091455d1b049cc340962
Former-commit-id: f79bca19dcc5e76885de61f3dab85b2108218790 [formerly 17c9d406a4706c06f892048f65c32ed63da34358]
Former-commit-id: f77a5479339bf8e692c514c44a28866eee5fde58
Former-commit-id: 47c2829c424bdb7acd855894a069e9984509a9a3
Former-commit-id: 7aef56955b4adb405513cf259ed88b261daa3959
Former-commit-id: 057b1bf2c31cf54b706d3d8a459cf834de44e46e
Former-commit-id: 59f17831e802f6a85a4aaf56ade151334e2ba0aa
|
2018-11-16 15:59:55 +08:00 |
|
liyang
|
1404731858
|
修改了菜单位置
Former-commit-id: b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly b0a0b359d1f968ebfc9054a1ef2840dac3b57603 [formerly 9787d4ef6d134402a5819b1429436474c525b82c [formerly a63eebb01b2486f313b3895987348f5ce688fc09]]]]]
Former-commit-id: 76fb079f581233dfff79b2ed37db34b04caa1138
Former-commit-id: 90cd89cb0fa8175e46704cce8299f0f8746cd6d1
Former-commit-id: 9f339e27dbfe17bd13fcb7310036131968fae9a0 [formerly 91df636552140ac0c455910f6569e029f6098f0b]
Former-commit-id: 27a4a6fb95246132725da85ea08d1bb836284cb7
Former-commit-id: f820298ec8857f3e2f4f059c8115ff6052010cb9
Former-commit-id: 0051c32707f5a0afb59a245c3717f1c5aea4eb80
Former-commit-id: 823b368e67235104765f36f5ca420f6b2b8faade
Former-commit-id: 9126a95cc0f0d0c07faffe773d1335a74ba62e6b
|
2018-11-16 15:59:55 +08:00 |
|
liyang
|
7cd7297723
|
暂存
Former-commit-id: 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 1ada65d8ae7f042e9fb184148e21b8ecdfc940e1 [formerly 3b2fffc792fa182bbfd7f639f75935ee95000ebc [formerly d9516320f8cf3e50148bb1e44171e656f9dc0a4a]]]]]
Former-commit-id: 6bdc2ca75847c570d857c46164c707a2290bf1fb
Former-commit-id: 7dfb5a24d74fba2e52aee345cadb43bbba884819
Former-commit-id: 7925a7906733ee3aad78c370bd7ecc3b193d3648 [formerly dd2fdf6fee672dba3c00db857902e2b17b8a4853]
Former-commit-id: 6db2895d3e7239333ccdb55844423e48cb34f29a
Former-commit-id: f576d9ebe24fc8e9613511ed1b86c942e56bc167
Former-commit-id: 9c070d963ad7ded364a6c1cce264076c1aa4b550
Former-commit-id: 099433557a963bfe1647a807e8d129e200281e01
Former-commit-id: 063ae4244f815db3de163f6aa61a57015fb0f181
|
2018-11-16 15:59:55 +08:00 |
|
liyang
|
8379102b40
|
暂存
Former-commit-id: a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly a691bed1d3831eff972236144a57b6b9cba32f1d [formerly 5e41ab23bd0ceef291a36c9ef8fde5a7aa4278ad [formerly 841fabfa756d397bd6258cd648970c754e0dca3c]]]]]
Former-commit-id: 13233ef25e853383f1cf1a1437faf079f5f333ff
Former-commit-id: e90f61299f0acee023daa0021b301e6e26e35a67
Former-commit-id: 78275758a8c367652dbd950bdf54b98fdd9d4abf [formerly c8926288ba8a113e1066991d2a26326db69e1586]
Former-commit-id: 645448b80ba2f67dc1d8a2cb18054c501508bc6f
Former-commit-id: 869f9d8698c412fdedeb8e388942cd00c5f0c7bc
Former-commit-id: 89a9c4e1d39c99220284f6516c6f5491cd54212d
Former-commit-id: c68a320534e9b90ea4c6f12c5489bb2c86105973
Former-commit-id: 79576a305f61a7330298b452744bbc3c5b985c51
|
2018-11-16 15:59:55 +08:00 |
|
han_feng
|
e471cccad2
|
解决因当前theme改名或被删除导致持久化数据加载异常的问题
Former-commit-id: 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 625d8496dfae1a9c333570366984895175077acf [formerly 916001d3e57fa400864f4689ddc7373d07e4b545] [formerly 916001d3e57fa400864f4689ddc7373d07e4b545 [formerly 5a149d2414f743b3558dbb66eab0d9831bf676ee [formerly 626d4fc39f13c3b8cbe3088850eafc0f00c77b95]]]]]
Former-commit-id: 6f211854865cc0119d4105dd27136656e1428f6b
Former-commit-id: 1b643c97bc4a1c63e0f840693c659a70a357506c
Former-commit-id: c685693f0f72dc96bb3b1c19e637966a27211cf9 [formerly 44d490a3ed57ecaf6570a3b44373c1408244e374]
Former-commit-id: 3726d62671a67f821582e3327dce966b67be1584
Former-commit-id: 021b55854c39dab55da4f9d2d630c631b6dbef3c
Former-commit-id: 131996f42d6a8838c0161148670985c8e714c7f0
Former-commit-id: 2ee66f826cc63a182b1307d882a15d03bd135afd
Former-commit-id: 230f5dbe791bc3485049ab8980bcfb33e4768f0b
|
2018-11-15 11:44:26 +08:00 |
|
han_feng
|
229be3c546
|
完善带参路由缓存案例，顺便解决 issues #133
Former-commit-id: 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 539ba541e07a43a03b22a16bec8b680ce6011d61 [formerly 26a4e88c8572d7b498fea2791fb9dc428a93d8d3 [formerly 1407c6c3eadde6eb7e539898d13282bf5ec520dc]]]]]
Former-commit-id: 46a26343895210835e3d6c0afc5e046e973054f9
Former-commit-id: b281a46d9e588702e651751d175f876f8e5c0cec
Former-commit-id: 9b9466a5d46d2908a74a0730237f965bec36cad5 [formerly 908c29cced36962c1ae58d0194fa5d96b18b36de]
Former-commit-id: 52f5fe7e02ae4f3421c6aa1ac6bb70369e69855a
Former-commit-id: 7e7de54f344d5178c5083b456eadf6f34b3ceafe
Former-commit-id: 98c5518762f16cc81feb63c7dd700f3b9fced766
Former-commit-id: 1cccd8fcd156848ca8fa8edfa9ae522cce786882
Former-commit-id: 57fb744f0537412125f9eaa360b81e9bae575a43
|
2018-11-15 11:30:26 +08:00 |
|
liyang
|
3674129876
|
Merge branch 'hotfix/han-feng-pr' into develop
Former-commit-id: d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly 8d348a3814037d08d2b813c889fbc6b95678d3c4 [formerly 4b8f2d5519ad2935b2885ad30b725a8da17a8361]]]]]
Former-commit-id: cb851fc4c36cb56e3c7f27b035edf483474852cf
Former-commit-id: 7e13b7b9501fda63d0b7b8e1a4a3b543c31a6780
Former-commit-id: 41469259431287505bf4aa93601752a01a1fae86 [formerly 144e14d0deb1be04ac6591edc957c4e0dfa9de68]
Former-commit-id: 522ad890e7e3a81f57ac63cc10183ca58112885f
Former-commit-id: 9d258ca277893f7a2956281a325dec0d1b2df426
Former-commit-id: 51a546f2080cdab83fb29c2942c71c40660ff7b8
Former-commit-id: 8a3b732c53ea22fd96be35994e7f9d9583a3a637
Former-commit-id: 855644404c5e5330005431de97ad7412b841347f
|
2018-11-14 19:54:59 +08:00 |
|
liyang
|
fdae2c84a3
|
更新版本号
Former-commit-id: 6b4de98221c1c2248217aafea2a903c1bed8e016 [formerly 6b4de98221c1c2248217aafea2a903c1bed8e016 [formerly 6b4de98221c1c2248217aafea2a903c1bed8e016 [formerly 6b4de98221c1c2248217aafea2a903c1bed8e016 [formerly 3f082a5c3b03971a551f3e455411bb49a6d3aea4 [formerly 045c0e430c62a4512bb65543942b9bc7ad41fe8b]]]]]
Former-commit-id: 80727ce3f8a508e5fe09a034d295ee658d637fb3
Former-commit-id: 4909c28cfef913033801a531b0493e5056cfccca
Former-commit-id: 6fd5877efa474696b47b86a4d8419c6fa5ade0ae [formerly 5387b4c99c658d214a90c5584c5465beb3ef05ae]
Former-commit-id: a24721ec1bd78231831b43c5c3d494264dec05fd
Former-commit-id: ac3b9e94c5d8b0b61b6088f4e93f666e1e2ab5ad
Former-commit-id: 0c9d638d520744b52cacfbedc1f67cd4f41ba81e
Former-commit-id: 2697492f9bba6d43c3366add71857e8da19ef10a
Former-commit-id: 9244f5da269b396dfe68373530529f9e2c5c3b6f
|
2018-11-14 19:54:46 +08:00 |
|
liyang
|
bbef644503
|
更改注释位置
Former-commit-id: c989af4e3083de7a165552e3b38d6e3c762901fe [formerly c989af4e3083de7a165552e3b38d6e3c762901fe [formerly c989af4e3083de7a165552e3b38d6e3c762901fe [formerly c989af4e3083de7a165552e3b38d6e3c762901fe [formerly c7cd214dda89d521b0eda92426a09f66b973079e [formerly 0ac9452a5ab670c80aa2b4be8febd0f1f1f2aed0]]]]]
Former-commit-id: 1a299fa758a9a99c8e38be4e51c99569df6c12a2
Former-commit-id: 1abe5c83af178140883e5be1f5b7fb3539129af7
Former-commit-id: 9186ee92e52a6f3a30e2bef7ef6498623372103b [formerly 25d9df6186e2837327c301fa239ac4cf10b50395]
Former-commit-id: 399aec1e146bc31de49cc31b986c7fd8f5377c82
Former-commit-id: bb9bbdd93f64377eed0311e9bfbc0323d461abd8
Former-commit-id: ff6753ebc6763ee173b65c9e1a3131993f34120b
Former-commit-id: 3394182f3399b12c41dd6abc6bf0be46cf31ac8d
Former-commit-id: 44f43b463916db4b7a4995e1e4a0489c92aa0376
|
2018-11-14 19:48:44 +08:00 |
|
liyang
|
fecc0fed0e
|
优化一些细节
Former-commit-id: d40c51afd20ff6c8b75343b110c4a885494d13d6 [formerly d40c51afd20ff6c8b75343b110c4a885494d13d6 [formerly d40c51afd20ff6c8b75343b110c4a885494d13d6 [formerly d40c51afd20ff6c8b75343b110c4a885494d13d6 [formerly 8e89c9de19c7589bfef2ed381c4d04e5ffa10342 [formerly 43a6b0713d5f72c905ec7115dee22d64349905bc]]]]]
Former-commit-id: 7f951c4f7afbcde61758bc064d58b48a27f60b2e
Former-commit-id: 3ae33b4cb8fd3a6e217ea188db468378ec45a755
Former-commit-id: c1fbcedaf8f0742871894db45bc4f5fdd0a81401 [formerly fc2d9e0c6f21015a6a40af6baa2ea77cfe6e07d2]
Former-commit-id: a4fb93d4c675d59173e6a44897a17f27c36f7cea
Former-commit-id: e1d7b3b4afc1221bfc31a8079b05b1cc0bf2ee3e
Former-commit-id: 78de6f0e3afe650160da32723a88e8d5337fbbf2
Former-commit-id: 1e79f8a1bb257fba62c3a711741f788e2f61cb8e
Former-commit-id: d6563a9fbd5956d549fa6dc7ae36045d922da1fb
|
2018-11-14 19:46:17 +08:00 |
|
liyang
|
c7a675881c
|
Merge branch 'develop' of github.com:han-feng/d2-admin into hotfix/han-feng-pr
Former-commit-id: 7c88efa2d097413cc17662a477f203733808f483 [formerly 7c88efa2d097413cc17662a477f203733808f483 [formerly 7c88efa2d097413cc17662a477f203733808f483 [formerly 7c88efa2d097413cc17662a477f203733808f483 [formerly 122edcf1cd60d6c1cd70ab257e387f654fc8baf0 [formerly 40665454071df523b652ed69ff863a13da062520]]]]]
Former-commit-id: 7e59718fd8ed81bae6ee35b3bcca7d398f166e7f
Former-commit-id: d642f92ff1170ad1f6dbc019c47b3d3469e25168
Former-commit-id: 62e9427636ac64866a984d080be9a72d24af410d [formerly 3a3d208f8632ba0f750f98fd1fec7f0bebe02940]
Former-commit-id: 1caab3cba24922e32b5c6f617e9d3e808f496362
Former-commit-id: e89fe0d578941c32add88ceb134c27e4981a4107
Former-commit-id: 337c4253a2bdcf7ce6a92a079ac7dafc24477ccc
Former-commit-id: 33c09aac32c07af8a1335ccae0761255c4096d8d
Former-commit-id: cb62c5fad312a6eb0d2c86a10ee2ed7a7e8b8e27
|
2018-11-14 18:15:22 +08:00 |
|
han_feng
|
201ead0f14
|
增加NoMock构建模式
Former-commit-id: 53eec152a91d65dbd0e2a4583c311fea2fe1c1c7 [formerly 53eec152a91d65dbd0e2a4583c311fea2fe1c1c7 [formerly 53eec152a91d65dbd0e2a4583c311fea2fe1c1c7 [formerly 53eec152a91d65dbd0e2a4583c311fea2fe1c1c7 [formerly c444975758b78dccb4417961afb6742968c896b1 [formerly dc590efc1303bd1368312e1641c481b0c4a8dbc7]]]]]
Former-commit-id: 1d0794f07342a190108aa8503d50d3951f3da9d7
Former-commit-id: 4407cc381a0f6202bba464e8f81046f8e50ae6c8
Former-commit-id: 7cae2a4aa50e146cc4c051f8bf45828e66d925f6 [formerly 586f3af810f4b0402d839b2d3b960379d6e57d48]
Former-commit-id: 28cc51bee72e51ea218e9c6a96011c264654f407
Former-commit-id: 7589bbd29c3df02ee14b111f55b560b374f779f8
Former-commit-id: 4b34228333185d62a4da20cdc57e481f09fd062d
Former-commit-id: bcc587834afb148202698b4f56f8fc29354e25ed
Former-commit-id: 3683c4bd65bacca11e47555140fb38d1e102cee1
|
2018-11-14 16:24:56 +08:00 |
|
han_feng
|
39617f64be
|
增加带参路由多页签支持
Former-commit-id: cbc33a78c59c6468df3e905a1bc1f5c513abf804 [formerly cbc33a78c59c6468df3e905a1bc1f5c513abf804 [formerly cbc33a78c59c6468df3e905a1bc1f5c513abf804 [formerly cbc33a78c59c6468df3e905a1bc1f5c513abf804 [formerly 66e615a1681dbb8ff72633fc3d53cbf5411610f5 [formerly 449c1c2a13a19d6d52537b97c18548c012b360dd]]]]]
Former-commit-id: 2a7a63bce617f5acaf5c1e4b13455f001f69118d
Former-commit-id: 49a1453a0343e1e52cbb1b7faf1d18ffbb0ae519
Former-commit-id: d303a906c5a794ef68376044fb6d9c578e9e85c9 [formerly bc51b43eaa43b3d1744d7edc36d605a6d3d0cd2e]
Former-commit-id: 8867f09a27c99223dfd2cb5e66b2b25ca75b49d9
Former-commit-id: 2f01e346f3474822a2ec1f50e02ffcce05dce8a8
Former-commit-id: 8f68a3470559ea51ee3ab7617347eb0236b607f1
Former-commit-id: dbcf55c5cfcb9f52dc8705397a2423f790d7ed82
Former-commit-id: 58abe040aadabc72c1db5acef2f45a7f30874614
|
2018-11-14 15:34:41 +08:00 |
|
liyang
|
c522feaa5a
|
Merge branch 'hotfix/goa' into develop
Former-commit-id: 452341426caeb7e29c7f19a0780bfbbca3abdfd9 [formerly 452341426caeb7e29c7f19a0780bfbbca3abdfd9 [formerly 452341426caeb7e29c7f19a0780bfbbca3abdfd9 [formerly 452341426caeb7e29c7f19a0780bfbbca3abdfd9 [formerly d7c1f6e773358011794bac2ad653cdc924dce887 [formerly fe34f08caf4c40438515704b8def3ce15050ee7e]]]]]
Former-commit-id: 64a4195b29ef997c6468c24a69f703b3a7938fbe
Former-commit-id: 05f2c1ab77599870e9eff49fb06a9e4f746965dd
Former-commit-id: 0d90aded977e3ed9e42bccd1341f78347f4cadb2 [formerly 96f7d2b09ec6d29ce92211ffb2443982568b9b1d]
Former-commit-id: e3999f888819fc8ab015cc028072ce87438a2dee
Former-commit-id: 29ab97d411709b5fc1bc8e5b925439405993c4f8
Former-commit-id: ce7197febd5ccff2a394ee68e2345c63ee68d49d
Former-commit-id: 56feb4ec70f8308c80313612a4797f5116e2b689
Former-commit-id: ce6b5e3bf85f72c9313d6c30993ffba3ec465b88
|
2018-11-13 16:11:49 +08:00 |
|
liyang
|
84df2aad73
|
Merge branch 'hotfix/goa'
Former-commit-id: a9cb4ef0668189496092aa08e8a176ec08be881e [formerly a9cb4ef0668189496092aa08e8a176ec08be881e [formerly a9cb4ef0668189496092aa08e8a176ec08be881e [formerly a9cb4ef0668189496092aa08e8a176ec08be881e [formerly 4235211fd50a4150298d4afce0945d2534fddf16 [formerly 3b01796143f3bfa5972ca4e8a91e02696b9c11f9]]]]]
Former-commit-id: dcb28fd285226189d38f5605ef7d79967ff76319
Former-commit-id: 32e9dab582545557e2216b7c53696b775d9c30c0
Former-commit-id: 6af2a86aa35721646ea9c0f37d1bc84c23ed9c0b [formerly 01f5ae951093f43ec2876f0229b053581bc53a2e]
Former-commit-id: 99de50d43fde7d7604e35167acaff2253f387dc3
Former-commit-id: db7c0fd4b94da3fa9db4ff88070599b926bb892e
Former-commit-id: fe7de1fa56848b231a81fc424f656236cb5fa7bf
Former-commit-id: 5f410bfc0e4255f3f745cde8832baa98fcc47082
Former-commit-id: f28461b8ae9617bdef2fa9bb8da5c722d740c965
|
2018-11-13 16:11:49 +08:00 |
|
liyang
|
3cf6a724aa
|
GOA
Former-commit-id: a7d9db10307a33f59869b424cc3086214e6a04f5 [formerly dd63d29197f9234409315b7e2c522ca5321a46cc] [formerly a7d9db10307a33f59869b424cc3086214e6a04f5 [formerly dd63d29197f9234409315b7e2c522ca5321a46cc] [formerly a7d9db10307a33f59869b424cc3086214e6a04f5 [formerly dd63d29197f9234409315b7e2c522ca5321a46cc] [formerly dd63d29197f9234409315b7e2c522ca5321a46cc [formerly 6cf1dc25a615096c8d11762906e94b3a3142978b [formerly 77e6478a909522ca312d0e4d9ad96bba12cee3fb]]]]]
Former-commit-id: 78c24ae8078c3d75e0b1d568ca4c436af1e96523
Former-commit-id: 5c845964076d3e079bc707447f95b3731da5818b
Former-commit-id: a437908eb5ee974df2a5e7414f9efd728540163d [formerly f9963e8bb96c17fd5effa2931d7084f2ffe1d195]
Former-commit-id: 46cc2223096f75501bc675795ac878592b760107
Former-commit-id: c6d587fcd1b144d50e0d6501926d5e5c02d652bc
Former-commit-id: b9d763b897428f6fea3f176a035922e46b411858
Former-commit-id: 08030e7b02e3a3dd134c683c0d595cf981b02e69
Former-commit-id: 4d3aeb5af0228acc218f2c31d839bd1b47913acd
|
2018-11-13 16:11:40 +08:00 |
|
liyang
|
a2f770fdd4
|
Merge branch 'hotfix/pr-129' into develop
Former-commit-id: 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly 475faae633c10c8d95e6386e1be9c5a098d6275d [formerly bea376e15d3762c526d1b749f4aca5d8fcf7f5de [formerly e8bdbb8b800713bb86581fa85bb809ef7fe4cee4]]]]]
Former-commit-id: 32b20e4ca8a907eee144b015e75e47eab61a3e53
Former-commit-id: 86823621d8d0bbe10ec50599907da452a35bd804
Former-commit-id: 58bd7e8fb9213ed6af279c5ef5917a1c985d751f [formerly cb090d3151869b3a109cf253c918b3caaa5b3c45]
Former-commit-id: aa4bf0e133cf48e433a9436e4331f86a73628663
Former-commit-id: 2623a21cb87cbb23ea382c2b95aa57a929e715cd
Former-commit-id: 44db2b4a850b57db67dfc32b3380b37a86fcdb99
Former-commit-id: b528d0bba8e90d6635020033c24c8d7c72a01ad7
Former-commit-id: bab1efc39968945b9fe9a45976a90b608fff8257
|
2018-11-08 10:07:36 +08:00 |
|
liyang
|
25b4a6d4b0
|
Merge branch 'hotfix/pr-129'
Former-commit-id: 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 2420270cd5a3e8ff918f0b2d2fa2e5b87982054d [formerly 081d8b5e161c2a59d053c15d6c1b1b6fe997c0c5 [formerly 5a0ddc43326c4f6eb2f1af23f59931c5f2bb0e8a]]]]]
Former-commit-id: 3380e5c983c16a8fa254e4312ab2c8c2b0bc370c
Former-commit-id: ba0f031113c2b8c74114a6466ea72d80667346dd
Former-commit-id: 2a92f7ddb02138c4f40975540b13136502e415ac [formerly 1fbe995c22d5d86f75a309a894d651c603528691]
Former-commit-id: 40a8e4587938320e1017ace0da488db49917877e
Former-commit-id: 11703b5e5908010d4e9f91fbd67254dd4dc616c2
Former-commit-id: 11fafcac9598222074507772993cb35e0fc7fe90
Former-commit-id: 9b282a4ea21e651a29b98f7b7b5512cf816af88d
Former-commit-id: af335eb320ea5bf299b09d682b46b5ed7afb85cc
|
2018-11-08 10:07:35 +08:00 |
|
liyang
|
99e602a2fc
|
update
Former-commit-id: a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly a40d521a5e6b4bacc1104087236eba111745b341 [formerly d54b29deaefca00f1d9104927aa2338f97a2c2e3 [formerly d8035dd97c5e4861c04bba643b4e2cd63fb1c6a1]]]]]
Former-commit-id: 256e15767e7c232c0a8c95ab2136d3a098e8c73b
Former-commit-id: 3d9a70257b2cc65985e6caafbf11f4dfc722b60c
Former-commit-id: 145bf9c7be9808aa4c01b9ce539da08cf6e5eae1 [formerly 2a28ebf86e795e7184ccb7c7572b26e01c6020ef]
Former-commit-id: 451ed69e42b9896a2ea02b438e69864febc12d2b
Former-commit-id: 3352c1c1d0edc2ce0134661e91b773090c387153
Former-commit-id: 6f36f0e3f8ec3f626f11a62ab4ee7b0df09a7649
Former-commit-id: e7675d80e742f817df2e93919c23d9e3d80750a8
Former-commit-id: 217b9e30d0b308cfaf8cb343df8949d28a1e389b
|
2018-11-08 10:07:26 +08:00 |
|
rongxingsun
|
7bff3e594b
|
刷新页面里渲染两次
Former-commit-id: becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly becbaf20e3ac33e1f957565d5b545048e7474bfe [formerly c3c3e3af6bba747484a96f423f3b1dbb9eeb9115 [formerly bcf3b474449ee0031efb6d8173bfbd8a71cbed08]]]]]
Former-commit-id: 41dfafacc8998d9db0c246df1f860e9762e9d2ca
Former-commit-id: 125a74f4f3b2aad510a2b2ce8f8e2cbb23637a7e
Former-commit-id: 6d76c99920b945296aaa0ee0f3018f6f39ffabdb [formerly 11e8e1223a26307590e997639339e6907502efae]
Former-commit-id: 35a88b883a2e26d5cb143dd31e760cd4c2fd3639
Former-commit-id: 8e37790a2ab2db52122446f3deaa0840f008c1ef
Former-commit-id: 810db9bb8f995d63c46e03502ca1266709022e99
Former-commit-id: e614b10d1cdeadd941277ee85ebc024f6f4f9ec8
Former-commit-id: a4526ef6d4db383b162e5be7eec9bd05827bf321
|
2018-11-07 17:00:18 +08:00 |
|
liyang
|
7669cd1bf9
|
Merge branch 'develop'
Former-commit-id: 440ccac33f57a61d99db5db3972f47b429d3145b [formerly 77f68523ca2c88da0c632381145c088dc9cfae7a] [formerly 440ccac33f57a61d99db5db3972f47b429d3145b [formerly 77f68523ca2c88da0c632381145c088dc9cfae7a] [formerly 440ccac33f57a61d99db5db3972f47b429d3145b [formerly 77f68523ca2c88da0c632381145c088dc9cfae7a] [formerly 77f68523ca2c88da0c632381145c088dc9cfae7a [formerly 4d502f99f9492bade4d2b995d4bf16933feb7fe5 [formerly 0b65b06d65b60b83fa6d22bfe0a93f4a9ac2594f]]]]]
Former-commit-id: ac8fa8e2d0a402dbb54725951b2c605d445cd31f
Former-commit-id: 77a16ff8862d666842a34b83c8cd2645a49f473c
Former-commit-id: 91fbc8a2cfabf9be8faabbe9e16fdcab2036e948 [formerly f6d85d01c67942773e863a4aad244b1187745f35]
Former-commit-id: 70d481680b297386ef3c13d748fafce5db159d23
Former-commit-id: c2ac26b5d85fae96e80665a465483a47c490a0b9
Former-commit-id: a759d6e6271845cc2ac5c9d6be3f08770a133578
Former-commit-id: fd43ea6039f4bb4703a2e211bf8db59a592c3f50
Former-commit-id: 1d4ec7e2e938b967d443fd36212a93f4e39f8249
|
2018-11-07 11:02:52 +08:00 |
|
liyang
|
cd0d515fd5
|
版本号
Former-commit-id: d24f58a1e8201eff44c911b9c11a96f80513f28f [formerly d24f58a1e8201eff44c911b9c11a96f80513f28f [formerly d24f58a1e8201eff44c911b9c11a96f80513f28f [formerly d24f58a1e8201eff44c911b9c11a96f80513f28f [formerly 626eda8072a3ceb104a882e33687ffc6ff637f7e [formerly 8d986edc14437da325c9a5efb9200f6ab13f7dc9]]]]]
Former-commit-id: e6b480fcd2563f93699ce01240311304e6ac04c1
Former-commit-id: a251b47320c2c1a6b659a1e94c7eaaef109daa14
Former-commit-id: ca79a073b40d8fd98c2d93f56ea2d22e19746e11 [formerly 7cd77c7626e69d142188f14bc3cc287c5f887c79]
Former-commit-id: c900574fd2c0c4a568417d21bfc171d1e4356a84
Former-commit-id: 1242576675ce0968157113ff0f46141467400043
Former-commit-id: 33326dfcf34fd65dcdbbdc5836d98277cec78fa9
Former-commit-id: 6b29a4e2d221327548d926f481c6ef26c6782e29
Former-commit-id: 47cbbbb9731185fd35766f2a182ba4415214d352
|
2018-11-07 11:02:46 +08:00 |
|
liyang
|
7d65325771
|
Merge branch 'feature/icon-fill-style' into develop
Former-commit-id: e971d04af6744aa4f4c4719c50e9c324dd2a20a1 [formerly e971d04af6744aa4f4c4719c50e9c324dd2a20a1 [formerly e971d04af6744aa4f4c4719c50e9c324dd2a20a1 [formerly e971d04af6744aa4f4c4719c50e9c324dd2a20a1 [formerly 63910a1783e12f57cd603284edd80b08340be5a5 [formerly 37c55522d79e8734b5efbca6f6ab9b44c387d029]]]]]
Former-commit-id: faed4b7a18104af2f06a17ae0693d34c92b6aa43
Former-commit-id: 5720b8a7cbb239876946e7d6f7f4ca900581dbf2
Former-commit-id: bc55d9a565865c28c84931f5b45222a3e669b0e1 [formerly a71b9f267b9f00bab201b759dce5461a15db8300]
Former-commit-id: 2dc82d3d4c53e6d6bf515f812a45166616d8442d
Former-commit-id: 02e71c8d1597398a6ec74b528029312b6e764eef
Former-commit-id: 0f666c9012e764d7ab11517f5562167eb6d60691
Former-commit-id: 5e99f88a03d441764ff6c9f4f7d0706bef621830
Former-commit-id: 6185a5cbcc9c948e710f97245ae4e5bc22b1535e
|
2018-11-07 11:01:22 +08:00 |
|
liyang
|
8f085da99f
|
Merge branch 'patch-2' of github.com:lorron/d2-admin into feature/icon-fill-style
Former-commit-id: d099af1dc9cd5246f3996ae85785d04456fa0ecb [formerly d099af1dc9cd5246f3996ae85785d04456fa0ecb [formerly d099af1dc9cd5246f3996ae85785d04456fa0ecb [formerly d099af1dc9cd5246f3996ae85785d04456fa0ecb [formerly aee00f71c33c3c279e21f72409a3fccd55c27fd5 [formerly 2beae26f8dde9d1c8b2a19a2250e42fa04d95f7c]]]]]
Former-commit-id: cfc8d088647cd3248b4136b7f3a6d6b666f55ed5
Former-commit-id: 5655764438c75154515a947ba7f5ca3f487bcd34
Former-commit-id: e59f71562582b4a533de771682916742f0a4fb35 [formerly 3665ffc877701a6a752905bcbdb90a525d9f21e0]
Former-commit-id: 8a6ca2ec9ba7e3e0788cbb6176ca462a738e96f9
Former-commit-id: f72d123db2a72300a6e8f9f5587d2c5208ce4b2e
Former-commit-id: dd6bb1ad94209b1b4f2dfb8e0602750425c30590
Former-commit-id: 07d3309fddbe16d76b5322e06f070938b43fed6e
Former-commit-id: 0084cd81454261958bc9370fe16c00350436487d
|
2018-11-07 10:59:28 +08:00 |
|
liyang
|
065da9b951
|
Merge branch 'develop'
Former-commit-id: 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 5a3fb9b93e6a848111d5f42af07e0de3c36c35b9 [formerly 6d31037fc2084f885a0a5baa90c391bba415a532 [formerly 2e213c7a937c94c988c5c1aba88771b66dd62ed9]]]]]
Former-commit-id: 4e5646b719ff6cf9028b5781d9a03e5583a48807
Former-commit-id: 6956978bf112c46406d30b0c3fea6b23d3038da4
Former-commit-id: d6992b7951b4cb0b3f7f505689a43c7224f5a699 [formerly 1bc7a48ad36401ab4c062f443314283fcd790570]
Former-commit-id: da4827bf60a8c8dcd190f8024bb1a881649ecdf7
Former-commit-id: 3f58690b5a7f9c49b6b55400da363ea8359729e9
Former-commit-id: abbf333e810acd4a32f7e8b7761337c6f40e21b6
Former-commit-id: 7b5ba1ac5e5e5221bffaf3d3319f1fe17c6ca073
Former-commit-id: 82ba394a78687f44795b73a0385ef7b9c6389317
|
2018-11-06 22:57:42 +08:00 |
|
liyang
|
10f37daec2
|
更新版本号
Former-commit-id: 84ca8e5adf72719027ff2018079ed2fb8ca70538 [formerly 3bb00c1793521bbfaf151a1a6f0555fd4aef37eb] [formerly 84ca8e5adf72719027ff2018079ed2fb8ca70538 [formerly 3bb00c1793521bbfaf151a1a6f0555fd4aef37eb] [formerly 84ca8e5adf72719027ff2018079ed2fb8ca70538 [formerly 3bb00c1793521bbfaf151a1a6f0555fd4aef37eb] [formerly 3bb00c1793521bbfaf151a1a6f0555fd4aef37eb [formerly ab62a49e5687335787a03b1b727d8d9990f92f45 [formerly bb516baccf86fe6a4098c5712fb80e26dc6d1068]]]]]
Former-commit-id: 30a6d6991bf1c9c11bee6363fc37a965b941ec8b
Former-commit-id: 1b036a570b665019b9d58044d3e8f3ad93047271
Former-commit-id: 8ddb3a37b087302068ce14e8209c341e6125575f [formerly bb83c4195f66c8d6f32b902156fea5da57977923]
Former-commit-id: 07e5111e92a83f6a2e64d48ca39ee4e92bef8592
Former-commit-id: 3e4cd39092cfbb36ca1f8873fd966a17723882ca
Former-commit-id: ca5d8aba972d9a67e1e2879ddb2d8ec02283e04c
Former-commit-id: 8a1b8655fe8208700bd9003378246ba63ec302a0
Former-commit-id: d9d8b7dabd24c406e6b51086030b6ed7212dff7e
|
2018-11-06 22:57:36 +08:00 |
|
liyang
|
e92c873528
|
Merge branch 'develop'
Former-commit-id: 6b5ab38225056b84f98e0375f797bfff02532535 [formerly 6b5ab38225056b84f98e0375f797bfff02532535 [formerly 6b5ab38225056b84f98e0375f797bfff02532535 [formerly 6b5ab38225056b84f98e0375f797bfff02532535 [formerly 4f81d93287e658d4748c43cee653ce2bc21288ff [formerly 0bf5dfaf0e62f689981cab5752a62c1d8b0ee58c]]]]]
Former-commit-id: aa83eebc2c6536627980c9c64a96756d87a1ebb3
Former-commit-id: 2f2511c1da2a48d4224b87719873701cb46fcbd2
Former-commit-id: 27305f9caf15cc69d73a853e6cbda21cb1ac7023 [formerly 1ae2ff5a4d66add1d5b1521f4ab57954322588d5]
Former-commit-id: 9bad9e9d32de44195453f4e4ad798f90b3df5a68
Former-commit-id: 2cac7fe7c9499c4da4f55c2762fe8bc79ab6da9f
Former-commit-id: 688234a45e2df39681158ed05b4b5fb3a4325dbb
Former-commit-id: c356ce373c6a6d1d93634163e8a8ab3a70f94dfc
Former-commit-id: 1129aa0b33467df3847734fcdaad70e3d3841af3
|
2018-11-06 22:37:58 +08:00 |
|
liyang
|
e01cdc4bcd
|
更多的示例
Former-commit-id: 833e467a1d8f7fc653b7b4aed549468546e511de [formerly 833e467a1d8f7fc653b7b4aed549468546e511de [formerly 833e467a1d8f7fc653b7b4aed549468546e511de [formerly 833e467a1d8f7fc653b7b4aed549468546e511de [formerly 7627708e75b3d5d504972613c5e733405587cba0 [formerly 1600182f4ba9a437717c6266564618d61a61ad00]]]]]
Former-commit-id: a7c7eaa88fd05ee835cee957a05ee8b86b136c13
Former-commit-id: 65ba4e2470e8390eb4e3779cb5f919d8f4f9bec1
Former-commit-id: 06f25a758c78826e23728ac7039f3fda9d4e3544 [formerly 79216eb458399d6e98da4cc976ec8e699e5ab7cd]
Former-commit-id: a86a391ffd8f7a2f0027b93f1f87a5576c42eb4e
Former-commit-id: c9d6c4bafa92eb9bbb7b1267d3117ae0ff07b4b1
Former-commit-id: 3e01824b941dfb6704c9bb8ddbb310d50f133062
Former-commit-id: 841b0ecb8a4bb24e3de5929b6288771530729d39
Former-commit-id: ea91d01c776ee376bbefb026bc96de2cf25e8417
|
2018-11-06 22:33:09 +08:00 |
|
liyang
|
5e459ccf51
|
Merge branch 'develop'
Former-commit-id: eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly eebdcf6674cba059e5f8116410f2071aa1a27c86 [formerly 6a64a9ad43e59279488f7bcdc1bd51815fa1d748 [formerly ed409f881cf04880ebdad73667c2ab9ca72cd776]]]]]
Former-commit-id: 6d2e208d03ffb559ccec7c4c9d3d1788a6c1a1c8
Former-commit-id: 19dcdce75a3be15d34c3b5c91d83744618e5bbf3
Former-commit-id: 4d2f55350e8052cc4ffdf5c8a443fa12507574f6 [formerly 07affb8a527c3de1aab06b7f8651cff4e8ea3f65]
Former-commit-id: 97fdb96c7b15e5438c357924f760a09879b1194c
Former-commit-id: d1baf4da9e48165d2cfb270c471310ff9cbd26e9
Former-commit-id: b729d32e92e006de04de525c31b1320f38d8e176
Former-commit-id: d88dba955e71fe75e8ac277e5d3627bbb0aef5d0
Former-commit-id: 7296615c810569cfd27a4e41525c7ac86a4dce6c
|
2018-11-06 20:55:47 +08:00 |
|
liyang
|
8a5362fc1f
|
删除无用的文件
Former-commit-id: caff46710c99e93a52ef72283dae54cedba4d72d [formerly 2885c4af96695ed873cbe1cc7cb1e2da17b5e11f] [formerly caff46710c99e93a52ef72283dae54cedba4d72d [formerly 2885c4af96695ed873cbe1cc7cb1e2da17b5e11f] [formerly caff46710c99e93a52ef72283dae54cedba4d72d [formerly 2885c4af96695ed873cbe1cc7cb1e2da17b5e11f] [formerly 2885c4af96695ed873cbe1cc7cb1e2da17b5e11f [formerly 235477ec0210e592c8214fb3716549a187181689 [formerly b318a89df5737da5279d3a5129f901cec22fa973]]]]]
Former-commit-id: 8e5806ffc4c640b49c32f797445df72a0ca3a50f
Former-commit-id: 74fbb76b21cc9a30e07ae5208883827a2acbd98b
Former-commit-id: e5683b35caa6005bfd2b223c545d49e9e6051e47 [formerly 1da9e3b1195323b2f6a46adea60db4aa4e467f48]
Former-commit-id: 9016618ea8fc3eea00e21e01528827d60bea51ad
Former-commit-id: d05c7f9d854fc51ded42fdeccf1bed23aac84cdb
Former-commit-id: 803a15f2cee43a43c8ccd457ac574c3057995e83
Former-commit-id: b66eb131afdffdfc534d0063a36eb6a1eeb57f41
Former-commit-id: 601dac3d1f5c3eb03d4ae92c07413c7feb666544
|
2018-11-06 20:55:37 +08:00 |
|
lorron
|
4bcfbd2443
|
矢量icon颜色与链接文字颜色同步
矢量icon颜色与链接文字颜色同步，利用fill样式，svg矢量图标文件中不能有内部样式，否则无效
Former-commit-id: 4722a5c5b959a7c05bc34080781ae7b4a504671e [formerly 4722a5c5b959a7c05bc34080781ae7b4a504671e [formerly 4722a5c5b959a7c05bc34080781ae7b4a504671e [formerly 4722a5c5b959a7c05bc34080781ae7b4a504671e [formerly 350454b1cf8aec32d8e166b9b0586337685ad887 [formerly a04e0fa67efed635f82b2faa186de835dcbcf3db]]]]]
Former-commit-id: 987f63fd9a80b030a2115b639627910cf8ce426a
Former-commit-id: f0b50fcff00c166da48bed08b414a706f3e7db5b
Former-commit-id: 82b6424af63115240336e1e11a202c20b4ea3e49 [formerly 20dd40bc4b889d57089b7514e12dc1014c4bd088]
Former-commit-id: 9d5c21c4cc529c8e4dfab9e13464fbb8e87bf4d2
Former-commit-id: 385d100e7677b883929bb1311d9d4efc4eeeb499
Former-commit-id: fc2d20c9834bf64874acf660376fcb671b62ddb0
Former-commit-id: 25dc8c4dadd9b1e160f458d5dbb99bdf4a32360a
Former-commit-id: 50c5cb2d7733c745e8962b92aa295d3428245bbf
|
2018-11-06 01:27:12 +08:00 |
|
liyang
|
81908f07ac
|
Merge branch 'hotfix/page演示'
Former-commit-id: 9f5be0d3d6ff1ec7dc7b82306d7836a5cd572eb3 [formerly 9f5be0d3d6ff1ec7dc7b82306d7836a5cd572eb3 [formerly 9f5be0d3d6ff1ec7dc7b82306d7836a5cd572eb3 [formerly 9f5be0d3d6ff1ec7dc7b82306d7836a5cd572eb3 [formerly 51e1c80d94d56131ab6331e1332ece005e1f0f4e [formerly 44fbe77c499c4db5da0d40b64122e0137ce9ccf9]]]]]
Former-commit-id: 989053e324b5b1413c121af46f7807033da8be86
Former-commit-id: 2c860a13dc3682228052ccf60e0693673b2b0a75
Former-commit-id: 457b638ae56bc1e7a8f3ce3e323605ff32e4f731 [formerly 013c24a9251a78cd78c2df337f15b444f06f4ad2]
Former-commit-id: c3a93be77077f69ed6fb6530ea8001b8d625c3ba
Former-commit-id: b905a8cd758b35816ce369103ee22b6797079ad5
Former-commit-id: c7a32171d771104269016bcdac8977b201f5132c
Former-commit-id: 9459f8c6edb1c7af15e027f36a7c729d993a792c
Former-commit-id: 83bee7d6ad5b698a8187f0facdd76ef4dac77785
|
2018-11-05 23:13:36 +08:00 |
|
liyang
|
04f684d2f6
|
Merge branch 'hotfix/page演示' into develop
Former-commit-id: d6ed9a217cc4651cc5a1cb4d91d4d8ec3fc4cc15 [formerly d6ed9a217cc4651cc5a1cb4d91d4d8ec3fc4cc15 [formerly d6ed9a217cc4651cc5a1cb4d91d4d8ec3fc4cc15 [formerly d6ed9a217cc4651cc5a1cb4d91d4d8ec3fc4cc15 [formerly 2999ea6f1b9a4e40b09993137d3e32811a649239 [formerly 817dd948b7ce0343de579ec448cbd2fbb412ddbd]]]]]
Former-commit-id: ad1010fa03b653476077f4fc0accf1c6ef4e17c5
Former-commit-id: 74238dbc7f1bf81f23d6f40634b7a29c7d322a11
Former-commit-id: b67a8bc54604f6f68264743cd739a727113ae5c0 [formerly 76b8e9566870744300f6fd3d97ee64ab337c90fe]
Former-commit-id: 24102e906b3341940dc29427b63d029eac9231de
Former-commit-id: d1d1848805d730e7ea0b4a96646d58220c5a35de
Former-commit-id: d163aa06a47bb00a14467d4392329bebbd6740ce
Former-commit-id: 89e2121b957c709b55f767fa29977c72dd1f0eda
Former-commit-id: a8c0ce437c38cd06c40500175e925740448409b1
|
2018-11-05 23:13:36 +08:00 |
|
liyang
|
22b6003da1
|
刷新方法和重定向方法升级
Former-commit-id: 585670458831c80f57d20e9283fb82476b946e27 [formerly eb7045546e2bd98ba5b5c5e7578c56588b2e3a1d] [formerly 585670458831c80f57d20e9283fb82476b946e27 [formerly eb7045546e2bd98ba5b5c5e7578c56588b2e3a1d] [formerly 585670458831c80f57d20e9283fb82476b946e27 [formerly eb7045546e2bd98ba5b5c5e7578c56588b2e3a1d] [formerly eb7045546e2bd98ba5b5c5e7578c56588b2e3a1d [formerly ce225a2891d4ce5ff086775b9b486bdbf8ee3e86 [formerly 1808e7dd59762f0a4c7e0aceb66ca2e6212d1ca1]]]]]
Former-commit-id: 9845611172f6adb3ed6fdb713d72f23a9dd49f00
Former-commit-id: 9f6810a3f586a57ebb79a19924357771d41b9bbf
Former-commit-id: 371348953967cfe88c0b2dce944e521a5c95b835 [formerly c7863b7e22f5ab553a97b828da52fbbcc6f73381]
Former-commit-id: 58b6d3a88b0f06cb5813bfe913ba113f8bd9d703
Former-commit-id: cdaef260dbddecc1848dbbe5fd75a070d305e1e5
Former-commit-id: 1a1369bb32c9b8599ee8688da2d0dbbeab4b06e2
Former-commit-id: 69be53f5764c10f665dc29fb9f3ac54f71ea639c
Former-commit-id: 6883200052e680c1478e801401fe0d014ebf696c
|
2018-11-05 23:13:28 +08:00 |
|
liyang
|
8d4f883026
|
Merge branch 'hotfix/page'
Former-commit-id: 69b279489afb234ff548cf31f39695574d2691ae [formerly 69b279489afb234ff548cf31f39695574d2691ae [formerly 69b279489afb234ff548cf31f39695574d2691ae [formerly 69b279489afb234ff548cf31f39695574d2691ae [formerly 1998c1a5b4e1a02a43d31919738fb1e37f73ceda [formerly 806762952ec1296a864eb647bdcee48f2891eb7d]]]]]
Former-commit-id: 68a9a7628c8877f025a811890a890b94a9971c41
Former-commit-id: 836119a88d3b4a46c7640a623dcd20413c6c4497
Former-commit-id: 5d726e4f59621be71f945ebb1a1925e347e92baf [formerly ec4260b0febcf47a01415603988bf23731d3e011]
Former-commit-id: 81256b43cc4b1116e080fe258c172ec61cac2cca
Former-commit-id: 568e13ef3a12b9d5634cf1960d88cd4a2178b2b8
Former-commit-id: 54353d00e428527f5870da33399510be3a73fa2b
Former-commit-id: 114e5409dc88db56a45ec231907b9b907951d0ac
Former-commit-id: 1f4782ed46ed1d90ed9348c7cd796c174ec96a76
|
2018-11-05 16:34:02 +08:00 |
|
liyang
|
a9db562e93
|
Merge branch 'hotfix/page' into develop
Former-commit-id: 2d45d0c2cb77973bf3ff9f5252a319e434eeeada [formerly 4e20bc70659e3ec902d70bedd2a3c6c16712bfb2] [formerly 2d45d0c2cb77973bf3ff9f5252a319e434eeeada [formerly 4e20bc70659e3ec902d70bedd2a3c6c16712bfb2] [formerly 2d45d0c2cb77973bf3ff9f5252a319e434eeeada [formerly 4e20bc70659e3ec902d70bedd2a3c6c16712bfb2] [formerly 4e20bc70659e3ec902d70bedd2a3c6c16712bfb2 [formerly 01d411c1b605ee7f45b07d8ab98d33e711d87281 [formerly 75c14dd833250c51cab1943dcf6d086f9f6f07c0]]]]]
Former-commit-id: 6e6354ea4524f241537a3f9c1083af39e1385944
Former-commit-id: bcb19a2b012696e32e9e0753d85c564395471392
Former-commit-id: 5aa2dd8c25965b1874e1225c533f5cbc2807ab08 [formerly 76e6579681051574445f77b6b9ac7687c9dc5d90]
Former-commit-id: 0bdb116335c54c28b04dc16ea82cde5abd6f44b2
Former-commit-id: fd79ef2ebbdc6c3d7a31bdec9bc23242117b8f36
Former-commit-id: a5b0dd7802c690780c882b2096eb595080fceaf1
Former-commit-id: 725a5f4b5ae144a5069f52d5ca69157996b84b7f
Former-commit-id: 3541f90741ce701b128376bfa071807a16e80b8d
|
2018-11-05 16:34:02 +08:00 |
|
liyang
|
19fa15bfdf
|
keepAliveRefresh
Former-commit-id: 2c8c57c8f67d7ded7d09afbb4ada367cc98f65a3 [formerly 2c8c57c8f67d7ded7d09afbb4ada367cc98f65a3 [formerly 2c8c57c8f67d7ded7d09afbb4ada367cc98f65a3 [formerly 2c8c57c8f67d7ded7d09afbb4ada367cc98f65a3 [formerly 7cc36a179472f39c319ff0c6088e590b4a798405 [formerly 570f28aedeb2d1d89676e3bf39e6bcbc3fa5b75e]]]]]
Former-commit-id: 2fcd03b3b4d524ca359df038061b5758f5bc85b8
Former-commit-id: bacaae7b2795383da2693bc803fdf15c19e78d94
Former-commit-id: c3a6666080e8f5dde320aee38f5d54e5f213d0cc [formerly 83898ab876765f1250d8402a3a34ff7a042837dc]
Former-commit-id: 6faaf4ace4aa366d9bee7dead81e0c744e946475
Former-commit-id: 318f0a5b2df81d22e8bfb71a7d9b3641a7829c14
Former-commit-id: aae1986ab30758c348c12c2351e4e1c3f6b18bb4
Former-commit-id: 647ad0b84820952ad9137af0ea100eebced4dd18
Former-commit-id: 9e3c75f80be4e49de6c92a8d67f113e33c47a1ad
|
2018-11-05 16:33:54 +08:00 |
|
liyang
|
7705a080d7
|
Merge branch 'hotfix/页面缓存设计优化'
Former-commit-id: a676ad1ea0d11b3b4dace0ef43daf96d3e01a13c [formerly a676ad1ea0d11b3b4dace0ef43daf96d3e01a13c [formerly a676ad1ea0d11b3b4dace0ef43daf96d3e01a13c [formerly a676ad1ea0d11b3b4dace0ef43daf96d3e01a13c [formerly 3e0d095327a036f6dd4d3f45f1c9aed63a45cb8c [formerly 12f2e7e35970b58b2dd4964f4c99d37e23498bda]]]]]
Former-commit-id: 0a39e71574381a2e811e6389d57946dddd35b086
Former-commit-id: 8985c6e7994b01792ced3641c57d40ecedc61bb3
Former-commit-id: 100c4b62d9841a88c1f76494f0c5ad8b83535d91 [formerly 5fe867b0da81e7f24b6828fdcacda52594e3c091]
Former-commit-id: 9a4df27fd8d6be1b9b049c372ca1d6c2b61f2345
Former-commit-id: 5ad60e5e4c90d66c935971de822b5479329bf9bc
Former-commit-id: 62e68139b5e2289d716382fd1c7d73c6518a6cca
Former-commit-id: 425f34253d8a9f84d5bcabb90bc48217b3da58d0
Former-commit-id: cc54346f9464a46f816f3ba78c5f0a284f5bac47
|
2018-11-05 15:35:15 +08:00 |
|
liyang
|
36713331e8
|
Merge branch 'hotfix/页面缓存设计优化' into develop
Former-commit-id: f6546986ce11c752c9a8274ad079b0a4b8a10201 [formerly f6546986ce11c752c9a8274ad079b0a4b8a10201 [formerly f6546986ce11c752c9a8274ad079b0a4b8a10201 [formerly f6546986ce11c752c9a8274ad079b0a4b8a10201 [formerly 4f65d0caee2091f6f17fb7cd60a1807abf4ac3c1 [formerly b5a31947c3c6eb3ef9bca5cf045c9efc2846500f]]]]]
Former-commit-id: acd43747a5032fe1896bbb71dc5c0d72542b0d78
Former-commit-id: 368a8d7281126ec52bff8279c5874b56b7985ec1
Former-commit-id: bbfea3063adec388d92f1644d06d8ec11d51c153 [formerly 2aa1b3f3ad23ae8d8443090a2e496f4b040c9980]
Former-commit-id: afa4fa32ffc6bb43d788023bf644fc07b1979ac6
Former-commit-id: 93872ad0b0c7a6dfa5e35857740119b9a3a190fb
Former-commit-id: 7483b8ffa1780fad02b1f4e4c1c80542abde256b
Former-commit-id: 218bafd9bade4f84cdd6ff61fd5f3c0722ddcfd5
Former-commit-id: 6fd9a40f7302d72ee2019403134b3eb44d809edc
|
2018-11-05 15:35:15 +08:00 |
|
liyang
|
63eeec5941
|
修复之前恢复页面时的判定遗漏
Former-commit-id: a9a8b129d2b26d1a937b536126a2f51f110c9f15 [formerly a9a8b129d2b26d1a937b536126a2f51f110c9f15 [formerly a9a8b129d2b26d1a937b536126a2f51f110c9f15 [formerly a9a8b129d2b26d1a937b536126a2f51f110c9f15 [formerly 24e2ff9d4c54ed4ab9c50c76e157b9e103da22be [formerly d49c2a6a3c873a85884ec1717799ccf4aab5daeb]]]]]
Former-commit-id: 0c13e9bf1298b1656a94070e04e1561efac5761c
Former-commit-id: 6a421bb56314d3a60353d3b7826129a92732340b
Former-commit-id: 019ace3365a990621c5d698710d2045e34c22be2 [formerly 8bf1a8ebc2ee9f4cb2098cd6d5f0c6a650dcbff6]
Former-commit-id: 246eea03096093375a7a2f6132598e5288d848ff
Former-commit-id: c0754fe6cb4bc61a82e1d988fe5caa34d07bce63
Former-commit-id: bb0a55f7b5beb9d034f033b7394fa27b226191db
Former-commit-id: 966b702636c60a408a49a1c6afd8baa5c98f0f6d
Former-commit-id: 2c848ead4cc1e7144b4a9d3e63f9dd86758b4058
|
2018-11-04 21:55:51 +08:00 |
|
liyang
|
257d032b98
|
Merge branch 'hotfix/关闭当前页演示'
Former-commit-id: 4f368ed19199f92ae0ce312b0d49f7393b0d300c [formerly 4f368ed19199f92ae0ce312b0d49f7393b0d300c [formerly 4f368ed19199f92ae0ce312b0d49f7393b0d300c [formerly 4f368ed19199f92ae0ce312b0d49f7393b0d300c [formerly 40d2b01ff21bc5de38a7072af32bc2905b3f3b70 [formerly 7deea2d63471a71fb5e8d8a8e2f5070cf51b16da]]]]]
Former-commit-id: 1e3351a67b1e27070a95060a21a31ac766a298c6
Former-commit-id: 5d598072199b4a449d942178884877ca9a247abd
Former-commit-id: 9dc0267651d6dc1a1b9a738356f804e6ee4f0b29 [formerly bd008d8ee242882285326df74f05baea22b78b7f]
Former-commit-id: d1b4d91cf957b5677e6944b57beaa6d08988e474
Former-commit-id: 545b18ec544eae4c86b83b3531907163eacbead6
Former-commit-id: d982e7487db22978757accd08364924ea18595da
Former-commit-id: 25ebf411b787d8d02822d2e6180f3b410a16b5d9
Former-commit-id: 7dfa02650feee3bfb276b80e3df7b4afd8a1ad1a
|
2018-11-03 22:03:36 +08:00 |
|
liyang
|
eb783ace0b
|
Merge branch 'hotfix/关闭当前页演示' into develop
Former-commit-id: 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 5b53cca9a6fa25d736fb31966796a70b43279e59 [formerly 1ab163a71e4c5edc16f28b164989038cf4e5c965]]]]]
Former-commit-id: 8f897dc1db60073e6cbce81cc1eab5ee0f50ba75
Former-commit-id: 4edd9bf6ac4efbeb15706633eb69c4d7c8e79bf2
Former-commit-id: 0c63734e6e14013d6c5fde820b78e513706d28b8 [formerly d15929fd903f0cf58b9049ff7f1168b354978216]
Former-commit-id: 536a61fcb42d76cf9bf3ffdfbb2a883b6c45d17a
Former-commit-id: 0e0af8598a5c3a5a64bfc67308504cbeb55ac6ca
Former-commit-id: e2f0ee692e075f1789481dad9360b484fe3f2d3c
Former-commit-id: 9062917a1046c973d59388157fa9bfcac81bafd8
Former-commit-id: 5f62240ed73e7f7ae894c0d098622a7590f98ae9
|
2018-11-03 22:03:36 +08:00 |
|
liyang
|
b0187d4049
|
新增了关闭当前页的演示页面
Former-commit-id: 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 3c54fb07a591656bd559d0c47ab411ed805a3f9a [formerly 825f86753aff1836276058c18173eb46fe234194]]]]]
Former-commit-id: 7edc745314d896b8485619b120d55f74eede993c
Former-commit-id: 2560f5530f3c08433d8d7eae1547e229cb966b10
Former-commit-id: 9f1b2d523e9aac7340602c5e535064506e8b1ae3 [formerly 2bedfa7b79262575d1fd11da3988acddd2254a76]
Former-commit-id: d02c30e8aab42b61d8be00a1a0a3842e26d5b2c3
Former-commit-id: e2901abdf43563238e24bdc6f5787f68cf01d3cd
Former-commit-id: 1e9831b40827e0c2af4da0a1c8f8bc89459ea6aa
Former-commit-id: 80c2de16c921ebd541189d7bcdd36b152593f054
Former-commit-id: 26d7667f92da3e0a33edfb875ce07e9f999eccdb
|
2018-11-03 22:03:21 +08:00 |
|
liyang
|
c8059a7ec8
|
Merge branch 'hotfix/调整$baseUrl设置位置'
Former-commit-id: 0c60e5ec79af2d80f2c79f8377dfefba61c96228 [formerly f4c0c90c2fc66e3fa5608c3f77b85634424781f0] [formerly 0c60e5ec79af2d80f2c79f8377dfefba61c96228 [formerly f4c0c90c2fc66e3fa5608c3f77b85634424781f0] [formerly 0c60e5ec79af2d80f2c79f8377dfefba61c96228 [formerly f4c0c90c2fc66e3fa5608c3f77b85634424781f0] [formerly f4c0c90c2fc66e3fa5608c3f77b85634424781f0 [formerly 9b343ebf6580620e8b0b8d37994df13251c458ae [formerly da0f100a7ba043c2706e20a3ada0ce302b8798ee]]]]]
Former-commit-id: c300200ae65d25df04e60ab331575768e7719d89
Former-commit-id: da840b19eea03737178248ddeaf5e53c6f46d94c
Former-commit-id: 48f813963078e908919cdd9ab2596ecd904ce998 [formerly a5b48b0d40372ad4a141dd61d96b6b8001a28425]
Former-commit-id: 911d99696e0b1405ff3a6980314d22e82623332a
Former-commit-id: 82666ab0945c6a5a3c6cf64ce13af168a88afc34
Former-commit-id: 5b5e304274fc58ce13d1159c078d7aef7632de79
Former-commit-id: 0cbf2e29d355dfb93545bd672a9638acaa7e0628
Former-commit-id: 3ca40580ecbcffa9426e1a3c9a384485bc9ff0da
|
2018-11-02 13:22:08 +08:00 |
|
liyang
|
146fd1adc5
|
Merge branch 'hotfix/调整$baseUrl设置位置' into develop
Former-commit-id: 14e161213d3b85d2a2f2b438034e4d9fbf0641f4 [formerly 14e161213d3b85d2a2f2b438034e4d9fbf0641f4 [formerly 14e161213d3b85d2a2f2b438034e4d9fbf0641f4 [formerly 14e161213d3b85d2a2f2b438034e4d9fbf0641f4 [formerly 6a812787eeeffa91df05380e182b842d21621597 [formerly b466df8776599507e247166186a18d9945fe78c9]]]]]
Former-commit-id: 416bf96117a7046c462a2e4a59ebcad9b9dd19e4
Former-commit-id: 2439d6a990045e8644713835a4b34870fd9d7f5e
Former-commit-id: c65bcc6b9a06b4b0cc7dd82efcf47aa50030b1a8 [formerly 4c40c5f15f4fef80bbbe9d388082ade89711bf9f]
Former-commit-id: a56e80ad12ab66e4bc911717a1a3028d0a0fb90a
Former-commit-id: 070350378bb670d57b970e947daffa6996873c04
Former-commit-id: e32a6fe8370bb8414e83aa69fa67bc8f63998e1f
Former-commit-id: 8ff476da36d47b3bc0b46719d086874634079997
Former-commit-id: eb2cfc01ee39674be316d25124311513115afeb5
|
2018-11-02 13:22:08 +08:00 |
|
liyang
|
43747ad006
|
删除初始化时设置全局尺寸的代码
Former-commit-id: 80bdb56c060ef778aa33b096bd3f02c6a40cb940 [formerly 80bdb56c060ef778aa33b096bd3f02c6a40cb940 [formerly 80bdb56c060ef778aa33b096bd3f02c6a40cb940 [formerly 80bdb56c060ef778aa33b096bd3f02c6a40cb940 [formerly c5f5a5839e8c8290f95f9eb58a6b7083a4d69c48 [formerly e022c140a93d7b8e0bed6d7efe3c305479add9a9]]]]]
Former-commit-id: c20b43540e68f75e28cd2897457302ee665d8615
Former-commit-id: e5b0cf94eb857a1dd70bc76d7ac9f3d87694e6d8
Former-commit-id: ba8c19df70cb04ff53cba4d5e6cb680d57a3af60 [formerly afb9171556709c0bddf2d6f664ef24f9e3e55e88]
Former-commit-id: f03b78a3fc2a1508177267a16149c87460bc98ec
Former-commit-id: 2b50ca5b4b6459635598d513dd49c58f3e2fe9cc
Former-commit-id: cada5f8d3029e4fcdb00fc9fd6392284c456ed0b
Former-commit-id: 7bdc74f5cee467a4395561b6d74cb14be1859ee6
Former-commit-id: d143d99c5241d2bc1c7f7aee8cb1a791473c88fc
|
2018-11-02 13:21:54 +08:00 |
|
liyang
|
1351a0a8ae
|
提高兼容性
Former-commit-id: 7aee8f91a8c4ec487e5fc092d136a300641fe144 [formerly 7aee8f91a8c4ec487e5fc092d136a300641fe144 [formerly 7aee8f91a8c4ec487e5fc092d136a300641fe144 [formerly 7aee8f91a8c4ec487e5fc092d136a300641fe144 [formerly aad502e8ff4cf4678209bb8921f2fc2d45965794 [formerly f1480f51494bb1fc93892ea72bc99eda8a6229c8]]]]]
Former-commit-id: fb18332801268dc982361987a826eba0607b1007
Former-commit-id: 879712f252ba19c5cec2fb904f370466768b5210
Former-commit-id: 001076c322678cbd02fc87d9dd46506f58c5993f [formerly f1b0c8012f1d8f956c36b5c93fc5303170409858]
Former-commit-id: 9886d8add7568650ca8adb73420325edeff80471
Former-commit-id: 0fd1b00469e785facc1b98932dde1bb5e7941d8c
Former-commit-id: fb277d5e092700756060d492f1c26164f937cb8c
Former-commit-id: e99284b813c77bfc8772417e8a7aa6c2971c775a
Former-commit-id: 28ae40fef1a2599e29b0880d35d15c8690abf192
|
2018-11-02 13:18:30 +08:00 |
|
liyang
|
d5952187c9
|
Merge branch 'hotfix/1.5.6'
Former-commit-id: 5a91afe04eda3db0680e1a1c2b51f0fbefbaf7b7 [formerly 5a91afe04eda3db0680e1a1c2b51f0fbefbaf7b7 [formerly 5a91afe04eda3db0680e1a1c2b51f0fbefbaf7b7 [formerly 5a91afe04eda3db0680e1a1c2b51f0fbefbaf7b7 [formerly 5f379694aacd59664a93b6b648828902f27b9df9 [formerly aa7922626b99831032f7993821f3ca283d6c5e44]]]]]
Former-commit-id: 743811f56fdedd027f333cb895551a1e5f5dfd2a
Former-commit-id: 1f976ccc4e5e4c640b2bc2b9aa95e0754a347f69
Former-commit-id: 96ddc2ab05bd265582077d96387497cf93e81e37 [formerly 961b5fb269885f68848664becb6dc3d363a4aab1]
Former-commit-id: 743ea16d43ae37f6f695be26cf536c9975dc92a8
Former-commit-id: efafe60d9c5fadcbe29a06c922a21f6b3fa5102d
Former-commit-id: e3bb23463d90fbb1a8c05017d14220a708e4bd16
Former-commit-id: 6be5fd8aa3e5e80398430308b402e5517967bf8b
Former-commit-id: 3114ac630a9672a14b0c00329bcf8b74fccf6c33
|
2018-10-30 19:28:08 +08:00 |
|