Merge branch 'feat/click-event-add-attribute-send' into 'main_dev'

feat: 事件下发新增属性下发

See merge request yunteng/thingskit-scada!182

@@ -34,7 +34,7 @@ div td.mxWindowTitle {
 }
 .geEditor input, .geEditor select,
 .geEditor textarea, .geEditor button {
-    font-size: inherit;
+	font-size: inherit;
 }
 .geMenubarContainer, .geToolbarContainer, .geHsplit,
 .geVsplit, .mxWindowTitle, .geSidebarContainer,
@@ -84,7 +84,7 @@ html > body > div > div.geToolbarContainer.geSimpleMainMenu .geToolbarContainer{
 	cursor:default !important;
 }
 .geBackgroundPage {
-  	box-shadow:0px 0px 2px 1px #d1d1d1;
+	box-shadow:0px 0px 2px 1px #d1d1d1;
 }
 .geSidebarContainer a, .geMenubarContainer a, .geToolbar a {
 	color:#000000;
@@ -217,11 +217,11 @@ a.geStatus .geStatusMessage {
 	padding:4px 6px 4px 6px;
 	font-size:12px;
 	background: -webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
-    background: -o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
-    background: -webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));
-    background: linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);
-    background-repeat: repeat-x;
-    border:1px solid #b2dba1;
+	background: -o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
+	background: -webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));
+	background: linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);
+	background-repeat: repeat-x;
+	border:1px solid #b2dba1;
 	border-radius:3px;
 	color:#3c763d !important;
 }
@@ -237,15 +237,15 @@ a.geStatus .geStatusMessage {
 	-moz-box-shadow: 2px 2px 3px 0px #ddd;
 	box-shadow: 2px 2px 3px 0px #ddd;
 }
-.geEditor input, .geEditor button, .geEditor select, .geColorBtn {
+.geEditor input, .geEditor button:not([class^="ant"]), .geEditor select, .geColorBtn {
 	border: 1px solid #d8d8d8;
 	border-radius: 4px;
 }
-.geEditor button, .geEditor select, .geColorBtn {
+.geEditor button:not([class*="ant-"]), .geEditor select, .geColorBtn {
 	background:#eee;
 }
-.geEditor button:hover:not([disabled], .geBigButton, .geShareBtn),
-.geEditor select:hover:not([disabled]), .geColorBtn:hover:not([disabled]) {
+.geEditor button:hover:not([class*="ant-"],	[disabled], .geBigButton, .geShareBtn),
+.geEditor select:hover:not([class*="ant-"], [disabled]), .geColorBtn:hover:not([disabled],	[class*="ant-"]) {
 	background:#e5e5e5;
 }
 .geColorDropper {
@@ -979,9 +979,9 @@ table.mxPopupMenu tr {
 	font-size:4pt;
 }
 html td.mxWindowTitle {
- 	color:rgb(112, 112, 112);
+	color:rgb(112, 112, 112);
 	background:#f1f3f4;
- 	padding:4px;
+	padding:4px;
 }
 table.geProperties {
 	table-layout:fixed;
@@ -996,46 +996,46 @@ table.geProperties tr td {
 	border: 1px solid #4472C4;
 }
 .gePropHeader>.gePropHeaderCell {
-    border-top: 0;
-    border-bottom: 0;
-    text-align: left;
+	border-top: 0;
+	border-bottom: 0;
+	text-align: left;
 	width: 50%;
 }
 .gePropHeader>.gePropHeaderCell:first-child {
-    border-left: none;
+	border-left: none;
 }
 .gePropHeader>.gePropHeaderCell:last-child {
-    border-right: none;
+	border-right: none;
 }
 .gePropHeader {
-    background: #e5e5e5;
-    color: black;
+	background: #e5e5e5;
+	color: black;
 }
 .gePropRowCell {
-    border-left: 1px solid #f3f3f3;
+	border-left: 1px solid #f3f3f3;
 	white-space:nowrap;
 	text-overflow:ellipsis;
 	overflow:hidden;
-    max-width: 50%;
+	max-width: 50%;
 }
 .gePropRow>.gePropRowCell {
-    background: #fff;
+	background: #fff;
 }
 .gePropRowAlt>.gePropRowCell {
-    background: #fcfcfc;
+	background: #fcfcfc;
 }
 .gePropRowDark>.gePropRowCell {
-    background: #fff;
-    color: #305496;
-    font-weight: bold;
+	background: #fff;
+	color: #305496;
+	font-weight: bold;
 }
 .gePropRowDarkAlt>.gePropRowCell {
-    background: #D9E1F2;
-    color: #305496;
-    font-weight: bold;
+	background: #D9E1F2;
+	color: #305496;
+	font-weight: bold;
 }
 .gePropEditor input:invalid {
-  border: 1px solid red;
+	border: 1px solid red;
 }
 /* Templates dialog css */
 .geTemplateDlg {
@@ -1043,8 +1043,8 @@ table.geProperties tr td {
 	height: 100%;
 }
 .geTemplateDlg ::-webkit-scrollbar {
-    width:12px;
-    height:12px;
+	width:12px;
+	height:12px;
 }
 .geTemplateDlg ::-webkit-scrollbar-track {
 	background:whiteSmoke;
@@ -1052,7 +1052,7 @@ table.geProperties tr td {
 }
 .geTemplateDlg ::-webkit-scrollbar-thumb {
 	background:#c5c5c5;
-    border-radius:10px;
+	border-radius:10px;
 	border:whiteSmoke solid 3px;
 }
 .geTemplateDlg ::-webkit-scrollbar-thumb:hover {
@@ -1072,8 +1072,8 @@ table.geProperties tr td {
 	margin: 14px 14px 14px 20px;
 }
 .geTempDlgSearchBox {
-    color:#888888;
-    background:url("/images/icon-search.svg") no-repeat;
+	color:#888888;
+	background:url("/images/icon-search.svg") no-repeat;
 	background-color: #FFFFFF;
 	background-position: 15px;
 	height: 40px;
@@ -1081,14 +1081,14 @@ table.geProperties tr td {
 	max-width: 400px;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
-    float:right;
-    font-family:Arial,Helvetica,sans-serif;
-    font-size:15px;
-    line-height:36px;
-    margin: 11px 36px 0 0;
-    outline:medium none;
-    padding:0 0 0 36px;
-    text-shadow:1px 1px 0 white;
+	float:right;
+	font-family:Arial,Helvetica,sans-serif;
+	font-size:15px;
+	line-height:36px;
+	margin: 11px 36px 0 0;
+	outline:medium none;
+	padding:0 0 0 36px;
+	text-shadow:1px 1px 0 white;
 }
 .geTemplatesList {
 	box-sizing: border-box;
@@ -1129,37 +1129,37 @@ table.geProperties tr td {
 .geTempDlgCreateBtn, .geTempDlgOpenBtn {
 	display: inline-block;
 	width: 67px;
-    border-radius: 3px;
-    background-color: #3D72AD;
-    padding: 6px;
-    text-align: center;
-    color: #fff;
-    cursor: pointer;
-    margin-left: 5px;
+	border-radius: 3px;
+	background-color: #3D72AD;
+	padding: 6px;
+	text-align: center;
+	color: #fff;
+	cursor: pointer;
+	margin-left: 5px;
 }
 .geTempDlgCancelBtn {
 	display: inline-block;
 	width: 67px;
-    padding: 6px;
-    text-align: center;
-    color: #3D72AD;
-    cursor: pointer;
+	padding: 6px;
+	text-align: center;
+	color: #3D72AD;
+	cursor: pointer;
 }
 .geTempDlgCancelBtn:active, .geTempDlgCreateBtn:active, 
 .geTempDlgOpenBtn:active, .geTempDlgShowAllBtn:active {
 	transform: translateY(2px);
 }
 .geTempDlgBtnDisabled {
-    background-color: #9fbddd;
+	background-color: #9fbddd;
 }
 .geTempDlgBtnDisabled:active {
-    transform: translateY(0px);
+	transform: translateY(0px);
 }
 
 .geTempDlgBtnBusy {
 	background-image: url(/images/aui-wait.gif);
-    background-repeat: no-repeat;
-    background-position: 62px 7px;
+	background-repeat: no-repeat;
+	background-position: 62px 7px;
 }
 
 .geTempDlgBack {
@@ -1284,7 +1284,7 @@ table.geProperties tr td {
 
 .geTempDlgDiagramsListHeader {
 	width: 100%;
-    height: 45px;
+	height: 45px;
 	padding: 18px 20px 0 11px;
 	box-sizing: border-box;
 }
@@ -1341,7 +1341,7 @@ table.geProperties tr td {
 	width: 13px;
 }
 .geTempDlgSpacer {
-    display: inline-block;
+	display: inline-block;
 	width: 10px;
 }
 
@@ -1350,8 +1350,8 @@ table.geProperties tr td {
 	white-space: nowrap;
 	font-size: 13px;
 	padding: 0px 20px 20px 10px;
-    box-sizing: border-box;
-    border-spacing: 0;
+	box-sizing: border-box;
+	border-spacing: 0;
 }
 
 .geTempDlgDiagramsListGrid tr {
@@ -1421,21 +1421,21 @@ table.geProperties tr td {
 
 .geTempDlgDiagramTileImgLoading {
 	background-image: url(/images/aui-wait.gif);
-    background-repeat: no-repeat;
-    background-position: center;
+	background-repeat: no-repeat;
+	background-position: center;
 }
 
 .geTempDlgDiagramTileImgError {
 	background-image: url(/images/broken.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-color: #be3730;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-color: #be3730;
 }
 
 .geTempDlgDiagramTileImg img{
 	max-width: 117px;
-    max-height: 117px;
-    cursor: pointer;
+	max-height: 117px;
+	cursor: pointer;
 }
 
 .geTempDlgDiagramTileActive > .geTempDlgDiagramTileImg{
@@ -1469,33 +1469,33 @@ table.geProperties tr td {
 
 .geTempDlgDiagramPreviewBox {
 	position: absolute;
-    top: 3%;
-    left: 10%;
-    width: 80%;
-    height: 94%;
-    background: white;
-    border: 4px solid #3D72AD;
-    border-radius: 6px;
-    box-sizing: border-box;
+	top: 3%;
+	left: 10%;
+	width: 80%;
+	height: 94%;
+	background: white;
+	border: 4px solid #3D72AD;
+	border-radius: 6px;
+	box-sizing: border-box;
 	display:table-cell;
 	vertical-align:middle;
 	text-align:center;
-    z-index: 2;
+	z-index: 2;
 }
 
 .geTempDlgDialogMask {
 	position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 1;
 }
 
 .geTempDlgDiagramPreviewBox img {
 	max-width: 95%;
-    max-height: 95%;
-    vertical-align: middle;
+	max-height: 95%;
+	vertical-align: middle;
 }
 
 .geTempDlgPreviewCloseBtn {
@@ -1511,25 +1511,25 @@ table.geProperties tr td {
 
 .geTempDlgLinkToDiagramBtn {
 	color: #555;
-    margin: 0 10px 0 10px;
-    height: 27px;
-    font-size: 14px;
+	margin: 0 10px 0 10px;
+	height: 27px;
+	font-size: 14px;
 }
 
 .geTempDlgErrMsg {
 	display: none;
 	color: red;
-    position: absolute;
-    width: 100%;
-    text-align: center;
+	position: absolute;
+	width: 100%;
+	text-align: center;
 }
 
 .geTempDlgImportCat {
 	font-weight: bold;
-    background: #f9f9f9;
-    padding: 5px 0px;
-    padding: 10px;
-    margin: 10px 10px 0px 0px;
+	background: #f9f9f9;
+	padding: 5px 0px;
+	padding: 10px;
+	margin: 10px 10px 0px 0px;
 }
 /* Comments CSS */
 .geCommentsWin {
@@ -1613,37 +1613,37 @@ table.geProperties tr td {
 }
 
 .geCommentDate::first-letter {
-    text-transform: uppercase;
+	text-transform: uppercase;
 }
 
 .geCommentTxt {
 	font-size: 14px;
-    padding-top: 5px;
-    white-space: normal;
-    min-height: 12px;
+	padding-top: 5px;
+	white-space: normal;
+	min-height: 12px;
 }
 
 .geCommentEditTxtArea {
-    margin-top: 5px;
-    font-size: 14px !important;
-    min-height: 12px;
-    max-width: 100%;
-    min-width: 100%;
+	margin-top: 5px;
+	font-size: 14px !important;
+	min-height: 12px;
+	max-width: 100%;
+	min-width: 100%;
 	width: 100%;
-    box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 .geCommentEditBtns {
 	width: 100%;
-    box-sizing: border-box;
-    padding-top: 5px;
-    height: 20px;
+	box-sizing: border-box;
+	padding-top: 5px;
+	height: 20px;
 }
 
 .geCommentEditBtn {
 	padding: 3px 8px 3px 8px !important;
-    float: right !important;
-    margin-left: 5px;
+	float: right !important;
+	margin-left: 5px;
 }
 
 .geCommentActions {
@@ -1659,7 +1659,7 @@ table.geProperties tr td {
 
 .geCommentAction {
 	display: inline-block;
-    padding: 0;
+	padding: 0;
 }
 
 .geCommentAction:before {
@@ -1684,8 +1684,8 @@ table.geProperties tr td {
 
 .geCheckedBtn {
 	background-color: #ccc;
-    border-top: 1px solid black !important;
-    border-left: 1px solid black !important;
+	border-top: 1px solid black !important;
+	border-left: 1px solid black !important;
 }
 
 .geCommentBusyImg {
@@ -1739,8 +1739,8 @@ table.geProperties tr td {
 .geStripedTable
 {
 	border-collapse: collapse;
- 	width: 100%;
- 	table-layout: fixed;
+	width: 100%;
+	table-layout: fixed;
 }
 
 .geStripedTable td, .geStripedTable th
@@ -1758,9 +1758,9 @@ table.geProperties tr td {
 .geStripedTable tr:hover {background-color: #ddd;}
 
 .geStripedTable th {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  background-color: #bbb;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	background-color: #bbb;
 }
 
 .geNotification-box {
@@ -1771,316 +1771,316 @@ table.geProperties tr td {
 	width: 20px;
 }
 .geNotification-bell {
-  animation: geBellAnim 1s 1s both;
+	animation: geBellAnim 1s 1s both;
 }
 .geNotification-bell * {
-  display: block;
-  margin: 0 auto;
-  background-color: #656565;
+	display: block;
+	margin: 0 auto;
+	background-color: #656565;
 }
 
 .geBell-top {
-  width: 2px;
-  height: 2px;
-  border-radius: 1px 1px 0 0;
+	width: 2px;
+	height: 2px;
+	border-radius: 1px 1px 0 0;
 }
 .geBell-middle {
-  width: 12px;
-  height: 12px;
-  margin-top: -1px;
-  border-radius: 7px 7px 0 0;
+	width: 12px;
+	height: 12px;
+	margin-top: -1px;
+	border-radius: 7px 7px 0 0;
 }
 .geBell-bottom {
-  position: relative;
-  z-index: 0;
-  width: 16px;
-  height: 1px;
+	position: relative;
+	z-index: 0;
+	width: 16px;
+	height: 1px;
 }
 .geBell-bottom::before,
 .geBell-bottom::after {
-  content: '';
-  position: absolute;
-  top: -4px;
+	content: '';
+	position: absolute;
+	top: -4px;
 }
 .geBell-bottom::before {
-  left: 1px;
-  border-bottom-width: 4px;
-  border-right: 0 solid transparent;
-  border-left: 4px solid transparent;
+	left: 1px;
+	border-bottom-width: 4px;
+	border-right: 0 solid transparent;
+	border-left: 4px solid transparent;
 }
 .geBell-bottom::after {
-  right: 1px;
-  border-bottom-width: 4px;
-  border-right: 4px solid transparent;
-  border-left: 0 solid transparent;
+	right: 1px;
+	border-bottom-width: 4px;
+	border-right: 4px solid transparent;
+	border-left: 0 solid transparent;
 }
 .geBell-rad {
-  width: 3px;
-  height: 2px;
-  margin-top: 0.5px;
-  border-radius: 0 0 2px 2px;
-  animation: geRadAnim 1s 2s both;
+	width: 3px;
+	height: 2px;
+	margin-top: 0.5px;
+	border-radius: 0 0 2px 2px;
+	animation: geRadAnim 1s 2s both;
 }
 .geNotification-count {
-  position: absolute;
-  z-index: 1;
-  top: -5px;
-  right: -4px;
-  width: 13px;
-  height: 13px;
-  line-height: 13px;
-  font-size: 8px;
-  border-radius: 50%;
-  background-color: #ff4927;
-  color: #FFF;
-  animation: geZoomAnim 1s 1s both;
+	position: absolute;
+	z-index: 1;
+	top: -5px;
+	right: -4px;
+	width: 13px;
+	height: 13px;
+	line-height: 13px;
+	font-size: 8px;
+	border-radius: 50%;
+	background-color: #ff4927;
+	color: #FFF;
+	animation: geZoomAnim 1s 1s both;
 }
 @keyframes geBellAnim {
-  0% { transform: rotate(0); }
-  10% { transform: rotate(30deg); }
-  20% { transform: rotate(0); }
-  80% { transform: rotate(0); }
-  90% { transform: rotate(-30deg); }
-  100% { transform: rotate(0); }
+	0% { transform: rotate(0); }
+	10% { transform: rotate(30deg); }
+	20% { transform: rotate(0); }
+	80% { transform: rotate(0); }
+	90% { transform: rotate(-30deg); }
+	100% { transform: rotate(0); }
 }
 @keyframes geRadAnim {
-  0% { transform: translateX(0); }
-  10% { transform: translateX(5px); }
-  20% { transform: translateX(0); }
-  80% { transform: translateX(0); }
-  90% { transform: translateX(-5px); }
-  100% { transform: translateX(0); }
+	0% { transform: translateX(0); }
+	10% { transform: translateX(5px); }
+	20% { transform: translateX(0); }
+	80% { transform: translateX(0); }
+	90% { transform: translateX(-5px); }
+	100% { transform: translateX(0); }
 }
 @keyframes geZoomAnim {
-  0% { opacity: 0; transform: scale(0); }
-  50% { opacity: 1; transform: scale(1); }
-  100% { opacity: 1; }
+	0% { opacity: 0; transform: scale(0); }
+	50% { opacity: 1; transform: scale(1); }
+	100% { opacity: 1; }
 }
 
 .geNotifPanel {
-  height: 300px;
-  width: 300px;
-  background: #fff;
-  border-radius: 3px;
-  overflow: hidden;
-  -webkit-box-shadow: 10px 10px 15px 0 rgba(0, 0, 0, 0.3);
-          box-shadow: 10px 10px 15px 0 rgba(0, 0, 0, 0.3);
-  -webkit-transition: all .5s ease-in-out;
-  transition: all .5s ease-in-out;
-  position: absolute;
-  right: 100px;
-  top: 42px;
-  z-index: 150;
+	height: 300px;
+	width: 300px;
+	background: #fff;
+	border-radius: 3px;
+	overflow: hidden;
+	-webkit-box-shadow: 10px 10px 15px 0 rgba(0, 0, 0, 0.3);
+	box-shadow: 10px 10px 15px 0 rgba(0, 0, 0, 0.3);
+	-webkit-transition: all .5s ease-in-out;
+	transition: all .5s ease-in-out;
+	position: absolute;
+	right: 100px;
+	top: 42px;
+	z-index: 150;
 }
 .geNotifPanel .header {
-  background: #cecece;
-  color: #707070;
-  font-size: 15px;
+	background: #cecece;
+	color: #707070;
+	font-size: 15px;
 }
 .geNotifPanel .header .title {
-  display: block;
-  text-align: center;
-  line-height: 30px;
-  font-weight: 600;
+	display: block;
+	text-align: center;
+	line-height: 30px;
+	font-weight: 600;
 }
 .geNotifPanel .header .closeBtn {
-  position: absolute;
-  line-height: 30px;
-  cursor: pointer;
-  right: 15px;
-  top: 0;
+	position: absolute;
+	line-height: 30px;
+	cursor: pointer;
+	right: 15px;
+	top: 0;
 }
 .geNotifPanel .notifications {
-  position: relative;
-  height: 270px;
-  overflow-x: hidden;
-  overflow-y: auto;
+	position: relative;
+	height: 270px;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
 .geNotifPanel .notifications .line {
-  position: absolute;
-  top: 0;
-  left: 27px;
-  height: 100%;
-  width: 3px;
-  background: #EBEBEB;
+	position: absolute;
+	top: 0;
+	left: 27px;
+	height: 100%;
+	width: 3px;
+	background: #EBEBEB;
 }
 .geNotifPanel .notifications .notification {
-  position: relative;
-  z-index: 2;
-  margin: 25px 20px 25px 43px;
+	position: relative;
+	z-index: 2;
+	margin: 25px 20px 25px 43px;
 }
 .geNotifPanel .notifications .notification:nth-child(n+1) {
-  animation: geHere-am-i 0.5s ease-out 0.4s;
-  animation-fill-mode: both;
+	animation: geHere-am-i 0.5s ease-out 0.4s;
+	animation-fill-mode: both;
 }
 .geNotifPanel .notifications .notification:hover {
-  color: #1B95E0;
-  cursor: pointer;
+	color: #1B95E0;
+	cursor: pointer;
 }
 .geNotifPanel .notifications .notification .circle {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  position: absolute;
-  height: 11px;
-  width: 11px;
-  background: #fff;
-  border: 2px solid #1B95E0;
-  -webkit-box-shadow: 0 0 0 3px #fff;
-          box-shadow: 0 0 0 3px #fff;
-  border-radius: 6px;
-  top: 0;
-  left: -20px;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	position: absolute;
+	height: 11px;
+	width: 11px;
+	background: #fff;
+	border: 2px solid #1B95E0;
+	-webkit-box-shadow: 0 0 0 3px #fff;
+	box-shadow: 0 0 0 3px #fff;
+	border-radius: 6px;
+	top: 0;
+	left: -20px;
 }
 
 .geNotifPanel .notifications .notification .circle.active {
-  background: #1B95E0;
+	background: #1B95E0;
 }
 
 .geNotifPanel .notifications .notification .time {
-  display: block;
-  font-size: 11px;
-  line-height: 11px;
-  margin-bottom: 2px;
+	display: block;
+	font-size: 11px;
+	line-height: 11px;
+	margin-bottom: 2px;
 }
 .geNotifPanel .notifications .notification p {
-  font-size: 15px;
-  line-height: 20px;
-  margin: 0;
+	font-size: 15px;
+	line-height: 20px;
+	margin: 0;
 }
 .geNotifPanel .notifications .notification p b {
-  font-weight: 600;
+	font-weight: 600;
 }
 @-webkit-keyframes geHere-am-i {
-  from {
-    -webkit-transform: translate3d(0, 50px, 0);
-            transform: translate3d(0, 50px, 0);
-    opacity: 0;
-  }
-  to {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-    opacity: 1;
-  }
+	from {
+		-webkit-transform: translate3d(0, 50px, 0);
+		transform: translate3d(0, 50px, 0);
+		opacity: 0;
+	}
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
 }
 
 @keyframes geHere-am-i {
-  from {
-    -webkit-transform: translate3d(0, 50px, 0);
-            transform: translate3d(0, 50px, 0);
-    opacity: 0;
-  }
-  to {
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-    opacity: 1;
-  }
+	from {
+		-webkit-transform: translate3d(0, 50px, 0);
+		transform: translate3d(0, 50px, 0);
+		opacity: 0;
+	}
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
 }
 
 .geTempTree {
-  margin: 0;
-  padding: 0;
+	margin: 0;
+	padding: 0;
 }
 
 .geTempTree, .geTempTreeActive, .geTempTreeNested {
-  list-style-type: none;
-  transition: all 0.5s;
+	list-style-type: none;
+	transition: all 0.5s;
 }
 
 .geTempTreeCaret {
-  box-sizing: border-box;
-  cursor: pointer;
-  user-select: none;
-  padding: 6px;
-  width: 100%;
-  transition: all 0.5s;
+	box-sizing: border-box;
+	cursor: pointer;
+	user-select: none;
+	padding: 6px;
+	width: 100%;
+	transition: all 0.5s;
 }
 
 .geTempTreeCaret::before {
-  content: "\25B6";
-  display: inline-block;
-  font-size: 10px;
-  margin-right: 6px;
+	content: "\25B6";
+	display: inline-block;
+	font-size: 10px;
+	margin-right: 6px;
 }
 
 .geTempTreeCaret-down::before {
-  transform: rotate(90deg);  
+	transform: rotate(90deg);  
 }
 
 .geTempTreeNested {
-  height: 0;
-  opacity: 0;
+	height: 0;
+	opacity: 0;
 }
 
 .geTempTreeActive {
-  height: 100%;
-  opacity: 1;
+	height: 100%;
+	opacity: 1;
 }
 
 .geTempTreeActive, .geTempTreeNested {
-  padding-left: 15px;
+	padding-left: 15px;
 }
 
 .geTempTreeActive > li, .geTempTreeNested > li {
-  box-sizing: border-box;
-  padding: 3px;
-  width: 100%;
-  cursor: pointer;
-  user-select: none;
-  transition: all 0.5s;
+	box-sizing: border-box;
+	padding: 3px;
+	width: 100%;
+	cursor: pointer;
+	user-select: none;
+	transition: all 0.5s;
 }
 
 /*Electron Window Controls*/
 #geWindow-controls {
-  display: grid;
-  grid-template-columns: repeat(3, 30px);
-  position: absolute;
-  top: 2px;
-  right: 3px;
-  height: 22px;
-  -webkit-app-region: no-drag;
+	display: grid;
+	grid-template-columns: repeat(3, 30px);
+	position: absolute;
+	top: 2px;
+	right: 3px;
+	height: 22px;
+	-webkit-app-region: no-drag;
 }
 
 #geWindow-controls .button {
-  grid-row: 1 / span 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100%;
-  user-select: none;
+	grid-row: 1 / span 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	height: 100%;
+	user-select: none;
 }
 #min-button {
-  grid-column: 1;
+	grid-column: 1;
 }
 #max-button, #restore-button {
-  grid-column: 2;
+	grid-column: 2;
 }
 #close-button {
-  grid-column: 3;
+	grid-column: 3;
 }
 #geWindow-controls .button.dark:hover {
-  background: rgba(255,255,255,0.1);
+	background: rgba(255,255,255,0.1);
 }
 #geWindow-controls .button.dark:active {
-  background: rgba(255,255,255,0.2);
+	background: rgba(255,255,255,0.2);
 }
 
 #geWindow-controls .button.white:hover {
-  background: rgba(0,0,0,0.1);
+	background: rgba(0,0,0,0.1);
 }
 #geWindow-controls .button.white:active {
-  background: rgba(0,0,0,0.2);
+	background: rgba(0,0,0,0.2);
 }
 
 #close-button:hover {
-  background: #E81123 !important;
+	background: #E81123 !important;
 }
 #close-button:active {
-  background: #F1707A !important;
+	background: #F1707A !important;
 }
 
 #restore-button {
-  display: none !important;
+	display: none !important;
 }
 /*
 .geMaximized #titlebar {
@@ -2089,13 +2089,13 @@ table.geProperties tr td {
 }
 */
 .geMaximized #restore-button {
-  display: flex !important;
+	display: flex !important;
 }
 
 .geMaximized #max-button {
-  display: none;
+	display: none;
 }
 [draggable="true"] {
-    transform: translate(0, 0);
-    z-index: 0;
+	transform: translate(0, 0);
+	z-index: 0;
 }

@@ -125,7 +125,7 @@ export const getDeviceActiveTime = (entityId: string) => {
 
 // 获取设备详情
 export const getDeviceInfo = (deviceId: string) => {
-  return defHttp.get(
+  return defHttp.get<DeviceItemType>(
     {
       url: isShareMode() ? `${Api.GET_DEVICE_DETAIL}public/${deviceId}` : `${Api.GET_DEVICE_DETAIL}${deviceId}`,
     },

@@ -174,7 +174,7 @@ export interface Unit {
 export interface RpcCommandType {
   additionalInfo: Recordable
   method: string
-  params: Recordable | string
+  params: Recordable | string | number
   persistent: boolean
 }
 

 import type { ThingsModelItemType } from '@/api/device/model'
 import type { ImageSelectorDataType } from '@/core/Library/components/ImageSelector'
 import type { CommandWayEnum } from '@/enums/commandEnum'
-import type { ActTypeEnum, AggregateTypeEnum, CommandDeliveryWayEnum, DeviceTypeEnum, EventActionTypeEnum, EventTypeEnum, SocketSubscriberEnum, TransportTypeEnum } from '@/enums/datasource'
+import type { ActRangListItemTypeEnum, ActTypeEnum, AggregateTypeEnum, CommandDeliveryWayEnum, DeviceTypeEnum, EventActionTypeEnum, EventTypeEnum, SocketSubscriberEnum, TransportTypeEnum } from '@/enums/datasource'
 
 export enum DeleteNodeDataTypeEnum {
   DATASOURCE = 'DATASOURCE',
@@ -145,7 +145,8 @@ export interface SingleClickEventDataType extends DoubleClickEventDataType { }
 
 export interface OperationPasswordDataType {
   checked: boolean
-  pawssword?: string
+  value?: string
+  label: string
 }
 
 export interface NodeDataEventJsonType {
@@ -157,7 +158,7 @@ export interface NodeDataEventJsonType {
 }
 
 export interface RangeItemType {
-  type?: string
+  type?: ActRangListItemTypeEnum
   min?: number
   max?: number
   statusValue?: number

@@ -85,9 +85,9 @@
 
 }
 
-.ant-modal-confirm .ant-modal-body {
-  padding: 24px !important;
-}
+// .ant-modal-confirm .ant-modal-body {
+  // padding: 24px !important;
+// }
 
 @media screen and (max-height: 600px) {
   .ant-modal {

+import { ActRangListItemTypeEnum, VariableImageSourceEnum } from '@/enums/datasource'
+
 export { default as SingleClickSetting } from './index.vue'
+
+export function getInitStatusSettingDefaultValue() {
+  return [
+    {
+      type: ActRangListItemTypeEnum.OPEN,
+      statusValue: 1,
+      imageInfo: {
+        path: new URL('/public/webapp/images/thingskit/switch-on.svg', import.meta.url).href,
+        imageSource: VariableImageSourceEnum.LOCAL,
+        libKey: 'light',
+      },
+    },
+    {
+      type: ActRangListItemTypeEnum.CLOSE,
+      statusValue: 0,
+      imageInfo: {
+        path: new URL('/public/webapp/images/thingskit/switch-off.svg', import.meta.url).href,
+        imageSource: VariableImageSourceEnum.LOCAL,
+        libKey: 'light',
+      },
+    },
+  ]
+}

@@ -6,10 +6,10 @@ import { isNullOrUnDef } from '@wry-smile/utils-is'
 import type { ComponentExposeType } from '../../..'
 import { usePublicFormContext } from '../../../usePublicFormContext'
 import { tableColumns } from './config'
+import { getInitStatusSettingDefaultValue } from '.'
 import { BasicTable, useTable } from '@/components/Table'
 import { buildUUID } from '@/utils/uuid'
 import { ImageSelector } from '@/core/Library/components/ImageSelector'
-import { ActRangListItemTypeEnum, VariableImageSourceEnum } from '@/enums/datasource'
 import type { RangeItemType, StatusActDataType } from '@/api/node/model'
 import { useMessage } from '@/hooks/web/useMessage'
 interface IDataSource extends Partial<RangeItemType> {
@@ -33,28 +33,7 @@ const [registerTable] = useTable({
 const validateTable = ref<boolean>(false)
 
 function getInitTableRecord(): IDataSource[] {
-  return [
-    {
-      uuid: buildUUID(),
-      type: ActRangListItemTypeEnum.OPEN,
-      statusValue: 1,
-      imageInfo: {
-        path: new URL('/public/webapp/images/thingskit/switch-on.svg', import.meta.url).href,
-        imageSource: VariableImageSourceEnum.LOCAL,
-        libKey: 'light',
-      },
-    },
-    {
-      uuid: buildUUID(),
-      type: ActRangListItemTypeEnum.CLOSE,
-      statusValue: 0,
-      imageInfo: {
-        path: new URL('/public/webapp/images/thingskit/switch-off.svg', import.meta.url).href,
-        imageSource: VariableImageSourceEnum.LOCAL,
-        libKey: 'light',
-      },
-    },
-  ]
+  return getInitStatusSettingDefaultValue().map(item => ({ ...item, uuid: buildUUID() }))
 }
 
 const getFieldsValue = () => {
@@ -87,7 +66,7 @@ const validate = async () => {
   const { dataSourceJson } = unref(getNodeData)!
   const { deviceId, attr } = dataSourceJson || {}
   if (!(deviceId || attr)) {
-    createMessage.warning('请绑定数据源～')
+    createMessage.warning('请绑定数据源')
     return Promise.reject(new Error('请绑定数据源'))
   }
 

@@ -10,18 +10,21 @@ import { usePublicFormContext } from '../../usePublicFormContext'
 import type { DynamicEffectItemType } from './config'
 import { getDynamicEffectItem as getEffectItem } from './config'
 import { useModal } from '@/components/Modal'
-import type { ActTypeEnum } from '@/enums/datasource'
+import { ActTypeEnum } from '@/enums/datasource'
+import { ControlComponentEnum } from '@/core/Library/packages/Control'
 
 const props = defineProps<{
   formSetting?: PublicFormSettingType
   beforeClick: () => Promise<any>
 }>()
 
+const { getCellInfo } = usePublicFormContext()
+
 const [register, { openModal }] = useModal()
 
 const getEffectItemSetting = computed(() => getEffectItem(props.formSetting))
 
-const checkStatus = reactive<Partial<Record<ActTypeEnum, boolean>>>(unref(getEffectItemSetting).map(item => item.key).reduce((prev, next) => ({ ...prev, [next]: false }), {} as Partial<Record<ActTypeEnum, boolean>>))
+const checkStatus = reactive<Partial<Record<ActTypeEnum, boolean>>>(unref(getEffectItemSetting).map(item => item.key).reduce((prev, next) => ({ ...prev, [next]: next === ActTypeEnum.STATUS_SETTING }), {} as Partial<Record<ActTypeEnum, boolean>>))
 
 const { getNodeData } = usePublicFormContext()
 
@@ -44,7 +47,7 @@ const setFieldsValue = (record: Partial<Record<ActTypeEnum, boolean>>) => {
 
 const getDisabledStatus = (key: ActTypeEnum) => {
   const data = unref(getNodeData)?.actJson[key]
-  return !data
+  return unref(getCellInfo).componentKey === ControlComponentEnum.SWITCH || !data
 }
 
 defineExpose<ComponentExposeType>({

+<script setup lang="ts">
+import { Modal } from 'ant-design-vue'
+import { nextTick, ref, unref } from 'vue'
+import type { FormSchema } from '@/components/Form'
+import { BasicForm, useForm } from '@/components/Form'
+import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
+
+const resolveFn = ref<Fn>()
+
+const visible = ref(false)
+
+const password = ref()
+
+const [register, { getFieldsValue, resetFields, validate, setProps }] = useForm({
+  layout: FormLayoutEnum.VERTICAL,
+  showActionButtonGroup: false,
+})
+
+enum FormFieldsEnum {
+  ATTR_VALUE = 'attrValue',
+  PASSWORD = 'password',
+}
+
+const createFormSchemas = (title?: string, password?: string): FormSchema[] => {
+  const schemas: FormSchema[] = [
+    {
+      field: FormFieldsEnum.ATTR_VALUE,
+      label: title || '属性值',
+      component: ComponentEnum.INPUT,
+      required: true,
+    },
+  ]
+
+  if (password) {
+    schemas.unshift({
+      field: FormFieldsEnum.PASSWORD,
+      label: '操作密码',
+      component: ComponentEnum.INPUT_PAWSSWORD,
+      required: true,
+      rules: [
+        {
+          validator(_rule, value) {
+            if (value !== password) return Promise.reject(new Error('操作密码不正确'))
+            return Promise.resolve()
+          },
+        },
+      ],
+    })
+  }
+
+  return schemas
+}
+
+const open = async ({ title, operationPassword }: Partial<Record<'operationPassword' | 'title', string>>) => {
+  visible.value = true
+  password.value = operationPassword
+  return new Promise((resolve) => {
+    resolveFn.value = resolve
+    nextTick(() => {
+      setProps({ schemas: createFormSchemas(title, operationPassword) })
+    })
+  })
+}
+
+const handleOk = async () => {
+  await validate()
+  const value = getFieldsValue()
+  unref(resolveFn)?.(value[FormFieldsEnum.ATTR_VALUE])
+  visible.value = false
+  resetFields()
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <Modal v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @ok="handleOk">
+    <!-- <section>
+      <FormItem label="操作密码" :label-col="{ span: 24 }">
+        <Input v-model:value="value" placeholder="请输入下发值" />
+      </FormItem>
+      <FormItem :label="fieldTitle" :label-col="{ span: 24 }">
+        <Input v-model:value="value" placeholder="请输入下发值" />
+      </FormItem>
+    </section> -->
+
+    <BasicForm @register="register" />
+  </Modal>
+</template>

+<script setup lang="ts">
+import { Modal } from 'ant-design-vue'
+import { nextTick, ref, unref } from 'vue'
+import { BasicForm, type FormSchema, useForm } from '@/components/Form'
+import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
+
+const resolveFn = ref<Fn>()
+
+const visible = ref(false)
+
+const [register, { resetFields, validate, setProps }] = useForm({
+  showActionButtonGroup: false,
+  layout: FormLayoutEnum.VERTICAL,
+})
+
+const createFormSchemas = (password: string): FormSchema[] => {
+  return [
+    {
+      field: 'password',
+      component: ComponentEnum.INPUT_PAWSSWORD,
+      label: '',
+      required: true,
+      rules: [{
+        validator(_rule, value) {
+          if (value !== password) return Promise.reject(new Error('操作密码不正确'))
+          return Promise.resolve()
+        },
+      }],
+      componentProps: {
+        placeholder: '请输入操作密码',
+      },
+    },
+  ]
+}
+
+const open = async (pwd: string) => {
+  visible.value = true
+  return new Promise((resolve) => {
+    resolveFn.value = resolve
+
+    nextTick(() => {
+      setProps({ schemas: createFormSchemas(pwd) })
+    })
+  })
+}
+
+const handlerOk = async () => {
+  await validate()
+  unref(resolveFn)?.(true)
+  resetFields()
+  visible.value = false
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <Modal
+    v-model:open="visible" :width="300" ok-text="确认" cancel-text="取消"
+    title="操作密码"
+    @ok="handlerOk"
+  >
+    <BasicForm @register="register" />
+  </Modal>
+</template>

+<script setup lang="ts">
+import { Icon } from '@iconify/vue'
+import { Modal } from 'ant-design-vue'
+import { ref, unref } from 'vue'
+
+const visible = ref(false)
+
+const resolveFn = ref<Fn>()
+
+const rejectFn = ref<Fn>()
+
+const open = async () => {
+  visible.value = true
+  return new Promise((resolve, reject) => {
+    resolveFn.value = resolve
+    rejectFn.value = reject
+  })
+}
+
+const handleOk = () => {
+  unref(resolveFn)?.()
+  visible.value = false
+}
+
+const handleCancel = () => {
+  unref(rejectFn)?.()
+  visible.value = false
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <Modal v-model:open="visible" :width="400" ok-text="确认" cancel-text="取消" @ok="handleOk" @cancel="handleCancel">
+    <template #title>
+      <div class="flex">
+        <span><Icon icon="ant-design:exclamation-circle-filled" class="text-yellow-300 text-xl" /></span>
+        <span class="font-bold ml-2">提示</span>
+      </div>
+    </template>
+    <div class="ml-5">
+      是否确认此操作?
+    </div>
+  </Modal>
+</template>

 export { default as CommandDeliveryModal } from './index.vue'
+export { default as CommandDeliveryConfirmModal } from './CommandDeliveryConfirmModal.vue'
+export { default as ConfirmModal } from './ConfirmModal.vue'
+export { default as AttributeDeliverModal } from './AttributeDeliverModal.vue'

@@ -91,7 +91,6 @@ const getDeviceDetail = async (deviceId: string) => {
 }
 
 const open = async (_data: SingleClickEventDataType) => {
-  console.warn(_data, 'data')
   const { operationPassword } = _data || {}
   dataSourceJson.value = _data.deviceInfo
   isPasswordInfo.value = operationPassword || {}

 import { unref } from 'vue'
+import type { DefaultOptionType } from 'ant-design-vue/es/select'
 import { usePublicFormContext } from '../../../usePublicFormContext'
 import { getThingsModelServices } from '@/api/device'
 import { type FormSchema } from '@/components/Form'
@@ -64,14 +65,14 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       defaultValue: EventActionTypeEnum.OPEN_LINK,
       required: true,
       componentProps: ({ formActionType }) => {
-        const options = [
-          { label: EventActionTypeNameEnum.OPEN_LINK, value: EventActionTypeEnum.OPEN_LINK, disbaled: false },
-          { label: EventActionTypeNameEnum.OPEN_PAGE, value: EventActionTypeEnum.OPEN_PAGE, disbaled: false },
+        const options: DefaultOptionType[] = [
+          { label: EventActionTypeNameEnum.OPEN_LINK, value: EventActionTypeEnum.OPEN_LINK },
+          { label: EventActionTypeNameEnum.OPEN_PAGE, value: EventActionTypeEnum.OPEN_PAGE },
 
-        ] as any
+        ]
 
         if (unref(getCellInfo).category.toUpperCase() === PackageCategoryEnum.CONTROL)
-          options.push({ label: EventActionTypeNameEnum.PARAMS_SETTING, value: EventActionTypeEnum.PARAMS_SETTING, disabled: !deviceProfileId })
+          options.push({ label: EventActionTypeNameEnum.PARAMS_SETTING, value: EventActionTypeEnum.PARAMS_SETTING, disabled: !deviceProfileId }, { label: EventActionTypeNameEnum.ATTRIBUTE_DELIVERY, value: EventActionTypeEnum.ATTRIBUTE_DELIVERY })
 
         return {
           options,
@@ -169,7 +170,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       label: FormFieldsNameEnum.WAY,
       component: ComponentEnum.RADIO_GROUP,
       required: true,
-      ifShow: ({ model }) => transportType !== TransportTypeEnum.TCP && model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING && model[FormFieldsEnum.COMMAND_WAY] === CommandDeliveryWayEnum.CUSTOM,
+      ifShow: ({ model }) => (transportType !== TransportTypeEnum.TCP && model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING && model[FormFieldsEnum.COMMAND_WAY] === CommandDeliveryWayEnum.CUSTOM) || model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.ATTRIBUTE_DELIVERY,
       defaultValue: CommandWayEnum.ONE_WAY,
       componentProps: () => {
         return {

@@ -4,10 +4,12 @@ import { computed, onMounted, reactive, ref, toRaw, unref } from 'vue'
 import { useNodeData } from '../../hook/useNodeData'
 import type { ConfigComponentProps } from '../../types'
 import { useSavePageContent } from '../../hook/useSavePageContent'
+import { ControlComponentEnum } from '../../packages/Control'
 import { DataSourceForm } from './components/DataSourceForm'
 import { DataEffects } from './components/DataEffects'
 import { DataEvents } from './components/DataEvents'
 import { createPublicFormContext } from './usePublicFormContext'
+import { getInitStatusSettingDefaultValue } from './components/DataEffects/StatusSetting'
 import type { ActTypeEnum, EventTypeEnum } from '@/enums/datasource'
 import { useMessage } from '@/hooks/web/useMessage'
 import type { NodeDataActJsonType, NodeDataEventJsonType } from '@/api/node/model'
@@ -64,11 +66,18 @@ const getEventJson = (): NodeDataEventJsonType => {
 const getActJson = (): NodeDataActJsonType => {
   const { actJson } = toRaw(unref(getNodeData)) || {}
 
-  if (!actJson) return {} as any
+  if (!actJson) return {} as NodeDataActJsonType
+
+  if (unref(getCellInfo).componentKey === ControlComponentEnum.SWITCH && !actJson.STATUS_SETTING) {
+    actJson.STATUS_SETTING = {
+      enable: true,
+      rangeList: getInitStatusSettingDefaultValue(),
+    }
+  }
 
   const status = unref(dataActElRef)?.getFieldsValue() as Record<ActTypeEnum, boolean>
 
-  if (!status) return {} as any
+  if (!status) return {} as NodeDataActJsonType
 
   Object.keys(status).forEach((key) => {
     if (actJson[key as ActTypeEnum])
@@ -103,7 +112,7 @@ const handleSave = async () => {
     if (contentDataStore.getIsTemplate)// 判断组态是不是模板
       dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
     await saveNodeAllData({ dataSourceJson, eventJson: { ...eventJson, OPERATION_PASSWORD: unref(getCellInfo).category === PackageCategoryEnum.CONTROL ? operationPassword : undefined }, actJson })
-    createMessage.success('操作成功～')
+    createMessage.success('操作成功')
     savePageContent()
   }
   finally {
@@ -159,14 +168,20 @@ createPublicFormContext(nodeDataActinType)
       <Divider orientation="left">
         数据源
       </Divider>
-      <DataSourceForm ref="dataSourceElRef" :component-key="getComponentKey" @field-value-change="handleDataSourceChange" />
+      <DataSourceForm
+        ref="dataSourceElRef" :component-key="getComponentKey"
+        @field-value-change="handleDataSourceChange"
+      />
     </div>
     <div v-if="getFormSetting && getFormSetting.eventSetting !== false">
       <Divider orientation="left">
         数据交互
       </Divider>
       <DataEvents ref="dataEventsElRef" :before-click="handleBeforeOpenEventOrActModal" :form-setting="getFormSetting" />
-      <div v-if="getCellInfo.category === PackageCategoryEnum.CONTROL" class="flex flex-col justify-center passwordInput" :class="getFormSetting?.actSetting === false && 'mb-4'">
+      <div
+        v-if="getCellInfo.category === PackageCategoryEnum.CONTROL" class="flex flex-col justify-center passwordInput"
+        :class="getFormSetting?.actSetting === false && 'mb-4'"
+      >
         <Checkbox v-model:checked="operationPassword.checked" :disabled="getSetPasswordStatus">
           <div class="flex">
             {{ operationPassword.label }}
@@ -175,7 +190,10 @@ createPublicFormContext(nodeDataActinType)
         </Checkbox>
         <Form>
           <FormItem :validate-status="getValidateStatus(operationPassword.value)">
-            <InputPassword v-model:value="operationPassword.value" class="mt-1" :disabled="!operationPassword.checked" placeholder="请输入操作密码" />
+            <InputPassword
+              v-model:value="operationPassword.value" class="mt-1" :disabled="!operationPassword.checked"
+              placeholder="请输入操作密码"
+            />
           </FormItem>
         </Form>
       </div>
@@ -200,9 +218,10 @@ createPublicFormContext(nodeDataActinType)
     @apply text-sm;
   }
 }
-.passwordInput{
-  :deep(.ant-form-item){
-    margin:0 !important
+
+.passwordInput {
+  :deep(.ant-form-item) {
+    margin: 0 !important
   }
 }
 </style>

 import { h, render } from 'vue'
-import { doCommandDelivery, getDeviceActive } from '@/api/device'
+import { ControlComponentEnum } from '../packages/Control'
+import { doCommandDelivery, getDeviceActive, getDeviceInfo } from '@/api/device'
 import type { MouseUpEventDataType, NodeDataDataSourceJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model'
 import { CommandWayEnum } from '@/enums/commandEnum'
-import { EventActionTypeEnum } from '@/enums/datasource'
+import { ActRangListItemTypeEnum, EventActionTypeEnum, TransportTypeEnum } from '@/enums/datasource'
 import { useMessage } from '@/hooks/web/useMessage'
-import { CommandDeliveryModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
+import { AttributeDeliverModal, CommandDeliveryConfirmModal, CommandDeliveryModal, ConfirmModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
+import type { MxCell } from '@/fitCore/types'
+import { NodeUtils } from '@/hooks/business/useNodeUtils'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import type { RpcCommandType } from '@/api/device/model'
 
-export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: NodeDataDataSourceJsonType) {
+export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: NodeDataDataSourceJsonType, cell: MxCell) {
   const { createMessage } = useMessage()
 
   const handlerCommandDelivery = async (data: MouseUpEventDataType) => {
@@ -34,7 +39,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
               persistent: true,
             },
           })
-          createMessage.success('下发成功~')
+          createMessage.success('下发成功')
         })
       }
 
@@ -66,6 +71,65 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
     (instance.component?.exposed as InstanceType<typeof CommandDeliveryModal>)?.open({ ..._data, deviceInfo, operationPassword: eventJson?.OPERATION_PASSWORD })
   }
 
+  const handleAttributeDelivery = async (data: SingleClickEventDataType) => {
+    try {
+      const nodeUtils = new NodeUtils()
+      const { way = CommandWayEnum.ONE_WAY } = data
+      const { attr, deviceId, attrInfo } = dataSourceJson
+      const { transportType, alias, name: deviceName } = await getDeviceInfo(dataSourceJson.deviceId) || {}// 设备信息
+      const contentDataStore = useContentDataStoreWithOut()
+      const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
+      if (!currentData) return
+      const { actJson, eventJson } = currentData
+      const { value: operationPassword, checked: operationPasswordEnable } = eventJson.OPERATION_PASSWORD
+
+      const command: RpcCommandType = {
+        additionalInfo: { cmdType: 'API' },
+        method: 'methodThingskit',
+        params: {},
+        persistent: true,
+      }
+      if (nodeUtils.getNodeComponentKey(cell) === ControlComponentEnum.SWITCH) {
+        const { rangeList } = actJson.STATUS_SETTING
+        const status = cell.getAttribute('SWITCH_STATUS')
+        const res = rangeList.find(item => item.type === (status === ActRangListItemTypeEnum.OPEN ? ActRangListItemTypeEnum.CLOSE : ActRangListItemTypeEnum.OPEN))
+        if (!res) return
+        const { statusValue } = res
+        command.params = transportType === TransportTypeEnum.TCP
+          ? statusValue!
+          : {
+              [attr]: statusValue,
+            }
+
+        if (operationPasswordEnable) {
+          const instance = h(CommandDeliveryConfirmModal)
+          render(instance, document.body)
+          await (instance.component?.exposed as InstanceType<typeof CommandDeliveryConfirmModal>)?.open(operationPassword)
+        }
+        else {
+          const instance = h(ConfirmModal)
+          render(instance, document.body)
+          await (instance.component?.exposed as InstanceType<typeof ConfirmModal>)?.open()
+        }
+
+        await doCommandDelivery({ way, command, deviceId })
+        createMessage.success('命令下发成功')
+      }
+      else {
+        const instance = h(AttributeDeliverModal)
+        render(instance, document.body)
+        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword }) as string
+
+        command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
+        await doCommandDelivery({ way, command, deviceId })
+        createMessage.success('命令下发成功')
+      }
+    }
+    catch (error) {
+      console.error(error)
+    }
+  }
+
   const handlerMouseClickEvent = (data: SingleClickEventDataType) => {
     const { actionType, enable } = data
     if (!enable) return
@@ -75,6 +139,8 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
       handleSwitchPage(data)
     else if (actionType === EventActionTypeEnum.PARAMS_SETTING)
       handleParamsSetting(data)
+    else if (actionType === EventActionTypeEnum.ATTRIBUTE_DELIVERY)
+      handleAttributeDelivery(data)
   }
 
   const handlerMouseDown = async () => {

+import type { RenderComponentExposeType } from '../types'
+import type { DoubleClickEventDataType, MouseDownEventDataType, MouseUpEventDataType, NodeDataType, SingleClickEventDataType } from '@/api/node/model'
+import { EventTypeEnum } from '@/enums/datasource'
+
+interface UseOnEventTriggerParamsType {
+  onMouseDown?: (eventData: MouseDownEventDataType, nodeData: NodeDataType) => any
+  onMouseUp?: (eventData: MouseUpEventDataType, nodeData: NodeDataType) => any
+  onClick?: (eventData: SingleClickEventDataType, nodeData: NodeDataType) => any
+  onDbClick?: (eventData: DoubleClickEventDataType, nodeData: NodeDataType) => any
+}
+export function useOnEventTrigger(params: UseOnEventTriggerParamsType) {
+  const onEventTrigger: RenderComponentExposeType['onEventTrigger'] = (eventName: EventTypeEnum, nodeData: NodeDataType) => {
+    if (!nodeData.eventJson[eventName].enable) return
+
+    if (eventName === EventTypeEnum.SINGLE)
+      params.onClick?.(nodeData.eventJson[eventName], nodeData)
+    else if (eventName === EventTypeEnum.DOUBLE)
+      params.onDbClick?.(nodeData.eventJson[eventName], nodeData)
+    else if (eventName === EventTypeEnum.DOWN)
+      params.onMouseDown?.(nodeData.eventJson[eventName], nodeData)
+    else if (eventName === EventTypeEnum.UP)
+      params.onMouseDown?.(nodeData.eventJson[eventName], nodeData)
+  }
+
+  return {
+    onEventTrigger,
+  }
+}

 <script lang="ts" setup>
-import { ref } from 'vue'
-import type { RenderComponentExposeType } from '@/core/Library/types'
+import { computed, ref, unref } from 'vue'
+import type { RenderComponentExposeType, RenderComponentProps } from '@/core/Library/types'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { NodeUtils } from '@/hooks/business/useNodeUtils'
-import { getMeetTheConditionsRange } from '@/core/Library/utils'
-import { ActTypeEnum, VariableImageSourceEnum } from '@/enums/datasource'
+import { VariableImageSourceEnum } from '@/enums/datasource'
 import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { CommandSource } from '@/core/websocket/processor'
 import type { SubscriptionUpdateMsg } from '@/core/websocket/type/message'
-import type { StatusActDataType } from '@/api/node/model'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+const props = defineProps<RenderComponentProps>()
 
 const imgUrl = ref(new URL('/public/webapp/images/thingskit/switch-on.svg', import.meta.url).href)
 
 const isNonstandard = ref(false)
-const onReceiveActMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
-  const { node, type, data } = commandSource
 
-  if (type !== ActTypeEnum.STATUS_SETTING) return
+const contentDataStore = useContentDataStoreWithOut()
+const getCurrentData = computed(() => contentDataStore.getCurrentNodeDataById(props.config))
 
+const onReceiveDataSourceMessage = (_commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
+  const { id: node, actJson, dataSourceJson } = unref(getCurrentData)!
+  const { attr } = dataSourceJson
+  const { rangeList } = actJson.STATUS_SETTING
   const nodeUtils = new NodeUtils()
   const cell = nodeUtils.getCellById(node)
   if (!cell) return
-  const { attr, rangeList } = data as StatusActDataType
-  const { latestValue } = useLatestMessageValue(message.data, attr)
-  const { flag, record } = getMeetTheConditionsRange(rangeList.map(item => ({ ...item, max: item.statusValue, min: item.statusValue })), latestValue)
+  const { latestValue } = useLatestMessageValue(message.data, attr!)
+  const flag = rangeList.find(item => item.statusValue?.toString() === latestValue?.toString())
+
   if (flag) {
     isNonstandard.value = false
-    const { imageInfo } = record!
+    const { imageInfo, type } = flag!
     const { path, imageSource, libPath } = imageInfo || {}
     imgUrl.value = imageSource === VariableImageSourceEnum.GALLERY ? libPath! : path!
+    if (!cell) return
+    cell.setAttribute('SWITCH_STATUS', type!)
   }
   else {
     isNonstandard.value = true
   }
 }
 
-const { onMessage } = useOnMessage({ onReceiveActMessage })
+const { onMessage } = useOnMessage({ onReceiveDataSourceMessage })
 
 defineExpose<RenderComponentExposeType>({
   onMessage,

@@ -6,6 +6,7 @@ import type { CommandSource, LightboxModeWebsocketService } from '@/core/websock
 import type { SubscriptionUpdateMsg } from '@/core/websocket/type/message'
 import type { TelemetrySubscriber } from '@/core/websocket/telemetry'
 import type { NodeDataType } from '@/api/node/model'
+import type { EventTypeEnum } from '@/enums/datasource'
 
 export interface FetchComponentFileType {
   key: string
@@ -107,5 +108,6 @@ export interface ConfigPresetOptionsType {
 }
 
 export interface RenderComponentExposeType {
-  onMessage(commandSource: CommandSource, message: SubscriptionUpdateMsg): void
+  onMessage?(commandSource: CommandSource, message: SubscriptionUpdateMsg): void
+  onEventTrigger?(eventName: EventTypeEnum, nodeData: NodeDataType): void
 }

+import type { App } from 'vue'
 import type { LightboxModeWebsocketService } from '.'
+import type { RenderComponentExposeType } from '@/core/Library/types'
 import { useNodeEvent } from '@/core/Library/hook/useNodeEvent'
 import { EventTypeEnum } from '@/enums/datasource'
 import type { MxState } from '@/fitCore/types'
+import { getAppInstanceId } from '@/utils/draw'
 
 interface MxEvent {
   state: MxState
@@ -65,8 +68,16 @@ export class EventHandler {
     const id = cell.getId()
 
     const node = this.service.dataSource.find(item => item.id === id)
+
     if (node && node.eventJson) {
-      const { handlerMouseDown, handlerMouseClick, handlerMouseDoubleClick, handlerMouseUp } = useNodeEvent(node.eventJson, node.dataSourceJson)
+      const instanceId = getAppInstanceId(cell)
+      const instance = window?.VueInstanceMap?.[instanceId] as App
+      if (instance && (instance._instance?.exposed as RenderComponentExposeType)?.onEventTrigger) {
+        (instance._instance?.exposed as RenderComponentExposeType)?.onEventTrigger?.(eventName, node)
+        return
+      }
+
+      const { handlerMouseDown, handlerMouseClick, handlerMouseDoubleClick, handlerMouseUp } = useNodeEvent(node.eventJson, node.dataSourceJson, cell)
       switch (eventName) {
         case EventTypeEnum.DOWN:
           handlerMouseDown()

@@ -220,6 +220,7 @@ export enum EventActionTypeEnum {
   OPEN_PAGE = 'OPEN_PAGE',
   ASSIGN_VARIABLE = 'ASSIGN_VARIABLE',
   PARAMS_SETTING = 'PARAMS_SETTING',
+  ATTRIBUTE_DELIVERY = 'ATTRIBUTE_DELIVERY',
 }
 
 export enum EventActionTypeNameEnum {
@@ -227,6 +228,7 @@ export enum EventActionTypeNameEnum {
   OPEN_PAGE = '打开页面',
   ASSIGN_VARIABLE = '变量赋值',
   PARAMS_SETTING = '参数设置',
+  ATTRIBUTE_DELIVERY = '属性下发',
 }
 
 export enum ContentDataFieldsEnum {