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
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 highlight from 'highlight.js'
import bandupan from './plugin/baidupan' import bandupan from './plugin/baidupan'
import 'github-markdown-css' import 'github-markdown-css'
import { ComponentsMarkdownBase } from '@/api/components/markdown' import { ComponentsMarkdownBase } from '@api/components.markdown'
export default { export default {
name: 'd2-markdown', name: 'd2-markdown',
props: { 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 { export default {
props: { props: {

View File

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

View File

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

View File

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

View File

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