Commit Graph

2374 Commits

Author SHA1 Message Date
liyang
925535a050 Merge branch 'develop'
Former-commit-id: c5fc070f7af3046385a1429ffcbffde07389f919 [formerly c5fc070f7af3046385a1429ffcbffde07389f919 [formerly c5fc070f7af3046385a1429ffcbffde07389f919 [formerly c5fc070f7af3046385a1429ffcbffde07389f919 [formerly 28707d68c220026a13f084fb330a2e07ed4e02f9 [formerly 07092395825ed208e026dd912c7914045b209a35]]]]]
Former-commit-id: f0a61eb4a38d78a17086eafc5d2674cbb94e2cbd
Former-commit-id: 8b525fde4dc9d0b819b7448f6bc0754b1e50cce3
Former-commit-id: f050b481897bbf5239f56445b5a7258c3759eee4 [formerly ff5f44be3a6f74a0eb6672d729e36c0349893a23]
Former-commit-id: 7cfb635350a0061635d3ad028f6b4166392bc9e6
Former-commit-id: db75f5be4b75e1a4fdf12b2fae8dd430bd9f7072
Former-commit-id: 23535d7fde91fbe3fa790cc3ca37c21dee5401d6
Former-commit-id: 19eff92bc2492238b583f7010140e72c60a09663
Former-commit-id: 25864f43ec16ffee6326682079e087440c0ecbcf
2019-04-23 22:21:59 +08:00
Lu Chaohai
f6d665e276 menu-scroll的load闭环
Former-commit-id: 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly b23640838d125a94b88f1f1251a58ab7ee8192b4 [formerly 95206821db3f98a24808708e18b6f3229f5c5081]]]]]
Former-commit-id: b418bd5953c02fc5a128edaea6814a82f759a0b4
Former-commit-id: f653dd9ca82a56576dd70ac5c41f84766c77c8aa
Former-commit-id: 4b9dd2a4dabc9c475eaa0aaff2d6a803a869ac18 [formerly 11ee19bc2f6791a9a2f755123e021c39ae238498]
Former-commit-id: 2d897b6562f9cc25db215868600c9e0750abc995
Former-commit-id: 064842b388029046538160bec1e4da87c29d97af
Former-commit-id: 877956cf441d92621e67a9827296afb15e0aa887
Former-commit-id: 4c4d5278eafde4bbf84eae6f5991f17de3228856
Former-commit-id: 73e53f2f1768b12320346573f277b0f9fc4521c7
2019-04-10 08:46:46 +08:00
Lu Chaohai
16efba90cf 修复初始刷新页面导致的顶部菜单滚动轴异常bug
Former-commit-id: 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly a4f4fe6a4efa08a93ec74345bb4630fece1b0560 [formerly 7a54ed8bc65c87132d18f1e3ff3fd7b2c94212dc]]]]]
Former-commit-id: 86a7bdfe0575038ae12d52f26fd0bfa334b0b704
Former-commit-id: 1d908e75d462b1f490d85abe2a5eb6c07ef23aee
Former-commit-id: cc70ea58925cd8339b3fcf6c2236ddba4eecd6a5 [formerly 8583b31523987529d8aee76070e0955ead44ca02]
Former-commit-id: 95c8f7f88157d3ec99e36688f5315c5c4d274cc4
Former-commit-id: c6ef3f63dddd62d6725cd31ee3cbd0a8428e6a3b
Former-commit-id: 4d5008e488776faa64ceb843042973c6fcdb5061
Former-commit-id: 193fad7fdeb14fa41370b62ca9cc8f68c044ba1a
Former-commit-id: 70bb99b49d3b0d335dd74f13aa71c781193dd260
2019-04-10 08:13:42 +08:00
liyang
31dbc17ebf 修复线上环境下首次路由匹配时报错
Former-commit-id: 6cd47843403d682ecbe90c3cc595b78d4e0d2cb1 [formerly 05072dca58e9347869ce723360001aeaef1c51b4] [formerly 6cd47843403d682ecbe90c3cc595b78d4e0d2cb1 [formerly 05072dca58e9347869ce723360001aeaef1c51b4] [formerly 6cd47843403d682ecbe90c3cc595b78d4e0d2cb1 [formerly 05072dca58e9347869ce723360001aeaef1c51b4] [formerly 05072dca58e9347869ce723360001aeaef1c51b4 [formerly ccb5421c057dcf18f2f28f0b0c6b6e453b7de760 [formerly b14b6676d82b06798ba3e17b0879c04762b04405]]]]]
Former-commit-id: 8bfc351ff38f563b0a2e502d94765d802a5f9c59
Former-commit-id: 8ff9e0aeaf6ab0c1aedfb5c2517b0c1b79cfecd5
Former-commit-id: c61d53ea29db97a08be17856bd0875e53a435a91 [formerly ebca0b46c1081cd989f7f1719514e738c35d0b46]
Former-commit-id: 04d55550e3bc1f5c644764707ee0cb13794d44a5
Former-commit-id: 3d458cc8f5690a5a133073057b45acb2161c31ca
Former-commit-id: bc93dce4925a2fbd21b20fc9c7eef5a558a59bda
Former-commit-id: 35371f80812c7a3e63805ed4073938f9850202ae
Former-commit-id: a242189e76f4f8fd886f77f2b687bb6eb69b5843
2019-04-08 16:46:39 +08:00
liyang
65d39577d0 去掉已经废弃过滤器的示例
Former-commit-id: fb858ee6378ec9c9d0734a2549972691692ea89d [formerly fb858ee6378ec9c9d0734a2549972691692ea89d [formerly fb858ee6378ec9c9d0734a2549972691692ea89d [formerly fb858ee6378ec9c9d0734a2549972691692ea89d [formerly 401fb93c9dc3dfcdacdb64ee035b55fd7f155d4c [formerly 75ce026085d5bf271b068b343650b5704c3ba803]]]]]
Former-commit-id: a734323ca5b6292e849d8081a89d1a4273aa3ed1
Former-commit-id: f0cdbae297cada10746c10f1d0b3a69bc6cc02d3
Former-commit-id: 5777911f81b23cfa706b8d2e48c7084eadd0424b [formerly 4de93b4e4da159cbdf4630bab6715a5607c16f5e]
Former-commit-id: 19da14a0f364b1e33c36bb968af58a6a4390254e
Former-commit-id: 0402bae18bb1dd5637bb27eed4bb5a5e3aea3c92
Former-commit-id: 24057d944f63fa0d1fba90e50e63414eaab27fa8
Former-commit-id: eb8577fd5fae3dcbac43f2ea5c95ee89ab57e5bb
Former-commit-id: 77961794a11e68de2e349177c3d8bf8d3f456f65
2019-04-08 15:08:40 +08:00
liyang
0b27a30887 fixed #165
Former-commit-id: bb4aa89bb54e590d51b5fdfef8f8ecbd320d3ab8 [formerly bb4aa89bb54e590d51b5fdfef8f8ecbd320d3ab8 [formerly bb4aa89bb54e590d51b5fdfef8f8ecbd320d3ab8 [formerly bb4aa89bb54e590d51b5fdfef8f8ecbd320d3ab8 [formerly 76a9815bbfe46656c04507e2343db7c913d327ac [formerly f368e3d9f9f6df2e27dbcf59d9faa425a2192ecb]]]]]
Former-commit-id: 92af69f0a2a4d5b55429b26ce074013893734467
Former-commit-id: 75ed4fa7b2594e8e927a15206a089db25ec16aa2
Former-commit-id: 736b169460b87c95893b9ba3b2c9e2c6cdf0dae0 [formerly 02288701a7281bafdd8307e8046c9ea24eeb56c8]
Former-commit-id: 1458a84d001be98a5a7546db37717e7fcf787fb5
Former-commit-id: fab4c59663b1d2ad132b609d2b30db716ae13456
Former-commit-id: 55ca9bc56473c7666d95227cc1a21b70e3bd8071
Former-commit-id: a4e1b98abf2276e7651cbe6e5d89801323307d5e
Former-commit-id: c1b8d27f20e627632328407a1e7c21491252fc56
2019-04-07 11:35:04 +08:00
liyang
8877d627ab 删除无用信息
Former-commit-id: 7dede6b98271e9a347a004cd98a9aebdcf4966e1 [formerly 7dede6b98271e9a347a004cd98a9aebdcf4966e1 [formerly 7dede6b98271e9a347a004cd98a9aebdcf4966e1 [formerly 7dede6b98271e9a347a004cd98a9aebdcf4966e1 [formerly b800f8a7b84a0bc97fbd48f88593f1f9fa7f4630 [formerly b46d79148cfe8a465e4589ec764d4dd7682d789e]]]]]
Former-commit-id: ed355eaa6adad4167ebefd0f816dcff0c222a8c2
Former-commit-id: cb03f3dbb116ccb5f8509d7ffb17c75406d576d8
Former-commit-id: a7734c1ae24060fe49f305106a01e537c70bf176 [formerly 6423697ba63195d157ea54c52390ca87300078e0]
Former-commit-id: 053b09ec2bc6a5cc8a71364b59dd7c2a9e071e0a
Former-commit-id: 68c9d60c44debfe94fbdf9165bf3f1b45fd70e8e
Former-commit-id: c3915dbda2b429b806729dfff3569d054d2e14d5
Former-commit-id: 56b6809da91588d8195fcf0e867102b82542fe3f
Former-commit-id: dcddb3c506aa6458ce155e85443d754e14e1a1d5
2019-04-07 11:29:24 +08:00
liyang
daf8b3e753 Add LanBlog
Former-commit-id: 786d889881166b8b76b65d591b482e63d6a66dc0 [formerly e3fe03cb74c2445c0ea28d9bc871c7c0bc1b86f1] [formerly 786d889881166b8b76b65d591b482e63d6a66dc0 [formerly e3fe03cb74c2445c0ea28d9bc871c7c0bc1b86f1] [formerly 786d889881166b8b76b65d591b482e63d6a66dc0 [formerly e3fe03cb74c2445c0ea28d9bc871c7c0bc1b86f1] [formerly e3fe03cb74c2445c0ea28d9bc871c7c0bc1b86f1 [formerly 1f78b93959600291393c206740dcfeee9ee7ca33 [formerly e26ca62046ae4354f561edc0c2253d2340a2771b]]]]]
Former-commit-id: adcadce14ec6612381fabaf657adb812e6e1e34f
Former-commit-id: fabe917fb6dd46f16643021c9378d01b1cffb4e8
Former-commit-id: 05867fefd148abc20c72e07378be02541fc64eea [formerly a6ec7228201f56818569ef6f881f3028f3a3d0aa]
Former-commit-id: fd2e8a83e5b66b98590dbc4082848967d2aaccef
Former-commit-id: a68d9368ed12820a34c0ef1acc48ea3df2a0de2c
Former-commit-id: f672c3830bdc1ca0c7e2beab1687d281f0b06d7b
Former-commit-id: cd24541338b2e67b91e4bce46dc708a78bb3b3ba
Former-commit-id: 0e334bf37c77ee4d0fea5214f18d5136d2db61ae
2019-04-07 10:46:10 +08:00
liyang
d3318af158 增加 ajax 错误的捕捉示例
Former-commit-id: ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly dbf242544733fb012f7539d174519b6ba1c19d3e [formerly 2a164f6c59e772be2699ea07d9a41b84cdaf97ff]]]]]
Former-commit-id: 40e977135b0c8bfbd51e87b534eefbb6f6d386ea
Former-commit-id: 68e6984ade3df1b6102792f11d3530ff06691261
Former-commit-id: b8fc000ad260dcf9ab15304df1fabd8ec45dbd51 [formerly eb154d14e358458e6dc1aa8d11b71a9dd77f693b]
Former-commit-id: 28aa0b81492e52f381255159bde81f9a79c00f00
Former-commit-id: 8e5a82c22f0db8e4d758254c8622b96ec83aa33b
Former-commit-id: 6eb4f8c3bc381e3180f7ee22eaa5766fc2fcf12c
Former-commit-id: 652a133e3a31b44af5e2e4aa2d4a71730e5470c1
Former-commit-id: 2dde2e26c765600d57e31f31b445baff7628c581
2019-04-07 10:34:06 +08:00
liyang
6a51fc4112 fixed issues/168
Former-commit-id: 14062d01fc4f85741368ff518b336069207abab5 [formerly 14062d01fc4f85741368ff518b336069207abab5 [formerly 14062d01fc4f85741368ff518b336069207abab5 [formerly 14062d01fc4f85741368ff518b336069207abab5 [formerly 1f4896bff9f3435aa4c29a28893c2692b66f07bf [formerly 4167bfaa7ed9bd4cf1e167fed8769c667fadb1b6]]]]]
Former-commit-id: dc93b1768c26f7351cd133c92b8d6a4a9b508e8b
Former-commit-id: 2e22e956026776c79fa4f81b2120aa18cdd8ab39
Former-commit-id: c902ed478f0ba330ee75751f4d174fc634ae0b44 [formerly fee26eee0fe50b20cf28cfdf7eecfe3a87d5dc1f]
Former-commit-id: 2e9ff9dea2b92f613262f926258929f540132d5a
Former-commit-id: 5efd7cd32f611c3d7c8ec539c2506d9eb4f578a7
Former-commit-id: 251745b97f7d66caa2e6dcdf0c0e4725a96200ec
Former-commit-id: 02b581e9ede47074e17d645bf3b970efd4dc250b
Former-commit-id: 4351c5fd8f37569918d4914a37080441e48d6f40
2019-04-07 10:33:39 +08:00
liyang
970e87f27e @d2-admin/filters-dayjs
Former-commit-id: 44b4adc5d8144bff5cd6950564f1382f474ed4af [formerly 44b4adc5d8144bff5cd6950564f1382f474ed4af [formerly 44b4adc5d8144bff5cd6950564f1382f474ed4af [formerly 44b4adc5d8144bff5cd6950564f1382f474ed4af [formerly e7d24cfca00c42b34df88c0a7bb8238f323f808f [formerly afc1573e8dec97a2eebaa65f008df04e68b98fcb]]]]]
Former-commit-id: 923ab0a0597fbd8f2e43a96f33e54a6310fbc1a0
Former-commit-id: 35e843586a60289343cf69675c7ef3e1772a03de
Former-commit-id: 57a8cb83294ecaf453bb7eb5a334c49d881968dc [formerly d95155e3f697f789ead7006cf2d4038cf4d7b54b]
Former-commit-id: 9dd422f52c554e729b4bed60fe1f6e0eb8d283ea
Former-commit-id: 6e98316c3edfa6842289af19a0c16ad350716502
Former-commit-id: 2e1877f4c4c58512ce66ca7ccbb26b549b5b7872
Former-commit-id: 2dfa15916b5891d0b6953a1cb16bffad6062afb5
Former-commit-id: af18a84b543f0a95f85add09707d6f60cc36d70b
2019-04-06 20:11:36 +08:00
liyang
92bc32f819 dayjs 过滤器移动到 packages 文件件内,保持单独发布,但是改变包名
Former-commit-id: 8edae44b33f18375c30f4da997e379135f9b852e [formerly 8edae44b33f18375c30f4da997e379135f9b852e [formerly 8edae44b33f18375c30f4da997e379135f9b852e [formerly 8edae44b33f18375c30f4da997e379135f9b852e [formerly a7623919d3baa987461b56a6b602c3967815c876 [formerly ad295a79a720c7dc124c6ad5b6d0004e3ad9dc02]]]]]
Former-commit-id: e89a5be7f8ff9fa1c079e16f543dc5e87f884f4c
Former-commit-id: cf6b44d1f2ca78cde4ec4de1e5f1309eb4c8c7b4
Former-commit-id: 832c549904c0ee4957b18e965793a6797c08b6bf [formerly 259b681de4c28f48656ec65adba0216b8a8a06dd]
Former-commit-id: e097b8dfe785f08ae133b9bda63e080e18baf887
Former-commit-id: a2bdb2a55fead0e81dedb31b8145f65b246cd29e
Former-commit-id: a6a3d0d9b7ab436a01d89b5bf255d12babb8be61
Former-commit-id: 564403ed9b8fbada916c0b21684268740912270b
Former-commit-id: 351f7454b858df065d947dab7f5bf26f619c11dd
2019-04-06 18:25:40 +08:00
李杨
034bad999f Merge pull request #167 from sunyongmofang/sunyongmofang_study
去除dayjs中的toArray和toObject实例

Former-commit-id: d2bd52baa9d40bdf57f084a86d4fd5db0d434e9e [formerly d2bd52baa9d40bdf57f084a86d4fd5db0d434e9e [formerly d2bd52baa9d40bdf57f084a86d4fd5db0d434e9e [formerly d2bd52baa9d40bdf57f084a86d4fd5db0d434e9e [formerly 563e1020679b7e8190a232e9623eb09b0026c971 [formerly 860792f6e5c0a59b0a8ad03981d4ad152516eed1]]]]]
Former-commit-id: e170b84f76ab5d8a3b188385bab5648d3ad55be8
Former-commit-id: fc8a04384cf6a507c92879a2603e7ed7e6c18bf9
Former-commit-id: 0e955abb0b35438c1d281353a36b9efdf3a197c8 [formerly e6e12c39e1b40e14228bf51b02de1d336911f880]
Former-commit-id: d0dcc4154aff45edb715141bd730988540f96aea
Former-commit-id: 69d862e2ae72c2b5708a164a86f3da00c2dedbd2
Former-commit-id: 6a9f6d05ac537f20d25231f893c48ecd6b9c78e5
Former-commit-id: e889368342d1b1c00d9eaed38404548552a5ddc1
Former-commit-id: 63decd35e202870ec42422256b500f8d383b642c
2019-04-06 17:36:22 +08:00
sunyongmofang
1071c6d3d8 去除dayjs中的toArray和toObject实例
Former-commit-id: 37d3f4fb90e315e37f54a78d1f77eb769cde4e93 [formerly 37d3f4fb90e315e37f54a78d1f77eb769cde4e93 [formerly 37d3f4fb90e315e37f54a78d1f77eb769cde4e93 [formerly 37d3f4fb90e315e37f54a78d1f77eb769cde4e93 [formerly 04bc6b621c2f2cadd757f0706de87a5799fc256b [formerly bffcaa2c62675f8ec8142c5ee8f79c79a4d3bc7e]]]]]
Former-commit-id: 7a8604a263e6d85e34e1a895d2dc02144bbe3165
Former-commit-id: d365519b110109e2faf319649f7aba8f3b32c8dd
Former-commit-id: 1bec56d1f99e8809a66ec4fee096a407be49fe6f [formerly d50c0e02c8959a4cfe6476b8453460140c9824d2]
Former-commit-id: 5f81cbe8d0108e260ac29c09e3ad89000c035e4a
Former-commit-id: a6a0dafc9bac473ffbc016a9d056f8fc203dfbab
Former-commit-id: 30f85e33ca10ff53b41b9dd9a109d278d47aa7d4
Former-commit-id: 3cc7fa516f1c9d34efc80a95f00b236a30d5c827
Former-commit-id: 87488ae0660f47510bd527648bf55d15f268dc69
2019-04-03 18:03:13 +08:00
liyang
0fc0d5ff41 Merge branch 'develop'
Former-commit-id: cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly cf18925b4ed71fb959c3b57a11f24968b82c7748 [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5] [formerly 89dc321115f9eee73b6b4ae793d113948ece49e5 [formerly 05c181530e4c5c621ccd74dbf0c3e11fcd8049d9 [formerly e812237df20881f11d9fa8e800f82b58c2fd2c74]]]]]
Former-commit-id: 088ce0e957a356b7349b9148126158cebe5fffd3
Former-commit-id: fd2e47f2d2dcb4c40477cb9b914616ac1f72f4af
Former-commit-id: 7fdd1c177646f43839d388b3ad129624cd934fdb [formerly 925a5e5e01c04fb62d00d617aece570f3bb09d9d]
Former-commit-id: 74c1edce6d352f3b8056f077b4ee5d3bec0b448e
Former-commit-id: b06f5304f3d9edb44200b416a8da6c4d5654d73d
Former-commit-id: b5ea1068ca8a4ba130559540a2cc3142e38a6756
Former-commit-id: 821e4abfe6e1bbc0d5f39fa848e6b216f3ffd4a3
Former-commit-id: 48335cba8c5acd98af7ffe693bfe087fa1b71acc
2019-03-22 22:49:52 +08:00
liyang
8bddd8f5d4 1.6.18
Former-commit-id: 2e846135f867a46f9500213350513280fca7cc10 [formerly 2e846135f867a46f9500213350513280fca7cc10 [formerly 2e846135f867a46f9500213350513280fca7cc10 [formerly 2e846135f867a46f9500213350513280fca7cc10 [formerly ee612706c64efc71133e2e34b0d48d4b94dd4673 [formerly 125d082d042b702038dcc679e56c607c0182387f]]]]]
Former-commit-id: 6cb281fda1c86a71383399abf67292fdf5ef93be
Former-commit-id: 4bc8a415e2704c9d46f4703eb90f1ef523e00a1b
Former-commit-id: 1102608a96cb82704013a6b9064cc7973f6e3608 [formerly b2c0a369a7b60c6bad1ebb1c334d88a3665449dc]
Former-commit-id: b466f1b38f9884b96050078c493740ae273e8831
Former-commit-id: 4b2b7f750d40011287e00b9e162371dad86e3f50
Former-commit-id: 0ed2228fb319129df00b121b64680a6558aefc59
Former-commit-id: 03c477cab30bd1d4b28b7a4ba3467023ce549d94
Former-commit-id: 9282c116565bfcd083f40c1110fb947410599c4d
2019-03-22 22:49:41 +08:00
liyang
a5934a168f issues 166
Former-commit-id: 137314f37d68d3c6ed58b4b2955f68ce8a6d1935 [formerly 8cfa67c8ab01c87b4e5b772456d475e06c645409] [formerly 137314f37d68d3c6ed58b4b2955f68ce8a6d1935 [formerly 8cfa67c8ab01c87b4e5b772456d475e06c645409] [formerly 137314f37d68d3c6ed58b4b2955f68ce8a6d1935 [formerly 8cfa67c8ab01c87b4e5b772456d475e06c645409] [formerly 8cfa67c8ab01c87b4e5b772456d475e06c645409 [formerly 5bb65b3d7d45c9fcf2a63d33c27b86af02433102 [formerly d11e58526b50aaa8444f827d5ac0d57348f39740]]]]]
Former-commit-id: 1ef587a14a2637fca192840f58a4e0ec0aebd5aa
Former-commit-id: fde2f956cb1d8e69e58de5947cacd4e211c7dab7
Former-commit-id: 08f5b7aa122d428f82dd0a417a55776d132cf9f0 [formerly 9d6d110e627bb702dd2f7cd8f773e8ea83437efa]
Former-commit-id: f4f5480fed5f2edebadf6dde7f5037020189a3f0
Former-commit-id: a3ab7fcf687cb843eb1be2c53428b21591dafee3
Former-commit-id: 49eae8bde1deff7214bd06fb700174b5a6e953af
Former-commit-id: 33091b0e5a482f2a00e2904f48ceec63b1d65451
Former-commit-id: 2926d3ae8897197f239fc6a5787c024c73895904
2019-03-22 22:49:13 +08:00
liyang
28ae1a3692 Merge branch 'develop'
Former-commit-id: a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly 5bcb80627b66a2c00808bef69b36b843e2922a03 [formerly 2964275a5c8476890ae8b7d72ae294e09e8cf8b7]]]]]
Former-commit-id: 280dfe51d47d3a9cfcd13bcf8fbdcfdee4ce99c3
Former-commit-id: 15a31d01f0300cdbba402f5e8fb420ceeada3735
Former-commit-id: 71f949beb62d94b345b91c1ef46e72ab37c53597 [formerly c4d83b9af57a07cb1a23b3f3c49839a35a943888]
Former-commit-id: 894c444ffdb911f295027afc18d0f2e6f8270cfe
Former-commit-id: f49ae6fb1753844defce74aefcff2adda77dfb36
Former-commit-id: 3d0665f660ccddb1b63218318ffa2840e16109ed
Former-commit-id: 088820e1cf0e37b000699d14b7be74c3936d6040
Former-commit-id: 464605f53726320dbd128a1123dfdea275396fcf
2019-03-22 19:26:02 +08:00
liyang
e5a975c4eb 修正错误的版本号
Former-commit-id: edc54328c612f43788534d6c45cd970742213438 [formerly edc54328c612f43788534d6c45cd970742213438 [formerly edc54328c612f43788534d6c45cd970742213438 [formerly edc54328c612f43788534d6c45cd970742213438 [formerly bba29b1436dbff218489ed4eddba7be13dd27b40 [formerly f46098926a8bc079fd418e1410310535c2514f71]]]]]
Former-commit-id: 569e85d737a79bd53294b8f7f2eeab2e7aa99740
Former-commit-id: 668fdd9a3457a993f62de16bff63f0183d0957a7
Former-commit-id: dbc00fccf1fdc42ef85bc330eb62617edb49c740 [formerly 257cba8ed6cd0778d377e47819eff27c54940bfb]
Former-commit-id: c059bcb149811a507c8ed996fc06a94836ce9056
Former-commit-id: fec8524354ceefaa7588f8c0a6e1fd6a4d417f86
Former-commit-id: 4c9994319ad5a8f479a2b455b78d5e98a369cf8a
Former-commit-id: 661be13963787e5afecaa49ed0d5fa7ffe8483b2
Former-commit-id: c54fe29a1071eb81fc4a41dcbbcb4a87d6c3a9e2
2019-03-22 19:25:56 +08:00
liyang
33ad064331 Merge branch 'develop'
Former-commit-id: 204d09d8dabbed45e8bde8fb011647216b59093c [formerly 204d09d8dabbed45e8bde8fb011647216b59093c [formerly 204d09d8dabbed45e8bde8fb011647216b59093c [formerly 204d09d8dabbed45e8bde8fb011647216b59093c [formerly 2d56af03b4429f30f560df908e488ef79e65e946 [formerly bba811bd39bcf1903b5e15ec91e6f3527e2141cd]]]]]
Former-commit-id: 70018967b277590baa30618c9e4f04f4c617390b
Former-commit-id: 55643002672ce80e04f9e8bab4305e3efa7e04a9
Former-commit-id: 27ee23fc8bb76441e2f97f75a287f1e6cb22afd5 [formerly 06b80136a429e2b84c912c8015eb3a3b008bed9f]
Former-commit-id: 3614d01c6b9e65ad4b2920ab2770e1f1f9e8265f
Former-commit-id: b46d71c7e5b84357e6dea6b10fb33193d52f62d3
Former-commit-id: 7b470329c7888cad04eb04bbcca51877039711f6
Former-commit-id: d538cf24824af97d8e481e2fab74e4babdea67e9
Former-commit-id: 1e8039a2587772929035bf7cf0c3c5f389ec5afb
2019-03-22 19:23:20 +08:00
liyang
67cc92dfa5 error => danger
Former-commit-id: 4d7cf4227b1c4132e2f8251771cc83ad3d4c2258 [formerly 46acb669a621f057e342a43d1956cbdeaef28d3e] [formerly 4d7cf4227b1c4132e2f8251771cc83ad3d4c2258 [formerly 46acb669a621f057e342a43d1956cbdeaef28d3e] [formerly 4d7cf4227b1c4132e2f8251771cc83ad3d4c2258 [formerly 46acb669a621f057e342a43d1956cbdeaef28d3e] [formerly 46acb669a621f057e342a43d1956cbdeaef28d3e [formerly 7db6c5143721ce2302c1d12d4ec70023288beeac [formerly 3752c857a977fec298acc8844cbba44c5aa357b5]]]]]
Former-commit-id: 809641e117916d12852b77379256c7f1000b1662
Former-commit-id: 5bbab8ca7137e8aa590dd6311ab9dba91f804321
Former-commit-id: f30c11f8078379aec964b2aa715fafad3f50430f [formerly bbefee0d80aaaccff5f169a0024cdb5a03bf1ba1]
Former-commit-id: 18a7c80e377b917653017af67b570aaeb181dc59
Former-commit-id: c4e3d8f86f2c73f15f750d36c31981792c2241d8
Former-commit-id: 13963d7d5032af2d2f51471d6609397672352e1f
Former-commit-id: 7f733a5097067f5ffe70c9525a2eac82310af122
Former-commit-id: 25e2e82ed96373e0d8325f93d3e438bc9ab73f48
2019-03-22 19:22:50 +08:00
liyang
c2a1daf0ce Merge branch 'develop'
Former-commit-id: 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 6029864179e5031a3422897015df05a6935873be [formerly 0f660a48d07ed1b75797c45e39af747afa47397e [formerly 3514948237fb4541ee0920486aff4214d749c4e4]]]]]
Former-commit-id: e5fd19c2902805afb179f1cff76df0ff26575366
Former-commit-id: 0d8b9960fa009110a8c92b3ae659744fed2d84d9
Former-commit-id: d7143c0c0a398dfd62b0662440a871d509ef593e [formerly c43467e2ffddf3662d6db8678fb41d368ed6b90b]
Former-commit-id: e6315ed375673cb4fcb6529452c06c48f75b6790
Former-commit-id: a1929c5db4655dd42efd32d95721f2d3fcd57927
Former-commit-id: 5e15be16870f361751bd7a771bd761ae036cdd63
Former-commit-id: e79faf2d537b78d937af93f53c5c07187e55e626
Former-commit-id: 111f1fed9b0dc656adfbd55cd19e7af77f5954b3
2019-03-22 18:52:51 +08:00
liyang
09eabf1564 1.6.18
Former-commit-id: f2e3edabbf045751c9e72deef0fdb6727956ff5c [formerly f2e3edabbf045751c9e72deef0fdb6727956ff5c [formerly f2e3edabbf045751c9e72deef0fdb6727956ff5c [formerly f2e3edabbf045751c9e72deef0fdb6727956ff5c [formerly 7da702d57e5584103959e05b35c1d002991312a6 [formerly fa5bc7b2e72f80e653f2c7ce39a9522824b63306]]]]]
Former-commit-id: 9cdb0415422f04ad094b8a75c1fd8c4177f386a4
Former-commit-id: 75c7079bd031a1cafd2a0c823cf51cf8ae66dd62
Former-commit-id: ac997478b905f149489964d618934d2cba05d89a [formerly 01c5edd66c543d4b89d16f161f5dabba59c6f9d9]
Former-commit-id: f5ee5b0fe614f79382f30951dd7a8ee90a6b2603
Former-commit-id: 8f79ab9abdde49ea2b11d35fed1fd88c907b968f
Former-commit-id: da81e8f4f41a26e3e2c0c8be43a1581c5cbff046
Former-commit-id: 17bbe2c8a67a5b7beeb40ab7649334f9e5db1068
Former-commit-id: ee59fa7e93ec6c1ddea0dc506de9b96f5f6649a4
2019-03-22 18:52:24 +08:00
liyang
9ecec2a780 Merge branch 'develop'
Former-commit-id: ec0db56a0a2fd789cc790314a3743d2c85420bb2 [formerly ec0db56a0a2fd789cc790314a3743d2c85420bb2 [formerly ec0db56a0a2fd789cc790314a3743d2c85420bb2 [formerly ec0db56a0a2fd789cc790314a3743d2c85420bb2 [formerly 24de088004ca097d2a426fdec4b61cfc1b41e637 [formerly 0daf2b860c4bc59254b908a1376b933cd681c1ff]]]]]
Former-commit-id: 91f0a3c4ed2319133cb57b9d4bf5baea4b3a7533
Former-commit-id: d5f0afae33ab88b90a2a853712d47e2bc477f517
Former-commit-id: cf5afd68d69f2a8dc79ac1c3beaa68d940c83f03 [formerly 1413f59e2ec68739845bb5d3cc9ef3b32f953f86]
Former-commit-id: 32556ac90f151baa3af26439c06b0b287519910e
Former-commit-id: 094063e6f17ccbacfab8d433aac739198c1dd18d
Former-commit-id: acb9f259b36013f0236bcbfde0802e923a4a56ae
Former-commit-id: 08bacf4476a8027c897f117080b00cc76f2bcd1b
Former-commit-id: efb4ed49118bf2b38ec40d397c49519d75c98f6c
2019-03-22 16:59:04 +08:00
liyang
015ae0a06f log table empty-text
Former-commit-id: 5a492b7231f24c6ee18a873372c76849cbbdb5f0 [formerly 62499badfbabc7afeb0a0732c9bd434609439674] [formerly 5a492b7231f24c6ee18a873372c76849cbbdb5f0 [formerly 62499badfbabc7afeb0a0732c9bd434609439674] [formerly 5a492b7231f24c6ee18a873372c76849cbbdb5f0 [formerly 62499badfbabc7afeb0a0732c9bd434609439674] [formerly 62499badfbabc7afeb0a0732c9bd434609439674 [formerly 1870e5f3a8181bb1a4154f3cc2ee34a451bfde2b [formerly 305c7cd77a27ee5ab5f289fcc0190744530ea13c]]]]]
Former-commit-id: 5358af54ab0950dc4549de17b18b32e0bdd2856a
Former-commit-id: 4d25fdc5cd40c3fcdc4479eb5f2ec39d64480a6c
Former-commit-id: 8b4dd51c6915a89414fa7215c2cd6db235a7f84b [formerly 1d84f174da70b8bddf0626f4a27462cd87728301]
Former-commit-id: c89c5d119a06224fd41db07da9f7276e90334a6e
Former-commit-id: 5abad3506f7670aceab422b417bb175ebc42680b
Former-commit-id: 1e9163e445f31d9751b860b3158fa6dbc9593c20
Former-commit-id: 0a8004ed1b5137950228009c9659e818311224f9
Former-commit-id: 6453529cd7a24044b11417e24ec4ca2c7861db5c
2019-03-22 16:58:58 +08:00
liyang
f22e59f961 Merge branch 'develop'
Former-commit-id: 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 49d89f5c96d9b2f916f3ca6690f043fe719f60f7 [formerly 1e9aba53827131c159f0ecf987a216b536a78116] [formerly 1e9aba53827131c159f0ecf987a216b536a78116 [formerly 4cd5dee5e3e1bc89e9fbab409201279b8e08cedf [formerly 08bd4638526c87fb6f9bbad58f9e2a67aa9d718c]]]]]
Former-commit-id: 9a26d683ecd433779ffeb2cc28c0b154104649bb
Former-commit-id: 088e423d0251d9a39848890cdfcec81156fc232c
Former-commit-id: d709b796f41d96d69aca76809a7510126bf1a7b6 [formerly 5de26439ee1d4b006a46af6af7d01b7044263693]
Former-commit-id: 899e22cd73866929fc822e09a6f6bf5e98ed5148
Former-commit-id: c84d8cb85a07f5071c12fbffeab3bd1d101e8c0b
Former-commit-id: 08ba61f77053d8d72fc81b31009b39bd88e60af2
Former-commit-id: b0b17b8c949963182e252637bc7c2b272c2333f7
Former-commit-id: 8944acb052012bc8bc316f6958562d1975466e3b
2019-03-22 15:57:00 +08:00
liyang
a4c8f40535 Merge remote-tracking branch 'origin/develop'
Former-commit-id: 96fd7cde0038cf426d908a227ed4462f6c3ace5c [formerly 96fd7cde0038cf426d908a227ed4462f6c3ace5c [formerly 96fd7cde0038cf426d908a227ed4462f6c3ace5c [formerly 96fd7cde0038cf426d908a227ed4462f6c3ace5c [formerly ad2e6a5eca8a46bf9f2fecefdca7d69d60de41d1 [formerly 71f37f654ea6459d459ec3bc49a14a515bb47227]]]]]
Former-commit-id: 31a37b122552fbd26e993102d5ca079d6408a248
Former-commit-id: d8f6ce991e22077cc8cf59160fb24399357bd50c
Former-commit-id: f2b7d2832afb45df3c988c607b3f17f383c54c8a [formerly ccfc8d2735de0bdac33eba71342a1db80e1708c2]
Former-commit-id: 1ba29ef2d7ef151654053cb36f38701c87d56249
Former-commit-id: d9d88ffbc80f716a3d050b6fbb9796040eba7aac
Former-commit-id: dad86160ea27e805f8850629e9223dc647b653dd
Former-commit-id: 5cca1791a26a7a18ba97366022c45dee000917f5
Former-commit-id: f7328d97b1a2f75755df37a4ec525bf3f285c1c8
2019-03-22 15:55:36 +08:00
liyang
4e534180a3 增加更多的显示内容
Former-commit-id: 2b1d3346600740ce83392b02e5f71c25594df2c7 [formerly 2b1d3346600740ce83392b02e5f71c25594df2c7 [formerly 2b1d3346600740ce83392b02e5f71c25594df2c7 [formerly 2b1d3346600740ce83392b02e5f71c25594df2c7 [formerly 5c8866f12dfd61d51b479a3b77edc52846ac93e2 [formerly 6903a8aacfb78e8590025cc88ffd3ba8a5b3f6e3]]]]]
Former-commit-id: 0836f5b4148140a275c9f16b415a81445916d85f
Former-commit-id: 8da38e80c4ad43db70bdaae029beead7e219312e
Former-commit-id: be809870af337dfeceb5f6273ffaba67bcf7d002 [formerly 4f437ea0599ecf94046509764febd2c3497ab719]
Former-commit-id: f097542edd531954c2d7cc4f0537293799e8ce7b
Former-commit-id: 46d9fdc2a1912b492c44c069fcd4d246198da53e
Former-commit-id: dcdc4743386ec984e28a590b2b571b2a7249f994
Former-commit-id: f558fa69d55e76b9bcb581f3097b618d6c8e315a
Former-commit-id: 3c87cc43bf9a625fe477657a58d1f0814d2121c9
2019-03-22 15:09:39 +08:00
liyang
9b090558f2 日志改为使用表格展示
Former-commit-id: 4ac4f563a31922a4b52ae88ad6d5637c3c9cd9e4 [formerly 4ac4f563a31922a4b52ae88ad6d5637c3c9cd9e4 [formerly 4ac4f563a31922a4b52ae88ad6d5637c3c9cd9e4 [formerly 4ac4f563a31922a4b52ae88ad6d5637c3c9cd9e4 [formerly 6eaf7f1696013d04d62331e44b247409cc2d4ebe [formerly 4e1c4ad157f4ad09a37f305c549ceaa692373fd1]]]]]
Former-commit-id: db738b0352d4d8722fa76538a090676a663abd5d
Former-commit-id: 0cc00ff0f436c2dc505cc29283a70afda48d0e13
Former-commit-id: 92faa11b7ff81af8d2cd22c003ec86ca7bb3d530 [formerly 20db4e2893d54c1c9e5822cdf407fb9e459410e1]
Former-commit-id: 476c6b23696a4492469a742de2f586f45f67fd1e
Former-commit-id: 0f772cebc6bf6d6b0ea6792c5d2a47c116ac0fad
Former-commit-id: 05661be17dfa5747c0be88c0d400a4906fbac365
Former-commit-id: 5d8d8bddbf40c35e706382f972a14b98f7ced909
Former-commit-id: 57baa8fdae4a99071521527a3463025d86ca35b6
2019-03-21 23:26:28 +08:00
liyang
e0efba2a53 日志页面增加页面 url
Former-commit-id: bef281a21af06abdd852d54653f27c07a37e8748 [formerly bef281a21af06abdd852d54653f27c07a37e8748 [formerly bef281a21af06abdd852d54653f27c07a37e8748 [formerly bef281a21af06abdd852d54653f27c07a37e8748 [formerly ddc327dd4c06ff799e9ede8628d204c443623a48 [formerly 825f4c74f35ac3364007e1d2c43112589d364f65]]]]]
Former-commit-id: 8cd1d4830466b239aae6d34b7bc199c12cd3adbe
Former-commit-id: 129f94dec8836d6ad6f1151d96998cba23ae4f01
Former-commit-id: bfaf6055cfbdd9bbd1b14d75a74ed073074f39ad [formerly d070d00d3598f5acbb794ce655f9e789f4be3b14]
Former-commit-id: 96c5ce9fd085ed1b7a8ae68651b184f7377e721b
Former-commit-id: 0300abf39c8cb444ec5ba3bad91bc71040d64ef7
Former-commit-id: 7724a16fdbd3e062615d48c33bee299030eadd22
Former-commit-id: b3782ee2c8936e6ef750d6f2b585bcfee2569300
Former-commit-id: b09fe2c642d3e0f5213460b54caee83979ffbbb3
2019-03-21 22:59:26 +08:00
liyang
780c5071ed 日志区分颜色
Former-commit-id: aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly 350c8c6514e327fbab5060978b4b7523a098f6d0 [formerly 17c340c2f594b545b945d52cc1a8647348ae3389]]]]]
Former-commit-id: 52db1bdfa3c024dfe218c09e9cf75747b6abb038
Former-commit-id: b2f85a553a4e78de0daa8c18c3d332e5b92510b1
Former-commit-id: ecd4f39b10208f44d030bfaba635e21215053ebc [formerly e68563d7da177cf374736e7f0b8170f0e407a9f4]
Former-commit-id: 2f8af3f79a52372c93e4b27d1f034d214edcd64d
Former-commit-id: 960bd7e3d8cfb67e152c07312ff68652114d480b
Former-commit-id: 9a716fc01315ad5e1064d9c64b671cdc36301721
Former-commit-id: 02d7d4a0e3aab9bfc0318e5dfbe355f306d1f9c3
Former-commit-id: 0c0c46088a4e916e3cd9c1099594b3e1a15bce46
2019-03-21 22:51:22 +08:00
liyang
20c30520f0 log 模块优化
Former-commit-id: 46dd58602044e544021e6dac3750f8063dd8f630 [formerly 46dd58602044e544021e6dac3750f8063dd8f630 [formerly 46dd58602044e544021e6dac3750f8063dd8f630 [formerly 46dd58602044e544021e6dac3750f8063dd8f630 [formerly 02da1cf89a30a31b7ada6753276bf8d7db49c7c2 [formerly 8732cbe9dc0937266a143b0cb94061cc6458c22f]]]]]
Former-commit-id: 9bb0587d2bf29ae030c34e973b2968898c409efa
Former-commit-id: 4573b85856d998f1e0e1fc745aa84c116374b757
Former-commit-id: 499c55cf76d4187c091b3780fc492b863b20160a [formerly 522496547f9dcaeb7cceff1c71ca90d19fa853ce]
Former-commit-id: 76cf33d5c5abb90f90715e0678987996286b8e7a
Former-commit-id: c5601273186197e17715589beec00fa4b0d93c8f
Former-commit-id: 2057049057822377d125e273d901e9e0b01d3d99
Former-commit-id: 4a45cde995408c9e2de7028e9335c72a57f93530
Former-commit-id: b8a74a0c8dca434b6dd43606d97cebb396bc36c0
2019-03-21 22:42:03 +08:00
liyang
f0d9674ed2 this.$log.push(this.text)
Former-commit-id: 68835d0d14a26c911493667952e8920533176cda [formerly 68835d0d14a26c911493667952e8920533176cda [formerly 68835d0d14a26c911493667952e8920533176cda [formerly 68835d0d14a26c911493667952e8920533176cda [formerly 36698e25123732c5ebcef3b1be4f6689a77fcc60 [formerly 0fdad5bcf43969f757bbcccb132a5876e84cba80]]]]]
Former-commit-id: 75abf1504b7ee705faefdbc909e48853a31804c5
Former-commit-id: 09a29410819b4a8a9206bf8f25983ced57acc210
Former-commit-id: c9ff463b6dccc21297940c5a029880b59c073bab [formerly 9b13330a75ac199ef4d634668f3daddc23faea93]
Former-commit-id: dc9f756459eb8a702f3a33729cbda50ec8a70085
Former-commit-id: 6085d6e77abf5efe9976a8414abec6524e621ac0
Former-commit-id: 2f1a97adf665f917721b92b3e8e8b7845d090e85
Former-commit-id: b739a8f5f768a0f5a864944b433f9ac6be47fe12
Former-commit-id: 139d6f73cc2c44d700276143280c56b7f34fef86
2019-03-20 16:57:14 +08:00
liyang
97c4e0864a Merge branch 'feature/log_component' into develop
Former-commit-id: 9880ff489b2fbe7104cba5fe86a62366b4558955 [formerly 9880ff489b2fbe7104cba5fe86a62366b4558955 [formerly 9880ff489b2fbe7104cba5fe86a62366b4558955 [formerly 9880ff489b2fbe7104cba5fe86a62366b4558955 [formerly 18da9c4e7f8593ed39a54df780d76bccb944b932 [formerly 52e94695b43cdc0f706a9a43cda23d1856765005]]]]]
Former-commit-id: 4c335cedfede7838264f422953efb913374334df
Former-commit-id: c0b7992c8f2fea6f3531f7424c182af1e155d8eb
Former-commit-id: 2f9642cea24b066c0292d09648035dc4b62ced68 [formerly d3560f3e2033d4b9888bb595700c95e2d8a25715]
Former-commit-id: 6c61b46394cc8b9566f48994e3f299b49d24bd8c
Former-commit-id: 169e084c7396b47d1db033860a0b85765cef5677
Former-commit-id: 853fedbd0ff657053d14e0b7e7e005e0e2114790
Former-commit-id: 7363d63bebf72da296cfefd1e60b4bbf86474293
Former-commit-id: c78400cfb7b7874dd21486aceca5aef54bec7109
2019-03-20 14:00:01 +08:00
liyang
617127f8bc markdown 组件和代码高亮组件优化
Former-commit-id: d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly 2cb8a3245f269e8fc8b8e84e75582dbe2111ef6e [formerly 2fcb318c9d67fd23d117fc43c58ce3bd0fe3276e]]]]]
Former-commit-id: 986b67d62d3c86fc484836203f8b5e1f4891eb6c
Former-commit-id: cf0546bc2376ab54f182e127f67c3a40393ff34b
Former-commit-id: 6963b119eb71b3d607c92c9cad99d050356c1d88 [formerly 19610c6adf62f7ebb440d7373832a1c5d60f4fb5]
Former-commit-id: 48f31983021b0ff99750c6dabc63b412ef34c83e
Former-commit-id: 98eaf63e71f322930ace1f3574bc7fc6e0c55525
Former-commit-id: a716504e5874c330944390c491ac790c991a598f
Former-commit-id: 3cb6935ae5fadeb239da1dfa19d1189f6f240e87
Former-commit-id: a457670c4f607c074274362653e516482c532363
2019-03-20 10:11:47 +08:00
liyang
c62248fdaf 删除了 clearfix 相关的代码
Former-commit-id: 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 33899ac6fd09a122ad71dbd89363e90cad5071aa [formerly 27c82ded5d78e431bb710b7bf1a699b70675289f]]]]]
Former-commit-id: 61eea194c45605f39985af151bac028d29d5855b
Former-commit-id: cd9b4b0fa53307068919a15fad8bf18dd616fd12
Former-commit-id: 84785db7c037f1590a283ed91a6a257f581619ee [formerly da6799054002c4eb3a598c6449e3bd108318bff8]
Former-commit-id: 71904e17a21b6db3bdbf8e0aaa346fb2570c16ff
Former-commit-id: 11b3e68c88f4b37ead0bf1811acf912a81da28ff
Former-commit-id: e6826aea1605f350672b21ab7f6a19ef29edd4fb
Former-commit-id: 656e5e672c0a8c037771b085c3bba1135a4f84f0
Former-commit-id: a1ecd8c27ceff6d1dcd6e79ce6687ff20bc5c5b6
2019-03-19 21:56:00 +08:00
liyang
7fb34d1a34 调整日志字号
Former-commit-id: 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly ffabe43efb80b471c40996fd65e63481ead56871 [formerly 54a01ee08ac5687b404959b8a4a2f78109d02d26]]]]]
Former-commit-id: 9f5f014a0e137d1e0c430187c6bae0783f2e0c40
Former-commit-id: 83a4d5598903a96a6b5cce032784902789adacd7
Former-commit-id: b99eb8ced925692575722ee31a6769e596a6de3f [formerly 82a6988900a27818dc1fb5eebc310dba268208a8]
Former-commit-id: 95158577265930e20286fc8b291ea09a07555c55
Former-commit-id: ca46a24af13fd6712ce324ee8c5a37f0e811014f
Former-commit-id: 49aae14614ab030973759ded896aeb11c5c4b778
Former-commit-id: 607ded65adbf58465892781fcc100364463e5f96
Former-commit-id: b72abeffb7446924fffdaa78b37798cba3ddcc78
2019-03-19 21:43:28 +08:00
liyang
0a44bf5a8f 将本地 console 和日志记录混为 $log
Former-commit-id: beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly b2ec499b9466f1629e2cd965d6948298399b7736 [formerly 996423bbecb3cdeef6ca080d1b59072050aa5f1f]]]]]
Former-commit-id: 6d0621bec321b2841fbf44dc05817c12eee20595
Former-commit-id: a9703939966616751729a94aedf76f5d534438ea
Former-commit-id: b6b9410194abaa1a6eff40f11754d79870492b70 [formerly 035ee58d42005f80e0005e7ab9e2b9bcdf97aa2a]
Former-commit-id: b5ceb6ea7a1b158eaeb97fb2e3c5b8312b8c51b3
Former-commit-id: 49e3519a3a7e6ec9b08e8d2184e086c16556f5b8
Former-commit-id: 3e14916037a5913c9a1e96ebf1e355ba6c209a53
Former-commit-id: 96190b9608241a670bcd72de6d9ffda3895a3602
Former-commit-id: 3b7884de25614fe06e9de3eb10f57babcaa9ee50
2019-03-19 21:41:56 +08:00
liyang
a40e069bae 增加上传图标
Former-commit-id: 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly e0b0b32e3e27bb4f1e2254fed1c6ec2219f80640 [formerly 220f7e81d9026225c0f748b32a21182ae6f63fd6]]]]]
Former-commit-id: 071b2901fe40861722e57250319e6e83d46bb105
Former-commit-id: 8faffa37950f6c51c07c3d15013b5e783d790151
Former-commit-id: 5af199b396739a3dea9a946421b5c76e1731965b [formerly 8afb1fa8ba9af31bb417315d4e7d525c18543866]
Former-commit-id: b820a36f0d7dde09ca777c23fc87c25867260cef
Former-commit-id: 50d3aa1834e091c8573f0b33dbba1212d655fd4d
Former-commit-id: ce018bf1aa977f8e44b9ac5e0c86f6ddeea7c7bd
Former-commit-id: 0c91caf01ae353ad6b75edff6e34c8dc8b551fd2
Former-commit-id: 628672d39b7d5b840c3246c6677aa3dea44de520
2019-03-19 21:28:04 +08:00
liyang
68d78dcde2 优化日志显示页面
Former-commit-id: 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly b4354d85cc1708aefade894a572c7c43cc1277a5 [formerly aba1ea86b235c25c24929198b57653ba3f278037]]]]]
Former-commit-id: 1b8861760a739469fa52f81ea95e92071b160380
Former-commit-id: 9d8bb76d2a57885529d8679b6a8ba870462ef576
Former-commit-id: c332d85b1553b2cd47feabaea442a27e6864d0dd [formerly 1f8c38491cc31a430b4a9fbcdb659c80f070f276]
Former-commit-id: 180c06ea08c275798eea50b6bb32aee7adb35ac5
Former-commit-id: afa3eebab977573725423f80b8692b15688487a7
Former-commit-id: e83926983c777be0f0b17e820cfc2c5033635d25
Former-commit-id: d539ddf492d6f6d65c799b3c79de5df233f77c2e
Former-commit-id: 6118829b8661097dd42f4b4fa9fd8257b6e129ed
2019-03-19 21:26:14 +08:00
liyang
806079df8d 新的日志格式
Former-commit-id: 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 4a31495f225f851d089fb4362edd0ac8358ca21c [formerly c8ae7cb50e9b9499812512b4172702752f57b544]]]]]
Former-commit-id: a93e32b805171cd5b9ac2f06e3d830f99a50e825
Former-commit-id: 93fe03aad8fa90cd42cec2d913c26162a8a3307b
Former-commit-id: 5b51ffc4ecb1b979dd2ef504a7f88b16f26b75cb [formerly 8863540da4ed06a0b4b9d5a4e575b8b536b3abaf]
Former-commit-id: dc756f8f5935b6d36e12a1384fcb4be834d37500
Former-commit-id: 4502fff0f4f42b1fc1e33996e118c98ceff85897
Former-commit-id: 42e563abacc02bc7fe11edabe0963007b57b717d
Former-commit-id: b01454379bb448756825f1aad43bb49efcab3fe2
Former-commit-id: 8c7cb3cb4b93fd67933bac039304a9651a366fae
2019-03-19 20:41:01 +08:00
liyang
0e20db8c30 Merge branch 'master' of github.com:d2-projects/d2-admin
Former-commit-id: 08e57a3129e81ec0407f7e64aa12f39d870d8798 [formerly 08e57a3129e81ec0407f7e64aa12f39d870d8798 [formerly 08e57a3129e81ec0407f7e64aa12f39d870d8798 [formerly 08e57a3129e81ec0407f7e64aa12f39d870d8798 [formerly 2cd96b9c991796ecb56b8fed599938b1e5de4e9f [formerly e9ace3552e53ee15c711a74fadbb38a0bceb0d1d]]]]]
Former-commit-id: 2b1137fb71af06b795b66d5cbfa9cfeb4c57c1d6
Former-commit-id: 51898279d4bdc573f4fa73dbbaf9f557d5775e35
Former-commit-id: 57ea470a9bb109c90eca72e282c120f9238e3d90 [formerly 12903eb76a80eaced4178c5ded641168ec9a2732]
Former-commit-id: 11afbc5708d02d5e774396a8d3b58ef0f7648fee
Former-commit-id: e9022481dee6c90bb956963a5f8744010c953019
Former-commit-id: 917e7a6cbc89019d60ae8130c0f711f30307394c
Former-commit-id: f113254192348ef34880edfd8b9ee2d18791a08f
Former-commit-id: 27083dfa12bde68d16d8909dab81f770440fc003
2019-03-19 19:50:57 +08:00
liyang
b07250cc40 系统日志页面搭建
Former-commit-id: 5acd4b9057871a6523fff27c28647a4087b977dc [formerly 5acd4b9057871a6523fff27c28647a4087b977dc [formerly 5acd4b9057871a6523fff27c28647a4087b977dc [formerly 5acd4b9057871a6523fff27c28647a4087b977dc [formerly a7dbb26902e95b3a64e57793e7b072adce4a2ec4 [formerly 4cc2829e67d3f66865415ced76cd7c8a1cce504c]]]]]
Former-commit-id: 637aad670296f24c5ced7f13246a2e54987f7904
Former-commit-id: a51647921d27766c644d04e5d5e2ea83525231c6
Former-commit-id: da28fbc3875fa0bb4aa0b4ebea035e391d1ded0c [formerly ac56d726dd3e4760951c39f5744444fb20075105]
Former-commit-id: ace138db807039e2915fac0a6ec9311dc1ac843b
Former-commit-id: 6087d466bd3ce2fc6bd1365b1de44e30941d1bca
Former-commit-id: 78c0406ed6f149c165da73fc477ece0407e409b3
Former-commit-id: 48e719e1cd05a0ba06cd46f85efa44f125381bb4
Former-commit-id: 785e4a4ecae7175700d20d322309aaff445e1512
2019-03-19 19:50:23 +08:00
rongxingsun
a6c23ca1da 修复container组件样式
1.  在低版本chrome内核中js获到full__body高度不正确
2.  刷页面时js获取full_body高度和标签切换时的高度不一致

Former-commit-id: ab6ab94f710c9af618dd6e212801d4fb22c6fc1e [formerly b50e8357bbbf61d42453526bafa8f81588f873cc] [formerly ab6ab94f710c9af618dd6e212801d4fb22c6fc1e [formerly b50e8357bbbf61d42453526bafa8f81588f873cc] [formerly ab6ab94f710c9af618dd6e212801d4fb22c6fc1e [formerly b50e8357bbbf61d42453526bafa8f81588f873cc] [formerly b50e8357bbbf61d42453526bafa8f81588f873cc [formerly c387f014aa9052b4482f86384dc33013444aa8d0 [formerly 4ec5d77801fddbc5b6c29300c85a9068c0e40aec]]]]]
Former-commit-id: be724ffb1448938a4af5f39e55c7615cbfb9ef37
Former-commit-id: 3f6d86a376a1b6cdcd24fed9734b45d49f552190
Former-commit-id: f21be7ab327d9a23c46405469dcb5eac1f1fc81e [formerly ba5797e85103a32e93588bb06c8f4acc69debdf7]
Former-commit-id: 62ffaa0824df79d2b36be384a98324f3a6b14e75
Former-commit-id: 8e6f954e2d473a22c7e5195436e0cc60afd05fab
Former-commit-id: 0a45d60eb6413f80be7091d025aec4d45be40b92
Former-commit-id: c1792fd719101a6cb1ec09b8d6df9b19ffa34b8d
Former-commit-id: 89332ac8e80762d0d35033eb4203bd7cd0c9593e
2019-03-15 09:05:49 +08:00
liyang
0f04615685 文件夹改名
Former-commit-id: 7b74bdf25b14c6a8da08ae07075e3f78be308894 [formerly 7b74bdf25b14c6a8da08ae07075e3f78be308894 [formerly 7b74bdf25b14c6a8da08ae07075e3f78be308894 [formerly 7b74bdf25b14c6a8da08ae07075e3f78be308894 [formerly 1e795e1614aaf94f23ad99354f6ca9be303a1b1e [formerly 9ce21aef6b043d8bfcb2849dd7c6bc34e4625387]]]]]
Former-commit-id: c92d7410adc4138c7903c0067860fc3d190f54b0
Former-commit-id: 9f0ab819a505e341a6edf210efb107df8b8efe33
Former-commit-id: 3006c0d2ccda4133203372c30ffee34a73fa8944 [formerly f340ca4127e4578b3c53747d13bbaba223ed4e83]
Former-commit-id: 9624c2aaa99880b5e37f1e60f1f36ac673e021ed
Former-commit-id: 7923489f2c3c637782d9d4a1707bc48dfe3b1acf
Former-commit-id: 2375e080a7f715bc48da40d4c56235efad3f0d5d
Former-commit-id: c41402e6c0266a07e974efad41feed7c6fb7d0b6
Former-commit-id: b8814b31619151361c91ed37cb1ee7f3813853c1
2019-03-14 20:24:45 +08:00
liyang
0de79b3462 pages 文件夹改为 views
Former-commit-id: e09f4e96ca40b138b2e0a512a2cbf86765fe55d5 [formerly e09f4e96ca40b138b2e0a512a2cbf86765fe55d5 [formerly e09f4e96ca40b138b2e0a512a2cbf86765fe55d5 [formerly e09f4e96ca40b138b2e0a512a2cbf86765fe55d5 [formerly 493feb170c8dd44e556a65690bcf108fdf7bbdec [formerly 1e1aecfcce5bc3000ab863dd87777f53e28b486e]]]]]
Former-commit-id: 5f5d61007bac9df4d6e2b4ffc643798aa9f4c676
Former-commit-id: aea51c653fd858a08fd821717792f311860cc98d
Former-commit-id: c651a36b46d20644b2608a71f0804e1bebdc7f2d [formerly f0720d0875d471ab36702b504ec10dff9c7feb3a]
Former-commit-id: 0e727a93de491976085546334e111ab7cbd4033e
Former-commit-id: 1595a7ab3cb21287b8cf7020d9b48135849aa82a
Former-commit-id: b0304860ea7182b4a160d15b15136eb39c0c9b20
Former-commit-id: 1de7beab1156c652086d5305edb9671084330514
Former-commit-id: 54d08d1b8b77a32fd2e1ff7c37cc4b8e6a22512b
2019-03-14 20:22:26 +08:00
liyang
bf0c914489 删除多余的 div
Former-commit-id: 689e318a8559547c9ef349f7876ede9092b00863 [formerly 689e318a8559547c9ef349f7876ede9092b00863 [formerly 689e318a8559547c9ef349f7876ede9092b00863 [formerly 689e318a8559547c9ef349f7876ede9092b00863 [formerly 15da17a8a156f35b835c9106d4f6b697aaf483c1 [formerly 445f9d41931aa1d3eaa803094e3d1e3626c3927b]]]]]
Former-commit-id: 54ed1676cf3b1416d3d95d6882a259a1c812cac3
Former-commit-id: c7e88ebacd457ce022a41ec5acfc484f26a754d3
Former-commit-id: a06c371f74dcf8e82306d668b70400aae8e9e275 [formerly 5d0cdea52c7363a1dbae1b874e68d682b159c489]
Former-commit-id: a87c982577d8949ec897a8fc81828733c1909f74
Former-commit-id: 797ba8396fb9ef60c0fac91dcc50ff2a77316b60
Former-commit-id: c1198211b4e85234053167acb4dcbb239c5fa924
Former-commit-id: b96eb6d508c197f704eb6cb11eb9d0f50688a0b6
Former-commit-id: b0b30dafae4d303737a0c38b90f750b72b0671a2
2019-03-14 16:58:09 +08:00
liyang
720c249b8a 将内置页面放置到 system 文件夹
Former-commit-id: 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly 9b6f1fc48ff0a4b7158522a9493476106efdc04c [formerly d81996a3796e2c63911966f0cb6ea18bec5e7906 [formerly df8f59f86f2e28a8e8be1e6eb72ce4ade91af154]]]]]
Former-commit-id: db47b459b73606a01e067ae92f28b500d405a609
Former-commit-id: 1dd52f3c4a1c48fc7c6cd6ad6f336c40d5e8c1d5
Former-commit-id: 3e24140718abe0ecb090121d1c695769e1b677c6 [formerly f58557f2407c0f8f445770865430beee4a3409f1]
Former-commit-id: 208210f8433f8ae4c42c663456c0c26eb0ea8b45
Former-commit-id: 08a2d89053625b33cd5e2922eae17b457ec38113
Former-commit-id: 859353ae3db7ae5bece84f07c912400df9ef8c36
Former-commit-id: 53ed8961afd584901342191f1c1576d18aedfe4e
Former-commit-id: 3d03936adbb9d467255220aa178f684fb80d00d2
2019-03-11 14:09:23 +08:00
liyang
5bb85f3887 修复格式错误
Former-commit-id: 5b0acfecf054f0a714ce63f8553facca80e43c0e [formerly 5b0acfecf054f0a714ce63f8553facca80e43c0e [formerly 5b0acfecf054f0a714ce63f8553facca80e43c0e [formerly 5b0acfecf054f0a714ce63f8553facca80e43c0e [formerly 614c7ca16460e1409ec1ce53e4632bf684b671d8 [formerly 8f498646fbb345c644f3a04e2cdbe5e1b8a8171a]]]]]
Former-commit-id: 2e71673b01f1959feb3cd19ff20b564d80afea53
Former-commit-id: c44e0157f994d7dd8e23203a15846c1f95eb1a09
Former-commit-id: 7a187d89f6598dcd043ad6aca592bdd60dc1f877 [formerly f85678d5646a5acaf8fd1d7c2724a4be027c3384]
Former-commit-id: a95d797745c24cea6d6250d92f43ff1e1459bb70
Former-commit-id: f10f0fa1198ac8315d0a7c986519a818365ce024
Former-commit-id: fa5b300f75ee060304ef1625f219a03a81169118
Former-commit-id: 7c5c1d0694c61a0928c9968d789bb3da45dbcca1
Former-commit-id: c6e669f72a768b823bcded2fc8d136a9c7178376
2019-03-10 23:00:55 +08:00
liyang
aaa2b02be8 删除旧的错误信息展示组件 为下一步准备用页面制作log显示做准备
Former-commit-id: 53f84c1b978bbe3f7c1a484f649ecb24904226c9 [formerly 53f84c1b978bbe3f7c1a484f649ecb24904226c9 [formerly 53f84c1b978bbe3f7c1a484f649ecb24904226c9 [formerly 53f84c1b978bbe3f7c1a484f649ecb24904226c9 [formerly d3727e3a924335c6f982b5b66085ffa0930b94f2 [formerly 19c41e84fdc55ab3f87ff45d67bd262eca2d213c]]]]]
Former-commit-id: 630d89e2818f7ceb56f38a0f51fcd5ffab969dc4
Former-commit-id: 9fc7690b01b0fb1abc352c2a073f8bb69bd3fd62
Former-commit-id: ce67ae520552390aed3a2a7b8c3e4220fa24b338 [formerly 95724b4f1eb486dd79fda543a5bdfb9f5d38c361]
Former-commit-id: b90a90dd985bda5959586c9f902b16754b3f21e0
Former-commit-id: 56d5ed57e2bcda3281c0850a5cbddd9f78a86011
Former-commit-id: b9cd9abc79b6177f9df7b06b1ded93a5d314d019
Former-commit-id: 6cf9a1a3c63ec56d5b3a91f74001c1af94bbb25f
Former-commit-id: d563b29a0c397dce540c363cc5306c7daff904ad
2019-03-10 22:46:12 +08:00