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
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
e864e35b13
|
Merge branch 'hotfix/优化' into develop
Former-commit-id: 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 41f90840a89361aead4e9a29f7748c8ce705b3e1 [formerly 4d87324168af3faa5cef93a3627a8379b1b33ba7]]]]]
Former-commit-id: 3a67b7dcd2f186909179ee5dd54f16482c4b7d5d
Former-commit-id: 2bb985abd53d9f6a4b44f35696a937c2b0c410ca
Former-commit-id: a9504b1c61461b5b553247c95a7862418fae62be [formerly 215c094f6c43b535f6d6c55e193d15cbe1fb791c]
Former-commit-id: d23e90567c0484aeac678df5bbea051bb77c41ee
Former-commit-id: 37e1e87948cbc0dfa0f62131ed74b879c251e3c3
Former-commit-id: a941bf25a1d40c214c64bcc1ac08df41fe3d7ce5
Former-commit-id: f6531fd1d0d4cfa68e595356deab7cffe0819389
Former-commit-id: 9feb3101c226aaa6bcb3e97ed505b858536219ba
|
2018-10-30 19:19:06 +08:00 |
|
liyang
|
6f113cb129
|
显示方面的一些小调整
Former-commit-id: d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4 [formerly 91553c9c2488b0c1d05a3aab1c61ae82bc5b22d0 [formerly 22262fe5218eccba752298a61459defd35d26487]]]]]
Former-commit-id: 058a2bdcf2c48c07e745df38a968bfd21e9d5900
Former-commit-id: 77378df13b64ad02bbb93a42d191720e394ffde2
Former-commit-id: c59fdbac42ae5ab58ef2c3d56fd916fb8f113508 [formerly 73295579e314891b3af8ec29a6226c3c74be49ba]
Former-commit-id: 44ad5e395aff162e385f4a2dd65719d1d9a19983
Former-commit-id: 86dd96bf27e600f542a0feaab613b8dd09f7a5d9
Former-commit-id: 24904c41eb2318577d5f0864ae931966eb333883
Former-commit-id: 458fadbcddd00389d2cdd24cf56a9db3f4f6e9d9
Former-commit-id: e7809f8cad3c8b1b91aade9960fa11cd178919a7
|
2018-10-30 19:18:57 +08:00 |
|
liyang
|
d897638d80
|
Merge branch 'hotfix/优化首页内容' into develop
Former-commit-id: ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly c2313d879ffe931c4e323a82544d4b54bb0dd1ea [formerly 760143941a3ed24dcf8570cd0d3784849690718e]]]]]
Former-commit-id: e87bd78fe0cd54c27a76a44a8e44b48fb1373e89
Former-commit-id: edefa63434fb7705b9dcfcef8a36da3f2a8d3873
Former-commit-id: f55192032f5d871dba785dfaa5028aca58b98cca [formerly 9bba8146cd9bf9d84a5e09939792cbe7ec6f0ba2]
Former-commit-id: 0eb82a9e7c83981e707a558681b8aa70f67a91d1
Former-commit-id: 3ac695d81c010c39973350048a46bede989cfe91
Former-commit-id: 86aa5b07dcf09521046b543f918feeb00e427653
Former-commit-id: 124fa42c2ce590e5da2fa7fc8a60410a4eb1af63
Former-commit-id: da45109b80d37c524a6188f10ce01e3fe9c4331d
|
2018-10-30 16:40:22 +08:00 |
|
liyang
|
04fb4060e2
|
no message
Former-commit-id: fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly 25e0a91852f2614640ba4a4a1b58adb5016188a5 [formerly c27611c842b4b7d1f3246944ff05205c356d5b8a]]]]]
Former-commit-id: a24228d0383b2c2f5a4018b8ecb75fe084351635
Former-commit-id: 5566538a7ff03b71e77fcc02cd4665b9dfedfdb7
Former-commit-id: 92c2dda6d3e96b67680d4e3755ce0bba0e4a2720 [formerly 51fcd12161f3452b834b944857a6860f9ccc8401]
Former-commit-id: 5a6e6abe49d70a2ce771cb939ff0fb7a26d3a30b
Former-commit-id: 2720b59b6d614a15c5df8936009a9975fd055d44
Former-commit-id: f348c982c963e4c081b1032bcaafb29f7bc139dd
Former-commit-id: 9a248d51e72d39a8e1ebd00fe4f4217aff668c7d
Former-commit-id: 31ac3a1e002c6d3de533678beeef0c6115d41665
|
2018-10-30 16:40:12 +08:00 |
|
liyang
|
a9c49bc666
|
Merge branch 'hotfix/优化演示页面显示' into develop
Former-commit-id: 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 5a07a98765d7604167752cd7928f4e912009e0a1 [formerly b2f91f3aaf1de3e08c8566e74973147108dc5284]]]]]
Former-commit-id: d55b8f7ca5987924e9668fc1a988c668605c6fdd
Former-commit-id: bb5a116c5f5f74b0baac89d9f704a9ec57b5af11
Former-commit-id: c2982598fbfe5e775069866515fa2c3021e3e7e7 [formerly 9b3b41dd8ef1d8fce36017117649ebc6cd886e59]
Former-commit-id: afac3edd703687f74128b62347422db898f91945
Former-commit-id: ef9f39e90fe0b90df342c79aad81f496db243978
Former-commit-id: c6ad74eb0e085003de5d26c1f548b4de0d219a67
Former-commit-id: 84454527c9e191d04b235f0bcf213ca43f84bd13
Former-commit-id: 4e65ae3a2367bfd9b07b140dc9abae0d57710e43
|
2018-10-30 16:29:19 +08:00 |
|
liyang
|
1fd967c41e
|
no message
Former-commit-id: 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10 [formerly 54d75f564e4df2cf804fdc9342eb8fe40aa865ff [formerly a3ca40613b3156cbbb2737ed8dd517a102b4c660]]]]]
Former-commit-id: 8fcd8411f3c6994501df63022e50fd8755b10096
Former-commit-id: 244193d1a0e6df2dc24da4079e095cce53b8fcc6
Former-commit-id: d79cb0c9f186c347e8c5cb428d150723616ceaec [formerly d817b7ab3af5a96d2b75434cb8d3e47e16fe0fd4]
Former-commit-id: fe85c8325aa5ce48f74d89d66482e8c877cafd94
Former-commit-id: 3529956ee2f8bf0817bcdfe5262ab3b9f0b1d362
Former-commit-id: 342699757cf8287bb487a1ee74a0bc89260c5d8b
Former-commit-id: b633d4c17816a14bd9719f60caa97068bb02e1d6
Former-commit-id: d4443c4c9e5d7cafd5fca33e4df5b0b74cde17b2
|
2018-10-30 16:29:08 +08:00 |
|
liyang
|
d923bba4c5
|
代码格式整理
Former-commit-id: 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 68ea7ce423969c3238e8a558cf3d2433d3ea8e30 [formerly 2cba54ba481e2677b53a3270378b15d14c9a098e]]]]]
Former-commit-id: 59dcc46a2ab5d4ead29bfe4adab074dfd04601f6
Former-commit-id: 4a8b26437302f85729935871fcf232f669e2cec8
Former-commit-id: c5f45af5da2e877de7018e0c3cabb0d96bfc609c [formerly 73bacac1ad42a3c388d285a8ddb553d92d5712d9]
Former-commit-id: 41149bc0e3e9e9dbffc2925f5dfb171e3076aa80
Former-commit-id: 876d20819cca960c232b46a778b5bf46ff51f8fe
Former-commit-id: a5c11df824443e85e11fed6a8a66f8b8168200c5
Former-commit-id: 7d7e44630259a0760bf1f7f55337be4b55fc0221
Former-commit-id: 598b2cfe65d175362d9465ff671399bea4cd3c06
|
2018-10-27 22:47:35 +08:00 |
|
liyang
|
cad161104c
|
缓存设置方式更新
Former-commit-id: a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68 [formerly 9ebaa44ba31bf6b89e6a26e7c880694317c10849 [formerly 6915b7b392bbf51a784a7a60faa5805e05749e62]]]]]
Former-commit-id: 0500901750714d3f756cdab974061f703c54a20c
Former-commit-id: 718d0d4f016503154f4d76b983fac52135d12ba8
Former-commit-id: f393f36317e7bfce386b8e8bd04d8a378552187d [formerly 74aef31060be3c3f360e1b902f5472d60ed3f360]
Former-commit-id: eacb846db5711af1dde9627b5df3001bfe524429
Former-commit-id: 00763a56295e33408b38497fd2c2ab89c635c8c9
Former-commit-id: 9447f0f2beb288dd1b07dae908148c02811cea2c
Former-commit-id: 713f4784cbf5ad1f49e8f599438cb395fcbf9d3d
Former-commit-id: e9835fb631ab8e6bff51fa25eecf1781bdb14f0f
|
2018-10-27 18:37:04 +08:00 |
|
liyang
|
ef307293d7
|
404 页面同步更新样式
Former-commit-id: ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly e6558b8582fd79c77ed3a488210362ba6349b716 [formerly d27a0573758b5eff85c7bda284301b5b178c14eb]]]]]
Former-commit-id: ccc355dd0527c21ee4146a540e7ffd66097dc111
Former-commit-id: 790d00b2548a876883465e23ed70645582c6a48e
Former-commit-id: bb1408c0525afa5a60481df5b3621f28afa8aef2 [formerly 18934caf62354d28c21171fb02190f3b2ad81a26]
Former-commit-id: 1e72b5ed7d44cf67ff9eaebb924c79e93a2c5769
Former-commit-id: 0715ff78402dd3c70cfdff795c428111e0c75467
Former-commit-id: ca0fab6e289453ea2ba82ef0fa36a013c76ab0b7
Former-commit-id: f2e27c288c54e194867fb57ea24ec0292e5038fd
Former-commit-id: 171622394883d7b14b1f6da9449f3d38936e46dd
|
2018-10-26 09:36:27 +08:00 |
|
liyang
|
e9b1351d0b
|
简化设置的导出方式
Former-commit-id: a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly 37b1babc66571b867f18d3cc0235595a4585c029 [formerly fa1408f9564153089cb701c915e697bc19ab1712]]]]]
Former-commit-id: f7f422b342b6619a0f180f1b4441ccc275c42a48
Former-commit-id: 06a541d8f64e407ccd0d95bf79acbecd5181bca6
Former-commit-id: f2c2f669869e23deb7595d9a6d2269603e557cfc [formerly 767ee24a9e21ee3ebc06ea4fc523c9c7572c9545]
Former-commit-id: a0c8f2d4b607428a0943358af1cc88721c82eecb
Former-commit-id: 5f7c62076981cab47e5f19f18bf25c60bea8beca
Former-commit-id: 7dc23769bda1b3ac1dc3c376f7efe2d318a8ee4d
Former-commit-id: 6424c627f48fc00dec7e0f1e23856aa749d0360d
Former-commit-id: 3a911eec99207c169989bd54605e837af3ec5450
|
2018-10-26 00:21:12 +08:00 |
|
liyang
|
e8df163268
|
修复外部修改数据无法触发更新的 bug
Former-commit-id: 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly ee00a9a643c513d59dff1cc739dc0a566bce63b4 [formerly 715c6c4ed9855dcc7ad775195f6686a427d085d3]]]]]
Former-commit-id: e567a7e3db7019f2567f9fa769fea6639e75dd42
Former-commit-id: 6df46229a1ccd1e341501e9fee419999e9daeeca
Former-commit-id: d3781c6cdf7e414047cafc9a7244a7abc6e7b778 [formerly a8d000bfdbfc4872d1383f17e8e8f6a4bdb239c3]
Former-commit-id: 1f6bad0a0b3462e6a53692af6a153b0c7fbdd0ae
Former-commit-id: e693037a587d7ddab5d87f311a4a0eda1a2c0c0b
Former-commit-id: 8294c8385c4852f8cf0a2f21cf3ac655918845f1
Former-commit-id: 7ab11d42decf2d1bba7c26919ca86de20f664918
Former-commit-id: 4ef43b3c25ce828467141dafb206bf6bc9ade6d3
|
2018-10-24 11:31:29 +08:00 |
|
liyang
|
1691f22cf3
|
更新地址
Former-commit-id: de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6 [formerly 4e659ec9585bd40193f621e2a1adfe447b01735c [formerly ee582d8ba8a8576b17cfda79064ba63bde908a2f]]]]]
Former-commit-id: 0c9e1c6252b593c4dba36c9df36e5192b6675cc3
Former-commit-id: 88bb9b5469b468a707ee148ebab85c9a2e8104c5
Former-commit-id: 836e7e9d626eec4065dc693ca0e0d51214e91506 [formerly 68980db7305a4f3f4f237c10ee4f2324cba9b37c]
Former-commit-id: 0de4be04331d37214f58befdce53c3dcf9dbdf57
Former-commit-id: a0e329466e0a5c22a69abca0e4888eedee9662e4
Former-commit-id: 02290aab53ae88a42f388f90b1ff5574c09c384e
Former-commit-id: 7bede6044d668dc346c8c8126f074d28172ea4de
Former-commit-id: 30883c4ea914733f76758639fc4c7719443099ee
|
2018-10-24 10:37:04 +08:00 |
|
liyang
|
7b9d46655d
|
删除请求新版本相关的代码
Former-commit-id: c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly 2ef73ea49b3405be63a1552eaa45649af7d559df [formerly e8792780e531de7b81bec704953a57fb05c3255e]]]]]
Former-commit-id: 80c8177590bbadb58158ea371d1aa67f05de60f5
Former-commit-id: ef3cdcd6a5eed24569fa9a0c38ead6903d8f84b0
Former-commit-id: 9874c1f8f43c8beda5404b222d53697774f808bb [formerly 810d6baa2283c6310dd8ae35fa99b810331cd7f3]
Former-commit-id: cd5531c1a53a55fa62d897a8ffa27b30b0d5be50
Former-commit-id: 79be8e7248a71c1b608c009d4b200c6cf04572ca
Former-commit-id: 0d797ed715b7091e9b9a3748dd85152a7c86549e
Former-commit-id: c175d6cb3db552a3b8749fa51c0cb6375fcfc0a7
Former-commit-id: 6c2d3338e77a6f3ca12fee92621d23ea795f7a3d
|
2018-10-23 19:05:33 +08:00 |
|
liyang
|
4cc57b0645
|
删除备份
Former-commit-id: 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly b72c22697c50254c7aeba282f8d78d62df593e9e [formerly 48017a6b8a4ae71b0b8fd6b171380ce7a23c7e10]]]]]
Former-commit-id: 467f17b9b429d306666d11e5e186924b06b83dc5
Former-commit-id: 64221fcc6c07492cc5ab1e37eb8ebb405712d1b5
Former-commit-id: 6a027e10de6b284f3feb237c94f985a2bade8a49 [formerly e7d72c0c2eeea156c3b008ed7826e83272dfd701]
Former-commit-id: 86966f7ea3ef61c6fd86bbdca637e47e2a6d04dd
Former-commit-id: 8e5aeaa9f9154ed54ce9c931062284c0d6769443
Former-commit-id: c0d22ae0e6ed572d10076c7fbd545d653289fcd4
Former-commit-id: be720d176af356de1a2b0b3493cdb69a4848b744
Former-commit-id: a719e87a2cafb77d007139ea49fdf1dcc48eaf29
|
2018-10-22 22:04:20 +08:00 |
|
CNine
|
f7f1d62d4c
|
增加 excel 导出的合并单元格选项
增加 excel 导出的第一行标题选项
Former-commit-id: 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 3463e5feeaec05f84a8c42930edfbacaba6f0b92 [formerly 9ab91bc47458493d93f817aca80427749cb0acf6]]]]]
Former-commit-id: 94df74e7c154789c835119fc23096fa6f8202ad5
Former-commit-id: 4a005fbd1ada5ce6e4cbb085b320660f2aa626cb
Former-commit-id: 9d6dcc7b0e761e85a5295b235351b2e462c42f1f [formerly 607caf152de8bef7fede86a44e3003b1aaff2912]
Former-commit-id: e54717456d4c5db124d9b8f0536a5dd6b1c9f8d7
Former-commit-id: 360f57cad825ce848e0cc1ef27835ec49837e0a8
Former-commit-id: 48de0f2794339a594d3fb37e3f76fdc6302932a9
Former-commit-id: e037bfa8bdb5e08b116cdea79887f82737b5034f
Former-commit-id: e785e67cb2ee407b5b682bf8959767daff219ce7
|
2018-10-22 19:53:54 +08:00 |
|
liyang
|
fdef9dd69b
|
no message
Former-commit-id: a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly 29b89fe809b751a13b96e7da444d27fa87860650 [formerly 8cd3e077bc1f315559e9a84c9567cd508ecb82b3]]]]]
Former-commit-id: 325f7590ad3db9bf4b40b2d1934228cfe53f22c8
Former-commit-id: 75bdb2621ca0442a7f814975df296b727f53203f
Former-commit-id: 51802ef4ec4f5fc78db1aeef2c50082383446e5d [formerly f8d29a8dd71d8736d3bdf97dcdf47348638195e3]
Former-commit-id: 884d1722b50d76553006f958c373eb17a8850572
Former-commit-id: b5fe4d346a8ca33df14edde64534a2681fef68b6
Former-commit-id: 7d0bae570cb6c6ed18dae60a1a0b545f4880a174
Former-commit-id: 0134f45e357029a7582cc7ca90b185714e949734
Former-commit-id: 9dc73a3f388d5342937c2463dab29fcfdd810059
|
2018-10-15 22:04:32 +08:00 |
|
liyang
|
b2a44d1356
|
no message
Former-commit-id: 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 5f4ee2187599947f17286d3bb3e54dfd090fd15e [formerly a61522201421698c4bf5148b2d8094896f673fc3]]]]]
Former-commit-id: f48de1f970e9cfdac764e8df25a39d8424bf1c8c
Former-commit-id: 476ea4773938b730931e1d9ed07cb7ea32f3075a
Former-commit-id: c836cfc9721da7ff774bd42a51e5d6224a17769c [formerly 75709120c47b08f8f922c3713d7144c7499624c2]
Former-commit-id: 330bcf325705b7a28f46bee1aa9348622e968365
Former-commit-id: eebce31e83173f9fe1d08755395ad650a29d4f7a
Former-commit-id: 365fe059c05fbb378cb56193fea7a3b64f12b97b
Former-commit-id: be8d993244dcf243e97d1586e690da4868952fa4
Former-commit-id: 58b71c1e23f509080990e2563f4e0dba45e20fff
|
2018-10-13 20:51:16 +08:00 |
|
liyang
|
2956d18cec
|
no message
Former-commit-id: 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5 [formerly c3c60a79855d50c56a434eeaf59e29def32213c8 [formerly aadfbbd86ddb0d5b6477af805b18c5331bff96a3]]]]]
Former-commit-id: f9e8f3adda0d3b8b9b8e73a1d61622bec170898a
Former-commit-id: 95f0b3f33ebbde615ecd9eea541be2fcebe493ed
Former-commit-id: d301e8adbfee1d5edf69e15cb79f35c190eeebae [formerly 4053f1c826056cbaa146fac54aa72d444f7f24ae]
Former-commit-id: 36fa26e3d0d4f54b3a2377d31ddf094067aca0ae
Former-commit-id: f14f9ea2bd7806cbd93eddf068f437dbfbfdeb13
Former-commit-id: bad957ddc620774add82ed308e0aee5700fbfbaa
Former-commit-id: 50f57cb8433f7826233433950657257225996db4
Former-commit-id: 0a0a5e36ff82fce7001ec6d5ba04a07c1a0759d2
|
2018-10-13 20:47:29 +08:00 |
|
liyang
|
8bdcdcf12a
|
no message
Former-commit-id: 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 7e3749104a3b9bf002ff4443731fa054bd2daa8d [formerly fb304ebf1a814d17c732be5141a9496835ad27ef]]]]]
Former-commit-id: 032ce71e0fece3eb585936d36f4261475be49237
Former-commit-id: 3d45913b8a557a16512fbcc98503ab667ac17f2c
Former-commit-id: ffdd24eb7784e1bf4f81185dfcd98b4900840cb1 [formerly 622633150ca71c03830dacd01f0e77fbfd08be5e]
Former-commit-id: e6a80912acb26ca21713516e3c6f4afdf5abf077
Former-commit-id: 12a0a80d23798a996c81a9efe138c393161ca9fc
Former-commit-id: b38753fe9ef650c203940edc162c32fff48a7676
Former-commit-id: ace21249def97c394f46b84e8704f2fabbde167e
Former-commit-id: 19c83f81a0e64499fcf7a3788cfc87304a610cef
|
2018-10-12 07:10:11 +08:00 |
|
liyang
|
75d3f3ad1a
|
删除了跳板页面
将跳板页面的内容转移到了路由设置中
Former-commit-id: 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead [formerly 328841e1f2ff4271049c0e4c2c77f604c7233332 [formerly 6c3b24af9ef2ec9aad6bf1fc831b16d4ebc231dd]]]]]
Former-commit-id: c153ece15eda3b413e055ac3ae8af347057db453
Former-commit-id: 3e0edf37e1e214be30efbfeff7e1f1eb3f8f51e5
Former-commit-id: 34f2ac943279797cb342e0fd2fe3ff06109921b1 [formerly 4c3598b0e74a65f4204655b3505cdf3c937f8a5a]
Former-commit-id: 4154c7ac3541715222ebecd2e5410f21d9aa4549
Former-commit-id: 99ce56f09a90866c95f9f10b3bec03b24c063bbc
Former-commit-id: c7b9c3c1a532582129dcaf86d0ac2b649bb253ae
Former-commit-id: 934dd2574d65647f2dda8513ab6b0407beb44abf
Former-commit-id: eb2e21a4aa92d66aa65bff40d02f0f3a33e1b6f4
|
2018-10-11 22:01:54 +08:00 |
|
Lu Chaohai
|
9af718c651
|
Merge branch 'develop' of https://github.com/d2-projects/d2-admin into develop
Former-commit-id: 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 87d9e7fcbfc6082cbeaaaa8ca27fda1cdc62f21b [formerly 0e37b994bbc29bedcccad347e6fb2c1cb615eba4]]]]]
Former-commit-id: 8cd9a54da3d640d0c659a769ca03a10d8c22ffbf
Former-commit-id: 1a62a3e203f76b1a8b5b3d6bd6425216409bf29d
Former-commit-id: ce908180ed2f364f8f025bdeace0f8c73bd5e0c4 [formerly 77a128308141d2e25d0f3d2ff23f4173d0a54228]
Former-commit-id: c900d987daf7448ffdd5f3e788ef6529d3527fe1
Former-commit-id: 2d0dce3592057efaf48b55b8ff5df97f09eb4a99
Former-commit-id: d3264169085a7230a18cf277cefc9c3112626ba1
Former-commit-id: f17bed94dbe6b8bd5d402bcaa8e3b3cdf171a58f
Former-commit-id: afb6e622ecaec0e5c517c34828311070c38796eb
|
2018-09-25 11:10:59 +08:00 |
|
Lu Chaohai
|
3e2bde7ad9
|
修复 顶部菜单滚动的一个bug
Former-commit-id: a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly 66daa14037aec6e43c6ba88af97de64b4a50b2d3 [formerly 2114dfc43f5ad6986a769742ab26266e54cb0b6c]]]]]
Former-commit-id: 183f171b097c28f166e251331b9e514d9028f78d
Former-commit-id: 92682d28b258c607affc03588dcacf68f47be925
Former-commit-id: 2f9faec630870376eb3df7e23db37e15afed77ad [formerly 930b7c4c442af8a61884acdef83e730aa9585dec]
Former-commit-id: ea2ec0ac5bf3f9ea05b0deae96f3bf52433b6407
Former-commit-id: 99cc6af72d213c54666e94da7e97969a04c8cdf6
Former-commit-id: 239aba85af1497940905675ab224b7679389cada
Former-commit-id: 8887f62b06b3cd4e67f7749e23522fe49f77893f
Former-commit-id: 248cdd954e099a4c910894e75a0f44444ab2ae10
|
2018-09-25 11:10:45 +08:00 |
|
孙昊翔
|
de57257fb5
|
demo17添加新增按钮
Former-commit-id: 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 79475700095dccfe6def593052c8ec3546e03be3 [formerly bb8bc03ef1b92d3c3d273ab63f946950f6b93d31]]]]]
Former-commit-id: f0c50fb983eccde70c8c8aac36ea5758b0ff8260
Former-commit-id: 65958e5538546a9f5e3405611ee84a856a0c5786
Former-commit-id: 3ded50c5e6d12dae4296ee1803eec02f79d18494 [formerly 5b107d00a4b57dbbe3dadf968000725c3d9a1365]
Former-commit-id: 9544e7d44ff5aff4216e5ab453ecbb75c6ac55ca
Former-commit-id: e315194dbf92c7be8b9dcdede5c7396c073b9557
Former-commit-id: f5c2a82f27dc4913e43cfd700d1fae5b2437622c
Former-commit-id: b3a6c6aed49cde8783c3fe3266b9099343ffebea
Former-commit-id: de0594b2161cb2b0f4b65c51899820098b2abee1
|
2018-09-21 19:31:38 +08:00 |
|
liyang
|
5dd20453e2
|
no message
Former-commit-id: f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly 257001ecfa6474a3768a67ea0f134062f7f14394 [formerly da3a620cf3099acab4993873244c7f36d3340bae]]]]]
Former-commit-id: 5eca38c66b440f042bcedd69b5cfa3e522b52914
Former-commit-id: f5e1b9c1f3cb1681d39317d0111f894c854d1859
Former-commit-id: 0e1470154ae7e31807c8c99a4143837b8864dd2f [formerly e3f2ff894738e9a6b2f39a32ba1260ec19eb9a65]
Former-commit-id: 39f38e5b07abd827e112e1bd338dbb7a54d5358f
Former-commit-id: 2efb6a3e1284d36ab66457f61290199f1d1e610b
Former-commit-id: 797ccc66958f7c688d0e8411ee8f7e75f7ec7b18
Former-commit-id: 94ece070f41cf36fcf05b4096f1855bec34c49f2
Former-commit-id: 0ad1f1b3ae30bbe002e4d491782e1c62b396bf88
|
2018-09-19 15:59:59 +08:00 |
|