feat: add more component && default checked

@@ -26,7 +26,7 @@
 	/**
 	/**
 	 * 
 	 * 
 	 */
 	 */
-	Sidebar.prototype.defaultEntries = 'component;fan;engine;valve;controller;';
+	Sidebar.prototype.defaultEntries = 'component;fan;engine;valve;controller;light;button;conduit;instrument;sewage';
 	
 	
 	/**
 	/**
 	 * Library definitions 
 	 * Library definitions 
@@ -116,7 +116,7 @@
 	 */
 	 */
 	Sidebar.prototype.configuration = [{id: 'general', libs: ['general', 'misc', 'advanced']},
 	Sidebar.prototype.configuration = [{id: 'general', libs: ['general', 'misc', 'advanced']},
 										//加入自定义图形ID
 										//加入自定义图形ID
-		                               {id:'fan'},{id:'engine'},{id:'valve'},{id:'component'},{id:'controller'},{id:'sewage'},{id:'conduit'},
+		                               {id:'fan'},{id:'engine'},{id:'valve'},{id:'component'},{id:'controller'},{id:'sewage'},{id:'conduit'},{id: 'light'},{id: 'instrument'},{id: 'button'},
 									   {id: 'uml'}, {id: 'uml25'}, {id: 'search'}, {id: 'er'},
 									   {id: 'uml'}, {id: 'uml25'}, {id: 'search'}, {id: 'er'},
 									   {id: 'azure2', prefix: 'azure2', libs: ['AI Machine Learning', 'Analytics', 'App Services', 'Azure Stack', 'Azure VMware Solution', 'Blockchain', 'Compute', 'Containers', 'CXP', 'Databases', 'DevOps', 'General', 'Identity', 'Integration', 'Internet of Things', 'Intune', 'IoT', 'Management Governance', 'Migrate', 'Mixed Reality', 'Monitor', 'Networking', 'Other', 'Preview', 'Security', 'Storage', 'Web']},
 									   {id: 'azure2', prefix: 'azure2', libs: ['AI Machine Learning', 'Analytics', 'App Services', 'Azure Stack', 'Azure VMware Solution', 'Blockchain', 'Compute', 'Containers', 'CXP', 'Databases', 'DevOps', 'General', 'Identity', 'Integration', 'Internet of Things', 'Intune', 'IoT', 'Management Governance', 'Migrate', 'Mixed Reality', 'Monitor', 'Networking', 'Other', 'Preview', 'Security', 'Storage', 'Web']},
 	                                   {id: 'ios', prefix: 'ios', libs: [''/*prefix is library*/, '7icons', '7ui']},
 	                                   {id: 'ios', prefix: 'ios', libs: [''/*prefix is library*/, '7icons', '7ui']},
@@ -511,12 +511,17 @@
 		// 	{title: mxResources.get('clipart'), id: 'clipart', image: IMAGE_PATH + '/sidebar-clipart.png'},
 		// 	{title: mxResources.get('clipart'), id: 'clipart', image: IMAGE_PATH + '/sidebar-clipart.png'},
 		// 	{title: mxResources.get('flowchart'), id: 'flowchart', image: IMAGE_PATH + '/sidebar-flowchart.png'}];
 		// 	{title: mxResources.get('flowchart'), id: 'flowchart', image: IMAGE_PATH + '/sidebar-flowchart.png'}];
 		//更多图形，显示出来的的标题跟id，同时包括图片
 		//更多图形，显示出来的的标题跟id，同时包括图片
-		var thingskitEntries = [{title:"风机",id:'fan',image:IMAGE_PATH + '/thingskit/风机.png'},
-			{title:"电机",id:'engine',image:IMAGE_PATH + '/thingskit/发动机.png'},
-			{title:"阀门",id:'valve',image:IMAGE_PATH + '/thingskit/1.png'},
+		var thingskitEntries = [
+			{title:"风机",id:'fan',image:IMAGE_PATH + '/thingskit/风机.png'},
+			{title:"发动机",id:'engine',image:IMAGE_PATH + '/thingskit/发动机.png'},
+			{title:"阀门",id:'valve',image:IMAGE_PATH + '/thingskit/阀门.png'},
 			{title:"基础组件",id:'component',image:IMAGE_PATH + '/thingskit/1.png'},
 			{title:"基础组件",id:'component',image:IMAGE_PATH + '/thingskit/1.png'},
-			{title: "污水处理",id:'sewage',image: IMAGE_PATH + '/thingskit/1.png'},
-			{title: "管道",id:'conduit',image: IMAGE_PATH + '/thingskit/1.png'}];
+			{title: "污水处理",id:'sewage',image: IMAGE_PATH + '/thingskit/污水处理.png'},
+			{title: "管道",id:'conduit',image: IMAGE_PATH + '/thingskit/管道.png'},
+			{title: "灯",id:'light',image: IMAGE_PATH + '/thingskit/灯.png'},
+			{title: "按钮",id:'button',image: IMAGE_PATH + '/thingskit/按钮.png'},
+			{title: "仪表",id:'instrument',image: IMAGE_PATH + '/thingskit/仪表.png'},
+		];
 		if (urlParams['sketch'] == '1')
 		if (urlParams['sketch'] == '1')
 		{
 		{
 			stdEntries = [{title: mxResources.get('searchShapes'), id: 'search'},
 			stdEntries = [{title: mxResources.get('searchShapes'), id: 'search'},
@@ -1098,13 +1103,13 @@
 		// 基础原件
 		// 基础原件
 		this.addBasicComponentsPalette();
 		this.addBasicComponentsPalette();
 		// 控制原价
 		// 控制原价
-		this.addControllerComponentsPalette();
+		// this.addControllerComponentsPalette();
 		// 发动机
 		// 发动机
 		this.addEnginePalette();
 		this.addEnginePalette();
 		// 阀门
 		// 阀门
 		this.addValvePalette();
 		this.addValvePalette();
 		// 图表
 		// 图表
-		this.addChartsPalette();
+		// this.addChartsPalette();
 		// 风机
 		// 风机
 		this.addFanPalette();
 		this.addFanPalette();
 		// 污水处理
 		// 污水处理