liyang
|
ab5cebfdf6
|
Merge branch 'feature/store-module' into develop
# Conflicts:
# src/pages/demo/playground/store/menu/index.vue
Former-commit-id: 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 77cb9e9175b35a94c8c5cbefb6981f75718bf282 [formerly 6ebe5372a382d911bdbe82f5a1867f72ab58f286 [formerly f7811326ccd36bd64b92f6c3094060be390a2b76]]]]]
Former-commit-id: 1a0ec7498901cca64a7d12c2b2c8f13ae701ca21
Former-commit-id: 3531de0dd9e330312c5073676f4c3aa82d28dfb9
Former-commit-id: cc70c17a885ff8b72df8b799921e38fbcbedd3e9 [formerly 73282cfd24758da343bea77d413773d569606110]
Former-commit-id: fa461f51727fdfc67b8ae790e1f0df161f85ca8b
Former-commit-id: 10e2f2cfce4a446c01957229fe254e4c5ec211a6
Former-commit-id: 602f7a473458e6f5f0d5ec96388e608971daca34
Former-commit-id: bb4a69677e9c9a76c8f653fb2b7c714eff13fa67
Former-commit-id: 277ce50885de084a418ba885418c22e8978e3c22
|
2018-08-12 08:07:35 +08:00 |
|
liyang
|
551aa111a1
|
page
Former-commit-id: 1801c7a5909d5415b360a996d4ecab23280b1076 [formerly 1801c7a5909d5415b360a996d4ecab23280b1076 [formerly 1801c7a5909d5415b360a996d4ecab23280b1076 [formerly 1801c7a5909d5415b360a996d4ecab23280b1076 [formerly 209999b1c78ca63880406cb2b633c3560aae0eba [formerly 54edc3b4bd966e2496564198d59ff84fe9ba0b25]]]]]
Former-commit-id: ad91a7092b963def0579ecc2011e578e87a8ecd5
Former-commit-id: fb96644ac016362df708618fafef872b7bc2567c
Former-commit-id: 257c0b84b8069b3ccb8ddc53e965a974fca01189 [formerly 6954456a39b73136a14f80b0747aea90a694c9a5]
Former-commit-id: 99c7481e576afeac70fff4effa7e57f6b17cb79d
Former-commit-id: cfddcdd7f760c61e4abe02159a75d484ad6c6e63
Former-commit-id: 06d4e8cf94bd8c24fa167d77f843c93541afb5e6
Former-commit-id: ef6879d28d953c827184c4d5caa6c7fef6b2326f
Former-commit-id: 1f1114b417621402ec7d9d3540b305563fb140ec
|
2018-08-10 13:49:54 +08:00 |
|
liyang
|
5ec1d84ca5
|
bug fixed
Former-commit-id: 238ed16728c0be22854ec5f3fefabff707b7d1ba [formerly 238ed16728c0be22854ec5f3fefabff707b7d1ba [formerly 238ed16728c0be22854ec5f3fefabff707b7d1ba [formerly 238ed16728c0be22854ec5f3fefabff707b7d1ba [formerly 249790559ed1c4ca07ebf4bb1ceb3f7947bfcc60 [formerly d3d071acf90e6ff13f20700d29da681dd6fb2ea3]]]]]
Former-commit-id: 2e67366e7a2e5c37390f62f866f49058754bb618
Former-commit-id: d4caf73a9cecd20f20ce844b821c475a16afcbb8
Former-commit-id: 5219b66ff691e40b792d24b8093e111418748a60 [formerly ecc3fbea6954d1ab664ad0d9520027c23f26007a]
Former-commit-id: 92982117b9c5fe9de2a05c250f8959d93ea6c723
Former-commit-id: 57a2293971a72e6fa2ebf241bbd54c448d91e9e2
Former-commit-id: cf1369733bd29475cc69525b1189d81498379db0
Former-commit-id: 5e666d7738c4d11c856f21b8a9dd3e64a98e7e44
Former-commit-id: 5fad4e12a8b423b48633a96fc61bd95700bae651
|
2018-08-09 19:37:08 +08:00 |
|
liyang
|
0aa6b6653a
|
bug fixed
Former-commit-id: e07df31b6ffd8319501d74042862cdb91e5d0317 [formerly e07df31b6ffd8319501d74042862cdb91e5d0317 [formerly e07df31b6ffd8319501d74042862cdb91e5d0317 [formerly e07df31b6ffd8319501d74042862cdb91e5d0317 [formerly 560a461a69a9d0e007f2e4f3486e90982bbbaf9b [formerly 10391c12c638ff20b45d5bc77f76ec56e53b0afc]]]]]
Former-commit-id: f9fbffa9a7232b8b6599cb9be54d076c8d27419f
Former-commit-id: b69940b20a46ea5ee988265cd53aa808b31d0c49
Former-commit-id: fdbc272cd56ddc535ad4d289983e595d55e8e113 [formerly 9393bcaf31a1b167751212c62052d0ee1aafb0ac]
Former-commit-id: 24afe2e7aa890be95aae0d6882d135e03ac37f87
Former-commit-id: 08116454227b205fd22de40bfbd5e93bf48b6085
Former-commit-id: df7e91d4cf2cee48d6af648512c0972363e46a73
Former-commit-id: 5478e6fea9bb6fa1a4ee82b850e81509cba19371
Former-commit-id: d1d1f7f2c31672faf3d25699c48210c78431f9cf
|
2018-08-09 19:21:44 +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 |
|
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
|
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 |
|
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 |
|
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
|
5d15b31f48
|
优化
Former-commit-id: 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 9aa2487c1a5dd2a6b347268355d27d60937b1a15 [formerly 4fa88c73d67fe113cdb9d5038baa61b9a2c50ac7 [formerly c1e1986deb2c50ecfff8f94c7e0af65b83777426]]]]]
Former-commit-id: 9ebe6124d8e9c0c91b8bbe32aff66f3c1892ba25
Former-commit-id: b32951098db0ae68c5b37e50bf7aedcc7c27c66e
Former-commit-id: f1577d9b650588c3a9d3083568face8219d867a3 [formerly e0a70087dcc7303505a1a21579dcbc313e953e22]
Former-commit-id: 1066bacc4e3b7211be367b7514994cbba041459f
Former-commit-id: c29f02c0c65173cf9b260c9c4e73a65e99a692ab
Former-commit-id: 9d2a3a8f99dfb8bdff9b665c45de5f0d2de9a7db
Former-commit-id: 41ac0283e997d7e392459d8d86544c822f5ac148
Former-commit-id: c59d4019d3b1f5454394cae4587d6653b616a978
|
2018-07-20 18:24:47 +08:00 |
|