diff --git a/.gitignore b/.gitignore index 3625cc65..8aee6d1e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,28 @@ yarn-error.log* /src/apps/ /src/config.json +/.nuxt/components/nuxt.js +/.nuxt/components/nuxt-build-indicator.vue +/.nuxt/components/nuxt-child.js +/.nuxt/components/nuxt-error.vue +/.nuxt/components/nuxt-link.client.js +/.nuxt/components/nuxt-link.server.js +/.nuxt/components/nuxt-loading.vue +/.nuxt/layouts/default.vue +/.nuxt/mixins/fetch.client.js +/.nuxt/mixins/fetch.server.js +/.nuxt/views/app.template.html +/.nuxt/views/error.html +/.nuxt/App.js +/.nuxt/client.js +/.nuxt/empty.js +/.nuxt/index.js +/.nuxt/jsonp.js +/.nuxt/loading.html +/.nuxt/middleware.js +/.nuxt/router.js +/.nuxt/router.scrollBehavior.js +/.nuxt/routes.json +/.nuxt/server.js +/.nuxt/store.js +/.nuxt/utils.js diff --git a/.npmrc b/.npmrc index b32e9535..4f8eb1af 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,2 @@ -registry=http://192.168.1.87:4873/ email=aixianling@sinoecare.com -always-auth=true package-lock=false -//192.168.1.87:4873/:_auth="YWRtaW46YWRtaW4xMjM=" diff --git a/examples/nuxt.config.js b/examples/nuxt.config.js new file mode 100644 index 00000000..0aa15ef7 --- /dev/null +++ b/examples/nuxt.config.js @@ -0,0 +1,17 @@ +import {resolve} from 'path' + +export default { + css: ['ui/lib/styles/common.scss'], + dev: process.env.NODE_ENV !== 'production', + alias: { + 'style': resolve(__dirname, './assets/style'), + 'dui': resolve(__dirname, '../ui') + }, + srcDir: "examples", + dir: { + pages: 'views', + }, + build: { + postcss: null + } +} diff --git a/examples/store/index.js b/examples/store/index.js index 4a00b8e4..0b966034 100644 --- a/examples/store/index.js +++ b/examples/store/index.js @@ -1,26 +1,26 @@ import Vue from 'vue' import Vuex from 'vuex' -import preState from 'vuex-persistedstate' import * as modules from "dui/lib/js/modules" import xsActions from "../../project/xiushan/actions" Vue.use(Vuex) - -export default new Vuex.Store({ - state: { - apps: [] - }, - mutations: { - addApp(state, app) { - state.apps.push(app) - }, - cleanApps(state) { - state.apps = [] - }, - }, - actions: { - ...xsActions - }, - modules, - plugins: [preState()] +export const state = () => ({ + apps: [] }) +export const mutations = { + addApp(state, app) { + state.apps.push(app) + }, + cleanApps(state) { + state.apps = [] + } +} +const actions = { + ...xsActions +} +export default { + state, + mutations, + actions, + modules, +} diff --git a/examples/views/appEntry.vue b/examples/views/appEntry.vue index da4f5dee..6f53f03f 100644 --- a/examples/views/appEntry.vue +++ b/examples/views/appEntry.vue @@ -6,9 +6,7 @@