diff --git a/examples/App.vue b/examples/App.vue index 5359f5e3..87104170 100644 --- a/examples/App.vue +++ b/examples/App.vue @@ -9,13 +9,13 @@ - + - + - +
@@ -30,7 +30,7 @@ import MainContent from "./components/mainContent"; import HeaderNav from "./components/headerNav"; import {mapActions, mapMutations, mapState} from "vuex"; import Mock from "./components/mock"; -import AiDvWrapper from "@dui/dv/layout/AiDvWrapper/AiDvWrapper.vue"; +import AiDvWrapper from "dui/dv/layout/AiDvWrapper/AiDvWrapper.vue"; export default { name: 'app', @@ -42,6 +42,13 @@ export default { /project\/sass/g.test(location.pathname) && (url += "?corpId=ww596787bb70f08288") return url }, + commonAttrs() { + return { + instance: this.$request, + dict: this.$dict, + permissions: this.$permissions + } + } }, data() { return { @@ -76,7 +83,8 @@ export default { } }, created() { - wx = jWeixin + const {jWeixin} = window + window.wx = jWeixin if (this.user.token) this.getUserInfo().finally(() => { if (/^\/project\/xiushan/.test(location.pathname)) { this.getFinanceUser() diff --git a/examples/components/mainContent.vue b/examples/components/mainContent.vue index a41180a6..702766a5 100644 --- a/examples/components/mainContent.vue +++ b/examples/components/mainContent.vue @@ -2,7 +2,7 @@
- + 欢迎使用村微产品库
diff --git a/examples/main.js b/examples/main.js index e431d335..9b694945 100644 --- a/examples/main.js +++ b/examples/main.js @@ -4,10 +4,10 @@ import ui from 'element-ui'; import router from './router'; import axios from './router/axios'; import utils from './utils'; -import dui from 'dui'; +import dui from 'dui/packages'; import store from './store'; import dataV from '@jiaminghi/data-view'; -import dvui from '@dui/dv' +import dvui from 'dui/dv' Vue.use(dataV) Vue.use(ui); diff --git a/examples/router/axios.js b/examples/router/axios.js index 772913c0..92ef0538 100644 --- a/examples/router/axios.js +++ b/examples/router/axios.js @@ -1,5 +1,5 @@ import {Message} from 'element-ui' -import instance from '../../ui/lib/js/request' +import instance from 'dui/lib/js/request' let baseURLs = { production: "/", @@ -8,31 +8,7 @@ let baseURLs = { instance.defaults.baseURL = baseURLs[process.env.NODE_ENV] instance.interceptors.request.use(config => { if (config.url.startsWith("/node")) { - config.baseURL = "/ns" - } else if (config.url.startsWith("/sse")) { - config.baseURL = "/" - } else if (/\/project\/activeAnalysis/.test(location.pathname)) { - config.baseURL = "/analysis" - } else if (/\/project\/beta/.test(location.pathname)) { - config.baseURL = "/wg" - } else if (/\/project\/sass/.test(location.pathname)) { - config.baseURL = "/saas" - } else if (/\/tianfuxing/.test(location.pathname)) { - config.baseURL = "/tfx" - } else if (/\/qianxinan/.test(location.pathname)) { - // config.baseURL = "/qxn" - } else if (/\/xiushan/.test(location.pathname)) { - config.baseURL = "/xsjr" - } else if (/project\/oms/.test(location.pathname)) { - config.baseURL = "/omsapi" - } else if (/#url-/.test(location.hash)) { - config.baseURL = location.hash.replace(/#url-/, '/') - } - if (["/xsjr", "/tfx", "/omsapi"].includes(config.baseURL)) { - config.url = config.url.replace(/(app|auth|admin|api)\//, "api/") - } - if (['/qxn', '/analysis'].includes(config.baseURL)) { - config.url = config.url.replace(/(app|auth|admin)\//, "api/") + config.url = "/ns" + config.url } if (process.env.VUE_APP_IS_SIMPLE_SERVER == 1) { config.url = config.url.replace(/(app|auth|admin)\//, "api/") diff --git a/examples/views/appEntry.vue b/examples/views/appEntry.vue deleted file mode 100644 index da4f5dee..00000000 --- a/examples/views/appEntry.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/package.json b/package.json index 70c9247f..b9d8e773 100644 --- a/package.json +++ b/package.json @@ -13,22 +13,25 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", - "@dui/dv": "^1.0.0", + "@ckeditor/ckeditor5-vue2": "^3.0.1", "@jiaminghi/data-view": "^2.10.0", "@logicflow/core": "^1.2.1", "bin-ace-editor": "^3.2.0", + "crypto-js": "^4.2.0", "dayjs": "^1.8.35", - "dui": "^2.0.0", "echarts": "^5.5.1", "echarts-wordcloud": "^2.0.0", "hash.js": "^1.1.7", "html2canvas": "^1.4.1", + "jspdf": "^2.5.2", "mp4box": "^0.4.1", "print-js": "^1.0.63", "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/packages/bigscreen/designer/components/DataConfig.vue b/packages/bigscreen/designer/components/DataConfig.vue index 7b9d121d..216a874e 100644 --- a/packages/bigscreen/designer/components/DataConfig.vue +++ b/packages/bigscreen/designer/components/DataConfig.vue @@ -168,7 +168,7 @@ import {monitorTypes} from "../config"; import ConfigItem from "./configItem.vue"; import DatasourcePicker from "./datasourcePicker.vue"; import AiSelect from "dui/packages/basic/AiSelect.vue"; -import {DvCompData} from "@dui/dv"; +import {DvCompData} from "dui/dv"; export default { name: 'dataConfig', diff --git a/packages/bigscreen/designer/components/configExtra.vue b/packages/bigscreen/designer/components/configExtra.vue index 3395a3d0..6acdd057 100644 --- a/packages/bigscreen/designer/components/configExtra.vue +++ b/packages/bigscreen/designer/components/configExtra.vue @@ -4,7 +4,7 @@ import ConfigItem from "./configItem"; import ChartPicker from "./chartPicker"; import JsonEditor from "./jsonEditor"; import {layers, monitorTypes} from "../config"; -import AiDvSummary from "@dui/dv/layout/AiDvSummary/AiDvSummary"; +import AiDvSummary from "dui/dv/layout/AiDvSummary/AiDvSummary"; export default { name: "configExtra", diff --git a/packages/bigscreen/designer/components/datasourcePicker.vue b/packages/bigscreen/designer/components/datasourcePicker.vue index 65927ac5..fa7ae3aa 100644 --- a/packages/bigscreen/designer/components/datasourcePicker.vue +++ b/packages/bigscreen/designer/components/datasourcePicker.vue @@ -34,7 +34,7 @@ import 'brace/snippets/json'; import 'brace/theme/github'; import 'brace/theme/monokai'; import JsonEditor from "./jsonEditor.vue"; -import {DvCompData} from "@dui/dv"; +import {DvCompData} from "dui/dv"; export default { name: "datasourcePicker", diff --git a/src/main.js b/src/main.js index 8ba0b702..c066ac2f 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import ui from 'element-ui'; import router from './utils/router'; import utils from './utils'; import vcUI from 'dui'; -import appComp from '@dui/dv'; +import appComp from 'dui/dv'; import store from './utils/store'; import autoRoutes from "./utils/autoRoutes"; import extra from "./config.json" diff --git a/vue.config.js b/vue.config.js index 0d755e16..dd04d191 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,11 +11,11 @@ module.exports = { } } }, - transpileDependencies: [/dui[\\\/]lib[\\\/]js/], chainWebpack: (config) => { config.resolve.alias .set('@packages', path.resolve(__dirname, 'packages')) .set('@project', path.resolve(__dirname, 'project')) + .set('dui', path.resolve(__dirname, 'ui')) config.module .rule('js') .include