Merge branch 'ww' into 'main'

feat: hidden some function

See merge request huang/thingskit-drawio!19

@@ -5839,7 +5839,7 @@ App.prototype.updateButtonContainer = function()
 			{
 				if (this.shareButton == null)
 				{
-					// TODO 预览模式按钮
+					// TODO thingsKit 预览模式按钮
 					this.shareButton = document.createElement('div');
 					this.shareButton.className = 'geBtn gePrimaryBtn';
 					this.shareButton.style.display = 'inline-block';

@@ -4594,7 +4594,8 @@
 
 				if (Object.getOwnPropertyNames != null && Object.getOwnPropertyNames(properties).length > 0)
 				{
-					this.container.appendChild(this.addProperties(this.createPanel(), properties, sstate));
+					// TODO thingsKit 隐藏属性
+					// this.container.appendChild(this.addProperties(this.createPanel(), properties, sstate));
 				}
 			}
 		};

@@ -1203,7 +1203,7 @@
 		// in older browsers. URL param has precedence over the saved setting.
 		if (mxClient.IS_CHROMEAPP || isLocalStorage)
 		{
-			// TODO switch language 切换语言按钮 多语言切换
+			// TODO thingsKit switch language 切换语言按钮 多语言切换
 			// this.put('language', new Menu(mxUtils.bind(this, function(menu, parent)
 			// {
 			// 	var addLangItem = mxUtils.bind(this, function (id)
@@ -3718,10 +3718,15 @@
 		// Overrides edit menu to add find, copyAsImage editGeometry
 		this.put('edit', new Menu(mxUtils.bind(this, function(menu, parent)
 		{
+			// TODO thingsKit 隐藏 编辑菜单中的编辑数据
 			this.addMenuItems(menu, ['undo', 'redo', '-', 'cut', 'copy', 'copyAsImage', 'paste',
-				'delete', '-', 'duplicate', '-', 'findReplace', '-', 'editData', 'editTooltip', '-',
+				'delete', '-', 'duplicate', '-', 'findReplace', '-', 'editTooltip', '-',
 				'editStyle',  'editGeometry', '-', 'edit', '-', 'editLink', 'openLink', '-',
-                'selectVertices', 'selectEdges', 'selectAll', 'selectNone', '-', 'lockUnlock']);
+				'selectVertices', 'selectEdges', 'selectAll', 'selectNone', '-', 'lockUnlock']);
+			// this.addMenuItems(menu, ['undo', 'redo', '-', 'cut', 'copy', 'copyAsImage', 'paste',
+			// 	'delete', '-', 'duplicate', '-', 'findReplace', '-', 'editData', 'editTooltip', '-',
+			// 	'editStyle',  'editGeometry', '-', 'edit', '-', 'editLink', 'openLink', '-',
+            //     'selectVertices', 'selectEdges', 'selectAll', 'selectNone', '-', 'lockUnlock']);
 		})));
 
 		var action = editorUi.actions.addAction('comments', mxUtils.bind(this, function()
@@ -3795,12 +3800,13 @@
 			
 			if (isLocalStorage || mxClient.IS_CHROMEAPP)
 			{
-				var item = this.addMenuItem(menu, 'scratchpad', parent);
-				
-				if (!editorUi.isOffline() || mxClient.IS_CHROMEAPP || EditorUi.isElectronApp)
-				{
-					this.addLinkToItem(item, 'https://www.diagrams.net/doc/faq/scratchpad');
-				}
+				// TODO thingsKit 隐藏 查看菜单中的 便笺本
+				// var item = this.addMenuItem(menu, 'scratchpad', parent);
+				//
+				// if (!editorUi.isOffline() || mxClient.IS_CHROMEAPP || EditorUi.isElectronApp)
+				// {
+				// 	this.addLinkToItem(item, 'https://www.diagrams.net/doc/faq/scratchpad');
+				// }
 			}
 			
 			this.addMenuItems(menu, ['shapes', '-', 'pageView', 'pageScale']);

 (function () {
-    // Adds Atlassian shapes
-    // 图表
-    Sidebar.prototype.addChartsPalette = function () {
-        var s = 'html=1;shadow=0;dashed=0;shape=mxgraph.atlassian.';
-        var s2 = 'html=1;shadow=0;dashed=0;fillColor=none;strokeColor=none;shape=mxgraph.bootstrap.rect;';
-        var s3 = mxConstants.STYLE_STROKEWIDTH + '=1;shadow=0;dashed=0;align=center;html=1;' + mxConstants.STYLE_SHAPE + "=mxgraph.mockup.";
-        var gn = 'mxgraph.charts';
-        var dt = 'charts ';
-        var sb = this;
-        this.setCurrentSearchEntryLibrary('charts');
-
-        const now = () => Date.now
-        var fns = [
-            this.addEntry('charts', mxUtils.bind(this, function () {
-                const nodeId = `echarts__${ now() }`
-                var cell = new mxCell(`<div style="color: red" id="${ nodeId }">${ now() }</div>`, new mxGeometry(0, 0, 160, 20), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
-                cell.setVertex(true)
-                return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, 'charts');
-            })),
-        ];
-
-        this.addPalette('charts', '图表', false, mxUtils.bind(this, function (content) {
-            for (var i = 0; i < fns.length; i++) {
-                content.appendChild(fns[i](content));
-            }
-        }));
-
-        this.setCurrentSearchEntryLibrary();
-    };
+	// Adds Atlassian shapes
+	// 图表
+	Sidebar.prototype.addChartsPalette = function () {
+
+		const generatorId = () => `echarts__instance__${ Date.now() }`
+
+		const addClickHandler = Sidebar.prototype.addClickHandler
+		Sidebar.prototype.addClickHandler = function (elt, ds, cells) {
+			var graph = this.editorUi.editor.graph;
+			var tol = graph.tolerance;
+			const cell = cells[0]
+			const cellValue = cell.value
+			const validate = cellValue && cellValue.nodeName === 'UserObject' && cellValue.getAttribute('componentsType') === 'charts'
+			const mouseDown = ds.mouseDown
+
+			ds.mouseDown = function (evt) {
+				if (validate) {
+					cell.value.setAttribute('id', generatorId())
+					graph.setAttributeForCell(cell, 'label', `<div class="echarts__instance" id="${ generatorId() }">${ generatorId() }</div>`)
+				}
+				mouseDown.apply(this, arguments)
+			};
+
+			const mouseUp = ds.mouseUp
+			ds.mouseUp = function () {
+				try {
+					mouseUp.apply(this, arguments)
+				} finally {
+					if (validate) {
+						const id = cell.value.id
+						const chartDom = document.getElementById(id);
+						chartDom.style.width = '400px'
+						chartDom.style.height = '400px'
+						const myChart = echarts.init(chartDom);
+						const option = {
+							xAxis: {
+								type: 'category',
+								data: [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ],
+							},
+							yAxis: {
+								type: 'value',
+							},
+							series: [
+								{
+									data: [ 150, 230, 224, 218, 135, 147, 260 ],
+									type: 'line',
+								},
+							],
+						};
+
+						option && myChart.setOption(option);
+					}
+				}
+				// const dom = document.getElementById()
+			}
+			addClickHandler.apply(this, arguments)
+		}
+
+		const convertValueToString = this.graph.convertValueToString
+		this.graph.convertValueToString = function (cell) {
+			const cellValue = cell.value
+			const validate = cellValue && cellValue.nodeName === 'UserObject' && cellValue.getAttribute('componentsType') === 'charts'
+			if (validate) {
+				setTimeout(() => {
+					const id = cell.value.id
+					console.log(id)
+					const chartDom = document.getElementById(id);
+					chartDom.style.width = '400px'
+					chartDom.style.height = '400px'
+					const myChart = echarts.init(chartDom);
+					const option = {
+						xAxis: {
+							type: 'category',
+							data: [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ],
+						},
+						yAxis: {
+							type: 'value',
+						},
+						series: [
+							{
+								data: [ 150, 230, 224, 218, 135, 147, 260 ],
+								type: 'line',
+							},
+						],
+					};
+
+					option && myChart.setOption(option);
+				})
+			}
+
+			return convertValueToString.apply(this, arguments)
+		}
+
+		var s = 'html=1;shadow=0;dashed=0;shape=mxgraph.atlassian.';
+		var s2 = 'html=1;shadow=0;dashed=0;fillColor=none;strokeColor=none;shape=mxgraph.bootstrap.rect;';
+		var s3 = mxConstants.STYLE_STROKEWIDTH + '=1;shadow=0;dashed=0;align=center;html=1;' + mxConstants.STYLE_SHAPE + "=mxgraph.mockup.";
+		var gn = 'mxgraph.charts';
+		var dt = 'charts ';
+		var sb = this;
+		this.setCurrentSearchEntryLibrary('charts');
+
+		const now = Date.now
+		var fns = [
+			this.addEntry('charts', mxUtils.bind(this, function () {
+				const id = generatorId()
+				var cell = new mxCell(`<div  id="${ id }" class="echarts__instance"></div>`, new mxGeometry(0, 0, 400, 400), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
+				cell.setVertex(true)
+				this.graph.setAttributeForCell(cell, 'placeholders', '1');
+				this.graph.setAttributeForCell(cell, 'componentsType', 'charts');
+				cell.value.setAttribute('id', id)
+				return this.createVertexTemplateFromCells([ cell ], cell.geometry.width, cell.geometry.height, 'charts');
+			})),
+		];
+
+		this.addPaletteFunctions('charts', '图表', false, fns);
+
+		this.setCurrentSearchEntryLibrary();
+	};
 })();
+
+function testChartImg() {
+	return 'data:image/png;base64,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'
+}
\ No newline at end of file

-(function()
-{
-	// Adds conduit shapes
-	// 管道
-	Sidebar.prototype.addConduitPalette = function()
-	{
+
+(function () {
+	// Adds Atlassian shapes
+	// conduit 管道
+	Sidebar.prototype.addConduitPalette = function () {
 		var gn = 'mxgraph.conduit';
-		var dt = 'conduit ';
+		var dt = 'conduit';
+		var width = 66;
+		var height = 74;
 		this.setCurrentSearchEntryLibrary('conduit');
 
 		var fns = [
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/Y形接头.svg;',
-				66, 66, '', 'Y形接头', null, null, this.getTagsForStencil(gn, 'Y形接头', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/三通.svg;',
-				64, 74, '', '三通', null, null, this.getTagsForStencil(gn, '三通', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/四通.svg;',
-				64, 74, '', '四通', null, null, this.getTagsForStencil(gn, '四通	', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 1.svg;',
-				64, 74, '', '斜面弯管 1', null, null, this.getTagsForStencil(gn, '斜面弯管 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 2.svg;',
-				64, 74, '', '斜面弯管 2', null, null, this.getTagsForStencil(gn, '斜面弯管 2	', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 3.svg;',
-				64, 74, '', '斜面弯管 3', null, null, this.getTagsForStencil(gn, '斜面弯管 3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 4.svg;',
-				64, 74, '', '斜面弯管 4', null, null, this.getTagsForStencil(gn, '斜面弯管 4	', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜三通 上.svg;',
-				64, 74, '', '斜三通 上', null, null, this.getTagsForStencil(gn, '斜三通 上', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜三通 下.svg;',
-				64, 74, '', '斜三通 下', null, null, this.getTagsForStencil(gn, '斜三通 下', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜四通.svg;',
-				64, 74, '', '斜四通', null, null, this.getTagsForStencil(gn, '斜四通', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/直管 2.svg;',
-				64, 74, '', '直管 2', null, null, this.getTagsForStencil(gn, '直管 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/直管.svg;',
-				64, 74, '', '直管', null, null, this.getTagsForStencil(gn, '直管', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 2.svg;',
-				64, 74, '', '转换接头 2', null, null, this.getTagsForStencil(gn, '转换接头 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 3.svg;',
-				64, 74, '', '转换接头 3', null, null, this.getTagsForStencil(gn, '转换接头 3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 4.svg;',
-				64, 74, '', '转换接头 4', null, null, this.getTagsForStencil(gn, '转换接头 4	', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 5.svg;',
-				64, 74, '', '转换接头 5', null, null, this.getTagsForStencil(gn, '转换接头 5', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头.svg;',
-				64, 74, '', '转换接头', null, null, this.getTagsForStencil(gn, '转换接头', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/Y形接头.svg;imageAspect=0;', width, height, '', 'Y形接头', null, null, this.getTagsForStencil(gn, 'Y形接头', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/三通.svg;imageAspect=0;', width, height, '', '三通', null, null, this.getTagsForStencil(gn, '三通', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/四通.svg;imageAspect=0;', width, height, '', '四通', null, null, this.getTagsForStencil(gn, '四通', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜三通 上.svg;imageAspect=0;', width, height, '', '斜三通 上', null, null, this.getTagsForStencil(gn, '斜三通 上', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜三通 下.svg;imageAspect=0;', width, height, '', '斜三通 下', null, null, this.getTagsForStencil(gn, '斜三通 下', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜四通.svg;imageAspect=0;', width, height, '', '斜四通', null, null, this.getTagsForStencil(gn, '斜四通', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 1.svg;imageAspect=0;', width, height, '', '斜面弯管 1', null, null, this.getTagsForStencil(gn, '斜面弯管 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 2.svg;imageAspect=0;', width, height, '', '斜面弯管 2', null, null, this.getTagsForStencil(gn, '斜面弯管 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 3.svg;imageAspect=0;', width, height, '', '斜面弯管 3', null, null, this.getTagsForStencil(gn, '斜面弯管 3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/斜面弯管 4.svg;imageAspect=0;', width, height, '', '斜面弯管 4', null, null, this.getTagsForStencil(gn, '斜面弯管 4', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/直管 2.svg;imageAspect=0;', width, height, '', '直管 2', null, null, this.getTagsForStencil(gn, '直管 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/直管.svg;imageAspect=0;', width, height, '', '直管', null, null, this.getTagsForStencil(gn, '直管', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 2.svg;imageAspect=0;', width, height, '', '转换接头 2', null, null, this.getTagsForStencil(gn, '转换接头 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 3.svg;imageAspect=0;', width, height, '', '转换接头 3', null, null, this.getTagsForStencil(gn, '转换接头 3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 4.svg;imageAspect=0;', width, height, '', '转换接头 4', null, null, this.getTagsForStencil(gn, '转换接头 4', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头 5.svg;imageAspect=0;', width, height, '', '转换接头 5', null, null, this.getTagsForStencil(gn, '转换接头 5', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/conduit/转换接头.svg;imageAspect=0;', width, height, '', '转换接头', null, null, this.getTagsForStencil(gn, '转换接头', dt).join(' ')),
 
 		];
+
 		this.addPaletteFunctions('conduit', '管道', false, fns);
+
 		this.setCurrentSearchEntryLibrary();
 	};
 })();

-(function()
-{
-	// Adds sewage shapes
-	// 污水处理
-	Sidebar.prototype.addSewagePalette = function()
-	{
+
+(function () {
+	// Adds Atlassian shapes
+	// sewage  污水处理
+	Sidebar.prototype.addSewagePalette = function () {
 		var gn = 'mxgraph.sewage';
-		var dt = 'sewage ';
+		var dt = 'sewage';
+		var width = 66;
+		var height = 74;
 		this.setCurrentSearchEntryLibrary('sewage');
 
 		var fns = [
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/板式澄清器.svg;',
-				66, 66, '', '板式澄清器', null, null, this.getTagsForStencil(gn, '板式澄清器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/超微细筛机.svg;',
-				64, 74, '', '超微细筛机', null, null, this.getTagsForStencil(gn, '超微细筛机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉淀池 2.svg;',
-				64, 74, '', '沉淀池 2', null, null, this.getTagsForStencil(gn, '沉淀池 2	', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉淀池.svg;',
-				64, 74, '', '沉淀池', null, null, this.getTagsForStencil(gn, '沉淀池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉砂池.svg;',
-				64, 74, '', '沉砂池', null, null, this.getTagsForStencil(gn, '沉砂池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器 1.svg;',
-				64, 74, '', '澄清器 1', null, null, this.getTagsForStencil(gn, '澄清器 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器 2.svg;',
-				64, 74, '', '澄清器 2', null, null, this.getTagsForStencil(gn, '澄清器 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器（侧面）.svg;',
-				64, 74, '', '澄清器（侧面）', null, null, this.getTagsForStencil(gn, '澄清器（侧面）', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器和浓缩器.svg;',
-				64, 74, '', '澄清器和浓缩器', null, null, this.getTagsForStencil(gn, '澄清器和浓缩器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/池塘.svg;',
-				64, 74, '', '池塘', null, null, this.getTagsForStencil(gn, '池塘', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/储水池.svg;',
-				64, 74, '', '储水池', null, null, this.getTagsForStencil(gn, '储水池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/处理池.svg;',
-				64, 74, '', '处理池', null, null, this.getTagsForStencil(gn, '处理池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/处理罐.svg;',
-				64, 74, '', '处理罐', null, null, this.getTagsForStencil(gn, '处理罐', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/大蜻蜓.svg;',
-				64, 74, '', '大蜻蜓', null, null, this.getTagsForStencil(gn, '大蜻蜓', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/带罐澄清器.svg;',
-				64, 74, '', '带罐澄清器', null, null, this.getTagsForStencil(gn, '带罐澄清器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/带式压滤机.svg;',
-				64, 74, '', '带式压滤机', null, null, this.getTagsForStencil(gn, '带式压滤机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/袋式过滤器.svg;',
-				64, 74, '', '袋式过滤器', null, null, this.getTagsForStencil(gn, '袋式过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/地面.svg;',
-				66, 66, '', '地面', null, null, this.getTagsForStencil(gn, '地面', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/低速通风废水处理.svg;',
-				64, 74, '', '低速通风废水处理', null, null, this.getTagsForStencil(gn, '低速通风废水处理', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/电动阀式浇口（打开）.svg;',
-				64, 74, '', '电动阀式浇口（打开）', null, null, this.getTagsForStencil(gn, '电动阀式浇口（打开）', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/电动阀式浇口（关闭）.svg;',
-				64, 74, '', '电动阀式浇口（关闭）', null, null, this.getTagsForStencil(gn, '电动阀式浇口（关闭）', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/反渗透主机.svg;',
-				64, 74, '', '反渗透主机', null, null, this.getTagsForStencil(gn, '反渗透主机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/防爆维护.svg;',
-				64, 74, '', '防爆维护', null, null, this.getTagsForStencil(gn, '防爆维护', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/废水研磨机.svg;',
-				64, 74, '', '废水研磨机', null, null, this.getTagsForStencil(gn, '废水研磨机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/废水蒸发器.svg;',
-				64, 74, '', '废水蒸发器', null, null, this.getTagsForStencil(gn, '废水蒸发器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/焚化炉.svg;',
-				64, 74, '', '焚化炉', null, null, this.getTagsForStencil(gn, '焚化炉', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/浮油回收器.svg;',
-				64, 74, '', '浮油回收器', null, null, this.getTagsForStencil(gn, '浮油回收器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/干燥装置.svg;',
-				64, 74, '', '干燥装置', null, null, this.getTagsForStencil(gn, '干燥装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 1.svg;',
-				64, 74, '', '高位槽 1', null, null, this.getTagsForStencil(gn, '高位槽 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 2.svg;',
-				64, 74, '', '高位槽 2', null, null, this.getTagsForStencil(gn, '高位槽 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 3.svg;',
-				64, 74, '', '高位槽 3', null, null, this.getTagsForStencil(gn, '高位槽 3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 4.svg;',
-				64, 74, '', '高位槽 4', null, null, this.getTagsForStencil(gn, '高位槽 4', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 5.svg;',
-				64, 74, '', '高位槽 5', null, null, this.getTagsForStencil(gn, '高位槽 5', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/格栅.svg;',
-				64, 74, '', '格栅', null, null, this.getTagsForStencil(gn, '格栅', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/鼓式过滤器.svg;',
-				64, 74, '', '鼓式过滤器', null, null, this.getTagsForStencil(gn, '鼓式过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 2.svg;',
-				64, 74, '', '过滤器 2', null, null, this.getTagsForStencil(gn, '过滤器 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 3.svg;',
-				64, 74, '', '过滤器 3', null, null, this.getTagsForStencil(gn, '过滤器 3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 4.svg;',
-				64, 74, '', '过滤器 4', null, null, this.getTagsForStencil(gn, '过滤器 4', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 5.svg;',
-				64, 74, '', '过滤器 5', null, null, this.getTagsForStencil(gn, '过滤器 5', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 6.svg;',
-				64, 74, '', '过滤器 6', null, null, this.getTagsForStencil(gn, '过滤器 6', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器.svg;',
-				64, 74, '', '过滤器', null, null, this.getTagsForStencil(gn, '过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器外壳.svg;',
-				64, 74, '', '过滤器外壳', null, null, this.getTagsForStencil(gn, '过滤器外壳', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/豪华立式管线机.svg;',
-				64, 74, '', '豪华立式管线机', null, null, this.getTagsForStencil(gn, '豪华立式管线机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/化学品加料机.svg;',
-				64, 74, '', '化学品加料机', null, null, this.getTagsForStencil(gn, '化学品加料机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/灰处理池.svg;',
-				66, 66, '', '灰处理池', null, null, this.getTagsForStencil(gn, '灰处理池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/加氯器.svg;',
-				64, 74, '', '加氯器', null, null, this.getTagsForStencil(gn, '加氯器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/简单高位槽.svg;',
-				64, 74, '', '简单高位槽', null, null, this.getTagsForStencil(gn, '简单高位槽', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/简单蒸发器.svg;',
-				64, 74, '', '简单蒸发器', null, null, this.getTagsForStencil(gn, '简单蒸发器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/桨式干燥机.svg;',
-				64, 74, '', '桨式干燥机', null, null, this.getTagsForStencil(gn, '桨式干燥机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/紧密耦合自吸泵.svg;',
-				64, 74, '', '紧密耦合自吸泵', null, null, this.getTagsForStencil(gn, '紧密耦合自吸泵', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/精细过滤器.svg;',
-				64, 74, '', '精细过滤器', null, null, this.getTagsForStencil(gn, '精细过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水器.svg;',
-				64, 74, '', '净水器', null, null, this.getTagsForStencil(gn, '净水器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水系统.svg;',
-				64, 74, '', '净水系统', null, null, this.getTagsForStencil(gn, '净水系统', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水系统2.svg;',
-				64, 74, '', '净水系统 2', null, null, this.getTagsForStencil(gn, '净水系统 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/聚合物混合装置.svg;',
-				66, 66, '', '聚合物混合装置', null, null, this.getTagsForStencil(gn, '聚合物混合装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/聚合物注入装置.svg;',
-				64, 74, '', '聚合物注入装置', null, null, this.getTagsForStencil(gn, '聚合物注入装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/空气扩散装置.svg;',
-				64, 74, '', '空气扩散装置', null, null, this.getTagsForStencil(gn, '空气扩散装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蓝色过滤器.svg;',
-				64, 74, '', '蓝色过滤器', null, null, this.getTagsForStencil(gn, '蓝色过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/冷却塔组.svg;',
-				64, 74, '', '冷却塔组', null, null, this.getTagsForStencil(gn, '冷却塔组', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沥青过滤器.svg;',
-				64, 74, '', '沥青过滤器', null, null, this.getTagsForStencil(gn, '沥青过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/流阀.svg;',
-				64, 74, '', '流阀', null, null, this.getTagsForStencil(gn, '流阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/螺杆传动.svg;',
-				64, 74, '', '螺杆传动', null, null, this.getTagsForStencil(gn, '螺杆传动', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/滤膜.svg;',
-				64, 74, '', '滤膜', null, null, this.getTagsForStencil(gn, '滤膜', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/滤水器.svg;',
-				64, 74, '', '滤水器', null, null, this.getTagsForStencil(gn, '滤水器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/地面.svg;',
-				66, 66, '', '地面', null, null, this.getTagsForStencil(gn, '地面', dt).join(' ')),
-
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/民用自来水.svg;',
-				64, 74, '', '民用自来水', null, null, this.getTagsForStencil(gn, '民用自来水', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/排水池.svg;',
-				64, 74, '', '排水池', null, null, this.getTagsForStencil(gn, '排水池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/排水系统.svg;',
-				64, 74, '', '排水系统', null, null, this.getTagsForStencil(gn, '排水系统', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/喷头.svg;',
-				64, 74, '', '喷头', null, null, this.getTagsForStencil(gn, '喷头', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气池 1.svg;',
-				66, 66, '', '曝气池 1', null, null, this.getTagsForStencil(gn, '曝气池 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气池 2.svg;',
-				64, 74, '', '曝气池 2', null, null, this.getTagsForStencil(gn, '曝气池 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气消化池 1.svg;',
-				64, 74, '', '曝气消化池 1', null, null, this.getTagsForStencil(gn, '曝气消化池 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气消化池 2.svg;',
-				64, 74, '', '曝气消化池 2', null, null, this.getTagsForStencil(gn, '曝气消化池 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/气体处理.svg;',
-				64, 74, '', '气体处理', null, null, this.getTagsForStencil(gn, '气体处理', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/潜水式搅拌器.svg;',
-				64, 74, '', '潜水式搅拌器', null, null, this.getTagsForStencil(gn, '潜水式搅拌器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/球形储罐 1.svg;',
-				64, 74, '', '球形储罐 1', null, null, this.getTagsForStencil(gn, '球形储罐 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/球形储罐 2.svg;',
-				64, 74, '', '球形储罐 2', null, null, this.getTagsForStencil(gn, '球形储罐 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/容器.svg;',
-				64, 74, '', '容器', null, null, this.getTagsForStencil(gn, '容器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/溶气浮选装置.svg;',
-				64, 74, '', '溶气浮选装置', null, null, this.getTagsForStencil(gn, '溶气浮选装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/溶液给料机.svg;',
-				66, 66, '', '溶液给料机', null, null, this.getTagsForStencil(gn, '溶液给料机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/筛子.svg;',
-				64, 74, '', '筛子', null, null, this.getTagsForStencil(gn, '筛子', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/生物处理设备.svg;',
-				64, 74, '', '生物处理设备', null, null, this.getTagsForStencil(gn, '生物处理设备', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/生物反应池.svg;',
-				64, 74, '', '生物反应池', null, null, this.getTagsForStencil(gn, '生物反应池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/湿式收尘器.svg;',
-				64, 74, '', '湿式收尘器', null, null, this.getTagsForStencil(gn, '湿式收尘器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理厂.svg;',
-				64, 74, '', '水处理厂', null, null, this.getTagsForStencil(gn, '水处理厂', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理池（俯视）.svg;',
-				64, 74, '', '水处理池（俯视）', null, null, this.getTagsForStencil(gn, '水处理池（俯视）', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理罐.svg;',
-				64, 74, '', '水处理罐', null, null, this.getTagsForStencil(gn, '水处理罐', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理系统.svg;',
-				64, 74, '', '水处理系统', null, null, this.getTagsForStencil(gn, '水处理系统', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水解沉砂池.svg;',
-				64, 74, '', '水解沉砂池', null, null, this.getTagsForStencil(gn, '水解沉砂池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水解酸化池.svg;',
-				66, 66, '', '水解酸化池', null, null, this.getTagsForStencil(gn, '水解酸化池', dt).join(' ')),
-
-
-
-
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水龙头.svg;',
-				64, 74, '', '水龙头', null, null, this.getTagsForStencil(gn, '水龙头', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水渠.svg;',
-				64, 74, '', '水渠', null, null, this.getTagsForStencil(gn, '水渠', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/碳吸收器.svg;',
-				66, 66, '', '碳吸收器', null, null, this.getTagsForStencil(gn, '碳吸收器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥浓缩池.svg;',
-				64, 74, '', '污泥浓缩池', null, null, this.getTagsForStencil(gn, '污泥浓缩池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥塘.svg;',
-				64, 74, '', '污泥塘', null, null, this.getTagsForStencil(gn, '污泥塘', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥消化池.svg;',
-				64, 74, '', '污泥消化池', null, null, this.getTagsForStencil(gn, '污泥消化池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污水槽气泡扩散器.svg;',
-				64, 74, '', '污水槽气泡扩散器', null, null, this.getTagsForStencil(gn, '污水槽气泡扩散器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污水罐.svg;',
-				64, 74, '', '污水罐', null, null, this.getTagsForStencil(gn, '污水罐', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/吸收器.svg;',
-				64, 74, '', '吸收器', null, null, this.getTagsForStencil(gn, '吸收器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/洗涤器设备.svg;',
-				64, 74, '', '洗涤器设备', null, null, this.getTagsForStencil(gn, '洗涤器设备', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/洗水处理和回收系统.svg;',
-				64, 74, '', '洗水处理和回收系统', null, null, this.getTagsForStencil(gn, '洗水处理和回收系统', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/消化池.svg;',
-				64, 74, '', '消化池', null, null, this.getTagsForStencil(gn, '消化池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/小瓶灌装机.svg;',
-				66, 66, '', '小瓶灌装机', null, null, this.getTagsForStencil(gn, '小瓶灌装机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/斜板澄清器.svg;',
-				64, 74, '', '斜板澄清器', null, null, this.getTagsForStencil(gn, '斜板澄清器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/絮凝器.svg;',
-				64, 74, '', '絮凝器', null, null, this.getTagsForStencil(gn, '絮凝器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蓄水池.svg;',
-				66, 66, '', '蓄水池', null, null, this.getTagsForStencil(gn, '蓄水池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/筛子.svg;',
-				64, 74, '', '筛子', null, null, this.getTagsForStencil(gn, '筛子', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/旋液分离器.svg;',
-				64, 74, '', '旋液分离器', null, null, this.getTagsForStencil(gn, '旋液分离器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/生物反应池.svg;',
-				64, 74, '', '压榨过滤机', null, null, this.getTagsForStencil(gn, '压榨过滤机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/厌氧序批式反应器.svg;',
-				64, 74, '', '厌氧序批式反应器', null, null, this.getTagsForStencil(gn, '厌氧序批式反应器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/引水渠.svg;',
-				64, 74, '', '引水渠', null, null, this.getTagsForStencil(gn, '引水渠', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离和回收装置.svg;',
-				64, 74, '', '油水分离和回收装置', null, null, this.getTagsForStencil(gn, '油水分离和回收装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离器 1.svg;',
-				64, 74, '', '油水分离器 1', null, null, this.getTagsForStencil(gn, '油水分离器 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离器 2.svg;',
-				64, 74, '', '油水分离器 2', null, null, this.getTagsForStencil(gn, '油水分离器 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油箱消化池.svg;',
-				64, 74, '', '油箱消化池', null, null, this.getTagsForStencil(gn, '油箱消化池', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/浴缸.svg;',
-				66, 66, '', '浴缸', null, null, this.getTagsForStencil(gn, '浴缸', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/预滤器.svg;',
-				64, 74, '', '预滤器', null, null, this.getTagsForStencil(gn, '预滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/圆顶水箱.svg;',
-				64, 74, '', '圆顶水箱', null, null, this.getTagsForStencil(gn, '圆顶水箱', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/真空过滤器.svg;',
-				66, 66, '', '真空过滤器', null, null, this.getTagsForStencil(gn, '真空过滤器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蒸发器.svg;',
-				64, 74, '', '蒸发器', null, null, this.getTagsForStencil(gn, '蒸发器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蒸发装置.svg;',
-				64, 74, '', '蒸发装置', null, null, this.getTagsForStencil(gn, '蒸发装置', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/制氧机.svg;',
-				64, 74, '', '制氧机', null, null, this.getTagsForStencil(gn, '制氧机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/中央净水器.svg;',
-				64, 74, '', '中央净水器', null, null, this.getTagsForStencil(gn, '中央净水器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/中央软水器.svg;',
-				64, 74, '', '中央软水器', null, null, this.getTagsForStencil(gn, '中央软水器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/重力带式机械浓缩机.svg;',
-				64, 74, '', '重力带式机械浓缩机', null, null, this.getTagsForStencil(gn, '重力带式机械浓缩机', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/主澄清器.svg;',
-				64, 74, '', '主澄清器', null, null, this.getTagsForStencil(gn, '主澄清器', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/转鼓浓缩机.svg;',
-				64, 74, '', '转鼓浓缩机', null, null, this.getTagsForStencil(gn, '转鼓浓缩机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/中央净水器.svg;imageAspect=0;', width, height, '', '中央净水器', null, null, this.getTagsForStencil(gn, '中央净水器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/中央软水器.svg;imageAspect=0;', width, height, '', '中央软水器', null, null, this.getTagsForStencil(gn, '中央软水器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/主澄清器.svg;imageAspect=0;', width, height, '', '主澄清器', null, null, this.getTagsForStencil(gn, '主澄清器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/低速通风废水处理.svg;imageAspect=0;', width, height, '', '低速通风废水处理', null, null, this.getTagsForStencil(gn, '低速通风废水处理', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/储水池.svg;imageAspect=0;', width, height, '', '储水池', null, null, this.getTagsForStencil(gn, '储水池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/冷却塔组.svg;imageAspect=0;', width, height, '', '冷却塔组', null, null, this.getTagsForStencil(gn, '冷却塔组', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水器.svg;imageAspect=0;', width, height, '', '净水器', null, null, this.getTagsForStencil(gn, '净水器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水系统.svg;imageAspect=0;', width, height, '', '净水系统', null, null, this.getTagsForStencil(gn, '净水系统', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/净水系统2.svg;imageAspect=0;', width, height, '', '净水系统2', null, null, this.getTagsForStencil(gn, '净水系统2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/制氧机.svg;imageAspect=0;', width, height, '', '制氧机', null, null, this.getTagsForStencil(gn, '制氧机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/加氯器.svg;imageAspect=0;', width, height, '', '加氯器', null, null, this.getTagsForStencil(gn, '加氯器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/化学品加料机.svg;imageAspect=0;', width, height, '', '化学品加料机', null, null, this.getTagsForStencil(gn, '化学品加料机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/压榨过滤机.svg;imageAspect=0;', width, height, '', '压榨过滤机', null, null, this.getTagsForStencil(gn, '压榨过滤机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/厌氧序批式反应器.svg;imageAspect=0;', width, height, '', '厌氧序批式反应器', null, null, this.getTagsForStencil(gn, '厌氧序批式反应器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/反渗透主机.svg;imageAspect=0;', width, height, '', '反渗透主机', null, null, this.getTagsForStencil(gn, '反渗透主机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/吸收器.svg;imageAspect=0;', width, height, '', '吸收器', null, null, this.getTagsForStencil(gn, '吸收器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/喷头.svg;imageAspect=0;', width, height, '', '喷头', null, null, this.getTagsForStencil(gn, '喷头', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/圆顶水箱.svg;imageAspect=0;', width, height, '', '圆顶水箱', null, null, this.getTagsForStencil(gn, '圆顶水箱', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/地面.svg;imageAspect=0;', width, height, '', '地面', null, null, this.getTagsForStencil(gn, '地面', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/处理池.svg;imageAspect=0;', width, height, '', '处理池', null, null, this.getTagsForStencil(gn, '处理池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/处理罐.svg;imageAspect=0;', width, height, '', '处理罐', null, null, this.getTagsForStencil(gn, '处理罐', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/大蜻蜓.svg;imageAspect=0;', width, height, '', '大蜻蜓', null, null, this.getTagsForStencil(gn, '大蜻蜓', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/容器.svg;imageAspect=0;', width, height, '', '容器', null, null, this.getTagsForStencil(gn, '容器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/小瓶灌装机.svg;imageAspect=0;', width, height, '', '小瓶灌装机', null, null, this.getTagsForStencil(gn, '小瓶灌装机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/带式压滤机.svg;imageAspect=0;', width, height, '', '带式压滤机', null, null, this.getTagsForStencil(gn, '带式压滤机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/带罐澄清器.svg;imageAspect=0;', width, height, '', '带罐澄清器', null, null, this.getTagsForStencil(gn, '带罐澄清器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/干燥装置.svg;imageAspect=0;', width, height, '', '干燥装置', null, null, this.getTagsForStencil(gn, '干燥装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/废水研磨机.svg;imageAspect=0;', width, height, '', '废水研磨机', null, null, this.getTagsForStencil(gn, '废水研磨机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/废水蒸发器.svg;imageAspect=0;', width, height, '', '废水蒸发器', null, null, this.getTagsForStencil(gn, '废水蒸发器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/引水渠.svg;imageAspect=0;', width, height, '', '引水渠', null, null, this.getTagsForStencil(gn, '引水渠', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/排水池.svg;imageAspect=0;', width, height, '', '排水池', null, null, this.getTagsForStencil(gn, '排水池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/排水系统.svg;imageAspect=0;', width, height, '', '排水系统', null, null, this.getTagsForStencil(gn, '排水系统', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/斜板澄清器.svg;imageAspect=0;', width, height, '', '斜板澄清器', null, null, this.getTagsForStencil(gn, '斜板澄清器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/旋液分离器.svg;imageAspect=0;', width, height, '', '旋液分离器', null, null, this.getTagsForStencil(gn, '旋液分离器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气池 1.svg;imageAspect=0;', width, height, '', '曝气池 1', null, null, this.getTagsForStencil(gn, '曝气池 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气池 2.svg;imageAspect=0;', width, height, '', '曝气池 2', null, null, this.getTagsForStencil(gn, '曝气池 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气消化池 1.svg;imageAspect=0;', width, height, '', '曝气消化池 1', null, null, this.getTagsForStencil(gn, '曝气消化池 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/曝气消化池 2.svg;imageAspect=0;', width, height, '', '曝气消化池 2', null, null, this.getTagsForStencil(gn, '曝气消化池 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/板式澄清器.svg;imageAspect=0;', width, height, '', '板式澄清器', null, null, this.getTagsForStencil(gn, '板式澄清器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/格栅.svg;imageAspect=0;', width, height, '', '格栅', null, null, this.getTagsForStencil(gn, '格栅', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/桨式干燥机.svg;imageAspect=0;', width, height, '', '桨式干燥机', null, null, this.getTagsForStencil(gn, '桨式干燥机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/民用自来水.svg;imageAspect=0;', width, height, '', '民用自来水', null, null, this.getTagsForStencil(gn, '民用自来水', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/气体处理.svg;imageAspect=0;', width, height, '', '气体处理', null, null, this.getTagsForStencil(gn, '气体处理', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理厂.svg;imageAspect=0;', width, height, '', '水处理厂', null, null, this.getTagsForStencil(gn, '水处理厂', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理池（俯视）.svg;imageAspect=0;', width, height, '', '水处理池（俯视）', null, null, this.getTagsForStencil(gn, '水处理池（俯视）', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理系统.svg;imageAspect=0;', width, height, '', '水处理系统', null, null, this.getTagsForStencil(gn, '水处理系统', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水处理罐.svg;imageAspect=0;', width, height, '', '水处理罐', null, null, this.getTagsForStencil(gn, '水处理罐', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水渠.svg;imageAspect=0;', width, height, '', '水渠', null, null, this.getTagsForStencil(gn, '水渠', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水解沉砂池.svg;imageAspect=0;', width, height, '', '水解沉砂池', null, null, this.getTagsForStencil(gn, '水解沉砂池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水解酸化池.svg;imageAspect=0;', width, height, '', '水解酸化池', null, null, this.getTagsForStencil(gn, '水解酸化池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/水龙头.svg;imageAspect=0;', width, height, '', '水龙头', null, null, this.getTagsForStencil(gn, '水龙头', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/池塘.svg;imageAspect=0;', width, height, '', '池塘', null, null, this.getTagsForStencil(gn, '池塘', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污水槽气泡扩散器.svg;imageAspect=0;', width, height, '', '污水槽气泡扩散器', null, null, this.getTagsForStencil(gn, '污水槽气泡扩散器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污水罐.svg;imageAspect=0;', width, height, '', '污水罐', null, null, this.getTagsForStencil(gn, '污水罐', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥塘.svg;imageAspect=0;', width, height, '', '污泥塘', null, null, this.getTagsForStencil(gn, '污泥塘', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥浓缩池.svg;imageAspect=0;', width, height, '', '污泥浓缩池', null, null, this.getTagsForStencil(gn, '污泥浓缩池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/污泥消化池.svg;imageAspect=0;', width, height, '', '污泥消化池', null, null, this.getTagsForStencil(gn, '污泥消化池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉淀池 2.svg;imageAspect=0;', width, height, '', '沉淀池 2', null, null, this.getTagsForStencil(gn, '沉淀池 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉淀池.svg;imageAspect=0;', width, height, '', '沉淀池', null, null, this.getTagsForStencil(gn, '沉淀池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沉砂池.svg;imageAspect=0;', width, height, '', '沉砂池', null, null, this.getTagsForStencil(gn, '沉砂池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/沥青过滤器.svg;imageAspect=0;', width, height, '', '沥青过滤器', null, null, this.getTagsForStencil(gn, '沥青过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离和回收装置.svg;imageAspect=0;', width, height, '', '油水分离和回收装置', null, null, this.getTagsForStencil(gn, '油水分离和回收装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离器 1.svg;imageAspect=0;', width, height, '', '油水分离器 1', null, null, this.getTagsForStencil(gn, '油水分离器 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油水分离器 2.svg;imageAspect=0;', width, height, '', '油水分离器 2', null, null, this.getTagsForStencil(gn, '油水分离器 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/油箱消化池.svg;imageAspect=0;', width, height, '', '油箱消化池', null, null, this.getTagsForStencil(gn, '油箱消化池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/洗水处理和回收系统.svg;imageAspect=0;', width, height, '', '洗水处理和回收系统', null, null, this.getTagsForStencil(gn, '洗水处理和回收系统', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/洗涤器设备.svg;imageAspect=0;', width, height, '', '洗涤器设备', null, null, this.getTagsForStencil(gn, '洗涤器设备', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/流阀.svg;imageAspect=0;', width, height, '', '流阀', null, null, this.getTagsForStencil(gn, '流阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/浮油回收器.svg;imageAspect=0;', width, height, '', '浮油回收器', null, null, this.getTagsForStencil(gn, '浮油回收器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/浴缸.svg;imageAspect=0;', width, height, '', '浴缸', null, null, this.getTagsForStencil(gn, '浴缸', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/消化池.svg;imageAspect=0;', width, height, '', '消化池', null, null, this.getTagsForStencil(gn, '消化池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/湿式收尘器.svg;imageAspect=0;', width, height, '', '湿式收尘器', null, null, this.getTagsForStencil(gn, '湿式收尘器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/溶气浮选装置.svg;imageAspect=0;', width, height, '', '溶气浮选装置', null, null, this.getTagsForStencil(gn, '溶气浮选装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/溶液给料机.svg;imageAspect=0;', width, height, '', '溶液给料机', null, null, this.getTagsForStencil(gn, '溶液给料机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/滤水器.svg;imageAspect=0;', width, height, '', '滤水器', null, null, this.getTagsForStencil(gn, '滤水器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/滤膜.svg;imageAspect=0;', width, height, '', '滤膜', null, null, this.getTagsForStencil(gn, '滤膜', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/潜水式搅拌器.svg;imageAspect=0;', width, height, '', '潜水式搅拌器', null, null, this.getTagsForStencil(gn, '潜水式搅拌器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器 1.svg;imageAspect=0;', width, height, '', '澄清器 1', null, null, this.getTagsForStencil(gn, '澄清器 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器 2.svg;imageAspect=0;', width, height, '', '澄清器 2', null, null, this.getTagsForStencil(gn, '澄清器 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器和浓缩器.svg;imageAspect=0;', width, height, '', '澄清器和浓缩器', null, null, this.getTagsForStencil(gn, '澄清器和浓缩器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/澄清器（侧面）.svg;imageAspect=0;', width, height, '', '澄清器（侧面）', null, null, this.getTagsForStencil(gn, '澄清器（侧面）', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/灌装机.svg;imageAspect=0;', width, height, '', '灌装机', null, null, this.getTagsForStencil(gn, '灌装机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/灰处理池.svg;imageAspect=0;', width, height, '', '灰处理池', null, null, this.getTagsForStencil(gn, '灰处理池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/焚化炉.svg;imageAspect=0;', width, height, '', '焚化炉', null, null, this.getTagsForStencil(gn, '焚化炉', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/球形储罐 1.svg;imageAspect=0;', width, height, '', '球形储罐 1', null, null, this.getTagsForStencil(gn, '球形储罐 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/球形储罐 2.svg;imageAspect=0;', width, height, '', '球形储罐 2', null, null, this.getTagsForStencil(gn, '球形储罐 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/生物反应池.svg;imageAspect=0;', width, height, '', '生物反应池', null, null, this.getTagsForStencil(gn, '生物反应池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/生物处理设备.svg;imageAspect=0;', width, height, '', '生物处理设备', null, null, this.getTagsForStencil(gn, '生物处理设备', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/电动阀式浇口（关闭）.svg;imageAspect=0;', width, height, '', '电动阀式浇口（关闭）', null, null, this.getTagsForStencil(gn, '电动阀式浇口（关闭）', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/电动阀式浇口（打开）.svg;imageAspect=0;', width, height, '', '电动阀式浇口（打开）', null, null, this.getTagsForStencil(gn, '电动阀式浇口（打开）', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/真空过滤器.svg;imageAspect=0;', width, height, '', '真空过滤器', null, null, this.getTagsForStencil(gn, '真空过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/碳吸收器.svg;imageAspect=0;', width, height, '', '碳吸收器', null, null, this.getTagsForStencil(gn, '碳吸收器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/空气扩散装置.svg;imageAspect=0;', width, height, '', '空气扩散装置', null, null, this.getTagsForStencil(gn, '空气扩散装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/筛子.svg;imageAspect=0;', width, height, '', '筛子', null, null, this.getTagsForStencil(gn, '筛子', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/简单蒸发器.svg;imageAspect=0;', width, height, '', '简单蒸发器', null, null, this.getTagsForStencil(gn, '简单蒸发器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/简单高位槽.svg;imageAspect=0;', width, height, '', '简单高位槽', null, null, this.getTagsForStencil(gn, '简单高位槽', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/精细过滤器.svg;imageAspect=0;', width, height, '', '精细过滤器', null, null, this.getTagsForStencil(gn, '精细过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/紧密耦合自吸泵.svg;imageAspect=0;', width, height, '', '紧密耦合自吸泵', null, null, this.getTagsForStencil(gn, '紧密耦合自吸泵', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/絮凝器.svg;imageAspect=0;', width, height, '', '絮凝器', null, null, this.getTagsForStencil(gn, '絮凝器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/聚合物注入装置.svg;imageAspect=0;', width, height, '', '聚合物注入装置', null, null, this.getTagsForStencil(gn, '聚合物注入装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/聚合物混合装置.svg;imageAspect=0;', width, height, '', '聚合物混合装置', null, null, this.getTagsForStencil(gn, '聚合物混合装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蒸发器.svg;imageAspect=0;', width, height, '', '蒸发器', null, null, this.getTagsForStencil(gn, '蒸发器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蒸发装置.svg;imageAspect=0;', width, height, '', '蒸发装置', null, null, this.getTagsForStencil(gn, '蒸发装置', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蓄水池.svg;imageAspect=0;', width, height, '', '蓄水池', null, null, this.getTagsForStencil(gn, '蓄水池', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/蓝色过滤器.svg;imageAspect=0;', width, height, '', '蓝色过滤器', null, null, this.getTagsForStencil(gn, '蓝色过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/螺杆传动.svg;imageAspect=0;', width, height, '', '螺杆传动', null, null, this.getTagsForStencil(gn, '螺杆传动', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/袋式过滤器.svg;imageAspect=0;', width, height, '', '袋式过滤器', null, null, this.getTagsForStencil(gn, '袋式过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/豪华立式管线机.svg;imageAspect=0;', width, height, '', '豪华立式管线机', null, null, this.getTagsForStencil(gn, '豪华立式管线机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/超微细筛机.svg;imageAspect=0;', width, height, '', '超微细筛机', null, null, this.getTagsForStencil(gn, '超微细筛机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/转鼓浓缩机.svg;imageAspect=0;', width, height, '', '转鼓浓缩机', null, null, this.getTagsForStencil(gn, '转鼓浓缩机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 2.svg;imageAspect=0;', width, height, '', '过滤器 2', null, null, this.getTagsForStencil(gn, '过滤器 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 3.svg;imageAspect=0;', width, height, '', '过滤器 3', null, null, this.getTagsForStencil(gn, '过滤器 3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 4.svg;imageAspect=0;', width, height, '', '过滤器 4', null, null, this.getTagsForStencil(gn, '过滤器 4', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 5.svg;imageAspect=0;', width, height, '', '过滤器 5', null, null, this.getTagsForStencil(gn, '过滤器 5', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器 6.svg;imageAspect=0;', width, height, '', '过滤器 6', null, null, this.getTagsForStencil(gn, '过滤器 6', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器.svg;imageAspect=0;', width, height, '', '过滤器', null, null, this.getTagsForStencil(gn, '过滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/过滤器外壳.svg;imageAspect=0;', width, height, '', '过滤器外壳', null, null, this.getTagsForStencil(gn, '过滤器外壳', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/重力带式机械浓缩机.svg;imageAspect=0;', width, height, '', '重力带式机械浓缩机', null, null, this.getTagsForStencil(gn, '重力带式机械浓缩机', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/防爆维护.svg;imageAspect=0;', width, height, '', '防爆维护', null, null, this.getTagsForStencil(gn, '防爆维护', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/预滤器.svg;imageAspect=0;', width, height, '', '预滤器', null, null, this.getTagsForStencil(gn, '预滤器', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 1.svg;imageAspect=0;', width, height, '', '高位槽 1', null, null, this.getTagsForStencil(gn, '高位槽 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 2.svg;imageAspect=0;', width, height, '', '高位槽 2', null, null, this.getTagsForStencil(gn, '高位槽 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 3.svg;imageAspect=0;', width, height, '', '高位槽 3', null, null, this.getTagsForStencil(gn, '高位槽 3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 4.svg;imageAspect=0;', width, height, '', '高位槽 4', null, null, this.getTagsForStencil(gn, '高位槽 4', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/高位槽 5.svg;imageAspect=0;', width, height, '', '高位槽 5', null, null, this.getTagsForStencil(gn, '高位槽 5', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/sewage/鼓式过滤器.svg;imageAspect=0;', width, height, '', '鼓式过滤器', null, null, this.getTagsForStencil(gn, '鼓式过滤器', dt).join(' ')),
 
 		];
+
 		this.addPaletteFunctions('sewage', '污水处理', false, fns);
+
 		this.setCurrentSearchEntryLibrary();
 	};
 })();

-(function()
-{
+
+(function () {
 	// Adds Atlassian shapes
-	// 阀门
-	Sidebar.prototype.addValvePalette = function()
-	{
+	// valve
+	Sidebar.prototype.addValvePalette = function () {
 		var gn = 'mxgraph.valve';
-		var dt = 'valve ';
+		var dt = 'valve';
 		var width = 66;
 		var height = 74;
 		this.setCurrentSearchEntryLibrary('valve');
 
 		var fns = [
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/安全阀.svg;imageAspect=0;',
-				width, height, '', '安全阀', null, null, this.getTagsForStencil(gn, '安全阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/垂直单向阀.svg;imageAspect=0;',
-				width, height, '', '垂直单向阀', null, null, this.getTagsForStencil(gn, '垂直单向阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/垂直控制阀.svg;imageAspect=0;',
-				width, height, '', '垂直控制阀', null, null, this.getTagsForStencil(gn, '垂直控制阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/电动阀.svg;imageAspect=0;',
-				width, height, '', '电动阀', null, null, this.getTagsForStencil(gn, '电动阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/阀门.svg;imageAspect=0;',
-				width, height, '', '阀门', null, null, this.getTagsForStencil(gn, '阀门', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/阀门2.svg;imageAspect=0;',
-				width, height, '', '阀门2', null, null, this.getTagsForStencil(gn, '阀门2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/法兰控制阀.svg;imageAspect=0;',
-				width, height, '', '法兰控制阀', null, null, this.getTagsForStencil(gn, '法兰控制阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/夹管阀.svg;imageAspect=0;',
-				width, height, '', '夹管阀', null, null, this.getTagsForStencil(gn, '夹管阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/控制阀 2.svg;imageAspect=0;',
-				width, height, '', '控制阀 2', null, null, this.getTagsForStencil(gn, '控制阀 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/控制阀.svg;imageAspect=0;',
-				width, height, '', '控制阀', null, null, this.getTagsForStencil(gn, '控制阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 1.svg;imageAspect=0;',
-				width, height, '', '球形阀 1', null, null, this.getTagsForStencil(gn, '球形阀 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 2.svg;imageAspect=0;',
-				width, height, '', '球形阀 2', null, null, this.getTagsForStencil(gn, '球形阀 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 3.svg;imageAspect=0;',
-				width, height, '', '球形阀 3', null, null, this.getTagsForStencil(gn, '球形阀 3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/手动阀 1.svg;imageAspect=0;',
-				width, height, '', '手动阀 1', null, null, this.getTagsForStencil(gn, '手动阀 1', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/手动阀 2.svg;imageAspect=0;',
-				width, height, '', '手动阀 2', null, null, this.getTagsForStencil(gn, '手动阀 2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/双通阀.svg;imageAspect=0;',
-				width, height, '', '双通阀', null, null, this.getTagsForStencil(gn, '双通阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平单向阀.svg;imageAspect=0;',
-				width, height, '', '水平单向阀', null, null, this.getTagsForStencil(gn, '水平单向阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀.svg;imageAspect=0;',
-				width, height, '', '水平控制阀', null, null, this.getTagsForStencil(gn, '水平控制阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀2.svg;imageAspect=0;',
-				width, height, '', '水平控制阀2', null, null, this.getTagsForStencil(gn, '水平控制阀2', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀3.svg;imageAspect=0;',
-				width, height, '', '水平控制阀3', null, null, this.getTagsForStencil(gn, '水平控制阀3', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/塑料旋启式止回阀.svg;imageAspect=0;',
-				width, height, '', '塑料旋启式止回阀', null, null, this.getTagsForStencil(gn, '塑料旋启式止回阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/卸灰阀.svg;imageAspect=0;',
-				width, height, '', '卸灰阀', null, null, this.getTagsForStencil(gn, '卸灰阀', dt).join(' ')),
-			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/旋转阀.svg;imageAspect=0;',
-				width, height, '', '旋转阀', null, null, this.getTagsForStencil(gn, '旋转阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/卸灰阀.svg;imageAspect=0;', width, height, '', '卸灰阀', null, null, this.getTagsForStencil(gn, '卸灰阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/双通阀.svg;imageAspect=0;', width, height, '', '双通阀', null, null, this.getTagsForStencil(gn, '双通阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/垂直单向阀.svg;imageAspect=0;', width, height, '', '垂直单向阀', null, null, this.getTagsForStencil(gn, '垂直单向阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/垂直控制阀.svg;imageAspect=0;', width, height, '', '垂直控制阀', null, null, this.getTagsForStencil(gn, '垂直控制阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/塑料旋启式止回阀.svg;imageAspect=0;', width, height, '', '塑料旋启式止回阀', null, null, this.getTagsForStencil(gn, '塑料旋启式止回阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/夹管阀.svg;imageAspect=0;', width, height, '', '夹管阀', null, null, this.getTagsForStencil(gn, '夹管阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/安全阀.svg;imageAspect=0;', width, height, '', '安全阀', null, null, this.getTagsForStencil(gn, '安全阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/手动阀 1.svg;imageAspect=0;', width, height, '', '手动阀 1', null, null, this.getTagsForStencil(gn, '手动阀 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/手动阀 2.svg;imageAspect=0;', width, height, '', '手动阀 2', null, null, this.getTagsForStencil(gn, '手动阀 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/控制阀 2.svg;imageAspect=0;', width, height, '', '控制阀 2', null, null, this.getTagsForStencil(gn, '控制阀 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/控制阀.svg;imageAspect=0;', width, height, '', '控制阀', null, null, this.getTagsForStencil(gn, '控制阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/旋转阀.svg;imageAspect=0;', width, height, '', '旋转阀', null, null, this.getTagsForStencil(gn, '旋转阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平单向阀.svg;imageAspect=0;', width, height, '', '水平单向阀', null, null, this.getTagsForStencil(gn, '水平单向阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀.svg;imageAspect=0;', width, height, '', '水平控制阀', null, null, this.getTagsForStencil(gn, '水平控制阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀2.svg;imageAspect=0;', width, height, '', '水平控制阀2', null, null, this.getTagsForStencil(gn, '水平控制阀2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/水平控制阀3.svg;imageAspect=0;', width, height, '', '水平控制阀3', null, null, this.getTagsForStencil(gn, '水平控制阀3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/法兰控制阀.svg;imageAspect=0;', width, height, '', '法兰控制阀', null, null, this.getTagsForStencil(gn, '法兰控制阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 1.svg;imageAspect=0;', width, height, '', '球形阀 1', null, null, this.getTagsForStencil(gn, '球形阀 1', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 2.svg;imageAspect=0;', width, height, '', '球形阀 2', null, null, this.getTagsForStencil(gn, '球形阀 2', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/球形阀 3.svg;imageAspect=0;', width, height, '', '球形阀 3', null, null, this.getTagsForStencil(gn, '球形阀 3', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/电动阀.svg;imageAspect=0;', width, height, '', '电动阀', null, null, this.getTagsForStencil(gn, '电动阀', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/阀门.svg;imageAspect=0;', width, height, '', '阀门', null, null, this.getTagsForStencil(gn, '阀门', dt).join(' ')),
+			this.createVertexTemplateEntry('image;image=img/lib/thingskit/valve/阀门2.svg;imageAspect=0;', width, height, '', '阀门2', null, null, this.getTagsForStencil(gn, '阀门2', dt).join(' ')),
+
 		];
 
-		this.addPalette('valve', '阀门', false, mxUtils.bind(this, function(content)
-		{
-			for (var i = 0; i < fns.length; i++)
-			{
-				content.appendChild(fns[i](content));
-			}
-		}));
+		this.addPaletteFunctions('valve', '阀门', false, fns);
 
 		this.setCurrentSearchEntryLibrary();
 	};

@@ -4879,7 +4879,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
     const ss = ui.getSelectionState();
     const vertices = ss.vertices || []
 
-    console.log(this.editorUi)
+    // console.log(this.editorUi)
     console.log(vertices)
 
 
@@ -5286,7 +5286,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
             function echoDataSource() {
-                const { dataSources = [] } = currentNodeData
+                const { dataSources = [] } = currentNodeData || {}
                 const [dataSource = {}] = dataSources
                 const { orgId, deviceId, slaveDeviceId, attr } = dataSource
                 const queue = []
@@ -6564,13 +6564,14 @@ StyleFormatPanel.prototype.init = function () {
         this.container.appendChild(this.addEffects(this.createPanel()));
     }
 
-    var opsPanel = this.addEditOps(this.createPanel());
+    // TODO thingsKit 编辑样式 隐藏
+    // var opsPanel = this.addEditOps(this.createPanel());
 
-    if (opsPanel.firstChild != null) {
-        mxUtils.br(opsPanel);
-    }
+    // if (opsPanel.firstChild != null) {
+    //     mxUtils.br(opsPanel);
+    // }
 
-    this.container.appendChild(this.addStyleOps(opsPanel));
+    // this.container.appendChild(this.addStyleOps(opsPanel));
 };
 
 /**
@@ -11285,12 +11286,13 @@ class DispatchCenter {
     /**
      * @description 更新页面
      * @param callback
+     * @param cell
      */
-    updatePage(callback) {
+    updatePage(callback, cell) {
         this.graph.getModel().beginUpdate()
         try {
             callback()
-            this.graph.refresh();
+            this.graph.refresh(cell);
         } finally {
             this.graph.getModel().endUpdate()
         }
@@ -11495,7 +11497,6 @@ class HandleDataInteraction {
         }
         for (const item of list) {
             const { deviceId, slaveDeviceId, value, way } = item
-            console.log(item)
             if (!value || !deviceId) continue
             const data = {
                 method: "methodThingskit",
@@ -11659,7 +11660,7 @@ class HandleDynamicEffect {
         }
         switch (type) {
             case HandleDynamicEffect.enumActType.ROTATE:
-                // invoke = this.rotate.bind(this)
+                invoke = this.rotate.bind(this)
                 break
             case HandleDynamicEffect.enumActType.DISPLAY:
                 invoke = this.display.bind(this)
@@ -11677,7 +11678,6 @@ class HandleDynamicEffect {
      */
     rotate(data) {
         const { subscriptionId } = data
-        console.log(data)
         const node = this.getNodeByCmdId(subscriptionId)
         let deg = 0
         this.cleanSetInterval = RAFSetInterval(() => {
@@ -11687,7 +11687,6 @@ class HandleDynamicEffect {
             // const reg = /rotation=(-?)\w+(;?)/g
             // style = style.replace(reg, `rotation=${ deg }`)
             // // node.setStyle(style)
-            // console.log(node)
             // this.graph.getModel().beginUpdate()
             // try {
             //     node.setStyle(style)
@@ -11703,7 +11702,7 @@ class HandleDynamicEffect {
                 style = style.replace(reg, `rotation=${ deg }`)
                 node.setStyle(style)
                 this.graph.updateCellStyles(style, node)
-            })
+            }, node)
         }, 100)
     }
 

@@ -31,8 +31,8 @@ Menus.prototype.defaultFontSize = '12';
  * Sets the default font size.
  */
 // Menus.prototype.defaultMenuItems = ['file', 'edit', 'view', 'arrange', 'extras', 'help'];
-// TODO 工具栏 文件选项隐藏
-Menus.prototype.defaultMenuItems = ['edit', 'view', 'arrange', 'extras', 'help'];
+// TODO thingsKit 工具栏 文件选项隐藏
+Menus.prototype.defaultMenuItems = ['edit', 'view', 'arrange'];
 
 /**
  * Adds the label menu items to the given menu and parent.