Commit Graph

1435 Commits

Author SHA1 Message Date
liyang
eb5c89ff53 log
Former-commit-id: bab2bb15589539f4140f4582da09eb0069b873b9 [formerly bab2bb15589539f4140f4582da09eb0069b873b9 [formerly bab2bb15589539f4140f4582da09eb0069b873b9 [formerly bab2bb15589539f4140f4582da09eb0069b873b9 [formerly 8974b2fc64f21f240a768ff8657e83556de421d9 [formerly 7b4e1a2a70627488f945eba98d288a79a0a243cb]]]]]
Former-commit-id: 7620f9c9ddad400fbe6fc9042ca9690ad159093f
Former-commit-id: 4d857c13ead50fb0bd6869544b1c3dcdebd18874
Former-commit-id: aa6de588166ddb8fb649b072122f8b4ff2f7b6fa [formerly e2fbfc36ab2f2c86f6e12778c00c381d7f38db33]
Former-commit-id: 07cf29d93eba7745d9c8736c72582f1771b537a8
Former-commit-id: 09fa896073d1b3ebf06ef568f995f6a25e689974
Former-commit-id: 9823ce618d492cb49fb9bf35e4e35733b5580de7
Former-commit-id: b67e2c71b4b7d29f3a40c11f893db0df1a456642
Former-commit-id: 305b824f25acf280a145e9250ac376c17bb2589c
2018-08-09 11:50:45 +08:00
liyang
dde7b07c8b util拆分
Former-commit-id: 822c86f85a1268c28513cf97b7107dd697eb6d43 [formerly 822c86f85a1268c28513cf97b7107dd697eb6d43 [formerly 822c86f85a1268c28513cf97b7107dd697eb6d43 [formerly 822c86f85a1268c28513cf97b7107dd697eb6d43 [formerly 68c12439e9dd03521d919105efcbc06cb6da2126 [formerly 1d5c6a4b53da991761dd4a9399eefb27e70e96ca]]]]]
Former-commit-id: fbe49d601541d01db7f4c36658c71a6e3b014733
Former-commit-id: e2e4e2958c7f63990339e1d06b4b3aaf463dab31
Former-commit-id: 20c693d8bcc308b276d15d7cbc7288c74c709dbf [formerly fc2f99d56d410c349d5bff5e42176a6fc97325da]
Former-commit-id: 004230c8e00651d1793fd4ee68bb34299d4049f5
Former-commit-id: 94a29c7f87d6d3b6f200d9bdc9033fb25641cf3f
Former-commit-id: b5d93d8b5c1b5e85b62c01ca815c87dc943a694f
Former-commit-id: d787061bbfae4ea01a3aabf6f92cd1620377b572
Former-commit-id: 2fc8371e6d340382cca7539a5dc1aa09881fecb2
2018-08-09 09:52:52 +08:00
liyang
84da66a5ab log
Former-commit-id: 95d5baf9aaedee49ed4f341c165b36d521873c9c [formerly 95d5baf9aaedee49ed4f341c165b36d521873c9c [formerly 95d5baf9aaedee49ed4f341c165b36d521873c9c [formerly 95d5baf9aaedee49ed4f341c165b36d521873c9c [formerly 330406e4cc2346598ee009a18d532b65997bd688 [formerly 1499fb678f01b69954b0729d96e7d39fc2709fc6]]]]]
Former-commit-id: de221d5a7c6b2de8a630830fd2ea015dd79dcbcd
Former-commit-id: 209be7d51ff6103bfd63e3e77094ce2b6d720acd
Former-commit-id: 349fb4dd70e772432afb00aa89eb15bad514ce72 [formerly fc2b30471c827b14605252706fd8a1b58a847947]
Former-commit-id: e09b5544a3d3f7093b812d86a96be36938cc4ddb
Former-commit-id: fceb4888d7e32350a6e85cc78e28b2e273027fed
Former-commit-id: 69b0978005a32b472a421c2ce9462f8549405183
Former-commit-id: b2b88707f315ab0b9ec17d1747a86e9d0c72fc38
Former-commit-id: 418f35d509ee5e159a20a98f81e423aecca388d0
2018-08-09 01:29:41 +08:00
liyang
dd6bcfd94b log
Former-commit-id: 067af1ad15588da779f6fdb52d8dd5e4d5337a83 [formerly 067af1ad15588da779f6fdb52d8dd5e4d5337a83 [formerly 067af1ad15588da779f6fdb52d8dd5e4d5337a83 [formerly 067af1ad15588da779f6fdb52d8dd5e4d5337a83 [formerly 26bff908e7e98cdecb3942975cb8dac912d22760 [formerly 5394d813fcdce16e699ff3d54fca956c87f1b56b]]]]]
Former-commit-id: 4d70ea535fa6b135fd63ef83fc090e9a9d851e39
Former-commit-id: faec9e738fabb0225ec9ed61b86c30f269c02486
Former-commit-id: 9b54c495f13d810d67fa85e2129c05eec4a99324 [formerly 46471134b136a5df475c7787b5694052aca6b8ae]
Former-commit-id: 0eb56ebbfa256ce1c2d3c1d99994ec7236c7ad5f
Former-commit-id: 68c0847f64453808a6afc906ffc110654ccf84a4
Former-commit-id: 93c3b439339c575b5d7a085262817b295a852058
Former-commit-id: 32ccde3e80c1ec1a1dc8bc335082eb6ac80ea3e1
Former-commit-id: b8e2a549af61ff83b566fd961085ad7414d21b2d
2018-08-09 01:03:20 +08:00
liyang
b793604445 theme 模块
Former-commit-id: 5a60f7a68cfa3c9effbf33aee1a0bf606cb7a045 [formerly 5a60f7a68cfa3c9effbf33aee1a0bf606cb7a045 [formerly 5a60f7a68cfa3c9effbf33aee1a0bf606cb7a045 [formerly 5a60f7a68cfa3c9effbf33aee1a0bf606cb7a045 [formerly afdd5cb7b4d018f68b61257181f089438a12fa44 [formerly 6fdb6e759e339cd17c8d76d09d50b902fce8b74d]]]]]
Former-commit-id: 6e388aa8ce29cec9d8901ed1b11d8fe11a0cf2d4
Former-commit-id: c6c36e452f960cb9b24d73d65b28907e40c621b4
Former-commit-id: 7685d8e053d9f26643092bf32e74844d6cf89446 [formerly 8cfb43881c4ed2ac4facf1bd95ff6ac901dc41ba]
Former-commit-id: 8493ae32e3635ee733b09d558eb9049154883ebf
Former-commit-id: 728960b5d4f3ebf00130d78edb964beb3321fe59
Former-commit-id: 978d3701efedbcce3d5c694eaed1d34537cdf561
Former-commit-id: 4fd5476f29dd398a103a12d0f820e4d70750c97d
Former-commit-id: 2580f2041c87b19410c4bff2a99ec6a94727e766
2018-08-08 22:30:56 +08:00
liyang
9f06cd2c6f user 模块优化
Former-commit-id: abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067 [formerly 103e140145dc6124294568692de9a49f6455e10c [formerly 85e8b7e28529e4d632005906ad535c892cf37271]]]]]
Former-commit-id: 0337a7a21b785454f950bebf1c31f876854af4cf
Former-commit-id: 3e6ec221d7250dbb97b48f71cb1b296b859fc68f
Former-commit-id: 8b3c41abdf815b1ccc30893dd8552127da50e4cf [formerly 8b9e779beb974176130dd68c9a134774438ec699]
Former-commit-id: 8eef9fa291d08656d6a85504802c1d816158011c
Former-commit-id: 7ae6a8418781674243e70696cf35e0ac91d18dfe
Former-commit-id: 1e4be2f1623b7d3c7b1a5d54723f655a3d594f36
Former-commit-id: 0d04496116e5cfd45075a18c5c05bae80a8dfef1
Former-commit-id: 3bf321fea766617190e93eabe816143464ab5f1a
2018-08-08 16:42:02 +08:00
liyang
5a91ab709f util user menu releases
Former-commit-id: 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly cd607a12b20a3d53a1967ee6012a35e03e3d31fe [formerly 645a010d0d8f84a370c509c39c560d93eaa8ae4f]]]]]
Former-commit-id: fd4e72b6a4dc7cb2731c0b5fbf343dab6c251d3f
Former-commit-id: 68305cd58cbd1927373a79c1b507de3c4f3d9924
Former-commit-id: 48312890868f48d5524b0de0dda489f2b2c57b0a [formerly fec91cd8f508ffe42c5e254dcee018c879f3d51e]
Former-commit-id: 9e300a2baafd1eae86bb69a052f15b904724856e
Former-commit-id: eaafbb0a410a49a286eb8e666b6784b96c9df371
Former-commit-id: ccef5438dddbe9762bd3574b33aab49bc1edee58
Former-commit-id: d2ca5c406860c43079d78a80d18ca2b1ed87f776
Former-commit-id: d4648c6865bff45b24aea999b60381b78417b802
2018-08-08 16:04:10 +08:00
liyang
8ef8ae0ca4 函数文档书写优化
Former-commit-id: 93e74bc54bdb54522026dc64d0e65e20ffd54e2e [formerly 93e74bc54bdb54522026dc64d0e65e20ffd54e2e [formerly 93e74bc54bdb54522026dc64d0e65e20ffd54e2e [formerly 93e74bc54bdb54522026dc64d0e65e20ffd54e2e [formerly 4078a86d7671d63e8cdc94cf37befbedd4ef3900 [formerly 8ea10257c9a46150565e291a40a276e3439cd9a9]]]]]
Former-commit-id: e908ae7726ba64e0f7a54fc24061463ff56fc98b
Former-commit-id: 9f45d169b7afcea1ccc2a9bff4780066f56383d8
Former-commit-id: 4dc2a99741508b592812cabb0863e678a3246fc5 [formerly 91d967993cd1bbd0736eccc3d5ee5b762c54e2fe]
Former-commit-id: 3dd5d1b34ee3592a93cf6ba3c5f6da049249512d
Former-commit-id: ccc60e742d93d5e46135c855d28e64ce2260ab72
Former-commit-id: 1e6792ceb3919ccf7c6196e0d675c362dc113e90
Former-commit-id: 33e796d22840f14cb3a30ebef9e9621220968be2
Former-commit-id: 66a4eda8afa1035f2b3453fb1df0705cee7b5f63
2018-08-08 09:34:35 +08:00
liyang
b1459f100d 添加命名空间
Former-commit-id: 63fcb6e8af280eb6aa1847600c096fb48cf53ea1 [formerly 63fcb6e8af280eb6aa1847600c096fb48cf53ea1 [formerly 63fcb6e8af280eb6aa1847600c096fb48cf53ea1 [formerly 63fcb6e8af280eb6aa1847600c096fb48cf53ea1 [formerly 632d40c9d0643c6a24abfb7b58b999d829d4f4e5 [formerly 57132b61c7b2f326d08dbe138fda1fac4cb83c62]]]]]
Former-commit-id: c0cb71135408e03add94e219759ae37cfb75f31b
Former-commit-id: 7f8209eae78f59e644c204712c31dff787899384
Former-commit-id: b08fbd31671e552da8012eb3ee901edf4f89c0e9 [formerly bb7abe3cc56f2f376a59413c370032d896b50c38]
Former-commit-id: 0872ac8e17b45829eee426dc5f80f25e37c85ea3
Former-commit-id: 373b0874ce730b26f256600de55a39b2e40d5f9f
Former-commit-id: 472309b468a04d5e57a1a917a6472061668cc7f0
Former-commit-id: 88ad7d087a7382d66523f481b7e1476c21f2830d
Former-commit-id: 6557698b7db15cc1b62cf9c3976521de6cc194cd
2018-08-08 09:19:11 +08:00
liyang
129732558f 参数名批量修改
Former-commit-id: 1a0c7d8b50fec573a7aadeceb45091d912bcc1ef [formerly 1a0c7d8b50fec573a7aadeceb45091d912bcc1ef [formerly 1a0c7d8b50fec573a7aadeceb45091d912bcc1ef [formerly 1a0c7d8b50fec573a7aadeceb45091d912bcc1ef [formerly c2fbf3841957c808ada8d1ac6ea5e99445b9a752 [formerly 5ab8ff3ab01480b7aacdc88c6580b45e48b96ee4]]]]]
Former-commit-id: 61174d35787e83c7c25ce01359d68a12ef17d7f7
Former-commit-id: da2d36e071a049cf6bb1f9091c80d5183d324ad1
Former-commit-id: 9cc4b408474b2152a4e33937fb1afef51eb3db73 [formerly 8a101ad6b9db7aec74971ff3572192d92be60245]
Former-commit-id: 3ff22e65803fc966799c30c11f8f9958a3317090
Former-commit-id: 4e74b514a1e3051c18daaa258d98e2c32e18b4c8
Former-commit-id: e6c0d144a8d8d05f01f8d7086a347d2aba7022b4
Former-commit-id: e5f1805494b931e26afcbccf48a782f1ea495f9a
Former-commit-id: 8cf2f5dc12765d3262645d6ccd30704a25fa9b74
2018-08-08 07:59:52 +08:00
liyang
5cd91cc35d 修改文件目录 为后续模块化做准备
Former-commit-id: 7ac8ff67cfc714c7c5f3c1835c6a3585d2898cf5 [formerly 7ac8ff67cfc714c7c5f3c1835c6a3585d2898cf5 [formerly 7ac8ff67cfc714c7c5f3c1835c6a3585d2898cf5 [formerly 7ac8ff67cfc714c7c5f3c1835c6a3585d2898cf5 [formerly 585db786441b989eff439912ab47bf5f3c41a749 [formerly 1aa58fed969861d42b797dd3e06929132a3da912]]]]]
Former-commit-id: e277625851c94916eb9572636fb902666a88f808
Former-commit-id: ac4b8e1028d4647af2d3620bac6fc6caf1d01472
Former-commit-id: ddef88f77f257902e153d63300e5cc164ee741e6 [formerly e3c281ff3e3c4bfb39f93a8c778616e2408f53b1]
Former-commit-id: 53dcc046428da982a0a85367e0327c8a9d846619
Former-commit-id: db2d3dd5aa11586c35a7574c975005cf17e8cd35
Former-commit-id: 54ca2b1d019e0126cfffa847c751597f3137a3cd
Former-commit-id: 695755b41f0b2b7fe1961e20936da22e6a10b424
Former-commit-id: 459c83348032db43ef835634400897db180ac35c
2018-08-07 23:50:45 +08:00
liyang
201d1a8160 Merge branch 'release/v1.1.9' into develop
Former-commit-id: 143adffaaf7e8b418b62a2f20db8d0c7dee55c01 [formerly 143adffaaf7e8b418b62a2f20db8d0c7dee55c01 [formerly 143adffaaf7e8b418b62a2f20db8d0c7dee55c01 [formerly 143adffaaf7e8b418b62a2f20db8d0c7dee55c01 [formerly 28a059e7d9742059d66befb8e4cd45f4c3a454d2 [formerly 239cea764b0a415d73cad4ea02d52b746e1c2d3e]]]]]
Former-commit-id: 3f54b79bacb34df8ade6c7cc32b28cbb2934d762
Former-commit-id: ff6835d2e4b9a241b3f796e1669aeff34ae773dd
Former-commit-id: aaae54c0359ffabf42c4e976ccafb5f556b0a32f [formerly 5923baaa3c7175563592183916ec8f762e60bbeb]
Former-commit-id: 3242cc7b505484998c50bbb191c544f11fb732a0
Former-commit-id: d4e488bdfbae901feee474175a6860242bc3fffc
Former-commit-id: d7f5b2fd2cc48581afbeb25db9c6a6c6c42d526f
Former-commit-id: baad0857297d18cb64ce862ce27d7015e44a2456
Former-commit-id: ed645810f375909a08ec52548f8c6f8428c680c8
2018-08-07 23:11:44 +08:00
liyang
d1849aae93 修改版本号
Former-commit-id: 6bfe9aa4c0be9f437386e9258841d37b559a18f9 [formerly 6bfe9aa4c0be9f437386e9258841d37b559a18f9 [formerly 6bfe9aa4c0be9f437386e9258841d37b559a18f9 [formerly 6bfe9aa4c0be9f437386e9258841d37b559a18f9 [formerly aa91306e6182d56be5282a7438338b18ad372100 [formerly d4ab2a371bde138be15ae803b820b2e0eb32c1f6]]]]]
Former-commit-id: 9484d037e0b8ad88ea636c7aca14a834009ec834
Former-commit-id: e5b0a9cfba0585cf9ec751aad75cd3a5106e0494
Former-commit-id: 0cbf5c1143d4050b59a56f1b3723a12e91cdf878 [formerly 8b75da0230dd9883f3dc8820bbd34bc81cbab10e]
Former-commit-id: 9b5dd0a921630bbf3e2a7205d88e2fcae0b25109
Former-commit-id: 3680c1268da33bc021fb8b1f5840a7d2861b2881
Former-commit-id: c12bc893141fdcf21e4f58cb3de7e44506cee903
Former-commit-id: 44fe8b1bf65030929773544b1c8b3884854c6789
Former-commit-id: 4e38260e883e30716bf1871551f359b7a47cfab8
2018-08-07 23:10:46 +08:00
liyang
b9fa9535e6 Merge branch 'hotfix/多标签页数据持久化取值优化' into develop
Former-commit-id: bd816d23116af2cda5d8d5da065c8f55ddba4692 [formerly bd816d23116af2cda5d8d5da065c8f55ddba4692 [formerly bd816d23116af2cda5d8d5da065c8f55ddba4692 [formerly bd816d23116af2cda5d8d5da065c8f55ddba4692 [formerly 61166904ec1fc270346c426f52ef2531c4c82970 [formerly 9421b85330da1a2dcf60b56c36c884701df1701b]]]]]
Former-commit-id: 118795a5342df24d0e2bf8fb09b1c24829f107e8
Former-commit-id: 00262d535006193c68bceb0938945c6b6cb948d8
Former-commit-id: 893cd1aefc96a487468ee5ba5fe40645e8bec442 [formerly fc76ce075ee99c43f240ede1dceef4dff842d01f]
Former-commit-id: c8aa1c8a9b32b4cc1ef1ea780330951783cce5ec
Former-commit-id: 65ac875a1b90879999ba40bb2ee735edb33a254f
Former-commit-id: c9e959fb71b544ec55d8c0d9144ed039a1a6bab1
Former-commit-id: 3d127b3293f179dc28e7621003dd85bbfc44d79c
Former-commit-id: 4d5a417260160b177502743a934577c0b0ada968
2018-08-07 20:04:27 +08:00
liyang
c7c18eb241 更新函数api和文档
Former-commit-id: 0408056346d04b87872465df4e0c147c85f10210 [formerly 0408056346d04b87872465df4e0c147c85f10210 [formerly 0408056346d04b87872465df4e0c147c85f10210 [formerly 0408056346d04b87872465df4e0c147c85f10210 [formerly 49925a26369cc12bdf82ee7e25fb570299261899 [formerly 70956430ebe4390c69c4edbb0c901388acf2133c]]]]]
Former-commit-id: 6b4a33a588349731093387c71315cc537d92a8e4
Former-commit-id: 0b81b9cc34ce719f0e18cc13da05b333ad50dea6
Former-commit-id: 20f8000ccd6f578839040c046f1480ef15d50bd7 [formerly 3c0cef40de9da6e6632e05858d01853e4a7bd185]
Former-commit-id: 8251bd21a13c90379d5909b47c75bc284d36e548
Former-commit-id: 7b1660ad64d02a9989a42e506be6a542fc98147c
Former-commit-id: 8e2df92bf52f1ce342ac7839cd5af2423b104b3a
Former-commit-id: 973276df507ab47c233ae23d10039e1f14473b5e
Former-commit-id: 6d4e5d86b211d201230794c918b02b13f115fe48
2018-08-07 20:03:32 +08:00
liyang
fcc51d20ac Merge branch 'hotfix/修改mock注册文件名' into develop
Former-commit-id: 054fa51503b46b299676081dcd4e079d6e313f2c [formerly 054fa51503b46b299676081dcd4e079d6e313f2c [formerly 054fa51503b46b299676081dcd4e079d6e313f2c [formerly 054fa51503b46b299676081dcd4e079d6e313f2c [formerly 337cdb8e33079fec1d3c7a82c2088f0842a468f3 [formerly 876d90e317f068ce01286d3b36cea2d0e4f583ef]]]]]
Former-commit-id: c4344f438efa3af183d03b9063574f9262a7273a
Former-commit-id: 02d711c6f5bb8f9a0705243111cb2f920b22acac
Former-commit-id: c53f7a872a798d8974300496092c870cbe5ef6a7 [formerly b719e5615de7c595d187565b7a2e5ba978c4f80d]
Former-commit-id: d6bd6c6d20188a4072580871622b628c24216f1a
Former-commit-id: 91c0b125035f1b52257cddb59ae58400f66f9d5f
Former-commit-id: dfaf91768faf7a2ea5c781e850bfad309236f699
Former-commit-id: 34f9ba5cec4fa0ae1fc69771d463e99d53770e05
Former-commit-id: 6bc4bf9d02a927729c2b26e5f00dfc514621b75b
2018-08-07 19:08:59 +08:00
liyang
ea59df987d Merge branch 'hotfix/修改mock注册文件名'
Former-commit-id: 439c1959f5d92aa0da7352c0a4793fa8765b1470 [formerly 439c1959f5d92aa0da7352c0a4793fa8765b1470 [formerly 439c1959f5d92aa0da7352c0a4793fa8765b1470 [formerly 439c1959f5d92aa0da7352c0a4793fa8765b1470 [formerly fbfa5feea529dec4b2d2ad0c10a5bd43abea8abf [formerly 94deed6c203cb847e5ed9c02f2ddfa201bd3cd5e]]]]]
Former-commit-id: 5b72852c765b5b12d750ad52efb6db7f508df4d4
Former-commit-id: 79a8d1e657aeda59e3458c86c2f8998553df27dd
Former-commit-id: 9089a5282b793e0ac2b201985162c341ad204219 [formerly 321d7a0ece2ecc5e79142b08ab28a4673d4f801e]
Former-commit-id: b7b604e5d17d31a435ae7f0b53b51a0479283f0c
Former-commit-id: 3973f9c4968a6e7d3bbb8e7ba09d51d122a798c2
Former-commit-id: 9bd7e7a6f4b34eb447a1ced278f889cd21f0946e
Former-commit-id: cfc6a84485969f1176c14716922b6f5b87bdf913
Former-commit-id: 6bceddcf7e75acfd7d0696b9323e27f68cd967eb
2018-08-07 19:08:59 +08:00
liyang
9007fe59db 简化mock注册方式
优化mock ajax测试页面显示效果


Former-commit-id: 36a8a63d3126439f05be7f952b02f1794abbf10c [formerly 36a8a63d3126439f05be7f952b02f1794abbf10c [formerly 36a8a63d3126439f05be7f952b02f1794abbf10c [formerly 36a8a63d3126439f05be7f952b02f1794abbf10c [formerly 9c48d010555e8f55f5a6f57d9d2e65c811dde3c9 [formerly ca2e8994bc1545e1618923b35626d9319fb12fd8]]]]]
Former-commit-id: 6f573879bc4e610763fcb2f7bc37e70cbd6bb99a
Former-commit-id: fb7840d2d437eb5e5caa206b46c18309abfd0b47
Former-commit-id: 6f3841382d90cd623dd01db59e8223d4e36aa601 [formerly 43f2ade1abe6e8d0457cab18402c572f259dd80a]
Former-commit-id: 9d00de3566f053a7fa59a7027555e49fc695a460
Former-commit-id: 4af553c3d1c2803463c03514d8ba6c17bc313ea1
Former-commit-id: 2c638b3c4486b791436fc64cb163de153d8c1146
Former-commit-id: b970f98ee6c4276d2b454796295c5b2fd10ac526
Former-commit-id: fa2af9321d47dd1d0a69357d879f8b5541bead14
2018-08-07 19:08:42 +08:00
liyang
1a5802f033 Merge branch 'hotfix/完善更新日志' into develop
Former-commit-id: afac3f58bd57ff0ff6e3909c1f87c6b159969609 [formerly afac3f58bd57ff0ff6e3909c1f87c6b159969609 [formerly afac3f58bd57ff0ff6e3909c1f87c6b159969609 [formerly afac3f58bd57ff0ff6e3909c1f87c6b159969609 [formerly 75f6230314e0ea7aec178af91b1fcd7cb519bff2 [formerly 8578653378b696cf55dec7a1a070a7be523fa5dc]]]]]
Former-commit-id: 0d4d924d12faaa3ac66cac4da0369e452eca7306
Former-commit-id: cd3978605c94ff80faeff22cd0d54250d09472a2
Former-commit-id: 22c2527452a67d5588be6363784b67256b665205 [formerly ceb662692319ab6cb035e16202530a3db9b66669]
Former-commit-id: 76a058e083dff5072fc3386bed4c21dc4377e62a
Former-commit-id: 8e8cb58c47520abf8a8af011609d65a1ac0dd8ed
Former-commit-id: a8cc7a8d2a18c1fc1d9699e4747d9d6045f6ce0f
Former-commit-id: 2db922223b1029329d3b692405ee04a2c24032b9
Former-commit-id: 530a5346aa7bd38275b60bb3326447a168e5db7c
2018-08-07 18:56:09 +08:00
liyang
9fc56e46a8 Merge branch 'hotfix/完善更新日志'
Former-commit-id: 72540b84e5f79cf81b6ac446775827a5de4bb4b7 [formerly 72540b84e5f79cf81b6ac446775827a5de4bb4b7 [formerly 72540b84e5f79cf81b6ac446775827a5de4bb4b7 [formerly 72540b84e5f79cf81b6ac446775827a5de4bb4b7 [formerly 0631f9c929f0df77ed7dc3190b36927a146da7e5 [formerly 7a08b8e48b8776f0855f58588d91486d744f04f6]]]]]
Former-commit-id: 90253ebc56e535eeecbefe9b583f20109413ea23
Former-commit-id: ac81846825ab35b727d5ffe2ac0e558c1f20b596
Former-commit-id: 271d13137f2a93ad40b1da00ad48fc37f04d02e0 [formerly a20e682e161fbcfa01077a8fd43795c93d63a16b]
Former-commit-id: adedaa110362258e5a6e5755bf8ef46b1dd02b67
Former-commit-id: e422339d26de753c99adc168beeb7ee2727a3e26
Former-commit-id: e29ee6792bad6dec41fc4be241a58bddcc379e0c
Former-commit-id: 2606c94039a9022986bb8d6e51e399fbfeaa6c9d
Former-commit-id: 7b62549df4c683eae7313abd7b1b930d2714aed4
2018-08-07 18:56:09 +08:00
liyang
8e62cb3f6a 更新日志
Former-commit-id: 11319065a828803c6035cfe00e54878b5b0fdb6c [formerly 11319065a828803c6035cfe00e54878b5b0fdb6c [formerly 11319065a828803c6035cfe00e54878b5b0fdb6c [formerly 11319065a828803c6035cfe00e54878b5b0fdb6c [formerly c2f882b4bbf781aaf253bf5a51a35d0a0b0cb838 [formerly 489d351e8d110463a854f79f9ad8a9222b11468f]]]]]
Former-commit-id: ff1102cc459c4f7ffb35fad6b1e34b1d318832b9
Former-commit-id: 33e1caf36d02d6442b8b1d362396f0b5a530fb62
Former-commit-id: 312300d9f6f83e1a45701b8a8a05255e1ba376a1 [formerly cadfa6f583aebbc8be514cf6b7505b75c7425ccc]
Former-commit-id: 6ed3c3da812c8914e4cf526ef4861276adac1f36
Former-commit-id: 9d7b00a62fc14d48c60e10aee4773eda7137c5e6
Former-commit-id: 307961be871d63edde954831b21f3fef3a29ef15
Former-commit-id: 94b1555860254d195bdd41037ed53fd10d15a3a3
Former-commit-id: 68e806f98088d9e9f4ca8e1069454bfe6fefac27
2018-08-07 18:55:50 +08:00
liyang
e1ae9162e4 Merge branch 'develop'
Former-commit-id: 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 00a586664b0abcec7cfccf224f82f261eadfc3e2 [formerly 921ad0c9b70d91b59e73fb4d96b53ad9ba1cc3f4]]]]]
Former-commit-id: 8437ded4daeabbe1ddda01bcf60094d4385e61b0
Former-commit-id: aab7f3b8394c7ba748295042ea7a527a7e8ba7dc
Former-commit-id: 45a1331c3f736752b258dad0ef56c1763d2f6350 [formerly 5a587becca557d79d8506dd95c057ec2dd7253c4]
Former-commit-id: cf6f57868f604f97f2279e1cba305f4eb0bc233c
Former-commit-id: 73d77c5bc8c90e676b26ccadc68073c26d084268
Former-commit-id: b254a978fab7661d60f04fc0ef9a6adedd03d075
Former-commit-id: 78019c15ab60c3cbd4950a5d99ff3a9f22f0a4c2
Former-commit-id: 5646c041e33a3c67b97b5dcc6de91c862fe4f910
2018-08-07 18:50:55 +08:00
liyang
7a5aed604b no message
Former-commit-id: ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly 7601e194be55be71099b582e55d8e5d258b8d5ca [formerly e069055a2d390c5ddb8ac8ada35def942828f9e5]]]]]
Former-commit-id: 32537e9ce0f8e8d0435e1fa87e61dbfaf45ce44d
Former-commit-id: e82322f345b5bcdd9f18d6a537f8bc6e01c0fdd1
Former-commit-id: 8ea4e1f8a4457d30efec0632d60066c5d53f3294 [formerly d75aaeb0851c9f4b47ca36b752ecb0b0d7f27654]
Former-commit-id: b72f6c445ebc07e4a956625bbca2cf70ca5eea71
Former-commit-id: 29ab36206485313739f835d003917049aa133d95
Former-commit-id: 66cb5ab238b2baf28e853a8c945cc59e3c899e93
Former-commit-id: 8a97bd41fb1603e5d22181b4105fa32828855bd7
Former-commit-id: 00a5825dd750392c15598de7ee745a2b83db8ab3
2018-08-07 18:50:09 +08:00
liyang
5ae63c3a99 Merge branch 'develop'
Former-commit-id: e7861b6ebc815a35d03fa061c7b8bf6f2069ef82 [formerly e7861b6ebc815a35d03fa061c7b8bf6f2069ef82 [formerly e7861b6ebc815a35d03fa061c7b8bf6f2069ef82 [formerly e7861b6ebc815a35d03fa061c7b8bf6f2069ef82 [formerly 9d66e2e4a07c8422737e7fbbe7cd5c6622b4fee0 [formerly bcea1c9a4f4fd7ba0964bd9458945791410e4f24]]]]]
Former-commit-id: 22e2046b46f1ffc2d2e86c2629bc7006d234b843
Former-commit-id: 7fea7056b2a8873aafa4749acc49afeeb1db0619
Former-commit-id: 780f476e65ca8ee2f90b8dcbb66598f33ac0f284 [formerly 8bbd7e1778baa6de1cac7f74d7a3da7257db94c0]
Former-commit-id: e20cfaa0d23acacb0fb3a4aa73a66dedc987f097
Former-commit-id: 744eb817fcdd9cf24e64789c5d6c586a90d5610e
Former-commit-id: 90790a7f72d139106a2173130992eff8db5fc9d0
Former-commit-id: d606c9e9131e871f02d425a00b63a55f5050dee8
Former-commit-id: dcd294865ccf225365981e0f4d0ae19ff4aa6917
2018-08-07 16:28:43 +08:00
liyang
cfaa0d4c1c no message
Former-commit-id: de8099d3b8072b8096eb348ada10899af93c2b06 [formerly 09a7b50c20d4e68f7469cc280c3d8d89dd7f9d73] [formerly de8099d3b8072b8096eb348ada10899af93c2b06 [formerly 09a7b50c20d4e68f7469cc280c3d8d89dd7f9d73] [formerly de8099d3b8072b8096eb348ada10899af93c2b06 [formerly 09a7b50c20d4e68f7469cc280c3d8d89dd7f9d73] [formerly 09a7b50c20d4e68f7469cc280c3d8d89dd7f9d73 [formerly aa0d6d0b40bfa65df263c3ec7530d4cec2b2cf2c [formerly 8a84b826e70662ac02bb52bd4362e69645aea6e5]]]]]
Former-commit-id: 0c5c8dc0832c97b222638f60fc801d02fe3516b5
Former-commit-id: 8bb05eb8f85c77676b191e33343c4e3e03a9a8fc
Former-commit-id: eb90b9bbc0ace8e3d9ee9a6285d3e277a53ffb32 [formerly 422eb8223a1c7a2ed7f5187ec3b186ad3be7de6b]
Former-commit-id: fe247278ab2b82ba8bd5b06f31ed28a0bd769d99
Former-commit-id: a23223faf464e7f7a819afbaa5d7113ef0945f09
Former-commit-id: 74a928afc84ce09d05b7905d8d84bbd16fa5e2c1
Former-commit-id: 9404a57faa6efb931a32ba885392d6b3a5225313
Former-commit-id: b79942a7339fed4efb419eb374cff7a979082806
2018-08-07 16:28:19 +08:00
liyang
e0eaff002b no message
Former-commit-id: ba9d1d9f30615949c6872ff141b81afe290326eb [formerly ba9d1d9f30615949c6872ff141b81afe290326eb [formerly ba9d1d9f30615949c6872ff141b81afe290326eb [formerly ba9d1d9f30615949c6872ff141b81afe290326eb [formerly fe3d52563dd793d7ce5f50a23a14a8bf0a93856c [formerly d5e4b6d9e679e9532e86ab8114a57479534e3a34]]]]]
Former-commit-id: 3bf9c44c910851a454974eec8c919673d5b5536d
Former-commit-id: a92ef5ee72bdfc837e052c5b00d97ce493b62456
Former-commit-id: babbfcf496ec4436d6141b2c9866ef66f2b46598 [formerly a980c724ee86a08c5c865edd1df0730a67808e4e]
Former-commit-id: 809817d6d84a7be86a50b6b89ec3e31ba5a85f59
Former-commit-id: 1affbf17f09ff2e1259b5b761376d5a7fad4e417
Former-commit-id: da59858fece84ac3c4f562882e5ee4af13955569
Former-commit-id: 9e19f85dec0f0bcc9224a4830b5ed1ecb6d0cfe7
Former-commit-id: 12862a9f7bc78a9500c4c7a3a4e6e037b367e3ec
2018-08-07 16:24:13 +08:00
liyang
95badc22ac Merge branch 'feature/error-collection' into develop
# Conflicts:
#	src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue


Former-commit-id: a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a [formerly 1f27799438509890c390866f6a08350b69784203 [formerly 56c0f3b550c89c0d0b9e363e157533c1e88b1b8a]]]]]
Former-commit-id: 8a1b5fba72c1e99b10e3051ace49ff669e195b11
Former-commit-id: 658e36a5af1185c8ab28c37824d4b7f8439ae71a
Former-commit-id: 3e0ae29967cd9cd24d183ec4efd5ed5f820917e9 [formerly 0d1450a0f05f903a57ede770c1dc3a9e0ec710d2]
Former-commit-id: 8a6020f844a854d6e4765e53c9477a9eabf061d1
Former-commit-id: 0dff2e0795f8025ca961e18b1c2fcd65dc9e3bc3
Former-commit-id: 02294aee8f5ae27ece66ff3dabf27a65258e1f3c
Former-commit-id: a66c0fe86850814ca44800db473687ec3f4705b2
Former-commit-id: 75ec5153bc6a9227404abda6b88f74355289ac85
2018-08-07 16:08:25 +08:00
liyang
f28718943b 完成
Former-commit-id: 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 1c2b3829fe2458a1dc678aa3e3e20c069fd186e9 [formerly 87efd77bd6c9e4842534b22a90a3c57f8ad49e15]]]]]
Former-commit-id: 51b7d845391107170b6d6055fae0db9204391cab
Former-commit-id: 16c827f13aeb87f8fcbdf7c667dd60a1681833f4
Former-commit-id: a9589d815008a1c41b625905413582a2225cc811 [formerly 58f118d7086495f51c085ecfe22e046dc25a1703]
Former-commit-id: de173859d5e70870200f9eb02220b0edda9ad6d3
Former-commit-id: ec7d195132cac799568d534473a70ce9e638a21f
Former-commit-id: fb49b3ce0453630207ec44212587c3df209529a2
Former-commit-id: 76d0b5475c8b665fd9eae851ae21e4c102254b2f
Former-commit-id: fb71b68aee8dd0627982ce3c39a91017abda502e
2018-08-07 16:07:05 +08:00
liyang
f091391b61 Merge branch 'develop'
Former-commit-id: bd56134026c1ca93726a3a57c334537f3084c99f [formerly bd56134026c1ca93726a3a57c334537f3084c99f [formerly bd56134026c1ca93726a3a57c334537f3084c99f [formerly bd56134026c1ca93726a3a57c334537f3084c99f [formerly 36d3b5f9afe154e9ed7f328b6757527dc1747b22 [formerly 43df0700f111554e10ebcdf2d91859062f3309fd]]]]]
Former-commit-id: a82c0b8b6c15861566a8260850869c90bca12f50
Former-commit-id: 9f2c7201b0f94eb7341c581095d63a1a90941460
Former-commit-id: f30c7244b20b1f4c55af69063234ef9718e135b4 [formerly c42b6786ac2b8eeda11f1b9bc29858da1b022f41]
Former-commit-id: 84a47d7ca0935bd309a2bd127b04c97cb165a0e4
Former-commit-id: d756aff4a0d605ac5cd8cbe3006d3feba3287064
Former-commit-id: daca0704bbd988df4db8a956b07c6757a0a17348
Former-commit-id: 5020025b693d9029cef0c6f3cbb9fc2719c58612
Former-commit-id: 7ac9b2b722d0784d758b8746e6c93bbd078341d6
2018-08-07 14:00:49 +08:00
liyang
787dc28752 完成
Former-commit-id: fecd36e23769415d3e36d3f8cc032d987aea2d8a [formerly fecd36e23769415d3e36d3f8cc032d987aea2d8a [formerly fecd36e23769415d3e36d3f8cc032d987aea2d8a [formerly fecd36e23769415d3e36d3f8cc032d987aea2d8a [formerly 759d40ac36de68510e861e2d0ecce3482a70fd24 [formerly b3dec19cec2be3c8c57fba0c5ac597daacda1d76]]]]]
Former-commit-id: 47d1371298c5eba1bd2b0529fea8f31bd7b0d8f4
Former-commit-id: 24887a2265f94dcd186c597beee9df65360f8d9f
Former-commit-id: 8d2355929d7ea131309f9984f86e93208442b831 [formerly 04c2e63aa138e17f58f1a5d68788e621aef61bf6]
Former-commit-id: dab965a72e93b7b7695d06ba2ce670418e0f1625
Former-commit-id: c13e304c52d597527ae9780760ab5835733ea9c5
Former-commit-id: bf2f63acd0a9e6a7b950d18752fc5db2f7bd7244
Former-commit-id: 4578fed754987fc9a30be468683294c1903845bf
Former-commit-id: 0ce3bb9c6052a318d801b24c7744a488f0f3c5d6
2018-08-07 13:59:42 +08:00
liyang
71efce3a34 Merge branch 'feature/business-search-table-1' into develop
Former-commit-id: 4462086fa67806fd34cfa27f022b43f3444d6757 [formerly 4462086fa67806fd34cfa27f022b43f3444d6757 [formerly 4462086fa67806fd34cfa27f022b43f3444d6757 [formerly 4462086fa67806fd34cfa27f022b43f3444d6757 [formerly 0aae823060161fd83a6ca9b96d82e8bd48790212 [formerly 19cccf41150dd4543872d93a1d85e04b3d426f71]]]]]
Former-commit-id: 16cc21345148c2ae7f233390fb5128e8212164ce
Former-commit-id: ea5c68aabd65935acd5dc4f17eb13274a1e341ac
Former-commit-id: a5f9835af47e6815664ab9a6774e0eb1ee81d081 [formerly 5bdee375d367fd80af8238b76f8260e1f6b9833c]
Former-commit-id: 1bffe34c649e42947db415759f83c52b52de4afe
Former-commit-id: 71eeaf3b6c377b3ff0da79ecda4119f65dca3964
Former-commit-id: 7c33ce5b4b9db9239c763760589e60345e8dc4f1
Former-commit-id: 5930c55236230f40ef79293e806c1b9aa312b8f8
Former-commit-id: 6478c83c0ffd5c07fe56e5b59744a1fd720ca638
2018-08-07 13:46:48 +08:00
liyang
e199d83c79 表格示例完成
Former-commit-id: cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly cb061e9cb3f1d290e3a776a8b88d834226d668be [formerly fcef20ff04bd08ab432bc47ac75fb4e6483c2851 [formerly fa46aa095a6a2e8317207d6ab9862cc7f4b56339]]]]]
Former-commit-id: 12745f3af51dabcf235c449e6f8b47ea0658b4c2
Former-commit-id: 020118a1c207454660f1e83e35dd834ac9493b74
Former-commit-id: d205e48a791b6afe1222c08943206ee238e92de8 [formerly dc747e67590f1042a5ac7b01ee86d4a9509cd920]
Former-commit-id: 867a148b7da027dc469ef8e1964f593e6abfe86b
Former-commit-id: d348819675978bf97305d79863fd72de108adad3
Former-commit-id: 8c8bcd05152b184547b8903de19a63ef262ed12c
Former-commit-id: 375bf4f1cbce6b86e82e86bedf7951d0d800f97f
Former-commit-id: 4b70e86cd638b19ed13371c86fa4b7be17528ae7
2018-08-07 13:46:04 +08:00
liyang
cad41fd8af 临时存档
Former-commit-id: 478135c9cddd262cc43ea3c78e3b010140a70965 [formerly 478135c9cddd262cc43ea3c78e3b010140a70965 [formerly 478135c9cddd262cc43ea3c78e3b010140a70965 [formerly 478135c9cddd262cc43ea3c78e3b010140a70965 [formerly 8655f13a475ab0b87d8da714fbd5887fe25b7c19 [formerly c0fd05438c5c159c2e3a9cedcf31814a6ba5e02b]]]]]
Former-commit-id: 7fb997158f60224f32cb323f1f3a853a5fec97cc
Former-commit-id: 80be589dcd2d3fb67ee217844c7590671fdbbd6e
Former-commit-id: 6930aaa344febf1efc9dd96488f5a8e1fdc3c00d [formerly 8109f02fa9ab2bf41a162778fdc48d638b852a6a]
Former-commit-id: e95e8233a308a067c10222e2a277106be773ca63
Former-commit-id: 7ba6a415d53a8f83684608d89a47e35dec98f930
Former-commit-id: 3540b9a82e5ef79b8dfb18753a8a7d2a013aed94
Former-commit-id: 695315892575ac385338befe856980ba21401803
Former-commit-id: 6e91b18c7175df95f5398d7798146f8f74d2b437
2018-08-07 11:38:25 +08:00
liyang
c51ab54649 Merge branch 'hotfix/readme-ice-info'
Former-commit-id: 15e4b1bdbeca2097e30f72028bb3a2b5d06a87e6 [formerly 15e4b1bdbeca2097e30f72028bb3a2b5d06a87e6 [formerly 15e4b1bdbeca2097e30f72028bb3a2b5d06a87e6 [formerly 15e4b1bdbeca2097e30f72028bb3a2b5d06a87e6 [formerly 4539eb540f44362080cc4e447c14c75f2082f201 [formerly 4d14e375888acef6ee66333feb9880dee51b06cb]]]]]
Former-commit-id: 6d1920e0a6f49fe8b456eef0aa9d6309e42e1a93
Former-commit-id: a32d478f25cf8ebaf31c4756f8281d0ead2fc4cc
Former-commit-id: db8f6178dd4e13377f145fcedaf2f1be515c595e [formerly 306938a9d18f7ec66925080d9d799bc764cdbe9a]
Former-commit-id: 7cd659d15e259e51f2047fda1af6a4e199e4abbc
Former-commit-id: 504e4faf841746e9e48dd7722e0108b4df5c6d6d
Former-commit-id: d2d83f51d5a97020d736d7e3f64a58a3b51cc4a4
Former-commit-id: a409d5691b4adf72ca5b5f07cee61a3c572d4fb7
Former-commit-id: 2c64bc3294e3b0a2b200be6d9487eafe510e9cad
2018-08-07 11:06:18 +08:00
liyang
524b92ce8c Merge branch 'hotfix/readme-ice-info' into develop
Former-commit-id: 92dbc312534a486882da15f23cbd74f492fd5f47 [formerly 92dbc312534a486882da15f23cbd74f492fd5f47 [formerly 92dbc312534a486882da15f23cbd74f492fd5f47 [formerly 92dbc312534a486882da15f23cbd74f492fd5f47 [formerly fcf3de5d5be9cfc3dd366635bc30326b256072d7 [formerly b63e1bad3de3648b132b73924f872ac64d710767]]]]]
Former-commit-id: 37e60aac08869bbca3c60478b7b77fe56e80e281
Former-commit-id: 6a33c39cf72070025a54ad1691e1c937bb4f3cd9
Former-commit-id: 469bc02286d14a299e4c09ee96b3571fe6013e16 [formerly ca80ddba41d948c2b06d5979c93f2fc1841c9a07]
Former-commit-id: 68a604705a94b14cf6fe928d1ab776c429a10e53
Former-commit-id: 356d755971d63a4022bb3f1f44d21446230ed3ca
Former-commit-id: 993569158fcdf129fc2ce091cbc9552ae06b2947
Former-commit-id: 0e3049f2b7b4142e159220dc9fd00aed4e5e95fd
Former-commit-id: 0f7269da61d54363c9959a9fc65dd5a6374c98ea
2018-08-07 11:06:18 +08:00
liyang
d157ec020a 添加飞冰相关介绍
Former-commit-id: 0634ecb96c40f5704a4ff824734f55306982d5ce [formerly 0634ecb96c40f5704a4ff824734f55306982d5ce [formerly 0634ecb96c40f5704a4ff824734f55306982d5ce [formerly 0634ecb96c40f5704a4ff824734f55306982d5ce [formerly ac61cfb7630d97919aba6daf04c0d0b05f87dc44 [formerly e5ec7de9d4fe5d3cafeac8b21ab1bcfffc62787e]]]]]
Former-commit-id: a35e36cd4c09b93a7f26ffc35a01f6d449c54d20
Former-commit-id: 38bed1eb25a8741367d8bf18a42732252b312969
Former-commit-id: 0d52b8a16fb156945c142033613a3b97934f1722 [formerly e11d3f221443bd19a782fc9408535ba3808944da]
Former-commit-id: 9e77b7bbcc1776aef339223cfb12ad28cccae85f
Former-commit-id: f476c7c310589d79bed85f33adb32dcce3d3b505
Former-commit-id: 3f885df8fa1e9ab50020dd073db32195fa81591d
Former-commit-id: a08f3763f466b4a71ba4622c490a92c30c76708e
Former-commit-id: 3736400cb2afd9b3b8697acf19fed4ce15627a4a
2018-08-07 11:05:55 +08:00
liyang
7476838461 完善
Former-commit-id: b884c14ff6a7eabd19d6d46c58d138559445b7d0 [formerly b884c14ff6a7eabd19d6d46c58d138559445b7d0 [formerly b884c14ff6a7eabd19d6d46c58d138559445b7d0 [formerly b884c14ff6a7eabd19d6d46c58d138559445b7d0 [formerly feb36665a3ec13b199f716dd21f8c8ce4fc7d22a [formerly 88bb76f34b499eaf2c86f516387254787921df61]]]]]
Former-commit-id: 06ffd5ee37a4a2a3f1d3f491eb44c15fccf23764
Former-commit-id: 6c2deb62bf8846beef4e310e80343ec4e78d47d9
Former-commit-id: 3540e6fde11512973180ea8f46dba43bec8fc9b0 [formerly 87395c73907104e27e8fd089d8bb89ba1b4ffe38]
Former-commit-id: 32ed6256796b02d9e8e96dc1576a5499f68ff9fc
Former-commit-id: bedcff834b6498bdae0151c6d55d64f72418f382
Former-commit-id: ef177bb11a63353e01103476d2b3dd59ac8defae
Former-commit-id: 69db6ad5d36ef97bf244950400ea2ac1b7a54b7d
Former-commit-id: 143c95ccf7aa834319c6a7bab5e4e3c5a357de36
2018-08-07 11:00:20 +08:00
liyang
8d9c1331f5 优化
Former-commit-id: afaa452d37658c5f62744d79b8512b602777e6e7 [formerly afaa452d37658c5f62744d79b8512b602777e6e7 [formerly afaa452d37658c5f62744d79b8512b602777e6e7 [formerly afaa452d37658c5f62744d79b8512b602777e6e7 [formerly b8ab7a17015b58a9454785b94a496ea1b8ef4946 [formerly 7d06c1ad50bc49569d9ff2071350b6c9f4194828]]]]]
Former-commit-id: 48b8f321c6782ef9f228196af32507c6bfcbf437
Former-commit-id: 2d0d551f108a273b4b8eb89cb402e2e6223db85c
Former-commit-id: 509e61862040344b57bb23a7502dc9e724412b38 [formerly 9683910aa2ca56b16b82385d2de9e1bcd9b95450]
Former-commit-id: 91576efbc04a625ad457efe0738f1c96bc368b49
Former-commit-id: fe399801aa974e6dc008923e93050d256edac5db
Former-commit-id: 63e0756f2d74e21bb62e977f5c2143293656811f
Former-commit-id: 081a8f64bc1346b7b3520bb6ad5db2d503555012
Former-commit-id: cf76e86e9b06bb9ee9513b09772dc63a23ce72d6
2018-08-07 09:28:21 +08:00
liyang
07649ec525 TypeControlMini
Former-commit-id: 544bb95921573b62571f41ecf94f668f61960273 [formerly 544bb95921573b62571f41ecf94f668f61960273 [formerly 544bb95921573b62571f41ecf94f668f61960273 [formerly 544bb95921573b62571f41ecf94f668f61960273 [formerly d0dbb0b9a36572979b0177bf701b4cbf8549118b [formerly 4c0015c234e1e46ce269cb6ac613651a7a13e1b6]]]]]
Former-commit-id: 38a553b240cc9f79e66046aaa69f2a9559855435
Former-commit-id: 01e39256915db1c83b4c91b69db939e4534789f3
Former-commit-id: 2ddc7c21212e278eb3a1585ad180724fcd07ae6d [formerly adc0a315f6460f844897605cef5dd495ca72488a]
Former-commit-id: 7a66d40d5cea27bbc4cbff3aefe68588bcc08706
Former-commit-id: 2d9fd9a88c21e33d5ce9681ddd98aa307f0f6254
Former-commit-id: d3035c2261163bd59e56161405e306c98bb346f8
Former-commit-id: 2080bb4babd91fa7c9f7434cc1539758d812133b
Former-commit-id: ad505fc840311ec7de1c144a5a31027cffa195e0
2018-08-07 09:17:27 +08:00
liyang
5c546dca95 状态列控制器基本完成
Former-commit-id: 0e03e0fea7fbaacf1c2d8ff2411c151d0aef433c [formerly 0e03e0fea7fbaacf1c2d8ff2411c151d0aef433c [formerly 0e03e0fea7fbaacf1c2d8ff2411c151d0aef433c [formerly 0e03e0fea7fbaacf1c2d8ff2411c151d0aef433c [formerly ce25e70b23df7f428a514a7a92790de70a393274 [formerly 0dc8f4cd9be176aae57942767a315623d104932d]]]]]
Former-commit-id: 9b38b47bc438321aa72180f9a170af8f92a9e77d
Former-commit-id: 01108104a6d5c36e474fdfb7ec0b0b8d73048221
Former-commit-id: 0cfebf110b20794e2690674ac285e3cba5280ae4 [formerly 5b9e9a9d9bef2e6d37eeb2630ad73d9f0494d967]
Former-commit-id: fd0ff1d79aebf7f13218e0149e1948083e1ba904
Former-commit-id: 7e1ede18df14c10daf4a25fdb509518929fb9d96
Former-commit-id: af50aad4bfb60e7b5ed9b6ca991e51a2f3490df2
Former-commit-id: 3462539ef1c1bba8d6efc7f52e95930515f1e108
Former-commit-id: b882ff02952b1f164f061ab090174018ee9afb4a
2018-08-07 09:02:43 +08:00
liyang
96563aedd9 分页控件和表格显示调整
Former-commit-id: e21a00c95c644d8135619e166b4fc8c7c2111c01 [formerly e21a00c95c644d8135619e166b4fc8c7c2111c01 [formerly e21a00c95c644d8135619e166b4fc8c7c2111c01 [formerly e21a00c95c644d8135619e166b4fc8c7c2111c01 [formerly 660af7b4d44705170e6d62dbd1b802a98eb25a7a [formerly 10433771479b69c21669a72ea1ed14f5ec6a6a5f]]]]]
Former-commit-id: d2dcdbfa394d231cb3a36a367cd8b53d55a873df
Former-commit-id: 87558ca229f720418110b9626375cd562cd33036
Former-commit-id: 6849a75e8df0342b7ff36adefeb85a6c8cafbdf0 [formerly 9380d34b9f1321cd5e2d382ebe839ce27f09b85e]
Former-commit-id: d4ccfa0d90cd15562532dd0aee0f472b7ce8e3c6
Former-commit-id: ec97fb45869d97a07c1c78eb125a1dbe07c8ee3d
Former-commit-id: 3fbc39660de71875f2eb031d1ddce10318911333
Former-commit-id: 1363e5c8b2b0e5c3d20a7087a54f75165ec0fe52
Former-commit-id: 640627b6e451e30290615dc3cd23539e621c27ca
2018-08-06 23:20:19 +08:00
liyang
daa3ccb798 临时存档
Former-commit-id: c3f26030318f42d19e45760b84f127a9fa0f8010 [formerly c3f26030318f42d19e45760b84f127a9fa0f8010 [formerly c3f26030318f42d19e45760b84f127a9fa0f8010 [formerly c3f26030318f42d19e45760b84f127a9fa0f8010 [formerly baf913370e890b66c5362ef0b91ef5db294166e1 [formerly e639100e00f1418900c57d39864dfdb806a4d99b]]]]]
Former-commit-id: 08d6e4a635cf122d2c2ddec02ef361daba543a4d
Former-commit-id: 8a5c8f0bb71e1ae2cca3fc4119b4b9dcfb6c43b0
Former-commit-id: 234b0fd329e12597fa600237802f7b53f085b1d1 [formerly c2067e7e02f3beb7738ee64fbae0ac5fa43b1629]
Former-commit-id: ce100562eade5a4a8aab73ff242c45b783961aa2
Former-commit-id: 7556c751d0c13bd75d2c1142f302ff5bc6a32258
Former-commit-id: 77d6731bfe01c61a6fe28337168c2fa5e58015c9
Former-commit-id: afc2d950bac686de249f934359afe2a2bf27335d
Former-commit-id: 04be92fa4756f43ede6b8d9c983663f877284388
2018-08-06 10:45:45 +08:00
liyang
01115f7ed7 建立相关文件
Former-commit-id: 0dde97a01739e7b6781e76269b603dec0b8568ab [formerly 0dde97a01739e7b6781e76269b603dec0b8568ab [formerly 0dde97a01739e7b6781e76269b603dec0b8568ab [formerly 0dde97a01739e7b6781e76269b603dec0b8568ab [formerly 6afdead4b409de4ccd1a249a41ac830cd03e64b4 [formerly bfd8ca2142b19960fb74f90c592d2ffd5e4fa009]]]]]
Former-commit-id: a7df8cd67e73a9e05a8815992687b28f9810e10f
Former-commit-id: 6c2bc61c3d7df299d9fa9e0e87e4eb5b47d62d22
Former-commit-id: 6ffb62427debfde1959131ccda34f5fbb211a925 [formerly fe94bd2f32b9d83809095b2cef1c04d818b0dca3]
Former-commit-id: eac98e8b4cb6adc76743e7f8e0b00fec2ce23a9b
Former-commit-id: 38f06669ec9bdbbd5487df589789028d6b13c36c
Former-commit-id: 2f441e094279eecece11ff7f238bcecb3f7377ad
Former-commit-id: 1b7c6dd063d14ed0f80efd1c811b6f02b842f5ce
Former-commit-id: 013b3d85cb83e86ac4dbaac99b8cfd7356ffa26a
2018-08-05 22:21:17 +08:00
liyang
79935b8e98 添加注释和备注
Former-commit-id: a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly 31cf030ac09457bd774065e437af8e9e0899ea55 [formerly 74c812bc31bec5085868d803efd472fb9ff50ca2]]]]]
Former-commit-id: 8c21b7cbb34e806e5a00d6f2b58b4e33356d62e5
Former-commit-id: ac0de984825b294627e24315d37aa54dcb2956c8
Former-commit-id: bd22f774d9d09b5dd19656f52c286a9e8883d080 [formerly 189d3354075e67db11b6abd750dc6bad278ec670]
Former-commit-id: 8539445287dcc0b1b026ba32316bfe3c9e5173b6
Former-commit-id: 71a393ec7cca8e8c01e0a93fa6ba0f0158ea4f4f
Former-commit-id: b76e8561ad281191b92ca88a9ba70ef477b87bc5
Former-commit-id: e870d1ab3fd69002f8e7b327a0fcd5fa26f4fa6c
Former-commit-id: 5d6b3d844cb94b90a4d33007a4406212bd45e136
2018-08-05 21:32:13 +08:00
liyang
6d95aa83c9 暂存
Former-commit-id: 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 00a1f89bbf28dde544c78a5cd6ca85d6cb0af8e2 [formerly bc8e53d9b756c71a48b5297743317938be6e623b]]]]]
Former-commit-id: 0553d2a78845193b193ec40142dec84fabb37548
Former-commit-id: 3e85f148d5e5a744ee7dcc7509d41fa900b79b59
Former-commit-id: 912bc68def6df219bfe0d60cefe9dcb9e2a7f8ba [formerly 19bb68c42653c71e4178b6f064b55a0da36b03bf]
Former-commit-id: 6a39e7859d60f6186f174c1840d356a16f695b78
Former-commit-id: f5ae3e4bd9af5d4fd69c11d63dc52538a7488528
Former-commit-id: 08bb86e655a23772f82a7fad8b522f012762ec34
Former-commit-id: 9bd95b7b604280efd01da8f1182f0b4d8b084b62
Former-commit-id: a21ec55bfd4451d88553f61ddd1f5be7b2debc9d
2018-08-05 11:10:42 +08:00
Lu Chaohai
9084d7bc17 Merge branch 'develop'
Former-commit-id: 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 3b365f371d19d27f70b1a305e9fd0cbef2bdd4b1 [formerly 12c91e77ed0809cd411f9a716843248a5487b994] [formerly 12c91e77ed0809cd411f9a716843248a5487b994 [formerly ff8fb309431460aa21947ec90b9a4e1341bac60d [formerly bcf10a6a8794d33e96a4d59c59333a7dcc172a0f]]]]]
Former-commit-id: fd2198cad210f0f711a0e635ee50f0c7e4ca2a1c
Former-commit-id: eafb3fea58c8f8d7c86fb620576eefe82bfdf519
Former-commit-id: d5f301eb0bd644ed61aa6d036b30efe7cd7f3587 [formerly e617e2b3be93a1b26f3df3716afb6a56e6cecc32]
Former-commit-id: e6bad860f47dfab4c5cc1f7d01497070f3d52225
Former-commit-id: 387fd7e2f9235728cef2a358062f4c44b07a43a2
Former-commit-id: d86efe02e91b0cd73ae632f6d382572bd79a7e3b
Former-commit-id: d3993e6d5ac68921718640176de2d76124359370
Former-commit-id: 3b7d9b97c8464cabbc0595fd4d741f4bc0cc48e3
2018-08-04 18:04:38 +08:00
Lu Chaohai
d824b1c82a 修复问题issue44,45,46
Former-commit-id: 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 26c19d2a6d5007572b2ffa80430bb7f3d4cbc101 [formerly 5c692da9331ee18f28dc4ed82e893fd3edf0b59e [formerly 5c876723e46ba5e9bd3e6b08ca26838281b9fe70]]]]]
Former-commit-id: 1be81527166d59028564eef5f3bad3433e170cdc
Former-commit-id: 3224de37c64ffb4080cbe40b2796b0460b269c78
Former-commit-id: 27624807993595ddabacea5f80a8d92787ddd49c [formerly d0d1585c512c7ef2a2ce66ad7c3e7309c908a08e]
Former-commit-id: 9fa0e8942ff590152d29c2cb2a872baf116e0271
Former-commit-id: e30298941ab3eb1661f567dc37c10cdd27238004
Former-commit-id: 239a341eb2dc0adc7e2aa82acaadfa3a1f48d954
Former-commit-id: 49ae60f02ff7683f17d6375ce2249f3b19f5e8cf
Former-commit-id: b0be7cf952884e67c4d8509272cb9205ab134644
2018-08-04 18:00:02 +08:00
liyang
59d1198572 Merge branch 'hotfix/contextmenu-on-close-btn'
Former-commit-id: 0d8d0161ed90205e8f11ddd3e1fd868e3ba8eb6f [formerly 0d8d0161ed90205e8f11ddd3e1fd868e3ba8eb6f [formerly 0d8d0161ed90205e8f11ddd3e1fd868e3ba8eb6f [formerly 0d8d0161ed90205e8f11ddd3e1fd868e3ba8eb6f [formerly 84a893919e91f22100718d757c3cc84098287086 [formerly cd9f7fc7345c5d4f3f453db3a1dbb6c514308fa2]]]]]
Former-commit-id: b89d16b2a86ef06f7d39aec6f400cc7bc805f776
Former-commit-id: b34dac88638423ce66711bcef3a1d7138b0da11c
Former-commit-id: 1dee4035a0484c9ee6fcbbbcde665e686c481ab5 [formerly 133fc85f7770b8244570b0ffec07e90d8d2c4dd8]
Former-commit-id: b733c218139b8c5edb465644ee80305627d987ed
Former-commit-id: edcbddeb737da02a364cb354a4315ef68199afce
Former-commit-id: 498f3307da60c446e16cf9e6c6054cd4fd53b238
Former-commit-id: a1491521984cd8efca810ce9c2646881467d13c3
Former-commit-id: b7030afe47f45f5db10b0effca2c2e60961ac3b2
2018-08-04 07:23:26 +08:00
liyang
745a51b106 Merge branch 'hotfix/contextmenu-on-close-btn' into develop
Former-commit-id: 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly 10482c766f2867c1436e4c205976a51952f0c170 [formerly f6b1f8f5ad335ec17d9832c2947da4f7f774b072 [formerly 7cc4631adcb11e56d1c333a5beb2e512e4a2747a]]]]]
Former-commit-id: cad358ee0ffc3a6bf72e36c4e8c9d0d09a3591d6
Former-commit-id: 6a55a0d15d23542431c5f594fa8bd3892ec82aac
Former-commit-id: ac40ad5eaa92f5bcf34ced4636a0b57e09322a70 [formerly e0bc3eeb74af2f5d9e308fe62d9815f164f1705e]
Former-commit-id: 6c60414042295ecf2bd61624e04ff7104838feab
Former-commit-id: 06087b5f6e1ea8b1a283d16964a46bef242c5db2
Former-commit-id: d4faceedbec06a481e72eb1c87a2533468021298
Former-commit-id: bdf2c63424524df7fd506d9074c4d49c16c0dd17
Former-commit-id: 712173f66061edbad89c087a2d4bbf5df06508a1
2018-08-04 07:23:26 +08:00
liyang
59b8cde0c5 bug fixed
Former-commit-id: a314ca0bb102d56470884422a879a2f41c7da9c6 [formerly a314ca0bb102d56470884422a879a2f41c7da9c6 [formerly a314ca0bb102d56470884422a879a2f41c7da9c6 [formerly a314ca0bb102d56470884422a879a2f41c7da9c6 [formerly 5ae0bf80bb9cd0f4a558974195dc304bacd5a3a9 [formerly b4ac51e3db85610616439094fd081c9246e0e3b2]]]]]
Former-commit-id: 7c4df6c4eb4c9abf9489fb8cd6371169cb4078a3
Former-commit-id: 9ea5592e447224e2c621ec93f793173fea228385
Former-commit-id: da1da6c29a0e8d46b5abf73b226c9294a158fe53 [formerly 2373d07b22ace39b1f5ef31007f162235854df1a]
Former-commit-id: e60010e505a5df6ede20b711e53318d7738adb31
Former-commit-id: 04765e0c449895310a7d08a988f3ebaffbfde82b
Former-commit-id: a5a8a9db2a0dc307612866451c786b1b2a742fc2
Former-commit-id: 612546a5c9f40a5654692c69a7783ee837cd6dff
Former-commit-id: 1034a87cb22cd6e3889100d4fa6311b8901408bb
2018-08-04 07:22:36 +08:00