diff --git a/components/index.js b/components/index.js deleted file mode 100644 index 93ee615a..00000000 --- a/components/index.js +++ /dev/null @@ -1,38 +0,0 @@ -//本地仓库外部组件 - -// 存储组件列表 -let components = []; -// 定义 install 方法,接收 Vue 作为参数。如果使用 use 注册插件,则所有的组件都将被注册 -const install = function (Vue) { - if (install.installed) return; - // 声明全局业务对象类 - const models = require.context('./model', true, /\.js$/) - if (models) { - const model = {} - models.keys().map(e => { - model[e.replace(/\.[\/\\]([^\\\/]+)\.js$/, '$1')] = models(e).default - }) - Vue.prototype.MODEL = model - } - Vue.prototype.$echartTpls = require("./AiEchart/echartTpls").default - // 遍历注册全局组件 - let contexts = require.context('.', true, /[\\\/]Ai([^\\\/]+)\.vue$/); - if (contexts) { - contexts.keys().map((e) => { - components.push(contexts(e).default); - Vue.component(contexts(e).default.name, contexts(e).default); - }); - } -}; - -// 判断是否是直接引入文件 -if (typeof window !== 'undefined' && window.Vue) { - install(window.Vue); -} - -export default { - // 导出的对象必须具有 install,才能被 Vue.use() 方法安装 - install, - // 以下组件列表 - ...components -}; diff --git a/examples/main.js b/examples/main.js index 98d2d660..f651e24e 100644 --- a/examples/main.js +++ b/examples/main.js @@ -7,12 +7,12 @@ import utils from './utils'; import dui from 'dui'; import store from './store'; import dataV from '@jiaminghi/data-view'; -import appComps from '../components' +import dvui from '@dui/dv' Vue.use(dataV) Vue.use(ui); Vue.use(dui); -Vue.use(appComps); +Vue.use(dvui); //富文本编辑器配置 Vue.config.productionTip = false; Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e])); diff --git a/package.json b/package.json index 294917c3..0f5c5775 100644 --- a/package.json +++ b/package.json @@ -9,20 +9,22 @@ "dev:dv": "vue-cli-service serve examples/main.js --mode dv", "dev:fengdu": "vue-cli-service serve examples/main.js --mode fengdu", "lib": "npm publish||(npm unpublish -f&&npm publish)", - "ui": "npm run lib -w ui&&npm i dui@latest", + "preui": "npm publish -ws||(npm unpublish -f -ws&&npm publish -ws)", + "ui": "npm i dui@latest @dui/dv@latest", "sync": "node bin/appsSync.js", "preview": "vue-cli-service serve" }, "workspaces": [ - "ui" + "ui", + "ui/dv" ], "files": [ "packages", - "project", - "components" + "project" ], "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@dui/dv": "^1.0.0", "@jiaminghi/data-view": "^2.10.0", "@logicflow/core": "^1.2.1", "bin-ace-editor": "^3.2.0", diff --git a/packages/bigscreen/designer/components/DataConfig.vue b/packages/bigscreen/designer/components/DataConfig.vue index 32556a27..7b9d121d 100644 --- a/packages/bigscreen/designer/components/DataConfig.vue +++ b/packages/bigscreen/designer/components/DataConfig.vue @@ -164,10 +164,11 @@ import 'brace/theme/monokai'; import AiDialogBtn from "dui/packages/layout/AiDialogBtn.vue"; import AiFold from "dui/packages/layout/AiFold.vue"; import ChartPicker from "./chartPicker.vue"; -import {DvCompData, monitorTypes} from "../config"; +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"; export default { name: 'dataConfig', diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue index 04f24ee5..f81f5302 100644 --- a/packages/bigscreen/designer/components/componentConfig.vue +++ b/packages/bigscreen/designer/components/componentConfig.vue @@ -214,10 +214,12 @@ diff --git a/packages/bigscreen/designer/components/datasourcePicker.vue b/packages/bigscreen/designer/components/datasourcePicker.vue index 8d54205e..0fe831c1 100644 --- a/packages/bigscreen/designer/components/datasourcePicker.vue +++ b/packages/bigscreen/designer/components/datasourcePicker.vue @@ -28,13 +28,13 @@