!7 1.2.43版本发布

Merge pull request !7 from hoslay/develop
This commit is contained in:
hoslay 2024-11-21 04:16:00 +00:00 committed by Gitee
commit d6002b6d98
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
173 changed files with 1095 additions and 630 deletions

View File

@ -10,7 +10,7 @@
<meta name="description" content="DDei在线设计器——简单、好用、免费的在线绘图和流程编排工具。流程设计、UML、思维导图、数据库设计、泳道图、时序图、类图、在线绘图、二次开发、API接口、协作!">
<meta name="Keywords" content="流程设计,UML,思维导图,数据库设计,泳道图,时序图,类图,在线绘图,免费,二次开发,API接口,协作">
<meta name="replace">
<title>DDei-在线设计器V1.2.42</title>
<title>DDei-在线设计器V1.2.43</title>
</head>
<body>
<div id="app"></div>

639
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "ddei-editor",
"version": "1.2.42-1",
"version": "1.2.43",
"private": false,
"type": "module",
"author": "hoslay <3697355039@qq.com>",
@ -10,6 +10,7 @@
"ddei",
"ddei-plugin",
"ddei-editor",
"ddei-flow",
"图形框架",
"流程图",
"思维导图",
@ -49,7 +50,9 @@
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
},
"dependencies": {
"ddei-framework": "^1.2.42"
"ddei-framework": "^1.2.43",
"lodash": "^4.17.21",
"three": "^0.156.1"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.0",

View File

@ -37,6 +37,10 @@ class DDeiCoreAddFontSizeButton extends DDeiPluginBase{
}
return DDeiCoreAddFontSizeButton;
}
static modify(fn) {
return DDeiCoreAddFontSizeButton.defaultIns.modify(fn)
}
}
export default DDeiCoreAddFontSizeButton

View File

@ -37,6 +37,10 @@ class DDeiCoreBorderDashButton extends DDeiPluginBase{
}
return DDeiCoreBorderDashButton;
}
static modify(fn) {
return DDeiCoreBorderDashButton.defaultIns.modify(fn)
}
}
export default DDeiCoreBorderDashButton

View File

@ -36,6 +36,10 @@ class DDeiCoreBorderWeightButton extends DDeiPluginBase{
}
return DDeiCoreBorderWeightButton;
}
static modify(fn) {
return DDeiCoreBorderWeightButton.defaultIns.modify(fn)
}
}
export default DDeiCoreBorderWeightButton

View File

@ -36,6 +36,10 @@ class DDeiCoreEditBoxButton extends DDeiPluginBase{
}
return DDeiCoreEditBoxButton;
}
static modify(fn) {
return DDeiCoreEditBoxButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditBoxButton

View File

@ -37,6 +37,10 @@ class DDeiCoreEditColorButton extends DDeiPluginBase{
}
return DDeiCoreEditColorButton;
}
static modify(fn) {
return DDeiCoreEditColorButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditColorButton

View File

@ -37,6 +37,10 @@ class DDeiCoreEditFontFamilyButton extends DDeiPluginBase{
}
return DDeiCoreEditFontFamilyButton;
}
static modify(fn) {
return DDeiCoreEditFontFamilyButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditFontFamilyButton

View File

@ -40,6 +40,10 @@ class DDeiCoreEditFontSizeButton extends DDeiPluginBase{
}
return DDeiCoreEditFontSizeButton;
}
static modify(fn) {
return DDeiCoreEditFontSizeButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditFontSizeButton

View File

@ -39,6 +39,10 @@ class DDeiCoreEditLinePointTypeButton extends DDeiPluginBase{
}
return DDeiCoreEditLinePointTypeButton;
}
static modify(fn) {
return DDeiCoreEditLinePointTypeButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditLinePointTypeButton

View File

@ -40,6 +40,10 @@ class DDeiCoreEditLineTypeButton extends DDeiPluginBase{
}
return DDeiCoreEditLineTypeButton;
}
static modify(fn) {
return DDeiCoreEditLineTypeButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditLineTypeButton

View File

@ -37,6 +37,10 @@ class DDeiCoreEditTextAlignButton extends DDeiPluginBase{
}
return DDeiCoreEditTextAlignButton;
}
static modify(fn) {
return DDeiCoreEditTextAlignButton.defaultIns.modify(fn)
}
}
export default DDeiCoreEditTextAlignButton

View File

@ -54,6 +54,10 @@ class DDeiCoreComponents extends DDeiPluginBase{
}
return DDeiCoreComponents;
}
static modify(fn) {
return DDeiCoreComponents.defaultIns.modify(fn)
}
}
export {DDeiCoreComponents,DDeiCoreAddFontSizeButton, DDeiCoreBorderDashButton, DDeiCoreBorderWeightButton

View File

@ -3,7 +3,7 @@ export default {
'name': '组合容器',
'code': 'comp',
'desc': '用于组合关系的容器',
'type': 'DDeiRectContainer',
'type': 'DDeiPolygonContainer',
'from': '100201',
'define': {

View File

@ -3,7 +3,11 @@ export default {
'name': '矩形容器',
'code': 'rectange_container',
'desc': '矩形形状的容器,能够包含其他容器',
'type': 'DDeiRectContainer',
'type': 'DDeiPolygonContainer',
'from':'100008',
'define': {
poly:2
},
/**
*

View File

@ -17,6 +17,9 @@ export default {
depPos:{
type:8
},
depProps: {
"8": "text" //映射属性
},
//一圈采样次数
loop: 4,
//半径距离
@ -112,7 +115,18 @@ export default {
]
}
},
{
name: "ddei.data",
icon: 'icon-edit-properies',
subGroups: [
{
name: "ddei.basic",
attrs: ["code", "text"]
},
]
},
]
}
}

View File

@ -17,6 +17,10 @@ export default {
depPos: {
type: 8
},
//一圈
depProps: {
"8": "text" //映射属性
},
//一圈采样次数
loop: 4,
//半径距离
@ -52,6 +56,9 @@ export default {
iconPos: {
dy: 20
},
depProps: {
"8": "text" //映射属性
},
//组合控件
composes: [
{
@ -98,7 +105,18 @@ export default {
]
}
},
{
name: "ddei.data",
icon: 'icon-edit-properies',
subGroups: [
{
name: "ddei.basic",
attrs: ["code", "text"]
},
]
},
]
}
}

View File

@ -20,6 +20,9 @@ export default {
depPos: {
type: 8
},
depProps: {
"8": "text" //映射属性
},
//一圈采样次数
loop: 4,
//半径距离
@ -116,7 +119,18 @@ export default {
]
}
},
{
name: "ddei.data",
icon: 'icon-edit-properies',
subGroups: [
{
name: "ddei.basic",
attrs: ["code", "text"]
},
]
},
]
}
}

View File

@ -64,6 +64,10 @@ class DDeiCoreControls extends DDeiPluginBase{
}
return DDeiCoreControls;
}
static modify(fn) {
return DDeiCoreControls.defaultIns.modify(fn)
}
}
export {DDeiCoreControls}

View File

@ -7,7 +7,7 @@
<svg class="icon groupicon" aria-hidden="true">
<use xlink:href="#icon-shapes-catalogy"></use>
</svg>
<div class="groupname">{{ editor.i18n('ddei.basic') }}</div>
<div class="groupname">{{ editor.i18n('ddei.basicSubject') }}</div>
<svg class="icon expand" aria-hidden="true">
<use xlink:href="#icon-btn-right"></use>
</svg>
@ -16,7 +16,7 @@
<svg class="icon groupicon" aria-hidden="true">
<use xlink:href="#icon-groups"></use>
</svg>
<div class="groupname">{{ editor.i18n('ddei.uml') }}</div>
<div class="groupname">{{ editor.i18n('ddei.umlSubject') }}</div>
<svg class="icon expand" aria-hidden="true">
<use xlink:href="#icon-btn-right"></use>
</svg>

View File

@ -38,6 +38,10 @@ class DDeiCoreAlignDialog extends DDeiPluginBase{
}
return DDeiCoreAlignDialog;
}
static modify(fn) {
return DDeiCoreAlignDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreAlignDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreChangeRatioDialog extends DDeiPluginBase{
}
return DDeiCoreChangeRatioDialog;
}
static modify(fn) {
return DDeiCoreChangeRatioDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreChangeRatioDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreChooseControlDialog extends DDeiPluginBase{
}
return DDeiCoreChooseControlDialog;
}
static modify(fn) {
return DDeiCoreChooseControlDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreChooseControlDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreChooseControlGroupDialog extends DDeiPluginBase{
}
return DDeiCoreChooseControlGroupDialog;
}
static modify(fn) {
return DDeiCoreChooseControlGroupDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreChooseControlGroupDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreCloseFileConfirmDialog extends DDeiPluginBase{
}
return DDeiCoreCloseFileConfirmDialog;
}
static modify(fn) {
return DDeiCoreCloseFileConfirmDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreCloseFileConfirmDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreCollFileConfirmDialog extends DDeiPluginBase{
}
return DDeiCoreCollFileConfirmDialog;
}
static modify(fn) {
return DDeiCoreCollFileConfirmDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreCollFileConfirmDialog

View File

@ -67,6 +67,10 @@ class DDeiCoreDialogs extends DDeiPluginBase {
}
return DDeiCoreDialogs;
}
static modify(fn) {
return DDeiCoreDialogs.defaultIns.modify(fn)
}
}

View File

@ -37,6 +37,10 @@ class DDeiCoreLinePointTypeDialog extends DDeiPluginBase{
}
return DDeiCoreLinePointTypeDialog;
}
static modify(fn) {
return DDeiCoreLinePointTypeDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreLinePointTypeDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreLineTypeDialog extends DDeiPluginBase{
}
return DDeiCoreLineTypeDialog;
}
static modify(fn) {
return DDeiCoreLineTypeDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreLineTypeDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreManageLayersDialog extends DDeiPluginBase{
}
return DDeiCoreManageLayersDialog;
}
static modify(fn) {
return DDeiCoreManageLayersDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreManageLayersDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreMergeComposeDialog extends DDeiPluginBase{
}
return DDeiCoreMergeComposeDialog;
}
static modify(fn) {
return DDeiCoreMergeComposeDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreMergeComposeDialog

View File

@ -37,6 +37,10 @@ class DDeiCorePositionDialog extends DDeiPluginBase{
}
return DDeiCorePositionDialog;
}
static modify(fn) {
return DDeiCorePositionDialog.defaultIns.modify(fn)
}
}
export default DDeiCorePositionDialog

View File

@ -37,6 +37,10 @@ class DDeiCorePublishFileConfirmDialog extends DDeiPluginBase{
}
return DDeiCorePublishFileConfirmDialog;
}
static modify(fn) {
return DDeiCorePublishFileConfirmDialog.defaultIns.modify(fn)
}
}
export default DDeiCorePublishFileConfirmDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreQCViewDialog extends DDeiPluginBase{
}
return DDeiCoreQCViewDialog;
}
static modify(fn) {
return DDeiCoreQCViewDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreQCViewDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreQuickSetStyleDialog extends DDeiPluginBase{
}
return DDeiCoreQuickSetStyleDialog;
}
static modify(fn) {
return DDeiCoreQuickSetStyleDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreQuickSetStyleDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreRotateDialog extends DDeiPluginBase{
}
return DDeiCoreRotateDialog;
}
static modify(fn) {
return DDeiCoreRotateDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreRotateDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreSelectBorderDashDialog extends DDeiPluginBase{
}
return DDeiCoreSelectBorderDashDialog;
}
static modify(fn) {
return DDeiCoreSelectBorderDashDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreSelectBorderDashDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreSelectBorderWeightDialog extends DDeiPluginBase{
}
return DDeiCoreSelectBorderWeightDialog;
}
static modify(fn) {
return DDeiCoreSelectBorderWeightDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreSelectBorderWeightDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreSelectColorDialog extends DDeiPluginBase{
}
return DDeiCoreSelectColorDialog;
}
static modify(fn) {
return DDeiCoreSelectColorDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreSelectColorDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreSelectFontDialog extends DDeiPluginBase{
}
return DDeiCoreSelectFontDialog;
}
static modify(fn) {
return DDeiCoreSelectFontDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreSelectFontDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreSelectFontSizeDialog extends DDeiPluginBase{
}
return DDeiCoreSelectFontSizeDialog;
}
static modify(fn) {
return DDeiCoreSelectFontSizeDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreSelectFontSizeDialog

View File

@ -37,6 +37,10 @@ class DDeiCoreTextAlignDialog extends DDeiPluginBase{
}
return DDeiCoreTextAlignDialog;
}
static modify(fn) {
return DDeiCoreTextAlignDialog.defaultIns.modify(fn)
}
}
export default DDeiCoreTextAlignDialog

View File

@ -56,6 +56,10 @@ class DDeiKeyActionAllSelect extends DDeiKeyAction {
return DDeiKeyActionAllSelect;
}
static modify(fn) {
return DDeiKeyActionAllSelect.defaultIns.modify(fn)
}
// ============================ 方法 ===============================

View File

@ -55,6 +55,10 @@ class DDeiKeyActionBrushData extends DDeiKeyAction {
}
return DDeiKeyActionBrushData;
}
static modify(fn) {
return DDeiKeyActionBrushData.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
isActive(element: object): boolean {

View File

@ -55,6 +55,10 @@ class DDeiKeyActionCancelCompose extends DDeiKeyAction {
}
return DDeiKeyActionCancelCompose;
}
static modify(fn) {
return DDeiKeyActionCancelCompose.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//修改当前操作控件坐标

View File

@ -54,6 +54,10 @@ class DDeiKeyActionCancelControlCreate extends DDeiKeyAction {
}
return DDeiKeyActionCancelControlCreate;
}
static modify(fn) {
return DDeiKeyActionCancelControlCreate.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei, editor: DDeiEditor): void {
if (editor.state == DDeiEditorState.CONTROL_CREATING) {

View File

@ -55,6 +55,10 @@ class DDeiKeyActionCancelCurrentAction extends DDeiKeyAction {
return DDeiKeyActionCancelCurrentAction;
}
static modify(fn) {
return DDeiKeyActionCancelCurrentAction.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei, editor: DDeiEditor): void {
if (editor.state == DDeiEditorState.DESIGNING) {

View File

@ -51,6 +51,10 @@ class DDeiKeyActionCancelQuickEdit extends DDeiKeyAction {
}
return DDeiKeyActionCancelQuickEdit;
}
static modify(fn) {
return DDeiKeyActionCancelQuickEdit.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
if (ddInstance.stage.brushDataText) {

View File

@ -51,6 +51,10 @@ class DDeiKeyActionCancelSelect extends DDeiKeyAction {
}
return DDeiKeyActionCancelSelect;
}
static modify(fn) {
return DDeiKeyActionCancelSelect.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//修改当前操作控件坐标

View File

@ -52,6 +52,10 @@ class DDeiKeyActionClearBrushData extends DDeiKeyAction {
}
return DDeiKeyActionClearBrushData;
}
static modify(fn) {
return DDeiKeyActionClearBrushData.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//记录当前格式信息,修改状态为刷子状态

View File

@ -2,8 +2,6 @@ import {DDeiConfig} from "ddei-framework";
import {DDei} from "ddei-framework";
import {DDeiEnumControlState} from "ddei-framework";
import {DDeiEnumOperateState} from "ddei-framework";
import {DDeiRectContainer} from "ddei-framework";
import {DDeiAbstractShape} from "ddei-framework";
import {DDeiKeyAction} from "ddei-framework";
import {DDeiEnumBusCommandType} from "ddei-framework";
import {DDeiUtil} from "ddei-framework";
@ -57,6 +55,10 @@ class DDeiKeyActionCloseDialog extends DDeiKeyAction {
}
return DDeiKeyActionCloseDialog;
}
static modify(fn) {
return DDeiKeyActionCloseDialog.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
DDeiEditorUtil.closeDialogs(DDeiEditorUtil.getEditorInsByDDei(ddInstance),["bottom-dialog", "property-dialog", "top-dialog", "toolbox-dialog"])

View File

@ -1,9 +1,4 @@
import {DDeiConfig} from "ddei-framework";
import {DDei} from "ddei-framework";
import {DDeiEnumControlState} from "ddei-framework";
import {DDeiEnumOperateState} from "ddei-framework";
import {DDeiRectContainer} from "ddei-framework";
import {DDeiAbstractShape} from "ddei-framework";
import {DDeiKeyAction} from "ddei-framework";
import {DDeiEnumBusCommandType} from "ddei-framework";
import {DDeiEditorState} from "ddei-framework";
@ -55,6 +50,10 @@ class DDeiKeyActionCompose extends DDeiKeyAction {
}
return DDeiKeyActionCompose;
}
static modify(fn) {
return DDeiKeyActionCompose.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//修改当前操作控件坐标

View File

@ -53,6 +53,10 @@ class DDeiKeyActionCopyImage extends DDeiKeyAction {
}
return DDeiKeyActionCopyImage;
}
static modify(fn) {
return DDeiKeyActionCopyImage.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei, editor: DDeiEditor): void {
if (DDeiConfig.ALLOW_CLIPBOARD || DDeiConfig.ALLOW_CLIPBOARD == undefined) {

View File

@ -66,6 +66,10 @@ class DDeiKeyActionCopy extends DDeiKeyAction {
return DDeiKeyActionCopy;
}
static modify(fn) {
return DDeiKeyActionCopy.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
async action(evt: Event, ddInstance: DDei, editor: DDeiEditor): boolean {

View File

@ -54,6 +54,10 @@ class DDeiKeyActionCut extends DDeiKeyAction {
return DDeiKeyActionCut;
}
static modify(fn) {
return DDeiKeyActionCut.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
async action(evt: Event, ddInstance: DDei, editor: DDeiEditor): void {
//修改当前操作控件坐标

View File

@ -51,6 +51,10 @@ class DDeiKeyActionEnterQuickEdit extends DDeiKeyAction {
return DDeiKeyActionEnterQuickEdit;
}
static modify(fn) {
return DDeiKeyActionEnterQuickEdit.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
let editor = DDeiEditor.ACTIVE_INSTANCE;

View File

@ -62,6 +62,10 @@ class DDeiKeyActionMoveModels extends DDeiKeyAction {
}
return DDeiKeyActionMoveModels;
}
static modify(fn) {
return DDeiKeyActionMoveModels.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
@ -184,24 +188,26 @@ class DDeiKeyActionMoveModels extends DDeiKeyAction {
}
let stage = ddInstance.stage
DDeiAbstractShape.moveModels(models, deltaX, deltaY, moveOriginLines);
let rsState = DDeiEditorUtil.invokeCallbackFunc("EVENT_CONTROL_DRAG_BEFORE", DDeiEnumOperateType.DRAG, { models: models }, ddInstance, evt)
if (rsState == 0 || rsState == 1){
DDeiAbstractShape.moveModels(models, deltaX, deltaY, moveOriginLines);
stage.layers[stage.layerIndex].opPoints = []
if (stage.layers[stage.layerIndex].opLine?.render) {
stage.layers[stage.layerIndex].opLine.render.enableRefreshShape()
}
delete stage.layers[stage.layerIndex].opLine;
stage.render.refreshJumpLine = false
ddInstance.bus.push(DDeiEnumBusCommandType.UpdateSelectorBounds);
ddInstance.bus.push(DDeiEnumBusCommandType.NodifyChange);
ddInstance.bus.push(DDeiEnumBusCommandType.AddHistroy, null, evt);
ddInstance.bus.push(DDeiEnumBusCommandType.ClearTemplateVars);
//渲染图形
ddInstance.bus.push(DDeiEnumBusCommandType.RefreshShape, null, evt);
stage.layers[stage.layerIndex].opPoints = []
if (stage.layers[stage.layerIndex].opLine?.render) {
stage.layers[stage.layerIndex].opLine.render.enableRefreshShape()
}
delete stage.layers[stage.layerIndex].opLine;
stage.render.refreshJumpLine = false
ddInstance.bus.push(DDeiEnumBusCommandType.UpdateSelectorBounds);
ddInstance.bus.push(DDeiEnumBusCommandType.NodifyChange);
ddInstance.bus.push(DDeiEnumBusCommandType.AddHistroy, null, evt);
ddInstance.bus.push(DDeiEnumBusCommandType.ClearTemplateVars);
//渲染图形
ddInstance.bus.push(DDeiEnumBusCommandType.RefreshShape, null, evt);
ddInstance.bus.executeAll();
DDeiEditorUtil.invokeCallbackFunc("EVENT_CONTROL_DRAG_AFTER", DDeiEnumOperateType.DRAG, { models: models }, ddInstance, evt)
ddInstance.bus.executeAll();
DDeiEditorUtil.invokeCallbackFunc("EVENT_CONTROL_DRAG_AFTER", DDeiEnumOperateType.DRAG, { models: models }, ddInstance, evt)
}
return true
}

View File

@ -13,6 +13,7 @@ import {DDeiPolygon} from "ddei-framework";
import {DDeiLink} from "ddei-framework";
import {DDeiModelLink} from "ddei-framework";
import { DDeiEditorState, DDeiEditorUtil } from "ddei-framework";
import {cloneDeep} from "lodash"
/**
* 键行为:粘贴
*
@ -60,6 +61,10 @@ class DDeiKeyActionPaste extends DDeiKeyAction {
return DDeiKeyActionPaste;
}
static modify(fn) {
return DDeiKeyActionPaste.defaultIns.modify(fn)
}
isActive(element: object): boolean {
if (!element) {
return true
@ -315,7 +320,7 @@ class DDeiKeyActionPaste extends DDeiKeyAction {
});
for (let i in ccDefine?.define) {
dataJson[i] = ccDefine?.define[i];
dataJson[i] = cloneDeep(ccDefine?.define[i]);
}
dataJson.text = textData;
dataJson.border = { type: 0 };
@ -1172,7 +1177,7 @@ class DDeiKeyActionPaste extends DDeiKeyAction {
let ccDefine = DDeiUtil.getControlDefine(dataJson)
for (let i in ccDefine?.define) {
dataJson[i] = ccDefine?.define[i];
dataJson[i] = cloneDeep(ccDefine?.define[i]);
}
dataJson.text = "";
dataJson.border = { type: 0 };

View File

@ -59,6 +59,10 @@ class DDeiKeyActionPushModels extends DDeiKeyAction {
}
return DDeiKeyActionPushModels;
}
static modify(fn) {
return DDeiKeyActionPushModels.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
isActive(element: object): boolean {

View File

@ -42,6 +42,10 @@ class DDeiKeyActionNewRowQuickEdit extends DDeiKeyAction {
}
return DDeiKeyActionNewRowQuickEdit;
}
static modify(fn) {
return DDeiKeyActionNewRowQuickEdit.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
let editor = DDeiEditor.ACTIVE_INSTANCE;

View File

@ -53,6 +53,10 @@ class DDeiKeyActionRemoveModels extends DDeiKeyAction {
return DDeiKeyActionRemoveModels;
}
static modify(fn) {
return DDeiKeyActionRemoveModels.defaultIns.modify(fn)
}
isActive(element: object): boolean {
if (!element) {
return true

View File

@ -60,6 +60,10 @@ class DDeiKeyActionReRevoke extends DDeiKeyAction {
}
return DDeiKeyActionReRevoke;
}
static modify(fn) {
return DDeiKeyActionReRevoke.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
isActive(element: object): boolean {

View File

@ -60,6 +60,10 @@ class DDeiKeyActionRevoke extends DDeiKeyAction {
}
return DDeiKeyActionRevoke;
}
static modify(fn) {
return DDeiKeyActionRevoke.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
isActive(element: object): boolean {

View File

@ -54,6 +54,10 @@ class DDeiKeyActionSaveFile extends DDeiKeyAction {
}
return DDeiKeyActionSaveFile;
}
static modify(fn) {
return DDeiKeyActionSaveFile.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
ddInstance.bus?.push(DDeiEditorEnumBusCommandType.SaveFile, {}, evt)

View File

@ -10,7 +10,7 @@ import {DDeiEditorState} from "ddei-framework";
import {DDeiKeyAction} from "ddei-framework";
import {DDeiEnumOperateState} from "ddei-framework";
import {DDeiAbstractShape} from "ddei-framework";
import { cloneDeep } from 'lodash';
/**
* 键行为:开启快捷编辑
*
@ -59,6 +59,10 @@ class DDeiKeyActionStartQuickEdit extends DDeiKeyAction {
}
return DDeiKeyActionStartQuickEdit;
}
static modify(fn) {
return DDeiKeyActionStartQuickEdit.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
isActive(element: object): boolean {
@ -215,7 +219,7 @@ class DDeiKeyActionStartQuickEdit extends DDeiKeyAction {
let controlDefine = DDeiUtil.getControlDefine(dataJson)
for (let i in controlDefine?.define) {
dataJson[i] = controlDefine.define[i];
dataJson[i] = cloneDeep(controlDefine.define[i]);
}
dataJson["id"] = "lsm_" + (stage.idIdx++)
dataJson["width"] = 80
@ -271,11 +275,6 @@ class DDeiKeyActionStartQuickEdit extends DDeiKeyAction {
editor.quickEditorModel = model;
}
//获取控件所占区域
model = DDeiAbstractShape.findBottomComponseByArea(model, ex, ey);

View File

@ -52,6 +52,10 @@ class DDeiKeyActionTableNextCol extends DDeiKeyAction {
}
return DDeiKeyActionTableNextCol;
}
static modify(fn) {
return DDeiKeyActionTableNextCol.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//修改当前操作控件坐标

View File

@ -51,6 +51,10 @@ class DDeiKeyActionTableNextRow extends DDeiKeyAction {
}
return DDeiKeyActionTableNextRow;
}
static modify(fn) {
return DDeiKeyActionTableNextRow.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
action(evt: Event, ddInstance: DDei): void {
//修改当前操作控件坐标

View File

@ -73,6 +73,10 @@ class DDeiCoreHotkeys extends DDeiPluginBase{
}
return hotkeys;
}
static modify(fn) {
return DDeiCoreHotkeys.defaultIns.modify(fn)
}
}
export {
DDeiCoreHotkeys, DDeiKeyActionAllSelect, DDeiKeyActionBrushData, DDeiKeyActionCancelCompose, DDeiKeyActionCancelControlCreate,

View File

@ -61,8 +61,8 @@ export default {
wholePage: "Whole Page",
precent: "Pre",
chooseShapeGroups: "Choose Shapes",
basic: "Basic",
uml: "UML",
basicSubject: "Basic",
umlSubject: "UML",
brush: "Brush",
startPoint: 'Start',
endPoint: 'End',
@ -78,6 +78,7 @@ export default {
mark: 'Mark',
paper: 'Paper',
propertyName: "Property",
searchResult: "Search Result",
property: {
id: 'id',
code: 'Code',

View File

@ -62,8 +62,8 @@ export default {
wholePage: "整页",
precent: "百分比",
chooseShapeGroups: "选择图形",
basic:"基本",
uml:"UML",
basicSubject:"基本",
umlSubject:"UML",
brush:"格式刷",
startPoint: "起点",
endPoint: "终点",
@ -80,6 +80,7 @@ export default {
mark: '水印',
paper: '纸张',
propertyName:"属性",
searchResult: "搜索结果",
property:{
id:'id',
code:'编码',
@ -141,6 +142,8 @@ export default {
bgImagePosition: '位置',
code001: "编码001",
linePointType:"端点类型",
ds:{
none: '无',

View File

@ -172,6 +172,10 @@ class DDeiCore extends DDeiPluginBase {
core.lifecycles = core.lifecycles.configuration(options, true)
return core;
}
static modify(fn) {
return DDeiCore.defaultIns.modify(fn)
}
}
export * from "./panels"

View File

@ -41,6 +41,10 @@ class DDeiCoreLayouts extends DDeiPluginBase{
}
return layouts;
}
static modify(fn) {
return DDeiCoreLayouts.defaultIns.modify(fn)
}
}
export { DDeiCoreLayouts, DDeiCoreStandLayout, DDeiCoreSimpleLayout }

View File

@ -49,6 +49,10 @@ class DDeiCoreSimpleLayout extends DDeiPluginBase{
}
return DDeiCoreSimpleLayout;
}
static modify(fn) {
return DDeiCoreSimpleLayout.defaultIns.modify(fn)
}
}
export default DDeiCoreSimpleLayout

View File

@ -50,6 +50,10 @@ class DDeiCoreStandLayout extends DDeiPluginBase{
}
return DDeiCoreStandLayout;
}
static modify(fn) {
return DDeiCoreStandLayout.defaultIns.modify(fn)
}
}
export default DDeiCoreStandLayout

View File

@ -48,6 +48,10 @@ class DDeiCoreLifeCycle extends DDeiLifeCycle {
}
return DDeiCoreLifeCycle;
}
static modify(fn) {
return DDeiCoreLifeCycle.defaultIns.modify(fn)
}
}
export default DDeiCoreLifeCycle

View File

@ -27,6 +27,10 @@ class DDeiCoreLifeCycles extends DDeiPluginBase {
core.lifecyclies = core.lifecyclies.configuration(options, true)
return core;
}
static modify(fn) {
return DDeiCoreLifeCycles.defaultIns.modify(fn)
}
}
export {DDeiCoreLifeCycles}

View File

@ -50,6 +50,10 @@ class DDeiCoreMenus extends DDeiPluginBase{
}
return menus;
}
static modify(fn) {
return DDeiCoreMenus.defaultIns.modify(fn)
}
}
export {
DDeiCoreMenus, MenuCancelMergeCell, MenuCopySheet, MenuInsertCol, MenuInsertRow,

View File

@ -45,6 +45,10 @@ class MenuCancelMergeCell extends DDeiMenuBase {
return MenuCancelMergeCell;
}
static modify(fn) {
return MenuCancelMergeCell.defaultIns.modify(fn)
}
// ============================ 方法 ===============================
/**
*

View File

@ -49,6 +49,10 @@ class MenuCopySheet extends DDeiMenuBase {
}
return MenuCopySheet;
}
static modify(fn) {
return MenuCopySheet.defaultIns.modify(fn)
}
/**
*
*/

View File

@ -44,6 +44,10 @@ class MenuInsertCol extends DDeiMenuBase {
}
return MenuInsertCol;
}
static modify(fn) {
return MenuInsertCol.defaultIns.modify(fn)
}
/**
*
*/

View File

@ -47,6 +47,10 @@ class MenuInsertRow extends DDeiMenuBase {
return MenuInsertRow;
}
static modify(fn) {
return MenuInsertRow.defaultIns.modify(fn)
}
/**
*

View File

@ -43,6 +43,10 @@ class MenuMergeCell extends DDeiMenuBase {
}
return MenuMergeCell;
}
static modify(fn) {
return MenuMergeCell.defaultIns.modify(fn)
}
/**
*
*/

View File

@ -43,6 +43,10 @@ class MenuRemoveCol extends DDeiMenuBase {
}
return MenuRemoveCol;
}
static modify(fn) {
return MenuRemoveCol.defaultIns.modify(fn)
}
/**
*
*/

View File

@ -44,6 +44,10 @@ class MenuRemoveRow extends DDeiMenuBase {
}
return MenuRemoveRow;
}
static modify(fn) {
return MenuRemoveRow.defaultIns.modify(fn)
}
/**
*
*/

View File

@ -51,6 +51,10 @@ class MenuRemoveSheet extends DDeiMenuBase {
return MenuRemoveSheet;
}
static modify(fn) {
return MenuRemoveSheet.defaultIns.modify(fn)
}
action(model: object, evt: Event): void {
if (model.modelType == 'DDeiSheet') {

View File

@ -41,6 +41,10 @@ class DDeiCoreChangeRatioPanel extends DDeiPluginBase{
}
return DDeiCoreChangeRatioPanel;
}
static modify(fn) {
return DDeiCoreChangeRatioPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreChangeRatioPanel

View File

@ -47,6 +47,10 @@ class DDeiCoreBottomPanels extends DDeiPluginBase{
}
return DDeiCoreBottomPanels;
}
static modify(fn) {
return DDeiCoreBottomPanels.defaultIns.modify(fn)
}
}

View File

@ -41,6 +41,10 @@ class DDeiCoreManageLayersPanel extends DDeiPluginBase{
}
return DDeiCoreManageLayersPanel;
}
static modify(fn) {
return DDeiCoreManageLayersPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreManageLayersPanel

View File

@ -41,6 +41,10 @@ class DDeiCorePlayPanel extends DDeiPluginBase{
}
return DDeiCorePlayPanel;
}
static modify(fn) {
return DDeiCorePlayPanel.defaultIns.modify(fn)
}
}
export default DDeiCorePlayPanel

View File

@ -41,6 +41,9 @@ class DDeiCoreShapeCountPanel extends DDeiPluginBase{
}
return DDeiCoreShapeCountPanel;
}
static modify(fn) {
return DDeiCoreShapeCountPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreShapeCountPanel

View File

@ -41,6 +41,10 @@ class DDeiCoreSheetsPanel extends DDeiPluginBase{
}
return DDeiCoreSheetsPanel;
}
static modify(fn) {
return DDeiCoreSheetsPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreSheetsPanel

View File

@ -41,6 +41,10 @@ class DDeiCoreSuitRatioPanel extends DDeiPluginBase{
}
return DDeiCoreSuitRatioPanel;
}
static modify(fn) {
return DDeiCoreSuitRatioPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreSuitRatioPanel

View File

@ -43,6 +43,10 @@ class DDeiCoreBottomMenuPanel extends DDeiPluginBase{
}
return DDeiCoreBottomMenuPanel;
}
static modify(fn) {
return DDeiCoreBottomMenuPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreBottomMenuPanel

View File

@ -364,12 +364,15 @@ export default {
);
let lastOnContainer = layer;
if (isAlt) {
let stageRatio = stage.getStageRatio()
let ex2 = ex / stageRatio
let ey2 = ey / stageRatio
//
let mouseOnContainers =
DDeiAbstractShape.findBottomContainersByArea(
layer,
ex,
ey
ex2,
ey2
);
if (mouseOnContainers && mouseOnContainers.length > 0) {
lastOnContainer =
@ -455,6 +458,23 @@ export default {
);
}
}
this.editor.creatingControls.forEach(model => {
let controlDefine = this.editor.controls.get(model.modelCode);
//
if (controlDefine?.define?.sample?.depProps) {
let depProps = controlDefine.define.sample.depProps;
//
for (let type in depProps) {
let property = depProps[type]
let modelPropValue = model[property];
if (modelPropValue) {
DDeiUtil.createDepLinkModel(model, modelPropValue, type)
}
}
}
model.refreshLinkModels()
});
//
this.editor.bus.push(
DDeiEnumBusCommandType.CancelCurLevelSelectedModels,

View File

@ -40,6 +40,10 @@ class DDeiCoreCanvasViewPanel extends DDeiPluginBase{
}
return DDeiCoreCanvasViewPanel;
}
static modify(fn) {
return DDeiCoreCanvasViewPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreCanvasViewPanel

View File

@ -26,7 +26,7 @@
</div>
</template>
<script lang="ts">
import {DDeiStoreLocal} from "ddei-framework";
// import {DDeiStoreLocal} from "ddei-framework";
import {DDeiEditor} from "ddei-framework";
import {DDeiStage} from "ddei-framework";
import {DDeiActiveType} from "ddei-framework";
@ -171,84 +171,84 @@ export default {
*/
openFile(evt) {
//
let storeIns = new DDeiStoreLocal();
storeIns.find("").then((datas) => {
// TODO
if (datas) {
for (let i = 0; i < datas.length; i++) {
let finded = false;
for (let j = 0; j < this.editor.files.length; j++) {
if (this.editor.files[j].id == datas[i].id) {
finded = true;
break;
}
}
if (!finded) {
let storeIns = new DDeiStoreLocal();
// let storeIns = new DDeiStoreLocal();
// storeIns.find("").then((datas) => {
// // TODO
// if (datas) {
// for (let i = 0; i < datas.length; i++) {
// let finded = false;
// for (let j = 0; j < this.editor.files.length; j++) {
// if (this.editor.files[j].id == datas[i].id) {
// finded = true;
// break;
// }
// }
// if (!finded) {
// let storeIns = new DDeiStoreLocal();
storeIns.load(datas[i].id).then((rowData) => {
//
if (rowData) {
let ddInstance = this.editor?.ddInstance;
let file = DDeiFile.loadFromJSON(JSON.parse(rowData.data), {
currentDdInstance: ddInstance,
});
this.editor.addFile(file);
for (let x = 0; x < this.editor.files.length; x++) {
this.editor.files[x].active = DDeiActiveType.NONE;
}
this.editor.currentFileIndex = this.editor.files.length - 1;
file.state = DDeiFileState.NONE;
file.active = DDeiActiveType.ACTIVE;
let sheets = file?.sheets;
// storeIns.load(datas[i].id).then((rowData) => {
// //
// if (rowData) {
// let ddInstance = this.editor?.ddInstance;
// let file = DDeiFile.loadFromJSON(JSON.parse(rowData.data), {
// currentDdInstance: ddInstance,
// });
// this.editor.addFile(file);
// for (let x = 0; x < this.editor.files.length; x++) {
// this.editor.files[x].active = DDeiActiveType.NONE;
// }
// this.editor.currentFileIndex = this.editor.files.length - 1;
// file.state = DDeiFileState.NONE;
// file.active = DDeiActiveType.ACTIVE;
// let sheets = file?.sheets;
if (file && sheets && ddInstance) {
file.changeSheet(file.currentSheetIndex);
// if (file && sheets && ddInstance) {
// file.changeSheet(file.currentSheetIndex);
let stage = sheets[file.currentSheetIndex].stage;
stage.ddInstance = ddInstance;
//
file.initHistroy();
//
ddInstance.stage = stage;
//
stage.initRender();
//
if (!stage.wpv) {
//
stage.wpv = {
x:
-(
stage.width -
ddInstance.render.container.clientWidth
) / 2,
y:
-(
stage.height -
ddInstance.render.container.clientHeight
) / 2,
z: 0,
};
}
this.editor.changeState(DDeiEditorState.DESIGNING);
ddInstance.bus.push(
DDeiEditorEnumBusCommandType.ClearTemplateUI
);
ddInstance.bus.push(
DDeiEditorEnumBusCommandType.RefreshEditorParts,
{ parts: ["bottommenu"] }
);
// let stage = sheets[file.currentSheetIndex].stage;
// stage.ddInstance = ddInstance;
// //
// file.initHistroy();
// //
// ddInstance.stage = stage;
// //
// stage.initRender();
// //
// if (!stage.wpv) {
// //
// stage.wpv = {
// x:
// -(
// stage.width -
// ddInstance.render.container.clientWidth
// ) / 2,
// y:
// -(
// stage.height -
// ddInstance.render.container.clientHeight
// ) / 2,
// z: 0,
// };
// }
// this.editor.changeState(DDeiEditorState.DESIGNING);
// ddInstance.bus.push(
// DDeiEditorEnumBusCommandType.ClearTemplateUI
// );
// ddInstance.bus.push(
// DDeiEditorEnumBusCommandType.RefreshEditorParts,
// { parts: ["bottommenu"] }
// );
ddInstance?.bus?.push(DDeiEnumBusCommandType.RefreshShape);
ddInstance?.bus?.executeAll();
}
}
});
return;
}
}
}
});
// ddInstance?.bus?.push(DDeiEnumBusCommandType.RefreshShape);
// ddInstance?.bus?.executeAll();
// }
// }
// });
// return;
// }
// }
// }
// });
},
},
};

View File

@ -41,6 +41,10 @@ class DDeiCoreExportAndImportPanel extends DDeiPluginBase{
}
return DDeiCoreExportAndImportPanel;
}
static modify(fn) {
return DDeiCoreExportAndImportPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreExportAndImportPanel

View File

@ -41,6 +41,10 @@ class DDeiCoreFileInfoPanel extends DDeiPluginBase{
}
return DDeiCoreFileInfoPanel;
}
static modify(fn) {
return DDeiCoreFileInfoPanel.defaultIns.modify(fn)
}
}
export default DDeiCoreFileInfoPanel

View File

@ -41,6 +41,10 @@ class DDeiCoreFileOperatePanel extends DDeiPluginBase{
}
return DDeiCoreFileOperatePanel;
}
static modify(fn) {
return DDeiCoreFileOperatePanel.defaultIns.modify(fn)
}
}
export default DDeiCoreFileOperatePanel

Some files were not shown because too many files have changed in this diff Show More