ui库和web端产品库合并版本(还需修复细节)

This commit is contained in:
2022-11-29 18:27:14 +08:00
parent 5e4bd93238
commit 8bf6c57668
151 changed files with 28267 additions and 49 deletions

View File

@@ -4,9 +4,9 @@ import ui from 'element-ui';
import router from './router/router';
import axios from './router/axios';
import utils from './utils';
import vcUI from 'dvcp-ui';
import 'dvcp-ui/lib/styles/common.scss';
import 'dvcp-ui/lib/dvcp-ui.css';
import vcUI from 'dui';
import 'dui/lib/styles/common.scss';
import 'dui/lib/dui.css';
import store from './store';
import dataV from '@jiaminghi/data-view';
import appComps from '../components'
@@ -28,9 +28,9 @@ let theme = null
store.dispatch('getSystem').then(({colorScheme}) => {
theme = JSON.parse(colorScheme || null)
Vue.prototype.$theme = theme?.web || "blue"
return import(`dvcp-ui/lib/styles/theme.${theme?.web}.scss`).catch(() => 0)
return import(`dui/lib/styles/theme.${theme?.web}.scss`).catch(() => 0)
}).finally(() => {
Vue.prototype.$vm = app
!theme ? app.$mount('#app') : import(`dvcp-ui/lib/styles/common.scss`).finally(() => app.$mount('#app'))
!theme ? app.$mount('#app') : import(`dui/lib/styles/common.scss`).finally(() => app.$mount('#app'))
})

View File

@@ -1,4 +1,4 @@
import instance from 'dvcp-ui/lib/js/request'
import instance from 'dui/lib/js/request'
import {Message} from 'element-ui'
let baseURLs = {

View File

@@ -1,7 +1,7 @@
import Vue from 'vue'
import Vuex from 'vuex'
import preState from 'vuex-persistedstate'
import * as modules from "dvcp-ui/lib/js/modules"
import * as modules from "dui/lib/js/modules"
import xsActions from "../../project/xiushan/actions"
Vue.use(Vuex)

View File

@@ -1,6 +1,6 @@
import {MessageBox} from 'element-ui'
import store from '../store'
import tools from 'dvcp-ui/lib/js/utils'
import tools from 'dui/lib/js/utils'
const addChildParty = (parent, pending) => {
let doBeforeCount = pending.length