From 8e04ec040af5c58c9fd1e3f84ba0bf5275c5333f Mon Sep 17 00:00:00 2001 From: aixianling Date: Fri, 24 Jun 2022 13:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=BA=94=E7=94=A8=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/main.js | 2 + package.json | 4 +- packages/bigscreen/designer/AppDesigner.vue | 26 ++- .../bigscreen/designer/components/Add.vue | 61 +++---- .../bigscreen/designer/components/Layout.vue | 18 +- .../bigscreen/viewer/AppGigscreenViewer.vue | 25 +-- packages/index.js | 2 + project/dvui/AppDVDemo.vue | 157 ------------------ .../dvui/components}/AiDataPanel.vue | 0 .../{AiDvPartyOrg => }/AiDvPartyOrg.vue | 0 .../dvui/components/AiDvRender.vue | 41 +++-- .../dvui/components}/AiStaData.vue | 0 .../dvui}/components/AiSwiper.vue | 0 .../{AiDvBackground => }/AiDvBackground.vue | 0 14 files changed, 78 insertions(+), 258 deletions(-) delete mode 100644 project/dvui/AppDVDemo.vue rename {packages/bigscreen/ui => project/dvui/components}/AiDataPanel.vue (100%) rename project/dvui/components/{AiDvPartyOrg => }/AiDvPartyOrg.vue (100%) rename packages/bigscreen/designer/components/RenderElement.vue => project/dvui/components/AiDvRender.vue (90%) rename {packages/bigscreen/ui => project/dvui/components}/AiStaData.vue (100%) rename {packages/bigscreen/designer => project/dvui}/components/AiSwiper.vue (100%) rename project/dvui/layout/{AiDvBackground => }/AiDvBackground.vue (100%) diff --git a/examples/main.js b/examples/main.js index 08b4bf8d..6539fb0f 100644 --- a/examples/main.js +++ b/examples/main.js @@ -9,10 +9,12 @@ import 'dvcp-ui/lib/styles/common.scss'; import 'dvcp-ui/lib/dvcp-ui.css'; import store from './store'; import dataV from '@jiaminghi/data-view'; +import dvui from '../project/dvui/entries' Vue.use(dataV); Vue.use(ui); Vue.use(vcUI); +Vue.use(dvui) //富文本编辑器配置 Vue.config.productionTip = false; Vue.prototype.$axios = axios; diff --git a/package.json b/package.json index d1b2e2c5..809cadbc 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name dvcp-core&&npm unpublish dvcp-core --force&&npm publish core/", "lib:project": "node project/build.js", "lib:all": "node project/allProject.js&&npm unpublish --workspaces --force&&npm publish --workspaces", - "ui": "npm i dvcp-ui@latest dvcp-dv-ui@latest" + "ui": "npm i dvcp-ui@latest" }, "workspaces": [ "project/*" @@ -20,8 +20,6 @@ "@jiaminghi/data-view": "^2.10.0", "bin-code-editor": "^0.9.0", "dayjs": "^1.8.35", - "dvcp-dv": "^1.0.0", - "dvcp-dv-ui": "file:project/dvui", "dvcp-ui": "^1.42.2", "echarts": "^5.1.2", "mp4box": "^0.4.1", diff --git a/packages/bigscreen/designer/AppDesigner.vue b/packages/bigscreen/designer/AppDesigner.vue index bcacab2f..daf05eba 100644 --- a/packages/bigscreen/designer/AppDesigner.vue +++ b/packages/bigscreen/designer/AppDesigner.vue @@ -6,32 +6,28 @@ - - + + diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue index ec66be32..249d05dc 100644 --- a/packages/bigscreen/designer/components/Add.vue +++ b/packages/bigscreen/designer/components/Add.vue @@ -33,14 +33,14 @@