admin/ddei-editor
1
0
Fork 0
mirror of https://gitee.com/hoslay/ddei-editor.git synced 2025-12-06 17:18:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

!7 1.2.43版本发布

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

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

639
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

7
package.json
View File

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

4
plugins/core/components/buttons/qbt-addfontsize.ts
View File

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

4
plugins/core/components/buttons/qbt-borderdash.ts
View File

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

4
plugins/core/components/buttons/qbt-borderweight.ts
View File

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

4
plugins/core/components/buttons/qbt-editbox.ts
View File

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

4
plugins/core/components/buttons/qbt-editcolor.ts
View File

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

4
plugins/core/components/buttons/qbt-fontfamily.ts
View File

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

4
plugins/core/components/buttons/qbt-fontsize.ts
View File

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

4
plugins/core/components/buttons/qbt-linepointtype.ts
View File

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

4
plugins/core/components/buttons/qbt-linetype.ts
View File

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

4
plugins/core/components/buttons/qbt-textalign.ts
View File

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

4
plugins/core/components/index.ts
View File

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

2
plugins/core/controls/control/base/compose-container.ts
View File

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

6
plugins/core/controls/control/base/container.ts
View File

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

16
plugins/core/controls/control/common/human.ts
View File

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

20
plugins/core/controls/control/common/human1.ts
View File

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

16
plugins/core/controls/control/common/human2.ts
View File

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

4
plugins/core/controls/index.ts
View File

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

4
plugins/core/dialogs/ChooseControlGroupDialog.vue
View File

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

4
plugins/core/dialogs/aligndialog.ts
View File

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

4
plugins/core/dialogs/changeratiodialog.ts
View File

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

4
plugins/core/dialogs/choosecontroldialog.ts
View File

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

4
plugins/core/dialogs/choosecontrolgroupdialog.ts
View File

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

4
plugins/core/dialogs/closefileconfirmdialog.ts
View File

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

4
plugins/core/dialogs/collfileconfirmdialog.ts
View File

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

4
plugins/core/dialogs/index.ts
View File

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

4
plugins/core/dialogs/linepointtypedialog.ts
View File

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

4
plugins/core/dialogs/linetypedialog.ts
View File

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

4
plugins/core/dialogs/managelayersdialog.ts
View File

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

4
plugins/core/dialogs/mergecomposedialog.ts
View File

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

4
plugins/core/dialogs/positiondialog.ts
View File

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

4
plugins/core/dialogs/publishfileconfirmdialog.ts
View File

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

4
plugins/core/dialogs/qcviewdialog.ts
View File

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

4
plugins/core/dialogs/quicksetstyledialog.ts
View File

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

4
plugins/core/dialogs/rotatedialog.ts
View File

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

4
plugins/core/dialogs/selectborderdashdialog.ts
View File

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

4
plugins/core/dialogs/selectborderweightdialog.ts
View File

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

4
plugins/core/dialogs/selectcolordialog.ts
View File

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

4
plugins/core/dialogs/selectfontdialog.ts
View File

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

4
plugins/core/dialogs/selectfontsizedialog.ts
View File

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

4
plugins/core/dialogs/textaligndialog.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-all-select.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-brushdata.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cancel-compose.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cancel-control-create.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cancel-current-action.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cancel-quick-edit.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cancel-select.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-clear-brushdata.ts
View File

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

6
plugins/core/hotkeys/actions/key-action-close-dialog.ts
View File

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

9
plugins/core/hotkeys/actions/key-action-compose.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-copy-image.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-copy.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-cut.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-enter-quick-edit.ts
View File

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

38
plugins/core/hotkeys/actions/key-action-move-models.ts
View File

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

9
plugins/core/hotkeys/actions/key-action-paste.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-push-models.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-quick-editor-newrow.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-remove-models.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-rerevoke.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-revoke.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-save-file.ts
View File

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

13
plugins/core/hotkeys/actions/key-action-start-quick-edit.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-table-next-col.ts
View File

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

4
plugins/core/hotkeys/actions/key-action-table-next-row.ts
View File

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

4
plugins/core/hotkeys/index.ts
View File

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

5
plugins/core/i18n/en_US.ts
View File

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

7
plugins/core/i18n/zh_CN.ts
View File

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

4
plugins/core/index.ts
View File

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

4
plugins/core/layouts/index.ts
View File

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

4
plugins/core/layouts/simple-layout.ts
View File

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

4
plugins/core/layouts/stand-layout.ts
View File

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

4
plugins/core/lifecycles/core-lifecycle.ts
View File

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

4
plugins/core/lifecycles/index.ts
View File

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

4
plugins/core/menus/index.ts
View File

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

4
plugins/core/menus/menu-cancel-merge-cell.ts
View File

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

4
plugins/core/menus/menu-copy-sheet.ts
View File

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

4
plugins/core/menus/menu-insert-col.ts
View File

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

4
plugins/core/menus/menu-insert-row.ts
View File

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

4
plugins/core/menus/menu-merge-cell.ts
View File

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

4
plugins/core/menus/menu-remove-col.ts
View File

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

4
plugins/core/menus/menu-remove-row.ts
View File

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

4
plugins/core/menus/menu-remove-sheet.ts
View File

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

4
plugins/core/panels/bottom/changeratio.ts
View File

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

4
plugins/core/panels/bottom/index.ts
View File

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

4
plugins/core/panels/bottom/managelayers.ts
View File

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

4
plugins/core/panels/bottom/play.ts
View File

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

3
plugins/core/panels/bottom/shapecount.ts
View File

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

4
plugins/core/panels/bottom/sheets.ts
View File

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

4
plugins/core/panels/bottom/suitratio.ts
View File

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

4
plugins/core/panels/bottommenu/index.ts
View File

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

24
plugins/core/panels/canvasview/CanvasView.vue
View File

@ -364,12 +364,15 @@ export default {
); );
let lastOnContainer = layer; let lastOnContainer = layer;
if (isAlt) { if (isAlt) {
let stageRatio = stage.getStageRatio()
let ex2 = ex / stageRatio
let ey2 = ey / stageRatio
//寻找鼠标落点当前所在的容器 //寻找鼠标落点当前所在的容器
let mouseOnContainers = let mouseOnContainers =
DDeiAbstractShape.findBottomContainersByArea( DDeiAbstractShape.findBottomContainersByArea(
layer, layer,
ex, ex2,
ey ey2
); );
if (mouseOnContainers && mouseOnContainers.length > 0) { if (mouseOnContainers && mouseOnContainers.length > 0) {
lastOnContainer = 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( this.editor.bus.push(
DDeiEnumBusCommandType.CancelCurLevelSelectedModels, DDeiEnumBusCommandType.CancelCurLevelSelectedModels,

4
plugins/core/panels/canvasview/index.ts
View File

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

150
plugins/core/panels/common/FileOperate.vue
View File

@ -26,7 +26,7 @@
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import {DDeiStoreLocal} from "ddei-framework"; // import {DDeiStoreLocal} from "ddei-framework";
import {DDeiEditor} from "ddei-framework"; import {DDeiEditor} from "ddei-framework";
import {DDeiStage} from "ddei-framework"; import {DDeiStage} from "ddei-framework";
import {DDeiActiveType} from "ddei-framework"; import {DDeiActiveType} from "ddei-framework";
@ -171,84 +171,84 @@ export default {
*/ */
openFile(evt) { openFile(evt) {
//执行保存 //执行保存
let storeIns = new DDeiStoreLocal(); // let storeIns = new DDeiStoreLocal();
storeIns.find("").then((datas) => { // storeIns.find("").then((datas) => {
//找到第一个没有打开的文件，执行打开 TODO // //找到第一个没有打开的文件，执行打开 TODO
if (datas) { // if (datas) {
for (let i = 0; i < datas.length; i++) { // for (let i = 0; i < datas.length; i++) {
let finded = false; // let finded = false;
for (let j = 0; j < this.editor.files.length; j++) { // for (let j = 0; j < this.editor.files.length; j++) {
if (this.editor.files[j].id == datas[i].id) { // if (this.editor.files[j].id == datas[i].id) {
finded = true; // finded = true;
break; // break;
} // }
} // }
if (!finded) { // if (!finded) {
let storeIns = new DDeiStoreLocal(); // let storeIns = new DDeiStoreLocal();
storeIns.load(datas[i].id).then((rowData) => { // storeIns.load(datas[i].id).then((rowData) => {
//存在数据，执行修改 // //存在数据，执行修改
if (rowData) { // if (rowData) {
let ddInstance = this.editor?.ddInstance; // let ddInstance = this.editor?.ddInstance;
let file = DDeiFile.loadFromJSON(JSON.parse(rowData.data), { // let file = DDeiFile.loadFromJSON(JSON.parse(rowData.data), {
currentDdInstance: ddInstance, // currentDdInstance: ddInstance,
}); // });
this.editor.addFile(file); // this.editor.addFile(file);
for (let x = 0; x < this.editor.files.length; x++) { // for (let x = 0; x < this.editor.files.length; x++) {
this.editor.files[x].active = DDeiActiveType.NONE; // this.editor.files[x].active = DDeiActiveType.NONE;
} // }
this.editor.currentFileIndex = this.editor.files.length - 1; // this.editor.currentFileIndex = this.editor.files.length - 1;
file.state = DDeiFileState.NONE; // file.state = DDeiFileState.NONE;
file.active = DDeiActiveType.ACTIVE; // file.active = DDeiActiveType.ACTIVE;
let sheets = file?.sheets; // let sheets = file?.sheets;
if (file && sheets && ddInstance) { // if (file && sheets && ddInstance) {
file.changeSheet(file.currentSheetIndex); // file.changeSheet(file.currentSheetIndex);
let stage = sheets[file.currentSheetIndex].stage; // let stage = sheets[file.currentSheetIndex].stage;
stage.ddInstance = ddInstance; // stage.ddInstance = ddInstance;
//记录文件初始日志 // //记录文件初始日志
file.initHistroy(); // file.initHistroy();
//刷新页面 // //刷新页面
ddInstance.stage = stage; // ddInstance.stage = stage;
//加载场景渲染器 // //加载场景渲染器
stage.initRender(); // stage.initRender();
//设置视窗位置到中央 // //设置视窗位置到中央
if (!stage.wpv) { // if (!stage.wpv) {
//缺省定位在画布中心点位置 // //缺省定位在画布中心点位置
stage.wpv = { // stage.wpv = {
x: // x:
-( // -(
stage.width - // stage.width -
ddInstance.render.container.clientWidth // ddInstance.render.container.clientWidth
) / 2, // ) / 2,
y: // y:
-( // -(
stage.height - // stage.height -
ddInstance.render.container.clientHeight // ddInstance.render.container.clientHeight
) / 2, // ) / 2,
z: 0, // z: 0,
}; // };
} // }
this.editor.changeState(DDeiEditorState.DESIGNING); // this.editor.changeState(DDeiEditorState.DESIGNING);
ddInstance.bus.push( // ddInstance.bus.push(
DDeiEditorEnumBusCommandType.ClearTemplateUI // DDeiEditorEnumBusCommandType.ClearTemplateUI
); // );
ddInstance.bus.push( // ddInstance.bus.push(
DDeiEditorEnumBusCommandType.RefreshEditorParts, // DDeiEditorEnumBusCommandType.RefreshEditorParts,
{ parts: ["bottommenu"] } // { parts: ["bottommenu"] }
); // );
ddInstance?.bus?.push(DDeiEnumBusCommandType.RefreshShape); // ddInstance?.bus?.push(DDeiEnumBusCommandType.RefreshShape);
ddInstance?.bus?.executeAll(); // ddInstance?.bus?.executeAll();
} // }
} // }
}); // });
return; // return;
} // }
} // }
} // }
}); // });
}, },
}, },
}; };

4
plugins/core/panels/common/exportandimport.ts
View File

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

4
plugins/core/panels/common/fileinfo.ts
View File

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

4
plugins/core/panels/common/fileoperate.ts
View File

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

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