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
This commit is contained in:
liyang
2018-12-11 08:48:45 +08:00
11 changed files with 6 additions and 5 deletions

View File

@@ -12,7 +12,7 @@ import marked from 'marked'
import highlight from 'highlight.js'
import bandupan from './plugin/baidupan'
import 'github-markdown-css'
import { ComponentsMarkdownBase } from '@/api/components/markdown'
import { ComponentsMarkdownBase } from '@api/components.markdown'
export default {
name: 'd2-markdown',
props: {

View File

@@ -1,4 +1,4 @@
import { get } from '@/api/demo/business/issues/142'
import { get } from '@api/demo.business.issues.142'
export default {
props: {

View File

@@ -17,7 +17,7 @@
</template>
<script>
import { BusinessTable1List } from '@/api/demo/business/table/1'
import { BusinessTable1List } from '@api/demo.business.table.1'
export default {
// name 值和本页的 $route.name 一致才可以缓存页面
name: 'demo-business-table-1',

View File

@@ -23,7 +23,7 @@
</template>
<script>
import { PluginMocksAjax } from '@/api/demo/plugins/mocks/ajax'
import { PluginMocksAjax } from '@api/demo.plugins.mocks.ajax'
export default {
name: 'demo-plugins-mock-ajax',
data () {

View File

@@ -1,5 +1,5 @@
import util from '@/libs/util.js'
import { AccountLogin } from '@/api/sys/login'
import { AccountLogin } from '@api/sys.login'
export default {
namespaced: true,

View File

@@ -95,6 +95,7 @@ module.exports = {
// 重新设置 alias
config.resolve.alias
.set('@', resolve('src'))
.set('@api', resolve('src/api'))
// node
config.node
.set('__dirname', true)