diff --git a/install-render.js b/install-render.js index e6eb6df..3b75670 100644 --- a/install-render.js +++ b/install-render.js @@ -3,7 +3,10 @@ import axios from 'axios' import VFormRender from '@/components/form-render/index.vue' import ContainerItems from '@/components/form-render/container-item/index' +import {registerIcon} from '@/utils/el-icons' import SvgIcon from '@/components/svg-icon' //svg组件 +import 'virtual:svg-icons-register' +import '@/iconfont/iconfont.css' import { installI18n } from '@/utils/i18n' import { loadExtension } from '@/extension/extension-loader' @@ -13,6 +16,7 @@ VFormRender.install = function (app) { loadExtension(app) app.use(ContainerItems) + registerIcon(app) app.component('svg-icon', SvgIcon) app.component(VFormRender.name, VFormRender) } @@ -26,6 +30,7 @@ const install = (app) => { loadExtension(app) app.use(ContainerItems) + registerIcon(app) app.component('svg-icon', SvgIcon) components.forEach(component => { app.component(component.name, component) diff --git a/install.js b/install.js index 969b29c..f2b7758 100644 --- a/install.js +++ b/install.js @@ -37,6 +37,7 @@ VFormRender.install = function (app) { app.use(ContainerItems) + registerIcon(app) app.component('svg-icon', SvgIcon) app.component(VFormRender.name, VFormRender) } @@ -54,6 +55,7 @@ const install = (app) => { app.use(ContainerWidgets) app.use(ContainerItems) + registerIcon(app) app.component('draggable', Draggable) app.component('svg-icon', SvgIcon) diff --git a/package.json b/package.json index 42b2f1a..7dc0d44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "variant-form3", - "version": "3.0.5", + "version": "3.0.6", "private": false, "scripts": { "serve": "vite", diff --git a/src/components/code-editor/index.vue b/src/components/code-editor/index.vue index cbfa8dc..24d427c 100644 --- a/src/components/code-editor/index.vue +++ b/src/components/code-editor/index.vue @@ -119,6 +119,10 @@ this.aceEditor.getSession().setMode('ace/mode/css') }, + getEditorAnnotations() { + return this.aceEditor.getSession().getAnnotations() + }, + } } diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue index d8ecb98..50aed0b 100644 --- a/src/components/form-designer/index.vue +++ b/src/components/form-designer/index.vue @@ -113,6 +113,8 @@ exportJsonButton: true, //是否显示导出JSON器按钮 exportCodeButton: true, //是否显示导出代码按钮 generateSFCButton: true, //是否显示生成SFC按钮 + toolbarMaxWidth: 420, //设计器工具按钮栏最大宽度(单位像素) + toolbarMinWidth: 300, //设计器工具按钮栏最小宽度(单位像素) presetCssCode: '', //设计器预设CSS样式代码 diff --git a/src/components/form-designer/setting-panel/form-setting.vue b/src/components/form-designer/setting-panel/form-setting.vue index 05fe479..3f664e8 100644 --- a/src/components/form-designer/setting-panel/form-setting.vue +++ b/src/components/form-designer/setting-panel/form-setting.vue @@ -85,7 +85,7 @@ :show-close="true" custom-class="drag-dialog small-padding-dialog" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true"> - +