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

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

@@ -4,23 +4,23 @@
 	Sidebar.prototype.addArchimate3Palette = function()
 	{
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Application');
-		// this.addArchimate3ApplicationPalette();
+		this.addArchimate3ApplicationPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Business');
-		// this.addArchimate3BusinessPalette();
+		this.addArchimate3BusinessPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Composite');
-		// this.addArchimate3CompositePalette();
+		this.addArchimate3CompositePalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Implementation and Migration');
-		// this.addArchimate3ImplementationAndMigrationPalette();
+		this.addArchimate3ImplementationAndMigrationPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Motivation');
-		// this.addArchimate3MotivationPalette();
+		this.addArchimate3MotivationPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Physical');
-		// this.addArchimate3PhysicalPalette();
+		this.addArchimate3PhysicalPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Relationships');
-		// this.addArchimate3RelationshipsPalette();
+		this.addArchimate3RelationshipsPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Strategy');
-		// this.addArchimate3StrategyPalette();
+		this.addArchimate3StrategyPalette();
 		this.setCurrentSearchEntryLibrary('archimate3', 'archimate3Technology');
-		// this.addArchimate3TechnologyPalette();
+		this.addArchimate3TechnologyPalette();
 		this.setCurrentSearchEntryLibrary();
 	};
 	
@@ -146,7 +146,7 @@
 					w * 150, h * 90, '', 'Representation', null, null, this.getTagsForStencil(gn, '', dt + 'representation').join(' '))
 		];
 			
-		this.addPalette('archimate3Business', 'archimate 3.0 / Business', true, mxUtils.bind(this, function(content)
+		this.addPalette('archimate3Business', 'archimate 3.0 / Business', false, mxUtils.bind(this, function(content)
 		// this.addPalette('archimate3Business', '架构 / 业务', false, mxUtils.bind(this, function(content)
 				{
 					for (var i = 0; i < fns.length; i++)

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

@@ -87,7 +87,6 @@
 	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.archimate4 = ['Application'];
 
 	Sidebar.prototype.electrical = ['LogicGates', 'Resistors', 'Capacitors', 'Inductors', 'SwitchesRelays', 'Diodes', 'Sources', 'Transistors', 'Misc', 'Audio', 'PlcLadder', 'Abstract', 'Optical', 'VacuumTubes', 'Waveforms', 'Instruments', 'RotMech', 'Transmission'];
 
@@ -155,9 +154,7 @@
            	                           {id: 'atlassian', libs: ['atlassian']},
 	                                   {id: 'fluid_power', libs: ['fluid_power']},
 	                                   {id: 'gmdl', prefix: 'gmdl', libs: Sidebar.prototype.gmdl},
-           	                        //    {id: 'archimate4', prefix: 'archimate4', libs: Sidebar.prototype.archimate4},
-           	                           {id: 'archimate_define', prefix: 'archimate_define', libs: Sidebar.prototype.archimate_define},
-
+									   {id: 'archimate3', prefix: 'archimate3', libs: Sidebar.prototype.archimate3},
            	                           {id: 'archimate', libs: ['archimate']},
            	                           {id: 'webicons', libs: ['webicons', 'weblogos']},
            	                           {id: 'sysml', prefix: 'sysml', libs: Sidebar.prototype.sysml}];
@@ -382,7 +379,7 @@
 		// Merges array of semicolon separated strings into a single array
 		var temp = all.join(';').split(';');
 		
-		temp.push('archimate');//二次开发，调整初始化左侧菜单展示项
+		// temp.push('archimate');//二次开发，调整初始化左侧菜单展示项
 		console.log(temp)
 		console.log(this.configuration)
 
@@ -515,9 +512,8 @@
 								{title: 'VMware', id: 'vvd', image: IMAGE_PATH + '/sidebar-vvd.png'}]},
             			{title: mxResources.get('business'),
 						// 二次开发 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'},
-            					// {title: '架构-自定义', id: 'archimate4', image: IMAGE_PATH + '/sidebar-archimate3.png'},
+            			entries: [
+								{title: 'ArchiMate 3.0', id: 'archimate3', image: IMAGE_PATH + '/sidebar-archimate3.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('sysml'), id: 'sysml', image: IMAGE_PATH + '/sidebar-sysml.png'},