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 |
|
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 |
|
liyang
|
6fb88bc26a
|
Merge branch 'hotfix/doc-ice-publish'
Former-commit-id: e2b71423c31e3852e1a71ca6496c235da2f83f55 [formerly 2197331407abbde5d6eb2f948ee3f7968c4c7f6a] [formerly e2b71423c31e3852e1a71ca6496c235da2f83f55 [formerly 2197331407abbde5d6eb2f948ee3f7968c4c7f6a] [formerly e2b71423c31e3852e1a71ca6496c235da2f83f55 [formerly 2197331407abbde5d6eb2f948ee3f7968c4c7f6a] [formerly 2197331407abbde5d6eb2f948ee3f7968c4c7f6a [formerly cdd999ece12e6f83118e31c2bf0f30b1852d22b8 [formerly f5d19486a0322095aab4f41110ba875f4e44f7cc]]]]]
Former-commit-id: 27db1e9eab2c296b69f543dba6ae0d89cbf5ece6
Former-commit-id: 26faf55f5d56f57354e6506ce6a74fd6ce18d04a
Former-commit-id: 85a5a3fb5bd0fb0002f9fd175ba84e0e28b12894 [formerly 5280e33bf1e600feb6e9a42de4f374f09faa5453]
Former-commit-id: 612aba99d95eae64f4b254eda396bcf64c693f3f
Former-commit-id: 422fd6e03c9944c956a4cf93d83a4d0430c77ea1
Former-commit-id: d5f4893869311a866b112155b79275c8b0059287
Former-commit-id: ae9b37492321983f1b733704211b52ea3919e35b
Former-commit-id: df7c09fa9a7329848ac614e9af0d169734a2d0c2
|
2018-08-03 03:10:06 +08:00 |
|
liyang
|
47e2ab136b
|
Merge branch 'hotfix/doc-ice-publish' into develop
Former-commit-id: 8b0031540663c0fd9955d4ebb9c151320e5c7029 [formerly 8b0031540663c0fd9955d4ebb9c151320e5c7029 [formerly 8b0031540663c0fd9955d4ebb9c151320e5c7029 [formerly 8b0031540663c0fd9955d4ebb9c151320e5c7029 [formerly 0d4a8465f129afb1033a93966e203aa7beaad6b0 [formerly a5e1cfc571f2b7f7f89363f0f5cb501ff3e3728c]]]]]
Former-commit-id: 2012071ed7050fd05e74f85b60482474d04dfbb5
Former-commit-id: ce0b8a760760ebeed1f702410ea6ab913c69c862
Former-commit-id: 8ac8d5f85d2f7604aeb65cd97f319d3c9f4b73f0 [formerly e07d10f26ba76d8da0e5be7e3768e754942f5ea2]
Former-commit-id: 6b4be6147e0e44f2518dafcdc49aa2ec0ffbb884
Former-commit-id: 8b9abe626f6dd2830932da4975b0ae71390db6ae
Former-commit-id: 9ced535ad11ec496b3a2f3a43df595edb49498fd
Former-commit-id: 941b0d4f82be72acc1f8815f0910374b1617b516
Former-commit-id: a08d33c5e845b1f56eb913eb96a9dc39b1386f2c
|
2018-08-03 03:10:06 +08:00 |
|
liyang
|
32f05f8010
|
飞冰版本宣传文档
Former-commit-id: df462cbc74e5d5f9f2b6d2a14369bbe007b9d460 [formerly df462cbc74e5d5f9f2b6d2a14369bbe007b9d460 [formerly df462cbc74e5d5f9f2b6d2a14369bbe007b9d460 [formerly df462cbc74e5d5f9f2b6d2a14369bbe007b9d460 [formerly ec8d6757bcca804a0eaa832cce9493457667831b [formerly cf89836cde98f4b69e50e8863ec6d94a9697fb46]]]]]
Former-commit-id: 9d49a5ec92447bf4e5c1c5d5e60262d2115a3c03
Former-commit-id: 4ce9106938fb3adad01d038a96aa6a322f1a2f6f
Former-commit-id: 5b33f91fabead2d7b12c1e254914f1126e3f852c [formerly 3601b35ab8c1897ba5cdd9e32b4c64585622eb6b]
Former-commit-id: 09e9cf395563628e43e1e997b33e3237a95448f3
Former-commit-id: 16df43728b52d9b9736c41ee14f3387c68148146
Former-commit-id: ce4871ce8d3542d8d73f1457f7c183e173f3b222
Former-commit-id: 2b402092ca41a56baba8edcf6d29afc4da46979f
Former-commit-id: 9c4eb4f8504f26b40f40cb310cd4daf44e033993
|
2018-08-03 03:09:21 +08:00 |
|
liyang
|
1a2ee5a0a5
|
Merge branch 'develop'
Former-commit-id: acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly acb6531780480942055827238a880458f184146f [formerly 683fdb9f545e9858574c65a565572bcd3591cdbf [formerly 86e5bf3b6a2e4ed0bb293c8cac6dd4bb6044598d]]]]]
Former-commit-id: 984ae0d808e0f968c8dd12172e3bbf310988662a
Former-commit-id: e78d96d19aba6de61041e3dbcd0e0933b94b2409
Former-commit-id: f4a42f6f7722c736993c1fed1f7ac72f10aae6c6 [formerly 85e431d8f80651ebed3c93f787fd715d4d8777d2]
Former-commit-id: 1e36a362c661c2d30a1e9270e97c482161993178
Former-commit-id: cd12f1dc733f051ba9f3b2402a253dcf1cae7c13
Former-commit-id: dabe846961afff06e599ba799ab4e2c05bd40663
Former-commit-id: 21c48d190f3f86d1e511b640f60179efe8a13925
Former-commit-id: 71e5dc2ad87ffe2fbf2e961ff452db1a8f5a079f
|
2018-08-02 14:19:44 +08:00 |
|
liyang
|
b677a6d373
|
修改版本号 1.1.7
Former-commit-id: ef5542023646f13a0488312722cc7b35be2d70ef [formerly ef5542023646f13a0488312722cc7b35be2d70ef [formerly ef5542023646f13a0488312722cc7b35be2d70ef [formerly ef5542023646f13a0488312722cc7b35be2d70ef [formerly 5c281871d32d8da05f040033922a87f0ed43077b [formerly 70833b043c1dc8c207bfa0321b39c74b398b3cc0]]]]]
Former-commit-id: 1d933a2f01c50fab5b8c59c3ee9e8b1927ad6091
Former-commit-id: 98987b198999421dad2fd58f1c72d1ea686f4f9d
Former-commit-id: 54fdfdf57c5b8f5f722b0f1795a92ad75af6d4c5 [formerly 58867df592f3fbdd08f17ebf63baaddef985e2d6]
Former-commit-id: 440560042c01f7b66b7dc7dcd69b0082be7c6833
Former-commit-id: 024aa34a784226b08abae5ccde8d20b2e8f12366
Former-commit-id: c5664628adc62f262b21ffefe0109a97410a1cd1
Former-commit-id: aa54e5f7f75b150c26d8b4ea13297f3f9103ac00
Former-commit-id: 129fbb42cae42923d361a19820c4d4378d66468b
|
2018-08-02 14:17:12 +08:00 |
|
Lu Chaohai
|
b499010a90
|
1.去掉无用class
2.对循环做一个次数显示和异常处理
Former-commit-id: a2535192478165fa6f11e58b8654f1c996ee8a2d [formerly a5c0e7f9db7727e2913687c49d7b62efc33f45fb] [formerly a2535192478165fa6f11e58b8654f1c996ee8a2d [formerly a5c0e7f9db7727e2913687c49d7b62efc33f45fb] [formerly a2535192478165fa6f11e58b8654f1c996ee8a2d [formerly a5c0e7f9db7727e2913687c49d7b62efc33f45fb] [formerly a5c0e7f9db7727e2913687c49d7b62efc33f45fb [formerly d3990f437c456dd24c5a2e65638734ecb9b361ac [formerly 33b6995a50c01f4fa7e98f0b0bc4d314075ea111]]]]]
Former-commit-id: c617fdafc84014336a9d7cdad857bd678f272604
Former-commit-id: e037f2f3ee65aca0739cd9229b188f14835781c2
Former-commit-id: 5c0b40939d7e550fabbb28bbf07aad1d8f528fcf [formerly 73ef97db32e549fec303817a992d574387437cf9]
Former-commit-id: 2e97fae10fe583e9d7156f3a17820ba07b8ba7b5
Former-commit-id: 739ccf8c28766b81484debd0679e4fb08b3bcc63
Former-commit-id: de8c953843db51ea0b7fa9aa9ad45a9e801f555f
Former-commit-id: f9dd18a6aa1885da96848cc0397647aaed567e52
Former-commit-id: 554515c82b84f9f12442f78edcba36bd6092cf4e
|
2018-08-02 14:01:45 +08:00 |
|
liyang
|
351dbdb020
|
Merge branch 'release/v1.1.6'
Former-commit-id: f1780b48ac3417478c4dd35ab2ea43ca495b3a33 [formerly f1780b48ac3417478c4dd35ab2ea43ca495b3a33 [formerly f1780b48ac3417478c4dd35ab2ea43ca495b3a33 [formerly f1780b48ac3417478c4dd35ab2ea43ca495b3a33 [formerly 77cd1a005be35cd9c34a3258dd722142437bf74f [formerly e99f62e7c35bcf3b15a7dca0d208a4a0d4b440f7]]]]]
Former-commit-id: 7348ae2f187ab5518cf7076a1b2f8b802f0144c6
Former-commit-id: b005dfcbc08d7ff24c6e598d9e21d2df5e38d328
Former-commit-id: 5afdaafe8c09a772b52b120047b7d232c857dd2a [formerly 22e052cdff9318f6f336ad7a4b755a00803bcf43]
Former-commit-id: 57608bf479a46bf810a9c17f117a299497d2d442
Former-commit-id: b12f96ab0dc35bd57b608e6bce36587166d25b48
Former-commit-id: af538030b5a08453ec8f58ba0a74622bed9d1f1f
Former-commit-id: 72a0d3bb3ed4e52b8b1553c5d6e9d35e9aa93021
Former-commit-id: 32ef0ebdc48e866afe9cd8ea4f7175cc53a12927
|
2018-08-01 22:59:10 +08:00 |
|
liyang
|
8c948f2e82
|
更改版本号
Former-commit-id: 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 95f300f5805822ed8eaa6ae5cb6b63fbf6d5edff [formerly 050000456c1e515edcedbd64527f9b815568b53b [formerly f8db76d25c4f370f65b75f530eead2eec7308486]]]]]
Former-commit-id: 09c61169f2709348cf28d08912c45e40039ac205
Former-commit-id: e83be33bb3ff29f3b200612c25430880b3d1330f
Former-commit-id: b818b75f9e95b4e27065cf027b315203a4af64c5 [formerly ed24a263e5429f8884ca3380d710e0f72bbc4402]
Former-commit-id: 7c95083a9cdf3a34168522c1b069024b5ca618e2
Former-commit-id: 396c3fa37c9b9e16cbe955622c1e45d531a389b8
Former-commit-id: a54a01f89b05c13a2e6719aba6beea2183403b66
Former-commit-id: b9cac170952c0afb7336a818d9e6ca0925d71b6a
Former-commit-id: 167678516b1bc7706002a2ef74d75570bf1db671
|
2018-08-01 22:57:02 +08:00 |
|
liyang
|
8230c55629
|
代码风格统一
Former-commit-id: ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly ff6dcea49152011f7ffadf67b3439a772dadf70c [formerly 036ab14e128b321b4a4f17972e276cffb62b4cf1 [formerly d24e01dcd8ef7f71d7e4b2f3e01b5b5b5f0d69de]]]]]
Former-commit-id: f5fc086d537466936ac404d4640381a99b9700e9
Former-commit-id: 8da9ee34c4814c6880e8cbb17a1c8f3c901c11f6
Former-commit-id: 074ba19730618a3f4e68ad553a5aa363efe5a21f [formerly 596f38d6e42274034b180513447dcf7bcacef2b3]
Former-commit-id: af1c1e83fc7e2136a1209548ce2f7dc49023847d
Former-commit-id: b3e4c457de4dabd533a2bd0df8723bf4b82a09b7
Former-commit-id: 073a989e801e02ccf52b67eb8e93fc512c021447
Former-commit-id: d7dee6ae60cadd4655536af792089ea468657033
Former-commit-id: e4c72e70c50356888fbeeebf4c92f4418dd97359
|
2018-08-01 16:28:26 +08:00 |
|
liyang
|
ae8d5ed7d9
|
修改代码格式
Former-commit-id: 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly 0e64bfc1c59aebc6bd015d864f20d980b904f9ff [formerly d13d6e57180fbb88e4d138a10665fa9f74ff9a43 [formerly a287323227fe49f19b1d8924f51e4f0d76f35e63]]]]]
Former-commit-id: 7b479c95b42db5ecea064b78e917c398d09d4786
Former-commit-id: 6fc9a09eae34051907101d998c957d085bdf388c
Former-commit-id: 1be2b7bdfcc7f83b48a7201846cda469b5c464c1 [formerly 9e1cc925f45eee78ea1b7765b58c284067a59bc5]
Former-commit-id: 9486aff65127ee994482ba806adce7fca171310d
Former-commit-id: 9406b9ec706cc4311b1a87c40b8cf4fa5a11e9dd
Former-commit-id: 6ace059932c6865eb91673fb7bf84aca2d822725
Former-commit-id: e159b3d518a4f24602919bbde6dd313c929864e1
Former-commit-id: 09656f37effcf523dbde72b3f31a1be0795ea274
|
2018-08-01 15:44:03 +08:00 |
|
liyang
|
d93b1fe713
|
修复语法错误
Former-commit-id: f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly f8448f6e9a1be2518fa8493b2136ddff478e1972 [formerly 96a5d8d72a3f9e937749b26b98ee35d8a5e573aa [formerly e8c25342965f77229f3ae09b1fac243c1a1b96a6]]]]]
Former-commit-id: c7983307dda2ddeddac8574313ec1135a39febdf
Former-commit-id: 49ad8b35f28dafdb4b055a41e2967dff8748502e
Former-commit-id: 8eebcd98f050bd9588085210ac5236ab0f4a4aad [formerly b9708f9a2744d5dae714539f4b6c49c74cf932e0]
Former-commit-id: aeee4d28dd59070a70c333ef241be600b35630c1
Former-commit-id: 87f9f9041c9ecf24c362564954bb721e380c482d
Former-commit-id: 888405131e5d3f00003b03e4b825515ba861ccfb
Former-commit-id: e335322b3ba220311531ae6ac5b6736d50a91813
Former-commit-id: ed6d531134acf6ad00f042553357c694597506ac
|
2018-08-01 14:45:08 +08:00 |
|
Lu Chaohai
|
05a3388001
|
Merge branch 'feature/tabsContextMenu' into develop
Former-commit-id: 19ee7eba58cc5fe4a6973bf4ecd16f4d7b480871 [formerly af09b56532e69671c3c2038087c67173157d85c8] [formerly 19ee7eba58cc5fe4a6973bf4ecd16f4d7b480871 [formerly af09b56532e69671c3c2038087c67173157d85c8] [formerly 19ee7eba58cc5fe4a6973bf4ecd16f4d7b480871 [formerly af09b56532e69671c3c2038087c67173157d85c8] [formerly af09b56532e69671c3c2038087c67173157d85c8 [formerly c1fb3608322920551fbee991206fb8d2e135418a [formerly 9caea2f71233f50326cacb64e7ea6fac0123c674]]]]]
Former-commit-id: 1ad35ce3307585bba2515f4900c2ecea31e6fee7
Former-commit-id: 96d0b66dc23ea1f91be168494965d7fc179a616a
Former-commit-id: 671cd30da4956683602fb0acdc2ea11a5d964349 [formerly e156d4165f9687908a57c83fcb97b2599d3b207a]
Former-commit-id: f28bef03ee171218e915df6cee866a35e15fbcd3
Former-commit-id: 8470d434f61ba76918bd59690e55a5490eb1705c
Former-commit-id: 121a23fd194e4c6995f586889c0a7922bd45e31c
Former-commit-id: 2609d129843c0b5d4eac8ca033587bc19cdb9422
Former-commit-id: a52d35fd78cbc43142b76ccb69505425d847ded8
|
2018-08-01 13:22:29 +08:00 |
|
Lu Chaohai
|
19410908a8
|
1. vuex里 对d2adminTagCloseLeft，d2adminTagCloseRight，d2adminTagCloseOther 做了兼容性改造【使得你的文档不需要修改】：
无参数测试和参数测试都通过了
2. 增加了一个contentmenuList做右键菜单内容的渲染和调用 —— 如果需要将参数提出出来做样式的配置，我需要一个参数列表。
Former-commit-id: 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly 4726d045828af2827cbed2da8b673acb7debd71f [formerly a1a2811342e61d0008f9199254070d700fd3b5bc] [formerly a1a2811342e61d0008f9199254070d700fd3b5bc [formerly 118b051ea28087166f54eedbf4af330e827f3e9c [formerly e4ec6d960fca41d9fbc5c5247ec2dff051bd52ee]]]]]
Former-commit-id: 81e60a1c9c6f35d4683d6caa8ba1e0fa69f8a2e7
Former-commit-id: fd9303ed5c8c13a87a67ee2b803aab4f45665eca
Former-commit-id: 8cf659c2a6adf39509fd79ecd295bc020ca833a4 [formerly 242bb104727c67d7c5fb3d2861ca3fb09e8c91a4]
Former-commit-id: 2fa2f3625e7db96c90c1dcf2fba4da685f233be8
Former-commit-id: bc7df38e257b2025ce107f09b01292ba256ee94c
Former-commit-id: d07007823fcd159cb496ed0db922e017449a5ea6
Former-commit-id: 72e5cd2e6d9c3293f38fa6eee6fb34b3e6947ad3
Former-commit-id: f704ab58381896ae24c78f6bf677fc9e23c73273
|
2018-08-01 13:19:11 +08:00 |
|
liyang
|
fbedf5611f
|
更新文档
Former-commit-id: 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 27ccc3da08c64071572bd1eb1ed6b10db249362d [formerly 0fa9c67f2c5244a9fd0ab3ef7f535ee5dbc17028 [formerly 5fa2a7b6bc4770626ad8dffb3079cc6c2dc9974d]]]]]
Former-commit-id: f30664ca7e509fd1dba988b0b1aafa26d597bc61
Former-commit-id: 7c5b94b5e644651fdb22b718a9510558d085f0e3
Former-commit-id: c73277f2c97cf7997a61be8593d8fa2ba88f00ca [formerly ea6c40ec2b32a4942246411f2840a88e3438bf4e]
Former-commit-id: 92245f6d7266be02d82f33c6fe924d6a3ed39b96
Former-commit-id: 42a7a0188ce77b45fe5f6005031317dede7a2572
Former-commit-id: effd07ee35c835c32458654db48d4e650020eadb
Former-commit-id: cf8765eb3f8f50ec96991ede9fd04705b2285d57
Former-commit-id: 01f9a3207cbd369c1a0776fad94d692471987fc8
|
2018-08-01 12:56:01 +08:00 |
|
liyang
|
7fd3660b67
|
读着 > 读者
Former-commit-id: f8806266fdf51ad815955d6421ef60e6abb84d83 [formerly f8806266fdf51ad815955d6421ef60e6abb84d83 [formerly f8806266fdf51ad815955d6421ef60e6abb84d83 [formerly f8806266fdf51ad815955d6421ef60e6abb84d83 [formerly 7656b1faa8f214d382df5462ca678058948e4fe1 [formerly a096f1dff5eecffba3551db840e18bba5e64461d]]]]]
Former-commit-id: e9865615193c16f7051ab7c6c015d035131ea34d
Former-commit-id: f18a86c2e7741ba9f254c708c12ec2a2aa75cecb
Former-commit-id: 01df9697aad6f018a640fb0d8a047e5aa71b320f [formerly 01ed0fd2511edf6f04f369e47b49023d03fbf43f]
Former-commit-id: 0ba32eeda6c21f42a8a29f4eb168b0db090f6e03
Former-commit-id: bb0c81fc5464f8d84129c1056d05505f94d639fd
Former-commit-id: d7b841417ffce3618f44c42747c98aab1fe56cd5
Former-commit-id: 8b28e3255fdaf49305d3534f439993b1c991b227
Former-commit-id: e5896e8baa459622fd70fbc8d336aebe5fb43195
|
2018-07-31 22:10:47 +08:00 |
|
李杨
|
4cbebe7086
|
Merge pull request #50 from d2-projects/revert-49-patch-1
Revert "Update plagiarize.md"
Former-commit-id: 4a03d9ead19514e4a35d3b79f2e9f90dae394208 [formerly 4a03d9ead19514e4a35d3b79f2e9f90dae394208 [formerly 4a03d9ead19514e4a35d3b79f2e9f90dae394208 [formerly 4a03d9ead19514e4a35d3b79f2e9f90dae394208 [formerly b9838b147a1deaa3e969566e9c5baf3546fcd8a9 [formerly 704598c56b7f1fc9fb6fadc4c7e36094a881bccb]]]]]
Former-commit-id: 03f46130b9f1d7cc2f4c4990fae83d80dc57a5d2
Former-commit-id: 0c5d05bade0eda379fa80496f52d134d94ac44d9
Former-commit-id: 332d9daf3a2372c4d9e35f4f0508c1246a1888e5 [formerly f4a061336b8047d694b06f221acd247c9a62f38b]
Former-commit-id: a8ffc7c50e0a43e4bec6e83d6512ac7bfebea792
Former-commit-id: 26c3abaf6522e0c2c44c1ea320eb03bb8496f730
Former-commit-id: 843ae36ff09ac27d37afee5b968cefebd27484be
Former-commit-id: 0642568197c4a27b357d37d0b3fa38397a2e4916
Former-commit-id: 54b6f57f47a840e54d76f37d6971c1e482add9ed
|
2018-07-31 22:06:42 +08:00 |
|
李杨
|
3976f3f7a9
|
Revert "Update plagiarize.md"
Former-commit-id: d35241b7af239a31a83515a80d60be08b69680db [formerly d35241b7af239a31a83515a80d60be08b69680db [formerly d35241b7af239a31a83515a80d60be08b69680db [formerly d35241b7af239a31a83515a80d60be08b69680db [formerly b8e9b624aaff785fc22127de78bbd602e24090f2 [formerly e34332806f0248198aa43ae1f50f162394f16a5a]]]]]
Former-commit-id: d65849153671a1c7c6a74375a19e800b473a66d8
Former-commit-id: b75cdbb82814051081b3fffcce6392bd0d14ab8f
Former-commit-id: a3df56fd8562b8a552e3ab334750b7a42b1c186e [formerly dad8ced82117510b17e8637a74b46d99a586f08d]
Former-commit-id: c03f6a63ee6b5d088591d2b946d0d91fefbc5b1d
Former-commit-id: 5d907c42aca7bc1470b4b4f9a1a427288af941be
Former-commit-id: 5fe8fe7545d30bd51c328f822dea9a77a6cb1887
Former-commit-id: c34b56ed23395931907f31770c33a0c524356a7d
Former-commit-id: 8be7a055a5ed92f220374af3bcf7835018ecc2b7
|
2018-07-31 22:06:05 +08:00 |
|
李杨
|
69bc840c81
|
Merge pull request #49 from mokeyjay/patch-1
Update plagiarize.md
Former-commit-id: f0d7263cf08fe3ab5de70ee88a26e116d6923725 [formerly f0d7263cf08fe3ab5de70ee88a26e116d6923725 [formerly f0d7263cf08fe3ab5de70ee88a26e116d6923725 [formerly f0d7263cf08fe3ab5de70ee88a26e116d6923725 [formerly 7c26d21bdba633e6c9099f9235c44980d9d4613f [formerly d6f58505bd89c7ee21b0fbc715eeb135f72c5cf5]]]]]
Former-commit-id: 36bfa42347fb938df270722810dceeed7858e50e
Former-commit-id: 876eb4e7bbfd397e74aa163954d9fae473a1deaf
Former-commit-id: f8fbac5a7bb49eb41734ae5a7dc09637ac690a96 [formerly d48be94fb900db4e54fd18630fe9f419828de972]
Former-commit-id: 03b3fe16ceb6602ac6b87adc8a11d60c50aa1763
Former-commit-id: ebb76d68524824790b8cfa6d6b6a09807221c0dc
Former-commit-id: c9691f8d4d102e0c41749f351a72d05595039495
Former-commit-id: f16d49bc78a8be6ae95b66999efec9b16d992a93
Former-commit-id: fd1f776296233a0686a45bb2caef99cac507dbaa
|
2018-07-31 21:51:05 +08:00 |
|
mokeyjay
|
f3118a7e91
|
Update plagiarize.md
修正一处错别字
Former-commit-id: 339efbb46ad6d16533ace90c011c7cc5bd9e3808 [formerly 339efbb46ad6d16533ace90c011c7cc5bd9e3808 [formerly 339efbb46ad6d16533ace90c011c7cc5bd9e3808 [formerly 339efbb46ad6d16533ace90c011c7cc5bd9e3808 [formerly 36e74e9cd9d7ebbb33b30b007bea846daa7465ca [formerly 0d37d21bc0f0f6141e95ea9a190de162bd44680a]]]]]
Former-commit-id: 107d2467ca14ccbaeff287d33608adb0e0ef6372
Former-commit-id: 13d4a22006882073be8d838e8029cde9200f881b
Former-commit-id: 788fae5dc23c800eb2457c74683b883fa799bcfb [formerly d457a2bd09e2c4d8ce689de6fbb4788b0c04a255]
Former-commit-id: 05bebf2e5f49a1fafddb6c2689f7ef1ceaea7831
Former-commit-id: 99812e12afeda77a4dc1c5656a3ebd8ad5e05537
Former-commit-id: 610bf97763dfd775e123e5a7afe2101b8bf77ccf
Former-commit-id: 0c24593bb70ee9d013be0dfbccd4c08d7f9d543a
Former-commit-id: 77da5de1e1c5e366378de3598bc0a4522638abdd
|
2018-07-31 21:40:14 +08:00 |
|
Lu Chaohai
|
ba769e6592
|
完成第一步：定制自己的右键菜单
Former-commit-id: ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly ce0304d2a56962ad9fe64a12c802c11909457afa [formerly 37d262cdbc810790b833d06503ca0c38d940310c [formerly 2afb0e2f7d7ca0d7ef3df1a34ccbf726786370d6]]]]]
Former-commit-id: 5868cdaeb5da645fd4964e4f8d0375e9bd8df178
Former-commit-id: 3742735054ffd6dea30adab4803c9d4187091467
Former-commit-id: 4907c8e6ed8b8769d5f441076d9e4c65474440d9 [formerly 4dab0307c98aef7e71ba749887fbb95a48b12ed5]
Former-commit-id: 224a72f5de9cdabacdac076fb58516dbca6a0216
Former-commit-id: 6f1576eec600ef6f192850f449ac6b67e71f30e1
Former-commit-id: 095d0f4d404728bb68ee56e4193ad4d53548a119
Former-commit-id: 9da6f4c2e4c0c2ef4f5ae43b34d9ad1c5f0910c0
Former-commit-id: 7b871cd75a69dfea4053644bc8852db779b67fb6
|
2018-07-31 21:10:38 +08:00 |
|
李杨
|
a36245cb28
|
Merge pull request #48 from namklaw/master
【BUG】修复一像素的显示异常
Former-commit-id: e91474230bcab5381570312daad6b23e1c9c775f [formerly e91474230bcab5381570312daad6b23e1c9c775f [formerly e91474230bcab5381570312daad6b23e1c9c775f [formerly e91474230bcab5381570312daad6b23e1c9c775f [formerly f0eeb0c53524a38a18319cb932cbd21d8e86d32c [formerly 2d60eb80f8ded90f934fd65c6d69f4b89c7f3f11]]]]]
Former-commit-id: d8f17effd8003b5ec15fdad002c192da543ac527
Former-commit-id: 1f65d2e4379231ae77f231cc87502d7e2ab6e00d
Former-commit-id: 3e74002823438bcfc4821a8d11105bca12174f36 [formerly dda7b4c5f7568f6e7de84e6b88f47221c5cb1f3a]
Former-commit-id: 1154336e402bb520b9a7442b7470d4451931a2b0
Former-commit-id: a91c77f0d675705a31c8bbd113f63f3d4852de89
Former-commit-id: d9beb6c6b73b6c50bbb922f9095c277f4b584e72
Former-commit-id: e4adfacf032ef9bb0751ae86948ebf76630b150c
Former-commit-id: ecb630d9a3f34341c12a1b837060785f8938bed2
|
2018-07-31 13:39:42 +08:00 |
|
Lu Chaohai
|
0c2e26ec47
|
【BUG】修复一像素的显示异常
Former-commit-id: e193b5fd4ee0d94e1970f4b8627ce6726f6df42a [formerly e193b5fd4ee0d94e1970f4b8627ce6726f6df42a [formerly e193b5fd4ee0d94e1970f4b8627ce6726f6df42a [formerly e193b5fd4ee0d94e1970f4b8627ce6726f6df42a [formerly 05503effa19850c34be27fee3967ff7c4b063302 [formerly cf8c13120e48dc9a68fc2747251361a503932fe4]]]]]
Former-commit-id: ae2f177aa14eb08d7ffb58bd201296ce3c3c7024
Former-commit-id: d403a04ed8230379b07b8ce077b9ddaa0b117acf
Former-commit-id: ba1369401f05cf9ce723e09614c7a051a8b790c3 [formerly 4f11d2563367bc6fb72d764db8ccf0d75c9cd76a]
Former-commit-id: 84bef17c116021a3226ad9b56c9c11d3cd26d7f7
Former-commit-id: d87f0813100a08c22119620398e6312d502e07c8
Former-commit-id: a708c005647835148ba5d000a30f903e8e3ad193
Former-commit-id: 29d3fd9620bc8952ea84c025703511e9834524d1
Former-commit-id: fadc44e8aa27c9f4a82b43d76f6649c53ad54656
|
2018-07-31 13:37:16 +08:00 |
|
李杨
|
e29801b8c1
|
Merge pull request #47 from namklaw/master
【BUG】修复IE情况的显示异常
Former-commit-id: b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly 3f998e49afc3dae28b3e0c7c554fbc5a0fad1f9e [formerly ef3ea5574b2745e51de917a4ae439262f5751632]]]]]
Former-commit-id: 9654e22674859badbfc8f1abb63723138d59a5a8
Former-commit-id: 7ee90e91ecd008ff19826a8a91f28e5744967b9a
Former-commit-id: 960d455510ea9bc6b8313de7fab427c715e0f110 [formerly 3f2511e3d4def73ef9128a608322fcabe7bac1a1]
Former-commit-id: dcb9037897a4177e420ff3c5d1bf4938c862544b
Former-commit-id: b2b7a8a6b4534c65fe26e38461174dbeca1bf6ec
Former-commit-id: d1453d96289bc108662567a624ae24f8c64c5f0d
Former-commit-id: ea3e2d4630826617887388ed6eacbd3467ab0aca
Former-commit-id: 7f0bd4e9adb04103b80ce2dbbed394ce07db6aeb
|
2018-07-31 13:18:04 +08:00 |
|
李杨
|
5be7ec8b19
|
Merge branch 'master' into master
Former-commit-id: 2f7ab8d91c325c4f70c15d2d165fed50863ac808 [formerly 675ce1b9a3d9eb43709e0ede1d7c1ec9d41d3939] [formerly 2f7ab8d91c325c4f70c15d2d165fed50863ac808 [formerly 675ce1b9a3d9eb43709e0ede1d7c1ec9d41d3939] [formerly 2f7ab8d91c325c4f70c15d2d165fed50863ac808 [formerly 675ce1b9a3d9eb43709e0ede1d7c1ec9d41d3939] [formerly 675ce1b9a3d9eb43709e0ede1d7c1ec9d41d3939 [formerly 3eb5c9734c4ab9ac060d13cd9579eb91e8353cfc [formerly a77bae94f03dd3a9df7670e64a8b61022e26f0b4]]]]]
Former-commit-id: e8322622a9a3c157b7d74b63b3c5f3930c2fa194
Former-commit-id: f5be65e42598ec0c94bc722966caa42b362c06d9
Former-commit-id: edae0d139666ff30a04bbfd5e95a19eec5da39af [formerly da8cf1d07629395d38116be4b8cfb154896b43ad]
Former-commit-id: 5acdeaa0a61da6039fc229628d4f86f0c6a8bc5a
Former-commit-id: 5c7a57f03c0e7096b38f6c322bee972290c739f3
Former-commit-id: f122a4594bea3d75050040134bfbf4fa8b82834c
Former-commit-id: 1d737eed91c2d644350cd19e0be960860625bb3e
Former-commit-id: 693fd3611099aa25ca308ac6c8340ddc9046365f
|
2018-07-31 13:12:58 +08:00 |
|
Lu Chaohai
|
51b6229efe
|
昨天衍生出来的bug：flex下的margin-right导致的。
在昨天的基础上：
1. 引入了flex.css，这个工具可以在实际开发中继续方便快速构建业务页面 —— 可以加一个页面说明
2. 将布局的部分从样式中脱离出来，在html里一目了然。
3. 测试情况：
测试环境：Chrome，IE11，Edge
—— 显示正常
—— 边框没有1px的问题
—— 标签过多显示正常
Former-commit-id: ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7 [formerly 75fc769098a2dd22f2570580e1e38a9211ba59a3 [formerly f5bb3ce14be07f93eeb61ef9b88df0a63a01a491]]]]]
Former-commit-id: 4ffb48d759ea3ba129aeeb77cfefb7b86fd91c76
Former-commit-id: f882c1ae2673b927ceb11f6eadeff0b43d5660d2
Former-commit-id: 0fec60f6d05afe04465adf11b0f3130c4b454b58 [formerly 072223429c32f5c05283726b1b5ad67cc7a6054b]
Former-commit-id: 7f6b6f9f23a0379c39bbedf03fe6520d437747ac
Former-commit-id: 9d55f0ff8170414c478360c6dddd74dafcc50e17
Former-commit-id: 3e81c2411638572ae500f07f2efb9976e8c1e710
Former-commit-id: b82c259e86a5a604901a12128a768da8262581b0
Former-commit-id: b0152867003988582a71dc6797f74f9189c7e051
|
2018-07-31 13:02:50 +08:00 |
|
liyang
|
f0eb217dcc
|
回滚
Former-commit-id: 0daadef3f388a0fb4fb0bbdc0d5ff37b295c1d0b [formerly 0daadef3f388a0fb4fb0bbdc0d5ff37b295c1d0b [formerly 0daadef3f388a0fb4fb0bbdc0d5ff37b295c1d0b [formerly 0daadef3f388a0fb4fb0bbdc0d5ff37b295c1d0b [formerly d28a3092f582e69cb6e069058088603de701d51d [formerly 46645c67646fbf89e14be31d5b2b9f0d3631e3cd]]]]]
Former-commit-id: 2fa72dbb32ca35f410f6c40b02e4b746f296acf2
Former-commit-id: a4a2f848f981bc5d25f11a521947cd9a5eabfe52
Former-commit-id: e5711c822290f5c5b280d2938c67f44037455bba [formerly bb0c10f4a0738eff4d28f8a886c6a0a4fe68a196]
Former-commit-id: beb421586876cca3f4f3975c7292cd7dff49b8c5
Former-commit-id: 74dde645b15f07e4e84424209b1249762fb2121c
Former-commit-id: e5e87b89adcb306dbf3c769495d8cf620f8e100c
Former-commit-id: 4cae17cd022fbb00bbc191870b1473bff6a430fd
Former-commit-id: c9c3b57262cead79480c09070195a68c7873f763
|
2018-07-30 18:42:41 +08:00 |
|
李杨
|
a91fd688de
|
Merge pull request #46 from namklaw/master
【BUG】IE 显示异常的问题
Former-commit-id: 1864c430f33144420a7a62154311cdf399f0b0af [formerly 1864c430f33144420a7a62154311cdf399f0b0af [formerly 1864c430f33144420a7a62154311cdf399f0b0af [formerly 1864c430f33144420a7a62154311cdf399f0b0af [formerly f64674dd52b4556c94c4622f4c10249786f90654 [formerly 5dc9d9442ffffbc7a349e6610f2702e2684cf058]]]]]
Former-commit-id: 11aa155cae518e40ecdfb68e94ac707731a86cf4
Former-commit-id: 7e1f9225c92ee7e28b0ef58e8db499505ad64718
Former-commit-id: b05af9de0e017771c66facd031b9f5d6aff05d73 [formerly f7c471572d3f93ebba1d5d4b9b1fc2a8dc412e98]
Former-commit-id: b9f2853da5fcc1db2c426b684a619feb919b3159
Former-commit-id: f99ab9edeb2d3de7fc862868dbb46b553e6a7da4
Former-commit-id: c6eaba32da3ea1b96f248e45771a6dc26901ba92
Former-commit-id: b4f087babf7a157bb698550fd2b245d9a8c3aae5
Former-commit-id: 491de1fc506b1d3417699e0d25f748fe6028adba
|
2018-07-30 18:37:50 +08:00 |
|
Lu Chaohai
|
28e13f7002
|
【BUG】IE 多出的间隙：
解决方案 —— .d2-theme-container-main-header 增加overflow
产生原因 —— display:inline-block + font-size
衍生bug —— 样式显示边框有异常
【BUG】边框缝隙没有密合：
解决方案 —— .d2-multiple-page-control-content-inner 去掉绝对定位，.d2-theme-container-main-body 去掉 margin-top
产生原因 —— 绝对定位导致父容器包含的区域小于子容器，而用了margin-top显然是为了解决父容器少掉的1px，但也造成了盒模型的渲染不一致
衍生bug —— 暂无
Former-commit-id: 425aa868220dc483d184ca6d08dc9b2e9d4afacf [formerly 425aa868220dc483d184ca6d08dc9b2e9d4afacf [formerly 425aa868220dc483d184ca6d08dc9b2e9d4afacf [formerly 425aa868220dc483d184ca6d08dc9b2e9d4afacf [formerly bc31d6444a9d3e7c9c9241592abf004938fb5e4a [formerly 0fba88f7fe8623d5a25741ab2ceb42086f93dd53]]]]]
Former-commit-id: 4b48425b7ab6eb604227e3773cb8dd860987beba
Former-commit-id: 1a9da51a12b0be670876c67eea7c08c325d2aafb
Former-commit-id: 76940fcab760f89a8469e9baa64e19b0b6e2c30d [formerly e92f92b629ed5dfe54cb71433a6cb760a2ade853]
Former-commit-id: c05a7439e87d712f508cf8ccd9e01133a5f20c33
Former-commit-id: 7173edc146db16bad6544e9a2fb9989c9d631ec0
Former-commit-id: d0c2ad696db49ae7c8b3759abdf3fc01b338d875
Former-commit-id: 1543a86a427a9d529b882018ce3633f252347fd9
Former-commit-id: 08b6340e1dc4ed4d323c7faa7d5974488e7a3fd8
|
2018-07-30 18:04:58 +08:00 |
|
liyang
|
14807709aa
|
新增使用方法
Former-commit-id: 7e394eb97803bf125618a0139aa18eca231caab7 [formerly 7e394eb97803bf125618a0139aa18eca231caab7 [formerly 7e394eb97803bf125618a0139aa18eca231caab7 [formerly 7e394eb97803bf125618a0139aa18eca231caab7 [formerly 73dc06934b076314dfc0768aa986b8791943869f [formerly 1eab88db2e061e50a0b16804c2cac73f60699d45]]]]]
Former-commit-id: 0bc3dc09af023f79533b1cb67dd21ecea5ce5c60
Former-commit-id: 556906e2c9b9ff5ce826e31e74e0d30d08a715d7
Former-commit-id: 19846fa20265d7f6a132410e537477ba42de4df9 [formerly 102714b63ca405f6bc98a9d3654c54be8b089ebb]
Former-commit-id: a57d296f8e27792526c24d68a9847b4049d0d621
Former-commit-id: 8f890791e9d0bf4ca0d0ac37fa12966791d5a6e1
Former-commit-id: ffb49e2716df467b4f051c71eee1d8ecb95db8a9
Former-commit-id: e77d7af5aa00da0e917fe8ca5357e4d6930db36a
Former-commit-id: b0b98149899747d7d51f568280f936042b0e714e
|
2018-07-30 10:06:54 +08:00 |
|
liyang
|
fd477067de
|
更新文章
Former-commit-id: 61ad084c154389570c12bc09f4402e95b7456db5 [formerly 61ad084c154389570c12bc09f4402e95b7456db5 [formerly 61ad084c154389570c12bc09f4402e95b7456db5 [formerly 61ad084c154389570c12bc09f4402e95b7456db5 [formerly c512089e39284168703af1553449d59260b571e6 [formerly bc122baf59437b278b50ec52db8e87da2be5b98a]]]]]
Former-commit-id: b4c6b72c0d166364509156b396bf6c69eb21e8c3
Former-commit-id: 9272d1cbe35ff7687cbcff3c5f62d2f5394f3248
Former-commit-id: c4bf587f2f1320abc21d8cec13f64ed67b0c7153 [formerly 833e22ebad2b6b29ca77fc4beebae2c64f717505]
Former-commit-id: d94578dfa596002a5cc659faef71754d0ab0140c
Former-commit-id: 3ffb695a830b293f8899169edf40821547f2f510
Former-commit-id: f097ef7c13d6233d1a43170ded021396b9f8a0d4
Former-commit-id: 0d0584ff9c513cfa61b9ef6b8c5a06ed6f69f394
Former-commit-id: 5a3bbd88be68aa4cb817f5f41e69dbf0b27f9735
|
2018-07-30 09:25:00 +08:00 |
|