Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

public/drawio/js/diagramly/Devel.js

@@ -157,6 +157,8 @@ mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Advanced.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AlliedTelesis.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AlliedTelesis.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Android.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Android.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-ArchiMate.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-ArchiMate.js');
+// 20231122 汪皖苏 自定义更多图形
+mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-ArchiMate4.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-ArchiMate3.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-ArchiMate3.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Arrows2.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Arrows2.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Atlassian.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Atlassian.js');

public/drawio/js/diagramly/sidebar/Sidebar.js

@@ -87,6 +87,7 @@
 	Sidebar.prototype.veeam2 = ['Auxiliary', 'Data Center', 'Features', 'General', 'Products and Components', 'Software', 'States', 'Storage', '3D'];
 	Sidebar.prototype.veeam2 = ['Auxiliary', 'Data Center', 'Features', 'General', 'Products and Components', 'Software', 'States', 'Storage', '3D'];
 
 
 	Sidebar.prototype.archimate3 = ['Application', 'Business', 'Composite', 'Implementation and Migration', 'Motivation', 'Physical', 'Relationships', 'Strategy', 'Technology'];
 	Sidebar.prototype.archimate3 = ['Application', 'Business', 'Composite', 'Implementation and Migration', 'Motivation', 'Physical', 'Relationships', 'Strategy', 'Technology'];
+	Sidebar.prototype.archimate4 = ['Application'];
 
 
 	Sidebar.prototype.electrical = ['LogicGates', 'Resistors', 'Capacitors', 'Inductors', 'SwitchesRelays', 'Diodes', 'Sources', 'Transistors', 'Misc', 'Audio', 'PlcLadder', 'Abstract', 'Optical', 'VacuumTubes', 'Waveforms', 'Instruments', 'RotMech', 'Transmission'];
 	Sidebar.prototype.electrical = ['LogicGates', 'Resistors', 'Capacitors', 'Inductors', 'SwitchesRelays', 'Diodes', 'Sources', 'Transistors', 'Misc', 'Audio', 'PlcLadder', 'Abstract', 'Optical', 'VacuumTubes', 'Waveforms', 'Instruments', 'RotMech', 'Transmission'];
 
 
@@ -154,7 +155,8 @@
            	                           {id: 'atlassian', libs: ['atlassian']},
            	                           {id: 'atlassian', libs: ['atlassian']},
 	                                   {id: 'fluid_power', libs: ['fluid_power']},
 	                                   {id: 'fluid_power', libs: ['fluid_power']},
 	                                   {id: 'gmdl', prefix: 'gmdl', libs: Sidebar.prototype.gmdl},
 	                                   {id: 'gmdl', prefix: 'gmdl', libs: Sidebar.prototype.gmdl},
-           	                           {id: 'archimate3', prefix: 'archimate3', libs: Sidebar.prototype.archimate3},
+           	                           {id: 'archimate4', prefix: 'archimate4', libs: Sidebar.prototype.archimate4},
+           	                           {id: 'archimate_define', prefix: 'archimate_define', libs: Sidebar.prototype.archimate_define},
            	                           {id: 'archimate', libs: ['archimate']},
            	                           {id: 'archimate', libs: ['archimate']},
            	                           {id: 'webicons', libs: ['webicons', 'weblogos']},
            	                           {id: 'webicons', libs: ['webicons', 'weblogos']},
            	                           {id: 'sysml', prefix: 'sysml', libs: Sidebar.prototype.sysml}];
            	                           {id: 'sysml', prefix: 'sysml', libs: Sidebar.prototype.sysml}];
@@ -510,9 +512,10 @@
 								{title: 'Veeam', id: 'veeam2', image: IMAGE_PATH + '/sidebar-veeam.png'},
 								{title: 'Veeam', id: 'veeam2', image: IMAGE_PATH + '/sidebar-veeam.png'},
 								{title: 'VMware', id: 'vvd', image: IMAGE_PATH + '/sidebar-vvd.png'}]},
 								{title: 'VMware', id: 'vvd', image: IMAGE_PATH + '/sidebar-vvd.png'}]},
             			{title: mxResources.get('business'),
             			{title: mxResources.get('business'),
-            			// entries: [{title: 'ArchiMate 3.0', id: 'archimate3', image: IMAGE_PATH + '/sidebar-archimate3.png'},
 						// 二次开发 20231117 wangwansu ArchiMate 3.0英文改中文
 						// 二次开发 20231117 wangwansu ArchiMate 3.0英文改中文
+            			// entries: [{title: 'ArchiMate 3.0', id: 'archimate3', image: IMAGE_PATH + '/sidebar-archimate3.png'},
             			entries: [{title: '架构', id: 'archimate3', image: IMAGE_PATH + '/sidebar-archimate3.png'},
             			entries: [{title: '架构', id: 'archimate3', image: IMAGE_PATH + '/sidebar-archimate3.png'},
+            					{title: '架构-自定义', id: 'archimate4', image: IMAGE_PATH + '/sidebar-archimate3.png'},
 								{title: mxResources.get('archiMate21'), id: 'archimate', image: IMAGE_PATH + '/sidebar-archimate.png'},
 								{title: mxResources.get('archiMate21'), id: 'archimate', image: IMAGE_PATH + '/sidebar-archimate.png'},
 								{title: mxResources.get('bpmn') + ' 2.0', id: 'bpmn2', image: IMAGE_PATH + '/sidebar-bpmn.png'},
 								{title: mxResources.get('bpmn') + ' 2.0', id: 'bpmn2', image: IMAGE_PATH + '/sidebar-bpmn.png'},
 								{title: mxResources.get('sysml'), id: 'sysml', image: IMAGE_PATH + '/sidebar-sysml.png'},
 								{title: mxResources.get('sysml'), id: 'sysml', image: IMAGE_PATH + '/sidebar-sysml.png'},
@@ -1188,6 +1191,7 @@
 		this.addVeeam2Palette();
 		this.addVeeam2Palette();
 		this.addVVDPalette();
 		this.addVVDPalette();
 		this.addArchimate3Palette();
 		this.addArchimate3Palette();
+		this.addArchimate4Palette();
 		this.addArchiMatePalette();
 		this.addArchiMatePalette();
 		this.addBpmn2Palette();
 		this.addBpmn2Palette();
 		this.addSysMLPalette(sysml, dir);
 		this.addSysMLPalette(sysml, dir);