From e4773ca7f0793f0160e45b1083530d5cb52ece17 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Mon, 26 Feb 2024 14:57:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=89=93=E5=8C=85=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/module/ContextPad/index.ts         |  9 ---------
 .../BpmnDesign/assets/module/Palette/index.ts |  9 ---------
 .../assets/module/Renderer/CustomRenderer.ts  |  7 +++----
 .../assets/module/Renderer/index.ts           |  9 ---------
 .../BpmnDesign/assets/module/index.ts         | 19 ++++++++++++-------
 5 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/components/BpmnDesign/assets/module/ContextPad/index.ts
 delete mode 100644 src/components/BpmnDesign/assets/module/Palette/index.ts
 delete mode 100644 src/components/BpmnDesign/assets/module/Renderer/index.ts

diff --git a/src/components/BpmnDesign/assets/module/ContextPad/index.ts b/src/components/BpmnDesign/assets/module/ContextPad/index.ts
deleted file mode 100644
index 67e4931..0000000
--- a/src/components/BpmnDesign/assets/module/ContextPad/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ModuleDeclaration } from 'didi';
-import CustomContextPadProvider from './CustomContextPadProvider';
-
-const CustomContextPad: ModuleDeclaration = {
-  __init__: ['customContextPadProvider'],
-  customContextPadProvider: ['type', CustomContextPadProvider]
-};
-
-export default CustomContextPad;
diff --git a/src/components/BpmnDesign/assets/module/Palette/index.ts b/src/components/BpmnDesign/assets/module/Palette/index.ts
deleted file mode 100644
index 7e6a665..0000000
--- a/src/components/BpmnDesign/assets/module/Palette/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ModuleDeclaration } from 'didi';
-import CustomPaletteProvider from './CustomPaletteProvider';
-
-const CustomPalette: ModuleDeclaration = {
-  __init__: ['CustomPaletteProvider'],
-  CustomPaletteProvider: ['type', CustomPaletteProvider]
-};
-
-export default CustomPalette;
diff --git a/src/components/BpmnDesign/assets/module/Renderer/CustomRenderer.ts b/src/components/BpmnDesign/assets/module/Renderer/CustomRenderer.ts
index 20b44fb..6a4eb1a 100644
--- a/src/components/BpmnDesign/assets/module/Renderer/CustomRenderer.ts
+++ b/src/components/BpmnDesign/assets/module/Renderer/CustomRenderer.ts
@@ -9,8 +9,6 @@ import {
   clear as svgClear,
   remove as svgRemove
 } from 'tiny-svg';
-import logo from '@/assets/logo/logo.png';
-import { Shape } from 'diagram-js/lib/model/Types';
 
 const HIGH_PRIORITY = 1500;
 export default class CustomRenderer extends BaseRenderer {
@@ -21,7 +19,7 @@ export default class CustomRenderer extends BaseRenderer {
     this.bpmnRenderer = bpmnRenderer;
     this.modeling = modeling;
   }
-  canRender(element: Shape) {
+  canRender(element) {
     // ignore labels
     return !element.labelTarget;
   }
@@ -32,7 +30,7 @@ export default class CustomRenderer extends BaseRenderer {
    * @param {*} element
    * @returns
    */
-  drawShape(parentNode, element: Shape) {
+  drawShape(parentNode, element) {
     const shape = this.bpmnRenderer.drawShape(parentNode, element);
     const { type, width, height } = element;
     // 开始 填充绿色
@@ -55,3 +53,4 @@ export default class CustomRenderer extends BaseRenderer {
     return this.bpmnRenderer.getShapePath(shape);
   }
 }
+CustomRenderer['$inject'] = ['eventBus', 'bpmnRenderer'];
diff --git a/src/components/BpmnDesign/assets/module/Renderer/index.ts b/src/components/BpmnDesign/assets/module/Renderer/index.ts
deleted file mode 100644
index 8731c96..0000000
--- a/src/components/BpmnDesign/assets/module/Renderer/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import CustomRenderer from './CustomRenderer';
-import { ModuleDeclaration } from 'didi';
-
-const customRenderer: ModuleDeclaration = {
-  __init__: ['customRenderer'],
-  customRenderer: ['type', CustomRenderer]
-};
-
-export default customRenderer;
diff --git a/src/components/BpmnDesign/assets/module/index.ts b/src/components/BpmnDesign/assets/module/index.ts
index f805766..55f6b9f 100644
--- a/src/components/BpmnDesign/assets/module/index.ts
+++ b/src/components/BpmnDesign/assets/module/index.ts
@@ -1,12 +1,17 @@
-// 扩展左侧选择面板
-import CustomPalette from './Palette';
-// 扩展节点右键
-import CustomContextPad from './ContextPad';
-// 扩展渲染
-import CustomRenderer from './Renderer';
 // 翻译模块
 import TranslationModule from './Translate';
 import { ModuleDeclaration } from 'didi';
+import CustomPaletteProvider from './Palette/CustomPaletteProvider';
+import CustomRenderer from './Renderer/CustomRenderer';
+import CustomContextPadProvider from './ContextPad/CustomContextPadProvider';
 
-const Module: ModuleDeclaration[] = [CustomPalette, CustomContextPad, TranslationModule, CustomRenderer];
+const Module: ModuleDeclaration[] = [
+  {
+    __init__: ['customPaletteProvider', 'customContextPadProvider', 'customRenderer'],
+    customPaletteProvider: ['type', CustomPaletteProvider],
+    customRenderer: ['type', CustomRenderer],
+    customContextPadProvider: ['type', CustomContextPadProvider]
+  },
+  TranslationModule
+];
 export default Module;