diff --git a/.npmrc b/.npmrc index 4f8eb1af..d4678dd9 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,4 @@ email=aixianling@sinoecare.com package-lock=false +registry=http://registry.npmmirror.com +legacy-peer-deps=true diff --git a/examples/components/sliderNav.vue b/examples/components/sliderNav.vue index e40d30b6..0ec4b680 100644 --- a/examples/components/sliderNav.vue +++ b/examples/components/sliderNav.vue @@ -102,7 +102,7 @@ export default { localStorage.setItem("searchApp", this.searchApp) }, }, - created() { + mounted() { this.searchApp = localStorage.getItem("searchApp") || "" } } diff --git a/examples/main.js b/examples/main.js index f651e24e..eae12050 100644 --- a/examples/main.js +++ b/examples/main.js @@ -1,18 +1,14 @@ import Vue from 'vue'; import App from './App.vue'; -import ui from 'element-ui'; import router from './router/router'; import axios from './router/axios'; import utils from './utils'; import dui from 'dui'; import store from './store'; import dataV from '@jiaminghi/data-view'; -import dvui from '@dui/dv' Vue.use(dataV) -Vue.use(ui); Vue.use(dui); -Vue.use(dvui); //富文本编辑器配置 Vue.config.productionTip = false; Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e])); @@ -28,7 +24,6 @@ store.dispatch('getSystem').then(res => { Vue.prototype.$theme = theme?.web || "blue" return import(`dui/lib/styles/theme.${theme?.web}.scss`).catch(() => 0) }).finally(() => { - Vue.prototype.$vm = app import(`dui/lib/styles/common.scss`).finally(() => app.$mount('#app')) }) diff --git a/examples/nuxt.config.js b/examples/nuxt.config.js index 0aa15ef7..9dad5cf2 100644 --- a/examples/nuxt.config.js +++ b/examples/nuxt.config.js @@ -12,6 +12,10 @@ export default { pages: 'views', }, build: { - postcss: null - } + postcss: null, + transpile: [/^ui/] + }, + plugins: [ + '~plugins/ui.js' + ], } diff --git a/examples/plugins/ui.js b/examples/plugins/ui.js new file mode 100644 index 00000000..9cf5904b --- /dev/null +++ b/examples/plugins/ui.js @@ -0,0 +1,7 @@ +import Vue from 'vue'; +import ElementUI from 'element-ui'; +import dui from 'dui/packages'; +import 'dui/lib/styles/common.scss'; + +Vue.use(ElementUI); +Vue.use(dui) diff --git a/examples/views/appEntry.vue b/examples/views/appEntry.vue index 6f53f03f..b8abd8df 100644 --- a/examples/views/appEntry.vue +++ b/examples/views/appEntry.vue @@ -18,14 +18,6 @@ export default { return app.esm ?? "" } }, - mounted() { - this.$vm.$on("mock", v => { - if (!!this.$refs.currentPage.$children?.[0]?.form) { - this.$refs.currentPage.$children[0].form = v - this.$refs.currentPage.$children[0].$forceUpdate() - } - }) - } } diff --git a/examples/views/index.vue b/examples/views/index.vue index defb7601..13e9570d 100644 --- a/examples/views/index.vue +++ b/examples/views/index.vue @@ -30,11 +30,10 @@ import MainContent from "../components/mainContent"; import HeaderNav from "../components/headerNav"; import {mapActions, mapMutations, mapState} from "vuex"; import Mock from "../components/mock"; -import AiDvWrapper from "../../ui/dv/layout/AiDvWrapper/AiDvWrapper.vue"; export default { name: 'app', - components: {AiDvWrapper, Mock, HeaderNav, MainContent, SliderNav}, + components: {Mock, HeaderNav, MainContent, SliderNav}, computed: { ...mapState(['user']), login() { @@ -75,8 +74,9 @@ export default { handleMock() { } }, - created() { - wx = jWeixin + mounted() { + const {jWeixin} = window + window.wx = jWeixin if (this.user.token) this.getUserInfo().finally(() => { if (/^\/project\/xiushan/.test(location.pathname)) { this.getFinanceUser() diff --git a/package.json b/package.json index f9cbed04..c559ee6e 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@ckeditor/ckeditor5-vue2": "^3.0.1", "@jiaminghi/data-view": "^2.10.0", "@logicflow/core": "^1.2.1", "bin-ace-editor": "^3.2.0", @@ -30,7 +31,9 @@ "serialize-javascript": "^6.0.0", "sortablejs": "^1.12.0", "vue-carousel": "^0.18.0", + "vue-cropper": "^0.6.5", "vue-draggable-resizable": "^2.3.0", + "vue-qr": "^4.0.9", "vue-ruler-tool": "^1.2.4", "vue-style-loader": "^4.1.3", "vuedraggable": "^2.24.3" diff --git a/ui/dv/package.json b/ui/dv/package.json deleted file mode 100644 index 2255ec88..00000000 --- a/ui/dv/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "@dui/dv", - "version": "1.0.0", - "author": "kubbo", - "scripts": { - "lib": "npm unpublish --force&&npm publish" - }, - "main": "index.js", - "dependencies": { - "@amap/amap-jsapi-loader": "^1.0.1", - "@jiaminghi/data-view": "^2.10.0", - "vuedraggable": "^2.24.3", - "element-ui": "^2.13.2", - "vue": "^2.6.11" - } -}