diff --git a/package-lock.json b/package-lock.json index 3fcb15d..2a75cf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "ddei-editor", - "version": "1.2.41-201", + "version": "1.2.41-206", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.41-201", + "version": "1.2.41-206", "license": "Apache License 2.0", "dependencies": { - "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-201.tgz" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-206.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", @@ -518,9 +518,9 @@ "integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g==" }, "node_modules/ddei-framework": { - "version": "1.2.41-201", - "resolved": "file:../ddei-framework/ddei-framework-1.2.41-201.tgz", - "integrity": "sha512-WKsM8XduU5MruGAgIlH2qIbUCxa+1rQ9yhhBdntcHVhy6U4Q2U0cL+gPbncwjJhooXPCi3vxD8f9zBKRKKzOaA==", + "version": "1.2.41-206", + "resolved": "file:../ddei-framework/ddei-framework-1.2.41-206.tgz", + "integrity": "sha512-T6L5G7OyuYF1b9WoAAonwSD4NCmBE4I2OQ92mCd1Zp3AckeHYEIYVCFy/f7kEy2YQmmpx4egqkPQtVTMstApdQ==", "license": "Apache License 2.0", "dependencies": { "ddei-autolink": "^1.1.1", diff --git a/package.json b/package.json index 259e494..0a5dd98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.41-202", + "version": "1.2.41-206", "private": false, "type": "module", "author": "hoslay <3697355039@qq.com>", @@ -49,7 +49,7 @@ "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false" }, "dependencies": { - "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-201.tgz" + "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-206.tgz" }, "devDependencies": { "@tsconfig/node18": "^18.2.0", diff --git a/plugins/htmlviewer/htmlviewer-lifecycle.ts b/plugins/htmlviewer/htmlviewer-lifecycle.ts index ab50644..e937dfd 100644 --- a/plugins/htmlviewer/htmlviewer-lifecycle.ts +++ b/plugins/htmlviewer/htmlviewer-lifecycle.ts @@ -1,5 +1,5 @@ import { DDeiLifeCycle, DDeiFuncData, DDeiEditorUtil, DDeiUtil, DDeiFuncCallResult, DDeiEditorState, DDeiEditorEnumBusCommandType } from "ddei-framework"; -import { createVNode,render ,markRaw } from "vue"; +import { createVNode,toRaw ,markRaw } from "vue"; class DDeiExtHtmlViewerLifeCycle extends DDeiLifeCycle { @@ -49,7 +49,7 @@ class DDeiExtHtmlViewerLifeCycle extends DDeiLifeCycle { if (model.render.tempCanvas){ model.render.tempCanvas.remove() } - if (model.render.viewerOption != option){ + if (model.render.viewerOption != option && toRaw(model.render.viewerOption) != option){ //如果已存在则销毁 DDeiUtil.removeRenderViewer(model) model.render.viewerOption = option diff --git a/src/App.vue b/src/App.vue index 7ab075b..d26b151 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,49 +20,91 @@ export default defineComponent({ data() { const options = markRaw({ - + currentLayout: "ddei-core-layout-simple", config: { - ratio: 1.3, //默认缩放比例为150% + ratio: 1, //默认缩放比例为150% paper:"A6", "mark": "水印文本", // EXT_STAGE_WIDTH: false, // EXT_STAGE_HEIGHT: false, // 自定义控件，接收一个object[]。由于定义内容较多，提取到外部，便于维护 - // controlDefines: ControlDefinesDemo, + controlDefines: ControlDefinesDemo, // 自定义分组，接收一个object[]。由于定义内容较多，提取到外部，便于维护 - // groupDefines: GroupDefinesDemo, + groupDefines: GroupDefinesDemo, initData: { controls: [ // { // model: "9999002" // }, - { - id: "act_1", - model: "102010", - type: "emp_1", - text: "第一步", - border: { color: "yellow", dash: [10, 10, 5, 5], width: 5 }, - fill: { color: "grey" }, - } + // { + // id: "act_1", + // model: "102010", + // type: "emp_1", + // text: "第一步", + // border: { color: "yellow", dash: [10, 10, 5, 5], width: 5 }, + // fill: { color: "grey" }, + // } + { + id: "act_1", + model: "102010", + type: "emp_1", + text: "第一步", + border: { color: "yellow", dash: [10, 10, 5, 5], width: 5 }, + fill: { color: "grey" }, + }, + { + id: "act_2", + model: "102010", + type: "emp_2", + width: 200, + height: 100, + text: "第二步", + offsetY: -70, + } + ] } }, extensions: [ - //布局的配置 - DDeiCoreStandLayout.configuration({ - //配置插件 - // 'top': [], - 'middle': ['ddei-core-panel-openfilesview', 'ddei-core-panel-canvasview', 'ddei-core-panel-quickcolorview'],// [!code ++] - // 'bottom': [], - // 'left': [], - // 'right': [] + // //布局的配置 + // DDeiCoreStandLayout.configuration({ + // //配置插件 + // // 'top': [], + // 'middle': ['ddei-core-panel-openfilesview', 'ddei-core-panel-canvasview', 'ddei-core-panel-quickcolorview'],// [!code ++] + // // 'bottom': [], + // // 'left': [], + // // 'right': [] + // }), + DDeiCoreSimpleLayout.configuration({ + other: ['ddei-core-panel-toolbox-simple', 'ddei-core-panel-topmenu-simple'], + middle: ['ddei-core-panel-canvasview'], + right: [], + bottom: [] }), - DDeiCoreSimpleLayout, DDeiExtUML, DDeiExtSearch, DDeiExtTooltip, DDeiExtQuickStyle, DDeiExtQuickControl, + //配置htmlviewer插件，matchField用于声明图形控件中的属性与config中的key对应字段 + DDeiExtHtmlViewer.configuration({ + matchField: "type", //匹配字段 + "emp_1": { //key-value + type: "emp_1", + name: "张三", + viewer: ReplaceDivDemo //HTML模板控件 + }, + "emp_2": { + type: "emp_2", + name: "李四", + viewer: ReplaceDivDemo + }, + "emp_3": { + type: "emp_3", + name: "王五", + viewer: ReplaceDivDemo + } + }) // QuickChooseControlDialog.configuration({ customGroups: ['101', '102'] }), // DDeiExtTooltip.configuration({ // 'ddei-ext-dialog-tooltip':{ diff --git a/src/HtmlViewerDemo.vue b/src/HtmlViewerDemo.vue index 5aef57d..14c3a53 100644 --- a/src/HtmlViewerDemo.vue +++ b/src/HtmlViewerDemo.vue @@ -1,5 +1,4 @@ \ No newline at end of file + + diff --git a/src/ReplaceDivDemo.vue b/src/ReplaceDivDemo.vue index fc10663..ad975f1 100644 --- a/src/ReplaceDivDemo.vue +++ b/src/ReplaceDivDemo.vue @@ -29,8 +29,7 @@ export default { }; \ No newline at end of file + + \ No newline at end of file