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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|