Merge branch 'sqy_dev' into 'main'

开发右侧操作栏的页面

See merge request huang/thingskit-drawio!4

@@ -4287,18 +4287,14 @@ DataFormatPanel.prototype.addDataFont = function (container)
 	deviceStylePanel.style.paddingBottom = '8px';
 	mxUtils.write(deviceStylePanel, "选择设备");
 	container.appendChild(deviceStylePanel);
-	var deviceSelect = document.createElement('input');
+	var deviceSelect = document.createElement('select');
 	deviceSelect.setAttribute('id','device');
 	deviceStylePanel.appendChild(deviceSelect)
+	
+	
+
+
 
-	// 删除父节点下的所有子节点
-  function deleteAllChild(element) { 
-		var first = element.firstElementChild; 
-		while (first) { 
-			first.remove(); 
-			first = element.firstElementChild; 
-		}
-  }
 	// 根据组织id获取组织下的设备列表--在点击组织时调用
 	function getDevicesByOrganizationId(organizationId){
 		if(organizationId){
@@ -4323,7 +4319,7 @@ DataFormatPanel.prototype.addDataFont = function (container)
 	mxUtils.write(attributeStylePanel, "选择属性");
 
 	container.appendChild(attributeStylePanel);
-  var attributeSelect = document.createElement("input");
+  var attributeSelect = document.createElement("select");
 	attributeSelect.setAttribute('id','attribute');
   attributeStylePanel.appendChild(attributeSelect);
 
@@ -4347,6 +4343,21 @@ DataFormatPanel.prototype.addDataFont = function (container)
     }
   }
 
+	// 异步此处才能生效，设置默认select和样式
+	setTimeout(()=>{
+		const options = {
+			data: [],
+      width: 150,
+      editable: false,
+      panelMaxHeight:200
+		}
+		$("#device").combobox(options);
+		$("#attribute").combobox(options);
+		$('.textbox').css({
+			"margin-left":"6px"
+		})
+	})
+
 	// Adds writing direction options
 	// LATER: Handle reselect of same option in all selects (change event
 	// is not fired for same option so have opened state on click) and
@@ -4354,16 +4365,140 @@ DataFormatPanel.prototype.addDataFont = function (container)
 
 	// NOTE: For automatic we use the value null since automatic
 	// requires the text to be non formatted and non-wrapped
+	
+	// 数据交互模块
 	var interactionStylePanel = this.createPanel();
 	container.appendChild(interactionStylePanel);
-
 	var dataInteractiveTitle = this.createTitle("数据交互");
 	dataInteractiveTitle.style.padding = '6px 0px 6px 6px';
 	container.appendChild(dataInteractiveTitle);
 
+	var press = stylePanel.cloneNode(false);
+	press.style.marginLeft = '0px';
+	press.style.paddingTop = '8px';
+	press.style.paddingBottom = '8px';
+	const pressInput = document.createElement('input');
+	const pressEdit = document.createElement('i');
+	pressEdit.style.display="inline-block"
+	pressEdit.style.marginLeft="80px"
+	pressEdit.style.width="20px"
+	pressEdit.style.height="20px";
+	pressEdit.style.backgroundImage="url('images/edit20.png')";
+	pressEdit.style.cursor="pointer"
+	pressEdit.setAttribute('id','pressEdit')
+	pressInput.setAttribute('id','press')
+	press.appendChild(pressInput)
+	press.appendChild(pressEdit)
+	container.appendChild(press);
+
+
+
+	var uplift = stylePanel.cloneNode(false);
+	uplift.style.marginLeft = "0px";
+	uplift.style.paddingTop = "8px";
+	uplift.style.paddingBottom = "8px";
+	const upliftInput = document.createElement("input");
+	const upliftEdit = document.createElement("i");
+	upliftEdit.style.display = "inline-block";
+	upliftEdit.style.marginLeft = "80px";
+	upliftEdit.style.width = "20px";
+	upliftEdit.style.height = "20px";
+	upliftEdit.style.backgroundImage = "url('images/edit20.png')";
+	upliftEdit.style.cursor = "pointer";
+	upliftEdit.setAttribute('id','upliftEdit')
+	upliftInput.setAttribute("id", "uplift");
+	uplift.appendChild(upliftInput);
+	uplift.appendChild(upliftEdit);
+	container.appendChild(uplift);
+
+
+
+	var click = stylePanel.cloneNode(false);
+  click.style.marginLeft = "0px";
+  click.style.paddingTop = "8px";
+  click.style.paddingBottom = "8px";
+	const clickInput = document.createElement("input");
+	const clickEdit = document.createElement("i");
+
+	clickEdit.style.display = "inline-block";
+	clickEdit.style.marginLeft = "80px";
+	clickEdit.style.width = "20px";
+	clickEdit.style.height = "20px";
+	clickEdit.style.backgroundImage = "url('images/edit20.png')";
+	clickEdit.style.cursor = "pointer";
+	clickEdit.setAttribute('id','clickEdit')
+	clickInput.setAttribute("id", "click");
+	click.appendChild(clickInput);
+	click.appendChild(clickEdit);
+	container.appendChild(click);
+
+
+
+	var doubleClick = stylePanel.cloneNode(false);
+	doubleClick.style.marginLeft = "0px";
+	doubleClick.style.paddingTop = "8px";
+	doubleClick.style.paddingBottom = "8px";
+	const doubleClickInput = document.createElement("input");
+	const doubleEdit = document.createElement("i");
+
+	doubleEdit.style.display = "inline-block";
+	doubleEdit.style.marginLeft = "80px";
+	doubleEdit.style.width = "20px";
+	doubleEdit.style.height = "20px";
+	doubleEdit.style.backgroundImage = "url('images/edit20.png')";
+	doubleEdit.style.cursor = "pointer";
+	doubleEdit.setAttribute('id','doubleEdit')
+	doubleClickInput.setAttribute("id", "dbclick");
+	doubleClick.appendChild(doubleClickInput);
+	doubleClick.appendChild(doubleEdit);
+	container.appendChild(doubleClick);
+	setTimeout(() => {
+		
+    $("#press").checkbox({
+      label: "按下",
+      value: "press",
+      labelPosition: "after",
+    });
+		$('#pressEdit').click(()=>{
+			console.log('按下编辑')
+		})
+
+    $("#uplift").checkbox({
+      label: "抬起",
+      value: "press",
+      labelPosition: "after",
+    });
+		$('#upliftEdit').click(()=>{
+			console.log('抬起编辑')
+		})
+
+    $("#click").checkbox({
+      label: "单击",
+      value: "press",
+      labelPosition: "after",
+    });
+		$('#clickEdit').click(()=>{
+			console.log('单击编辑')
+		})
+
+    $("#dbclick").checkbox({
+      label: "双击",
+      value: "press",
+      labelPosition: "after",
+    });
+		$('#doubleEdit').click(()=>{
+			console.log('双击编辑')
+		})
+
+
+
+
+  });
+
+
+	// 数据动效模块
 	var effectStylePanel = this.createPanel();
 	container.appendChild(effectStylePanel);
-
 	var dataEffectStylePanelTitle = this.createTitle("数据动效");
 	dataEffectStylePanelTitle.style.padding = '6px 0px 6px 6px';
 	container.appendChild(dataEffectStylePanelTitle);