Commit Graph

2194 Commits

Author SHA1 Message Date
liyang
0e1e9c3b5e jiiiiiin-security
Former-commit-id: 61cc967e5d746c261d3c91487a8ea76ce0f7dc31 [formerly 61cc967e5d746c261d3c91487a8ea76ce0f7dc31 [formerly 61cc967e5d746c261d3c91487a8ea76ce0f7dc31 [formerly 61cc967e5d746c261d3c91487a8ea76ce0f7dc31 [formerly 39746e698ab826d6af6643e629087bce1c59e183 [formerly 2aaf571ce60ed0c98cb1822d89a8ac058bea4f76]]]]]
Former-commit-id: 222e52b0ec6a512753bd0cf4cec537b8a9e51527
Former-commit-id: db29511bccc7c357f0cdc39d5cbc89bccd283cae
Former-commit-id: 3b3c2729ad3b4b36f611fffbd981c4cf82797714 [formerly add57b668ace7cd3766c9acbc0045b3655dbe4f4]
Former-commit-id: 2cfb445ef888c0cb506bfb799a0b9275cc99fe66
Former-commit-id: 779f9ade5a88a0dbe9d747b56e54a776fea0aed8
Former-commit-id: 829cecee9eca8e5d98cf337e58d450ba2f05b018
Former-commit-id: 8a4a2cd3b2c77cfe05255e1492e18e8d5f836c90
Former-commit-id: 28a5a578d65ce882bb4a3228f8f63f573a6f77c1
2018-12-20 19:23:39 +08:00
liyang
33ba31cc6f Merge branch 'hotfix/filename'
Former-commit-id: 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 6cb01eb064fecaf5a738762db167bbef3d77fd2f [formerly 19674e961fed54dd02409204e9ee1be55110cd9b [formerly 285f8c6666c9c0a5d54dda6d6f8313211db5fe4d]]]]]
Former-commit-id: c233c5d91b180ddd00b3f2ffeae303998e5c4658
Former-commit-id: a167aab1b9a21e0a9806e48b4b0c728255e89dc4
Former-commit-id: c53936144a453b2386e59a6fcf1ab291857e6552 [formerly fac3ce872db3c2e0711dc7747fd7d06ec05fef8d]
Former-commit-id: aabccd2fa72245c48952ab986a09453e906d92d7
Former-commit-id: 28fdd45e3235df6bf6d1835ae4adce89d6abe4e9
Former-commit-id: fce44665ba21df30fd37cbd3883c81e3ecaa8eb1
Former-commit-id: ff19996c0b0aea88fa9e5f3a0d6619df2f7cb09f
Former-commit-id: 4c657cb99eb944e7af32e0c7270216218a604aa8
2018-12-16 18:31:57 +08:00
liyang
06099f2307 no message
Former-commit-id: 7dba9e50ca5fe10ff3987f440cabc9e4628ea9b7 [formerly 7dba9e50ca5fe10ff3987f440cabc9e4628ea9b7 [formerly 7dba9e50ca5fe10ff3987f440cabc9e4628ea9b7 [formerly 7dba9e50ca5fe10ff3987f440cabc9e4628ea9b7 [formerly 3e070c75ff20d6037910b032b0623c54c46305af [formerly 6c053b858876046a1b91ce46dc1647fc9a765b52]]]]]
Former-commit-id: d3ddc741cdd7912d0a638bb908ef4a7d2f110dcd
Former-commit-id: 39324a7658e40f98120d0ac0c5f99a02dcab2835
Former-commit-id: c5c285e0f21927df30d5597c2b575def1f352423 [formerly 036cf307a12a9f968092e6a3bfca247f63063e07]
Former-commit-id: 95f508fc9e158bf6cfef42c31ca98df77214f323
Former-commit-id: d5a9a7d5d6c33add066edfde52c65a7e4ec2d6de
Former-commit-id: f1f9850837411e21aa9313ca92ed74320250f88b
Former-commit-id: c40ec2b2581a216ffcfc41095bbffc8a0053f2f2
Former-commit-id: 67134c944b18374725cff3bbeeadd779dfe54a40
2018-12-16 18:31:50 +08:00
liyang
685946ec5d Merge branch 'hotfix/v'
Former-commit-id: 99c4a1c4a7dab72305b65425f5ca2b17f624f1bc [formerly 99c4a1c4a7dab72305b65425f5ca2b17f624f1bc [formerly 99c4a1c4a7dab72305b65425f5ca2b17f624f1bc [formerly 99c4a1c4a7dab72305b65425f5ca2b17f624f1bc [formerly dca653f05e8e1af07b651b30b88890f4caab5a13 [formerly d38949ecf148415c4edfd904a624f0ad529bc0e8]]]]]
Former-commit-id: e97101780686d0e6adad16ade496e4e682cf9937
Former-commit-id: 0c754bbf12ae7051c6fb59d9d4f6176f33950e56
Former-commit-id: 9ebce8d36019f37394b683838c3f0c1720a3339d [formerly 5a105df675859646a3838d6f13dee6dc84a668ef]
Former-commit-id: aa55144a0ec18028ef70e4bfbb377c9509e41fea
Former-commit-id: 609026290b517ef08444cf3d87570744a09646a2
Former-commit-id: f66d0ec0bce04cd27e5030cc47cf396d9caa3d63
Former-commit-id: a0cc39a3494066a04f8519f51cb66f5a7a91f2e2
Former-commit-id: 5648fcc88ce9dd41d651bdcce41d279f1382b135
2018-12-16 16:32:22 +08:00
liyang
bb7b6b6462 new version
Former-commit-id: b1f966e92d2323bfb92cace0f60babbe78bb2cde [formerly dece4551cbb55149357f7b41b4088170d45e9c4c] [formerly b1f966e92d2323bfb92cace0f60babbe78bb2cde [formerly dece4551cbb55149357f7b41b4088170d45e9c4c] [formerly b1f966e92d2323bfb92cace0f60babbe78bb2cde [formerly dece4551cbb55149357f7b41b4088170d45e9c4c] [formerly dece4551cbb55149357f7b41b4088170d45e9c4c [formerly 44f06dc7807268d3a58f4b8e282a39f9c5c7c1e7 [formerly 12b501dd462d0fa759585c1f2e65f49f180c2a3d]]]]]
Former-commit-id: 23f77754b32a30e4bda3eb512e1580ccc2c6c947
Former-commit-id: 0357187e47992dd056d636eb362d936f86bade58
Former-commit-id: a0d29d9dfd471a1598a36ed7d29532d09ad6e42c [formerly 9fe95ea730d86d036ac76a3886e085b3edb03ccd]
Former-commit-id: 83eaf372f3284c258f3f9e78971f7fad476c2140
Former-commit-id: ca161a864bf559738b01972c1f55ef4afa198f73
Former-commit-id: b542957fffb6c03ea6ebc1b13bb116bbc23e739b
Former-commit-id: 7160e313468db8734117b22e36c86170511db531
Former-commit-id: eecf4267e0811ee6542ae61df2ba58eef5de4f23
2018-12-16 16:32:13 +08:00
liyang
c1b1a3fb70 Merge branch 'develop'
Former-commit-id: edaa328c0d38115b8a857804684686cecdcf6e6d [formerly edaa328c0d38115b8a857804684686cecdcf6e6d [formerly edaa328c0d38115b8a857804684686cecdcf6e6d [formerly edaa328c0d38115b8a857804684686cecdcf6e6d [formerly c7986af4ef37c27eff081acf56ac9335bc5ba19c [formerly 466d1ae95b50b49b77f5f8b7f4c977b609027d90]]]]]
Former-commit-id: 01fd860e1b3ba16c2a0b8b393dd029f0ebc0e247
Former-commit-id: 5e3f36bcf1f0cb2c101e8623d30994091eca7155
Former-commit-id: 4e81b0b2ff790460c87965ace5007912fbb70b00 [formerly e811ae9754b9959178fb1eba3c72e9595da13e9f]
Former-commit-id: 0e5079a82d3a892432a2b241b71942444f668c6b
Former-commit-id: 279dfc6ac6650ca03ccc53ca17523f71343b68d4
Former-commit-id: fedaade859a0c2e8abb537305884dd8ea77f9d8f
Former-commit-id: 280bc731ef1ca07d0fbea59d47ee0062fd807b21
Former-commit-id: 4a13279df1a4fc6315365aab4daf3c52e5fa5465
2018-12-16 15:41:54 +08:00
liyang
d039a6438f 将表格导入导出提取为单独的包
Former-commit-id: 022d07c06618417af8e2895dd00fcac3e0238c09 [formerly 022d07c06618417af8e2895dd00fcac3e0238c09 [formerly 022d07c06618417af8e2895dd00fcac3e0238c09 [formerly 022d07c06618417af8e2895dd00fcac3e0238c09 [formerly 3a6388bd7e36b1bbd3d22767b2dc3a4e462402b7 [formerly 15059226e8bd77dcbe7212699c6bab6b6ff9d385]]]]]
Former-commit-id: bfa445ba0136208e94ef7244f8bf127d2b186bfd
Former-commit-id: d9e3059e625371a01176c7fdcb34a25a5ea247d5
Former-commit-id: f543910387e755b14d40eec2b42eaed43c500d53 [formerly 4d3007385ebb14bf7ec659c68251af6358cc5982]
Former-commit-id: 19d3ef449fa36d92f5799987d6cda668c9b3534e
Former-commit-id: 91a0cb0497884cd435ff29d6b714e35b22eb9f4d
Former-commit-id: 0edac75e2cf32f0001191c3b3e9829bcd081ed66
Former-commit-id: b3cfe8d5c3432d308dad9437de878f4e22008ca7
Former-commit-id: 94ec0467d510f8506c5d5e6da7aa5f377c350cb3
2018-12-16 15:39:29 +08:00
liyang
20dcc66778 更新
Former-commit-id: a12171da79bf5de664283e6d4597563775c1f287 [formerly a12171da79bf5de664283e6d4597563775c1f287 [formerly a12171da79bf5de664283e6d4597563775c1f287 [formerly a12171da79bf5de664283e6d4597563775c1f287 [formerly 119b3a9dade5a4b0f0ae6a5f704208ecb4c78de3 [formerly 10239e8af2895132fa0fd71ab108847891c2178e]]]]]
Former-commit-id: e828ec18eae34256635931d1580ac9ad958fb704
Former-commit-id: c2ce864268f597cdb782d9b79b5755dd690d0773
Former-commit-id: 4c194d2f66f978006074346ffde4689317f01bae [formerly 810262e1ffb2c5c25ab00aa10377a3f428b31409]
Former-commit-id: b036173ce83075de020627bca3621d95473b150f
Former-commit-id: 38f0fb0dfd70d32ec2979e14e41eb2f29b5fd7e5
Former-commit-id: 98bb3486e63e997551c57fe0787732815f5bff50
Former-commit-id: cb26de635e0af16a26e8c96b8a278ffacaaf0b36
Former-commit-id: fd8164c83f1530d511915629db8d831088f1a6fe
2018-12-16 14:32:50 +08:00
liyang
67bbc7725b @d2-projects/vue-filters-date
Former-commit-id: 4f10378208aa67a5072be74c24da3d74ff327af2 [formerly 4f10378208aa67a5072be74c24da3d74ff327af2 [formerly 4f10378208aa67a5072be74c24da3d74ff327af2 [formerly 4f10378208aa67a5072be74c24da3d74ff327af2 [formerly c07c0f99b4a31dfc1a686002ad6b82976e26eefc [formerly 1a4246217c1cd6931ad915b546740c2e4f3ecf7d]]]]]
Former-commit-id: 76c50d24a2feab3f5e5711a7287e20ef5c767b8f
Former-commit-id: e77efd8622d1c0effdc47f385a700c37d1be7734
Former-commit-id: 95fc10c83c6de1956eb0d81fa7cc604016777bda [formerly 5cb0b573e2b6976e7ce8a2b3335a043828bb09d7]
Former-commit-id: 0918c2b1d4ca59dcb561888b8afa3c88e299a3c5
Former-commit-id: 39dad34618d230a9386de15046d013bcc0774d1d
Former-commit-id: 3c5ca48402581d7eb080843111b5906e6817425a
Former-commit-id: 7865ae783991f2df19684c58d6fd55f132383588
Former-commit-id: 87e4572ff7182eb2480f746c9e98f514c2f4fc05
2018-12-16 14:21:36 +08:00
liyang
17d8a70897 前缀改为 date
Former-commit-id: a7de50a0c5cb4b52d312f52754c963b04915048f [formerly a7de50a0c5cb4b52d312f52754c963b04915048f [formerly a7de50a0c5cb4b52d312f52754c963b04915048f [formerly a7de50a0c5cb4b52d312f52754c963b04915048f [formerly 881400792d8358d396ef093d9c057fe67ddf639b [formerly dcab6ba2e48a1f0b6a850ff6d833d338181751e7]]]]]
Former-commit-id: 37b3f5705798919ab3a6d78b0045fb865af805e5
Former-commit-id: 1ef37f5db55fd10650b066ec78cadff72019ae1b
Former-commit-id: b3f214e0620c26307ea5f62cf3bdd4a1bebc3114 [formerly 0b60de30f3e0c9be8abca715ab3f2db0ac2ff83a]
Former-commit-id: 584d8b27e2ab6afceb687aef3c6c92525e1f7df5
Former-commit-id: 4da9fbb42d117a1e4fda2d1e36b3db3d9c11936c
Former-commit-id: b4c62a79e03448524126a8c49c8cdb2c148fb841
Former-commit-id: 922607fe8153c8a65ac15dd437acb31ce72af650
Former-commit-id: 3820a773b0d91146f7b1eaaf3d5106ef4a6d0f76
2018-12-16 13:36:32 +08:00
liyang
6ec88a9b24 缩小演示页面 header 控件的尺寸
Former-commit-id: 5237db4b69ba38f3ba2c8e203e2e67ff9c2d0761 [formerly 5237db4b69ba38f3ba2c8e203e2e67ff9c2d0761 [formerly 5237db4b69ba38f3ba2c8e203e2e67ff9c2d0761 [formerly 5237db4b69ba38f3ba2c8e203e2e67ff9c2d0761 [formerly 29428b595d8efb7f2185d7b43508e9c8721ea971 [formerly 87faeb740c4f1a5d06668fa1eef4558b2359ef80]]]]]
Former-commit-id: c75865f24e8368763671cf33dfa6808b143052d0
Former-commit-id: 000e5bbff56fd311467a03fd6099ca21e019588f
Former-commit-id: c173c57f21f0211f98cd0b4dff43e719016fe410 [formerly d5c1bb320c744a0e713ef29965346dc8aa839d62]
Former-commit-id: b434b37cd43b3c6f4a23463271aa193e7fd855ca
Former-commit-id: 8e205e4f34577aab58185eae9a4a7b9f9b551eab
Former-commit-id: 22a89ced15888a9873ccc3d13ba69270d50b80d5
Former-commit-id: 77318db0931779b07d75f20e203ccfbc67bd61db
Former-commit-id: e187f04073b290ca24c26f192ab5a3e381a7638a
2018-12-16 12:41:26 +08:00
liyang
d14672667f 优化演示页面显示,帮助理解
Former-commit-id: 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly c126939c14dfc1f4de83826542d25b6742a0efba [formerly 0feb4c994c1b1ec96b04e19165d22f3d9b9798b5]]]]]
Former-commit-id: b86edf90b0d5a101666f974c0870383d4bddf4d4
Former-commit-id: 1fff3f00778fdc111a1afe6b510c2aaf9eaa90a6
Former-commit-id: c493552f0eec495528ad7fce12850accce9faef7 [formerly d269ed5b45a082222ecc68712255f8496c817f2e]
Former-commit-id: 5ee1efa4e3fbf9355d9715cf5ba0521934320503
Former-commit-id: f5ad3a4b65fcaef1387fe5ca7acf77ff7b10f15c
Former-commit-id: 079eebf234456b8b466d44f7513f2da9e43d4bce
Former-commit-id: 544e86957c428321a8461a2bba43494fa2cf00ba
Former-commit-id: 0505b45caaf091d3fad13337a13be7f612619f47
2018-12-16 12:40:01 +08:00
liyang
459af89c7e 优化显示
Former-commit-id: 3c68169e206863118588f20f40686bddc145144d [formerly 3c68169e206863118588f20f40686bddc145144d [formerly 3c68169e206863118588f20f40686bddc145144d [formerly 3c68169e206863118588f20f40686bddc145144d [formerly 1ccb1cee8b8fc74bd7f9aa0727390328b3564c12 [formerly fe0b39553f7125305a719395025854f9001858fa]]]]]
Former-commit-id: 7bb7976992e4ceed5882b58c925357a02385d61b
Former-commit-id: 2f66a885969adb564d488aea7310c41602b1804b
Former-commit-id: e0fdecc9c473163bb03a51f8bc0dd15f8325eea3 [formerly facdffc996dac5e9a2fb837c1b589a7720cafb9c]
Former-commit-id: 9cbacea58e103d30bb838052127c4f59feda348d
Former-commit-id: 2e686a4d7d2cc0c8476053471de0efdf9cd60f99
Former-commit-id: 1588e96c18ada37cfbf7475019725bbdd9f4a9ee
Former-commit-id: bc0a9d1d153ab2e8e1e2d9066fccda9921b8a131
Former-commit-id: 0a05d3db7a263084170beea3ee47cd7efa7dc027
2018-12-16 12:29:48 +08:00
liyang
e20159debc 增加日期相关的 filter 和更新一些菜单的显示
Former-commit-id: bacfe4e86ce0599752cc74916bb9547add6b0725 [formerly bacfe4e86ce0599752cc74916bb9547add6b0725 [formerly bacfe4e86ce0599752cc74916bb9547add6b0725 [formerly bacfe4e86ce0599752cc74916bb9547add6b0725 [formerly f5ed703f2aefb46bd7a6dd7dbb6d141cd43dec08 [formerly b679a8fecf5a7d908d20d57b1098d9c4708574c3]]]]]
Former-commit-id: 36c9337dc53258282bc83ed7b52a88c617a75a66
Former-commit-id: b418eed9356e5de890b70a8ccaa93ee1abbd30bf
Former-commit-id: e06310cdc83cd1c614e523f33558d2cb303ca81f [formerly 20341d1ed3372bfe16f777a177710894ca29f378]
Former-commit-id: 1795ddf1c595363c49c3d6530e2a552aa7906edd
Former-commit-id: 38c0384164faa36103bc9ee5d881cdacf367bbb4
Former-commit-id: 0a13e600fb5a8add5a282304dc2f26d35e711572
Former-commit-id: 5845a0b7620bd23f145b02cbe0427eb351792e6a
Former-commit-id: a8aeed67fd895c549600e636cf16094197c1891a
2018-12-16 12:25:41 +08:00
liyang
5e16818f73 util.db
Former-commit-id: 85a4564a9c26d25680e068390a9dce8081ff8301 [formerly 85a4564a9c26d25680e068390a9dce8081ff8301 [formerly 85a4564a9c26d25680e068390a9dce8081ff8301 [formerly 85a4564a9c26d25680e068390a9dce8081ff8301 [formerly 0c90f29ccfaf0af85cfee68a37e127969e1f403b [formerly 81d2e7a8b5e7b94b6707f2f7165948c23cb8fe97]]]]]
Former-commit-id: 4be8876f52078af7d2f09d5be200e14c4b103b9d
Former-commit-id: 0206f4b4d31c60ce01c43ceead230b7a242d6671
Former-commit-id: ca9b786629bc220dc77090732ec55ef682a65749 [formerly edc8fe2a03ccb155face81d2caa41898ffcc43da]
Former-commit-id: 9bcb79d27c3671cdf2efa9bc8bb3bc746b536f76
Former-commit-id: ca8fa5fae99b3c2f29982295366d3b57dbd69ea8
Former-commit-id: ada47bd1e953a2977d08741b07f6dfa7a43a4c0f
Former-commit-id: f7ae61fb796145f9e7cdc39c161876e4b1a70c3c
Former-commit-id: eba7ec27792eebd4cc8cde53318b952a92f86a06
2018-12-15 09:42:16 +08:00
liyang
f8cc7072aa 修复语法错误
Former-commit-id: b792f259a85060bc427414a1451d7218e8e099f7 [formerly b792f259a85060bc427414a1451d7218e8e099f7 [formerly b792f259a85060bc427414a1451d7218e8e099f7 [formerly b792f259a85060bc427414a1451d7218e8e099f7 [formerly 6a9e02c169cc62ae7f62e1f479aa2fc1eb7759b7 [formerly 7524303cc8515da2de88d785b38eae96a3cc501e]]]]]
Former-commit-id: cc0082f2dddee9629e13a66d8458132f4c1529fb
Former-commit-id: 1e88751bbe455a8ecf939f0c3745bd6005d3b549
Former-commit-id: 93b5b7cd4d80da8f81c4985e302ba317c3b8ef30 [formerly 6d5ef8bec31f4fa776f9d797f381e57722a0db10]
Former-commit-id: e4001eea6899889fe9f50194e23e320c0480dcfb
Former-commit-id: 249fd0bd5ccf93dc4a22fc0cc6951dd039151349
Former-commit-id: f35cdabda6780556b92d236ff7e8d359249203c5
Former-commit-id: 4593038573e235b2eb9032d858409e020b7ee667
Former-commit-id: 37b953c1c1657ac5582759f7e8bb63efdb8d90d0
2018-12-15 09:40:54 +08:00
liyang
7384f98e2d Merge branch 'hotfix/env_more' into develop
Former-commit-id: ed72e8707a8196c2fca54af3f243e50fc563cc20 [formerly ed72e8707a8196c2fca54af3f243e50fc563cc20 [formerly ed72e8707a8196c2fca54af3f243e50fc563cc20 [formerly ed72e8707a8196c2fca54af3f243e50fc563cc20 [formerly 5a8e9a01a65623c58efb2022021133720be82239 [formerly 32f22b3897792fd904ef53d18e36c06f7b768a78]]]]]
Former-commit-id: 350ed0d6af2253fa61e3d0c330ae8c54a0c707db
Former-commit-id: 8c18f86703e9e36962d0591a17120807afd60d66
Former-commit-id: 27c300f88a68cc4d9e3e84ba2f4e8d21aba23a0a [formerly 147593ba14aebdb85db9ecd634b27ad184c5b82b]
Former-commit-id: c77c88b9ffa862ee95d4874d061bf5e545de892f
Former-commit-id: 050c3ab00973fcddbcda76d35178706d91772cd5
Former-commit-id: 514b523fbfe8acd877a08cda1f3cc43e9788ed10
Former-commit-id: 8185f87961099032f99e0f78d68a93b17c2c7535
Former-commit-id: 00e1280b56dd1ee74f639170b31d1158b8467c37
2018-12-14 11:16:18 +08:00
liyang
24b7a97c1f Merge branch 'hotfix/env_more'
Former-commit-id: dac2f0b54474b03462639f386c8a740c2f148784 [formerly dac2f0b54474b03462639f386c8a740c2f148784 [formerly dac2f0b54474b03462639f386c8a740c2f148784 [formerly dac2f0b54474b03462639f386c8a740c2f148784 [formerly 516bde6adb22a12b145c52a078605d1d802b4faa [formerly 8ec5b4a61cd282705de8d8811016bc7148a3d127]]]]]
Former-commit-id: 3a1c6ad1cbb870320e3fa6d7f4d2da21b70e2050
Former-commit-id: 4350634d6dcf90d98649fe54c5bd60d97c7870e4
Former-commit-id: 9120ab262b8933396218b94d3073597d170a4f13 [formerly ea09e17f0fe3be6042e8f447f9cf3106fa393f1b]
Former-commit-id: 1b194602031d169ca2582984e12666697f21163c
Former-commit-id: c27c5e73cb3c2a5a85d265dbebc3562398039386
Former-commit-id: ae3219d55de2b5afef8227a489e4825ccace1f36
Former-commit-id: acbd0a874dbe8b369001bca2e6f7af8169eaa1d6
Former-commit-id: 57c2f8c79eb555d4c2464dda2189397e1722548d
2018-12-14 11:16:17 +08:00
liyang
e563d9317a 增加环境信息
Former-commit-id: 4dae4bb78d76f7f938f96cb7e8d70ae3e0f3ff9a [formerly 4dae4bb78d76f7f938f96cb7e8d70ae3e0f3ff9a [formerly 4dae4bb78d76f7f938f96cb7e8d70ae3e0f3ff9a [formerly 4dae4bb78d76f7f938f96cb7e8d70ae3e0f3ff9a [formerly 5e20e47a6957a82b94b57af913a9a45a58fa5281 [formerly 7b63f06f2da85d10f4df205ef81a25e2fa8a7933]]]]]
Former-commit-id: c9fce450c6afe4885d7105af2145fd597e2b7142
Former-commit-id: 837a71bd1de9152b2f22c7d2b310e6ab690cf563
Former-commit-id: e801081f67155ea604b9fbcfa8fb5f935d44189c [formerly d46bd2dfc6214d15783c2c9d1cf31e2ba8326ea7]
Former-commit-id: 43308d8ac292147918a94fcc23c20f992cf3f4f6
Former-commit-id: 5c2e21a21d6dbc1628f0aedd2366f6a96184c428
Former-commit-id: 8ac1d58beb3d54e8674e900cf0c9b15110eb8ed5
Former-commit-id: 9fee2dfe7f53f06b403f7a6a9a9d6585517d9518
Former-commit-id: d1971ac9f64902e97f4173008c87882e5a026496
2018-12-14 11:16:10 +08:00
liyang
a2a2931af1 issue演示页面使用mock数据加载list
Former-commit-id: 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly d59731e1bb8d0baa4b90d8e9c73f44c7f8ac4441 [formerly fc1e18dc44bd90924c6c02e4669197fd8502d18d]]]]]
Former-commit-id: 91557cbbc0e34412d129706b10375676a22562c2
Former-commit-id: 0905517334520418154b45a950ffaefb71171dbf
Former-commit-id: e71ba11d0f8ad3418af5d3b2c464b9a3a1042598 [formerly 8a7a02d1fd02f1b7828cdd0b63455aa7e51d408a]
Former-commit-id: 75e9f65dd0f5a99d6d9581b72f25d8429ebcee31
Former-commit-id: c63405062ebccba334a6ac9e1135364d297bdd0b
Former-commit-id: 3ddcada8fe0fb48e897c03c2e0f72da63bc17107
Former-commit-id: de1a37a99bb6b3f594b042bab01bb3ba5778cee2
Former-commit-id: bf4b3f3e405a31d9542c59f18784a8e080a9e31b
2018-12-14 10:42:43 +08:00
liyang
08b37db740 去掉没用的代码
Former-commit-id: fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly fb450118664f508e7be582541c49cc622ab72556 [formerly 4a7762aded9043a5399419e26d290be536062b6e [formerly 1fed2b0c71992e1c71db85dc3b50bf291e49b7b3]]]]]
Former-commit-id: a9866dff1ed147e4e8d14afe7f9a099cf2dc97b4
Former-commit-id: e4e72e484190486e76da71a5ce940793cee5aacc
Former-commit-id: 7e71b32d0e43af89a3fe8b0186f015d93a2098ec [formerly 7061988e02c8889f8835450fe568c9fee851924c]
Former-commit-id: 2996c6d457f31d784faa7fbc5dae84d7854c8c62
Former-commit-id: 4822fea0354118865b066a45fbd704128e86da5b
Former-commit-id: d52eee31ebe4717d8953e277750e966a5fbcd92c
Former-commit-id: 54682d51bb436fbca90adfaefcb2f97c0f535776
Former-commit-id: 12b9d8eceea4554ecad99d00fa166d51924efeac
2018-12-13 13:31:53 +08:00
liyang
aac8020433 Merge remote-tracking branch 'origin/master' into develop
Former-commit-id: b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly 5d2850b106dc1b50203c5ccd07aeaaf5e64abefb [formerly c47bfaf61c987bdcbd67d5ff33cee57ceb85520e]]]]]
Former-commit-id: 88ba97f79d648bb483a7c17f2b5acc9f52094937
Former-commit-id: 0abca3842a16aec2ddac7b1f4c87ee075e14cf82
Former-commit-id: 577aa39857ded4d6c2ebabb1908ec4774522fb9b [formerly 3e1b8940baf7bef31499565c7b3176816622652d]
Former-commit-id: aaced5d0b59d752cd9ae2509f4ac0c9ca53801d4
Former-commit-id: 1d26b050bb8a3d4c0b0ec52ff1b293ac916c9196
Former-commit-id: 5cff9c3ba978c84e295085e17ac0bfaa0094679c
Former-commit-id: d6b793809fb85991daf546fb57ce4618b0136edc
Former-commit-id: b38f8d0b0f421d1b2ab672ec9e02c701bbb1b79c
2018-12-13 13:24:28 +08:00
liyang
15c4cffc65 Merge branch 'hotfix/mock-suit' into develop
Former-commit-id: b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly b853feffff6368c305aec2ac8c9befdffb1866e3 [formerly 3b2dabf1723cce258edce353af9df1dbc560a390] [formerly 3b2dabf1723cce258edce353af9df1dbc560a390 [formerly 3b9658bc2cabeab6f2c44868a3dd33ab4d8ac754 [formerly 40cccd4355392058b00a4dce4a086ee86bab225d]]]]]
Former-commit-id: 7ea6c9718088202c6d577ead38b43ba276f40631
Former-commit-id: 4b2804be3735ddc0c801e55e6c7631143059c163
Former-commit-id: 1e9c1f8c221ad56e77a7981d2875346ea1b5baff [formerly 3d1495e181f44f7b3f5f7aae6d9367be4f1eee5f]
Former-commit-id: a5aa79828b945130298a22cacd54317d720bceb6
Former-commit-id: 6807140cea1ab7e4a382bd1e99eff3fd1a498313
Former-commit-id: e21532c43a3134e7087974b1ffb35948eaa9e66d
Former-commit-id: c2252a6adad80610f2350963d72bf06b159da443
Former-commit-id: 4d0f698aefaedc4daf248b96e768683487c10b29
2018-12-13 10:30:04 +08:00
liyang
b2d52bb33c Merge branch 'hotfix/mock-suit'
Former-commit-id: e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly e0594bb6a7fcd66196985094a5c30b2f1d56e00d [formerly 3233bbf8231b1e63f7c978ae1214ed48224eafc9 [formerly 937e9349ba90ec03e639e8d63539a7f384c385d3]]]]]
Former-commit-id: 473c82c143373f5f21f3e12772ad96b12039bb84
Former-commit-id: b158a89addbc07d8a29e73197d7425d6343d45e4
Former-commit-id: 74f425887c251da3e748588971a9c551ad0e7c00 [formerly 266c889c322fbdc108ff0b7a749571e02353375f]
Former-commit-id: 384dfc188d100face6f5f3b7947adb3675fa9d2b
Former-commit-id: 33becace2f0f845ae5797e2e1a732fac9a6dfa9b
Former-commit-id: 661e031b1ca40b556fcdd0a988844ab890181372
Former-commit-id: 43f6dc48ec6c87ac463610a05ff7e547569c5484
Former-commit-id: d5fda10a9e425941d452926776ba6004044a0617
2018-12-13 10:30:04 +08:00
liyang
56223d9195 更新 mock 设置
Former-commit-id: 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4 [formerly a995dd4aa6a5745242d449c1114d41592437d318 [formerly 84ceaffec1514357a65944b2b2af6ad55eed82cd]]]]]
Former-commit-id: 7fff6c3cca28a5b09ebbdb395fb250487bee6da3
Former-commit-id: ed647717531cb8a8d9ccb276c01986b5f8af7653
Former-commit-id: 7afd7c7718a1302fe0adc74bd06a1af0992fc305 [formerly fe10b57a2e3e9738867df9c88ec22d51d271891a]
Former-commit-id: 8ad7dd5c5e2ecf759e0ffd82e296658b5d735dd1
Former-commit-id: 289a192ca0d76c1e99dc1a9786a71580f705a1bd
Former-commit-id: 06de0f519d511e893333553a3a25d4388308e1b0
Former-commit-id: 0f21f9ff42abc15714f0622b0de1770509e19052
Former-commit-id: bbef35694d434bab48f2fcf49d7ae459fe7bff2b
2018-12-13 10:29:56 +08:00
liyang
b1afe31a05 更新mock设置
Former-commit-id: 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly 3561c0b2ab4034d5d5a89b6a2f35de618c147c2c [formerly ac1af8ddc9819b789fd70b8da10ee223faed6e69 [formerly 22a45253b3ddb18715a39500f9bf5b56e1b37c6e]]]]]
Former-commit-id: acba007c5344dce6a0122676027ba0266c5636b0
Former-commit-id: 33b90caaf8810a029cf1f051b4b0f30f7c328309
Former-commit-id: 6d602d737c16c5eda5f8e2448acb7c83c8df8c4c [formerly 415683706be473d2888806175eec075c57798e0e]
Former-commit-id: c5285636ff550374708ba4346fc6e98eb08d32e3
Former-commit-id: 0ed99aac2efee06256bc94d52eac820ca24dda35
Former-commit-id: d8a75b3f1da2a75645e0965f2b278bde10ef16cb
Former-commit-id: 8b424ac8ef5df06cb89d76e4ba3a3fcdeb34f113
Former-commit-id: 93f866cbfcf129ed0f0393c4bf567a45c6a17568
2018-12-12 22:58:18 +08:00
liyang
82c7f98e7c 优化 d2-icon-select d2-icon-svg-select
Former-commit-id: 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 23048d4149234e89b004c3e372329c6f98761758 [formerly 275123feb74c1c623162bbc40297f0aa7bc86fe0 [formerly 61a358238bfa2687b4af53abb16f97ed66000360]]]]]
Former-commit-id: 49fe5afc42637c517173105f33df8c8870d7fe88
Former-commit-id: 9f9153a76016993bdedfd6e6f7732e668b2047ea
Former-commit-id: cf1a0a4bf0e33deb3167c3583a4b98b18dc3246e [formerly 9612610849efccc456868c65de8f6d78fe1eb690]
Former-commit-id: 57967a2dcda29767e87196b4d82e433e4246e653
Former-commit-id: 85c96b419d24a43117c75a34fcc8454b57f72336
Former-commit-id: e58a7e88a7925b5e0761f919fa2f2160a350b681
Former-commit-id: 94635a1b758e730f362bf40949676cc2b320bf55
Former-commit-id: 6f412615cab141a24d32e1c259f949c13f78c6b9
2018-12-12 22:01:27 +08:00
liyang
d7a2b04f45 select-svg 基本完成
Former-commit-id: 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e7f1a63631ec0370683eadb16a9203b835f293d [formerly 8e6796da5ea041da9ed2fcbf89e84c91e2b7b230 [formerly 226e52a0e20b8a9cd011e2a2b0b0da2c25b9db4b]]]]]
Former-commit-id: 4fd47532611745f6cefcbbb3f9f9409c6cbb978c
Former-commit-id: 4a9f59b88aa4d6a164010e2cf80a20a6ad704efb
Former-commit-id: 8b2408f7205cf68a8920e6287ad7cdc6da541d13 [formerly 50abaafae7d85ed49404b471297543a95c773e68]
Former-commit-id: e9c5c24e393c7cc06f275b8249a1ff10e5aea3e2
Former-commit-id: 133e32b20973babb6cb2815c5f88f925e1d68cf2
Former-commit-id: 5b4528bd6e10f53f5ca19948af5fbe40a18ae4d3
Former-commit-id: 429cc57574024a3d073657f7c773104ec29ced39
Former-commit-id: b78065290d0d26c7fe4c6b2fd41288fb115686df
2018-12-12 20:57:40 +08:00
rongxingsun
96cc681731 layout取消动态加载组件
layout的组件动态加载会在刷新的时候出现先后顺序问题


Former-commit-id: 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 05f9a31f66779b347e247fabfe54c9c6fcafd952 [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5] [formerly 7a5be59da166fc5b831c4be55e34d8932e3e4fe5 [formerly af8c9b2260b28367beee903d7107ecfdefdd250d [formerly 31e6128abd4cdf44d8bfbb026c6846642582d32b]]]]]
Former-commit-id: 03dbfbb36f897504d6376a471967c5cd031b757e
Former-commit-id: cf7475f76a0fe43fa7001f4c25d75d0145c1ddab
Former-commit-id: 6e1cb39513ee655df40e66ee7ee586deffef1cc8 [formerly cf6873c601be9b5bfe0ea7aa4fc32a2410cc2393]
Former-commit-id: 6d41c5b53915640ea03e07263af12886d47ad46e
Former-commit-id: 7314042040ddea1b9edfe9216fe56cf8b4b0b881
Former-commit-id: 7f8078fbc20b2f048548217642c9fca1565d6fbd
Former-commit-id: bed1f60c17d2d6f3479e2d64e6cb0813c29d051c
Former-commit-id: e6d4357369acbd102fecfcf316e3842ec9f5f7b0
2018-12-12 14:37:46 +08:00
rongxingsun
28e8bcb897 Revert "尺寸刷新的bug"
This reverts commit 328a9aec42 [formerly 85cfbb927a6158ff2b48a75473e4b15e42e60ebe] [formerly 82d76084b5209a2fa5a8cc99cc4903d94b74d193] [formerly 03982b2b77c19c0688b96a3cc44522067f20702d] [formerly ff33ba85b39233d96d91f6abaeeb23f270031d97] [formerly 2c828d157eced3bfe3e44466e34f25be78175819] [formerly a2683dca11a10f4761e9192f46a1d7c9361e979c [formerly 4616fa95c3efaf5e84edd754cff9fa213e2f17ed]] [formerly b9ea8d1cffa6c02ea9e9bed2f13dfa9361927c7e] [formerly 49b1f49e3164183b67899541dfced086ecf4b806] [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly bb735b1c6dedb0243f3cf9fe2f5abdb30c91a86d [formerly 8e127fdb34322627d335af65e8e559cdb76a92fb]]]]]].


Former-commit-id: f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly f8ad249daa70cc05aa3283feaaa4e218739daf0e [formerly e2922802b27a664b07de229beb8dbf7d8126d18d] [formerly e2922802b27a664b07de229beb8dbf7d8126d18d [formerly 7bae0f13cca1ee2f3963f19af11ac3ea2584fd6f [formerly 6adad48ad4a5865e68e22b32f2e08865ea45ecf8]]]]]
Former-commit-id: 95a2606465d49d7de1adac0d48747039c68b8849
Former-commit-id: 4348615c4834deb9a5ee495d891e64ea997fb79b
Former-commit-id: c1bbf20c099d1e3e9596530814a31ddeffc2bbb6 [formerly 54bf5a72159c71256b5d077a25b7fef9acc47d4f]
Former-commit-id: ee7bdea10532029c70c6b538ea74037413b5cdfa
Former-commit-id: 383ac7c2a1090834695385c36c187b6e0e0276eb
Former-commit-id: 106561c387c996a73af122b9f9f354ec5de920ee
Former-commit-id: 7a0a7f903e0455c74d6978c9443095c7fb2c99b8
Former-commit-id: eba9c0a7d34ca58138f80f4c14cbc2aa1ab76e2a
2018-12-12 14:23:15 +08:00
rongxingsun
328a9aec42 尺寸刷新的bug
用户设置了尺寸,但是刷新之后第一个页面尺寸还是默认的,页面切换之后就有的

Former-commit-id: 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly 51fc5d8bee6cb8b52e4b0242cd4393d5606c1f99 [formerly bb735b1c6dedb0243f3cf9fe2f5abdb30c91a86d [formerly 8e127fdb34322627d335af65e8e559cdb76a92fb]]]]]
Former-commit-id: 49b1f49e3164183b67899541dfced086ecf4b806
Former-commit-id: b9ea8d1cffa6c02ea9e9bed2f13dfa9361927c7e
Former-commit-id: a2683dca11a10f4761e9192f46a1d7c9361e979c [formerly 4616fa95c3efaf5e84edd754cff9fa213e2f17ed]
Former-commit-id: 2c828d157eced3bfe3e44466e34f25be78175819
Former-commit-id: ff33ba85b39233d96d91f6abaeeb23f270031d97
Former-commit-id: 03982b2b77c19c0688b96a3cc44522067f20702d
Former-commit-id: 82d76084b5209a2fa5a8cc99cc4903d94b74d193
Former-commit-id: 85cfbb927a6158ff2b48a75473e4b15e42e60ebe
2018-12-12 10:09:22 +08:00
liyang
08127b0719 Merge branch 'hotfix/api_flat' into develop
Former-commit-id: 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 6d5b50aea080ece3d33d7f65df05442140fecbba [formerly 7f04c6f9bafb20b7c2686be90078e478919661c4 [formerly 521ff85eb96bdc3e49504d948e09085a96caa38e]]]]]
Former-commit-id: fda8c40ccd993f75cf8492ebc288abc39cfceeb5
Former-commit-id: f568cbba4c3d7c1e405e58a03041d56e2671817b
Former-commit-id: cc65b229be1d9e9063de60b85be5f3d4e05395ea [formerly e7ed80a376965f5a69a315e870ff77010d7eeb71]
Former-commit-id: 8ee1941d990e14d54a0616cddbde319bf9ceea50
Former-commit-id: 60b97a2aa47bf6f38cd512e2691caec81d0294ac
Former-commit-id: 423e0f3150ee79ca2782295c327f85fdc188314b
Former-commit-id: 040f18b7392ce5f1f83962a243432ed90ff3c27e
Former-commit-id: 9fa197cd41b3fdfab4cba826c6a05be207b10485
2018-12-11 08:48:45 +08:00
liyang
8104fb1db6 Merge branch 'hotfix/api_flat'
Former-commit-id: 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 22d1f88daa1ab08194425a1def844867700862c6 [formerly 3b01361156a8b46b4f4fdf0d352ed95f4dffd090 [formerly 7279190907d6f3e08cc0fa139c807db633a90266]]]]]
Former-commit-id: 02c0d67963b8e9b44a3eb8f47af3acc0b792f5c6
Former-commit-id: 7927a43ea565f1212d8c9afd8443ace54fcaa0ed
Former-commit-id: 837ad74b2bb69eeb4596363c8fcebe9504d0e472 [formerly 655f9f32999ef86372f9b6444f83a8e6e2b2fb5b]
Former-commit-id: f2d5d6a409633d26d3d071bdddc59b946f04687d
Former-commit-id: 55882fd86649094099af5d2ff48ea14064665417
Former-commit-id: 811fe296d0b6ce21122386c693beb7d5bd1824cb
Former-commit-id: 0fed6d95efc7f8b87da04a0483772fd6448e77bb
Former-commit-id: 917b93d2011ced4b3ddec5376c5718cc1337143b
2018-12-11 08:48:45 +08:00
liyang
3e9adc118d flat folder
Former-commit-id: 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5 [formerly dddeab643660d9536ccca28a7b131064862a0956 [formerly a60252b4bb0f8e4357c8fb5d96baa92b34348fd2]]]]]
Former-commit-id: 95c2b6d11f3fca5c35355f6e4462fc48bd75b837
Former-commit-id: 859b43e95cd2d96a6fbccadef42b5ccf030aec0b
Former-commit-id: e095e2d838b165bae833f949655dcd0616dd36a8 [formerly 4457c0c04c4c7dc570cc2fdc8b6c1d9ab63d4e7b]
Former-commit-id: 268d04b33f65537fed5e70f86a765e9d65569458
Former-commit-id: 6895dc7270ebceb21c77c2663ab3ad912b26a02c
Former-commit-id: bb41e9fc1a708ff94371c4c2a7cc14bd6ed40049
Former-commit-id: 5170da37ca33777f225f5ce6e2387ed6d0b1741d
Former-commit-id: c617fbc5781e40482af82fa6bb8ea5105c3e5d9c
2018-12-11 08:48:38 +08:00
liyang
9ea2ca80ec Merge branch 'hotfix/mock_flat' into develop
Former-commit-id: 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 4f12558d9013ddf94178f383155963d2dbc0ce74 [formerly 023d3df30a12391b09825cedf5bf9c64501bd8ab [formerly 235bb7b12ddbf799880031aa01077f415171cc23]]]]]
Former-commit-id: 358d8e104fd4c92f8237db9f4b662f0b29996ffa
Former-commit-id: 8a3821fb8292c16ec93b759fe69eaf476417aeb3
Former-commit-id: a908004402917c9b7f049ae253ac1ae2f789f5aa [formerly cd226fb245fda6648f52caefa9d6d2d3edfa38bf]
Former-commit-id: b934c1367c98ea47e7dd9e8d8571a2a401ed1c9d
Former-commit-id: 3e87e32d0766b09cc9c5b7375511e8612ebe519e
Former-commit-id: 2ce4bff0d9e276b303241386079a251094b76cf4
Former-commit-id: 8ffad4aa0d4255a84023e04670424fa9d1df0217
Former-commit-id: a1f754aac9edbe5669178dd8b1100b24c02a722c
2018-12-10 11:04:53 +08:00
liyang
a86c55eb89 Merge branch 'hotfix/mock_flat'
Former-commit-id: 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly 14f12c6ca066be71474e08a5d7dcecdaf7702b9f [formerly d65ae43963842bdc56b7d63b97db3eaa1907c686 [formerly 1119195197803dd3a3316de917dd02899add4d83]]]]]
Former-commit-id: fcc844dab0e8242436a6520fc241ebfb92079323
Former-commit-id: 94200ee18983b3a2b3d82b35d293625cc1c631af
Former-commit-id: 800f78f70bf9638edff6f274f7d914af1ac7650d [formerly dc26df92d7e7217855f9eb20a4b7fc91100ad841]
Former-commit-id: a9cb0fb421e2e43ef279ada047f91d256435dfe1
Former-commit-id: fdd71672b20dd5068ddfffac18adcc39a975e7d9
Former-commit-id: 76e470db75c164f3b52f55cb914d833eeb62b5ff
Former-commit-id: b39460780aa788015fd0ced2ef3b989e36f409b6
Former-commit-id: 16cd632f68d46f7f63e9e2f74ea5391339bcb556
2018-12-10 11:04:53 +08:00
liyang
0cf23cba57 扁平 mock 文件夹结构
Former-commit-id: edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly edb8e0819f6baaf6d19d752916fd746f9062f6fa [formerly 43d43484c561dfb366be8753aa5b461102e522f4 [formerly ce97e5f40c2e049145cace63cdc33c1032d444de]]]]]
Former-commit-id: 089a1e97d20d590cd810555ddb5093be36c4927e
Former-commit-id: 396e69f142ab127168c1ddc23351700d3f950b10
Former-commit-id: 9d77bdac87df7ec8c2e89a91218039cf4782f7fb [formerly 3c3cb317e3111c161c3e0f7edd33f881c23a56af]
Former-commit-id: 594a6423a0489a0c45c995390472f8ccf9aaaa4b
Former-commit-id: 2ce9acf12176cdeddbd0abfe54919e4cbdbd046c
Former-commit-id: 9fac2de7e4e93f2c107443b2e4cf7d9d15e2c3a7
Former-commit-id: f8fba332b2c45d1249fcf9aa4037262afa6028bb
Former-commit-id: 06b541ec993f9fb02646bbb8cc01099a45371c94
2018-12-10 11:04:46 +08:00
liyang
c10be83ac9 Merge branch 'hotfix/module_index' into develop
Former-commit-id: b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly b86c9cbc286c3e33e7aeb1023e625c78cb5e676b [formerly ae693b883d03b6dbeaf890b8f8399bc00613eb7b [formerly 3d0f191ed00bb60c35da9e4795be45c12ae94cce]]]]]
Former-commit-id: 8ee0b500f9f4c47fdf2bad0df25c31dbd6c5345a
Former-commit-id: 21d4c18d67d7ff8eb52479e84169fa1a2b5f2c95
Former-commit-id: b5cfa4558659b07d6b35494b127593b2fa3f9949 [formerly 7704295cccd6d36b7942d5e1bf1130dfbe85bc1b]
Former-commit-id: a3ccbc558530a951ae4924753bcfe39ac87be22d
Former-commit-id: 0fcc97a04f2481eb65b406f279d192870eb3b1b6
Former-commit-id: ac1b85539ad90ae766524c2c9b4d49999c7d6b7f
Former-commit-id: 877e491cd7e24d3daabe677c7a52654d778f36dc
Former-commit-id: f608cc6fccdb5522d2e61c9fada5d4db89857106
2018-12-08 18:52:25 +08:00
liyang
d4197f4569 Merge branch 'hotfix/module_index'
Former-commit-id: 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 992b560cedfeccba49f70f03d65031b596b09e6c [formerly 8a994fbbeb86000f86c396c8a3ca9e3498870958 [formerly b744466759f626e749132ebf2c5e81ef4e34e3f0]]]]]
Former-commit-id: e3c27c70ebbd5778dfeab31833b336a25304f2d0
Former-commit-id: 74db91270cd182f86139f5aaad6ceebde256129a
Former-commit-id: e3427a7ef289292fc00fc321297b4479c2135ab3 [formerly 870b67918e12046862770453d36b7d26291ff583]
Former-commit-id: e87d609da789038a96c9252cd87f38e21e34ec49
Former-commit-id: 10f0981446128b2f6e70a0ecab9ca253664e18fd
Former-commit-id: ec9c288d34a5d66429ce07f0788e920559f40d32
Former-commit-id: fd2f0dd665cae772458868da11f9faaee40d99d6
Former-commit-id: c1b03e3ae0b6533aacb7112d8ba1c3604a829c81
2018-12-08 18:52:25 +08:00
liyang
00d9b3dba8 module index 和菜单使用相同的路由跳转逻辑
Former-commit-id: 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly e996a77cf10a373f0e0d81721424667dca65af31 [formerly 6c1273298c08f1b9cf2505992ac7b6f0de8e4588 [formerly f64555e2dd133fe8d1b61c4502c91bdc546171e2]]]]]
Former-commit-id: aaec64a1729363181302bb856fcbe64e243f9871
Former-commit-id: 5cfded1e6acf2610eb1dc9ca11f84fcee0def4ab
Former-commit-id: 6db2d4d93f7809ff59f36381d18e660d74f73d4c [formerly 73a93e0b15176202f143a9a57794370a58d0f9cf]
Former-commit-id: 626c50b4a567eb2621e7e071aa24aa274b4d8dd4
Former-commit-id: 3f89e6c8f9e483b8b6cbab944cff1b808db6e4ef
Former-commit-id: 5d356777464c6aa5ff849c622c87ccbbc3831249
Former-commit-id: c01dae77899fdf8a5f12c0edd1d369458ccd767b
Former-commit-id: 611bd3819a80713ab49e28f4bb609eaac1f3bf01
2018-12-08 18:52:17 +08:00
思维空间
7c12c19499 Update page.js
关闭不缓存页面时将导致findIndex返回-1,从而影响到可能需要缓存的页面.

Former-commit-id: b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly daa045df580eea9044533854db79c4e1d2df8e81 [formerly 2376d2ff14a8d7f390957e7fc188ef969c95e233]]]]]
Former-commit-id: d96a65bf3fce18605161d186097966b5f03171c9
Former-commit-id: a20a3689e188b55e6b559bdab3706d66bc502bda
Former-commit-id: d9703316b304cbc1c67492cecd3de57252865861 [formerly 0535a169e91d3af3104f0e0ad6ca5e81de09e909]
Former-commit-id: e7eef6f66b4867bbc28ae2e369f3bfeebe213391
Former-commit-id: fd23177aa47c13b7d28e253ede8cf0e9e2f482fd
Former-commit-id: 7ef86e92237fb24d70eee9f79729b580125c909d
Former-commit-id: c608e97d7e6687a0ab67d17c750f736cf512136a
Former-commit-id: 67df9fdb44662647029a97be4f23c0277c799f60
2018-12-07 14:25:06 +08:00
liyang
9f67008854 Merge branch 'hotfix/contributor' into develop
Former-commit-id: a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly a9c3288c0895dda8d68751d3d2bc5232db0ef427 [formerly ea3026beeaf90868c2c63e057bc0e7b2b3273150 [formerly a527e5a27605575e9b4a9b485ed17073db4bf9d5]]]]]
Former-commit-id: 56eafec4afa3a841b35ecd61398cba8a49698877
Former-commit-id: 3811c17f54b211e62786caab390dd8dbf10d18bf
Former-commit-id: c483be9312351f0ed87cbd0187cb4a1421b5d845 [formerly 762cce6de374b8dd8073b6b26954915091892bd6]
Former-commit-id: 2625e4927927b68653091af3cef6b26a879cfbea
Former-commit-id: 5587e09155495ba35d733ed6e4bce1a7cce31005
Former-commit-id: 1ed2eeba0032e762247539a39141a68b180089d2
Former-commit-id: 24087ac0d5cea5b0f91dc75383f592eb1e35d0d9
Former-commit-id: 7d8bcc74aa959d3bee0be7f16a52ebfbc7f27015
2018-12-06 20:11:42 +08:00
liyang
b8e33d0013 Merge branch 'hotfix/contributor'
Former-commit-id: 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly 66c24f3118396ac911cbad16722c87faa81d9112 [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13] [formerly ebb83a6d15fa5b8c5ed9e8a70373082d31181f13 [formerly 5e0d2fef774c1b3aca1ad8ca3a4b486751539d1d [formerly 13393e66e71ed38eb93435e4cc626e753bb6d048]]]]]
Former-commit-id: e12fe642a940b18f9fabcb62318627b983ca647f
Former-commit-id: da4a020a242a88b97c47f6ff78122a9967504233
Former-commit-id: 5d5d0ae9b46e5d6ab1165b2514e79cd2dbcad3f2 [formerly 58eaed862638ed9faf047c97c7364dcc58eb523c]
Former-commit-id: 204e9c55b9f8f4ad41ed765ae57e2eaac746ffa2
Former-commit-id: 95a4c8c9cad0dcf2c94ab653114874921e42ac23
Former-commit-id: f60f62c5e936edc8ddc86db3c2983d57b7c003a1
Former-commit-id: fd76fc25a4eb992f6536ba2687b4a648602d1289
Former-commit-id: d69f3b1fdbd620ea793c0f9af34e3a68fdb0ff1a
2018-12-06 20:11:42 +08:00
liyang
8ddadadaee Important contributors
Former-commit-id: 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 059b38dedb84fa3eecfe378bfa1065a7526d5be0 [formerly 6e1f0523d51dd33958dd54cbcac3257252bf6e2b [formerly 22bd945a395aeed408f28e280a8e33545619231f]]]]]
Former-commit-id: 6fed1b84a5662646773af56a4bf97315b478c74a
Former-commit-id: b1c879e14bc8860d766ca82c70e096e75e32b40d
Former-commit-id: 924e38621f0b12e39415d2000691f846a9c928cb [formerly a9596b62e63452abdc3b5c17f46437775c8a38a5]
Former-commit-id: d43c7059f24a5db7eb677ae60cc5f8877256b6e2
Former-commit-id: d1d1f213f620541fa8c76e209b2945feb06355dd
Former-commit-id: eaaed17fd7a13c94fca9d35bea4a29af05d35f90
Former-commit-id: 31134849fec18c630527c73c0fb540e1bf74dd46
Former-commit-id: 03f9a4cc2988eb4c0fbd165d48ad3e0300febaaa
2018-12-06 20:11:34 +08:00
liyang
40a79e66f2 Merge branch 'hotfix/requireAuth' into develop
Former-commit-id: bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly bf6fa5497d63beb19ddf19dc70b5a622470dfceb [formerly 767f24a44cbf4c52d6572a4fb0498372688efd1c [formerly 4ec154f1633d84d570d65da4dc973da075089fb5]]]]]
Former-commit-id: d9b628aa1678e2ec10ab420fb76fb6ce181102cb
Former-commit-id: 87e71a1ac8e4683e43fe914ab23bb82ac5e83a57
Former-commit-id: e31f2c8ea0b4085b93faac92a80c2ebe200faa0c [formerly b1d399ec58010f847ad7087107b2a7e92e8bbdb1]
Former-commit-id: 8ba07021a8c1747a3d81f15c137b25877079b133
Former-commit-id: 951a4aee02ef60bdef59cf30dec8f48633f5c2e1
Former-commit-id: f865aa1eeade023c7f9e69d8aa30e35c2e22ae90
Former-commit-id: cab6ad9316cc583d9c09a6902278a7bb537b5f31
Former-commit-id: 2e41c18b173ea3f2034cf11bacc8de5a002864ed
2018-12-04 10:18:49 +08:00
liyang
cbf246d05b Merge branch 'hotfix/requireAuth'
Former-commit-id: 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 6f241ee65a6bef976421bfdde133e002a4eae935 [formerly 49ef89c90ec29ae88beb5fff944a9f9a529d5e56]]]]]
Former-commit-id: dbfd6018a3d0aec848d2d5a3464be2526a4b9f8f
Former-commit-id: 779518ca8fc707c1642f88cd80bc3a6ee4c4976e
Former-commit-id: 993f58ec14d0bb701c97efdca02f07cc27c040af [formerly 5e87d739d1a5d07e68d24c97adc0483a35d5666b]
Former-commit-id: c2ca454b036d3d2d47618a8c9ef1bc811cc99b7a
Former-commit-id: 841f7beb6f666e47284b12c3af261f19aef2be8a
Former-commit-id: 739d84e318361239f59cef7222dcdd782515b96d
Former-commit-id: 904361087f17d22181fa60f18388544362d041ac
Former-commit-id: e8d465ad7a13a142e8db85b84b33adbca7c1b5dd
2018-12-04 10:18:49 +08:00
liyang
084e5312c0 更新字段名
Former-commit-id: d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly d009fa0f663f2b7664af06e4145eb4f5378d6a73 [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2] [formerly 8f9c01536ef4a3ca08bb3748701386110c2d8ea2 [formerly 40082eb66b073a0210c319efb825d8e2ae5d9395 [formerly 163984d5d800002566d5786c1a9208bc7510ddee]]]]]
Former-commit-id: 5648ca2139a3afb28c175f8f27f2c8d9795a6477
Former-commit-id: cb08d3616c4256748cc7f8a7aeaa890827abf352
Former-commit-id: 2b76bf9ddd8166b47f9dec5275baf2fa09f5b82f [formerly e0ec8a7e3d8189c6067842d1ad61e943eefbc2ec]
Former-commit-id: f8b49ece9798cc72c3757c6e0527a7af234ae86e
Former-commit-id: f6d5e4de14a194e3bf23eb29c5eb27be99049728
Former-commit-id: e3bfd6aad4ed5d573b6a8a94c21bbab34df4bc7d
Former-commit-id: 4f54ba5c2ee7c8a71ede1ca8cc835782c25337de
Former-commit-id: b982ab172bcf73fa784067855b4c20f6a2756b03
2018-12-04 10:18:41 +08:00
liyang
6302db5c6f Merge branch 'hotfix/模块首页优化' into develop
Former-commit-id: 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 780e53a98d0a5bfc9cf679f76114ae4b9041afef [formerly 9a5371a06f04aa9946e6de3bd6c3efe2c71e7392 [formerly 44e7b946805355d595b83ffe32a028f7c3705930]]]]]
Former-commit-id: 2b2aec25712f225c0b8557b929be977cd9bf5427
Former-commit-id: 4cba1ea1fe912fa3d7b91c6f3c9862a04adf3b6d
Former-commit-id: bf23d3ad70043e00ed5d8080a7ebdf71f7342797 [formerly 164b51dd80b07b0d1386e06ec7a3bfe6e38abd94]
Former-commit-id: 07f4356585c63b53dac55bfd082c45db1d79bec6
Former-commit-id: 3d13f1de8313c00781e54605e0fa17c2b401b283
Former-commit-id: 2a3efa70f407f219db41532ef5ee4a36bceed3d9
Former-commit-id: de005ac828ab5aff0b111c17b4065618006ce33a
Former-commit-id: 37c6b11cc919a73f77247c2e534ec4fdbb67216c
2018-12-03 11:35:53 +08:00
liyang
4df0913890 Merge branch 'hotfix/模块首页优化'
Former-commit-id: d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly d44eb2322a77e277e7b207e270ba105b175e1411 [formerly acd4d69e70969268b4d01736275e754cef250d0e] [formerly acd4d69e70969268b4d01736275e754cef250d0e [formerly 949b9993d3a15549bdde4929ebb1459dc2c9ca95 [formerly 58293760d71d4cba9e939a2b499d3749fb3f5b15]]]]]
Former-commit-id: e928c12862dd7d62e651f3e0ffe12f547826f8b9
Former-commit-id: f1792ae75e9cbc7d18e1a95f64e180ada2ab037d
Former-commit-id: fad0c7c7c343975f457922043b061cbfb035674b [formerly 0346a76cce69e1cb08dc3ad5df4c746ec04d0a54]
Former-commit-id: 646f987fb1814b4fb1d46986bb151532adebcae6
Former-commit-id: 4c1abf97a90560fe281480f228320ef3e7a6880c
Former-commit-id: 0688efeb710b2b40aa2bb2d35f663de51222fefe
Former-commit-id: 9093ceb90221c73019427e0535df2d643955141c
Former-commit-id: 7d728af0fc5dfa4463c50c2819c315e629962f78
2018-12-03 11:35:52 +08:00
liyang
4e59b30666 在每个模块的首页显示链接列表
Former-commit-id: 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly 6cab63bfcc9fbbb16740f86c293fec3996061006 [formerly beab075483c86b86dcf8088652d47d10d17e791b [formerly aa0a4c06e6e6c365614a38137e570322db6356f5]]]]]
Former-commit-id: e27ebca4c2bb81ef3930d2a2744b569e3ba0c47e
Former-commit-id: 05ab8b935658496dbb83ebd1726fd7abdb85b4a5
Former-commit-id: 9fe99c61fd2c812e7ac86a65ef7a96fb77e2555a [formerly 8448054abcfec1aeb5d29b6b3ab9bb7994a0e5d3]
Former-commit-id: c40b050f64112493e7ea738e8cac1b3ec32839d6
Former-commit-id: cdb02c46bc4ec0dd38a15c7682acbe4da3f4ffe2
Former-commit-id: 6e620c8a7bf1f4feae914af55a3d4e48f2527adc
Former-commit-id: 46e4a65d456e1159c9bb5d4c34d4c171ea38c145
Former-commit-id: 90f1ebb055ffc14de13d90d00dc7bb14545c34c8
2018-12-03 11:35:37 +08:00