perf: hide cell outside arrow

@@ -36,6 +36,15 @@ class ConfigurationNodeApi {
     }
     }
 
 
     /**
     /**
+     * @description 获取所有的网关设备和直连设备
+     * @param {string} orgId 
+     * @returns 
+     */
+    static getAllGatewayDeviceAndConnectionDevice(orgId) {
+        return defHttp.get(`/yt/device/list/master/${orgId}`)
+    }
+
+    /**
      * @description 查询设备的子设备
      * @description 查询设备的子设备
      * @param deviceId 设备ID
      * @param deviceId 设备ID
      * @returns {Promise<*>}
      * @returns {Promise<*>}

@@ -6021,9 +6021,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 		/**
 		/**
 		 * @description 创建回显数据 查询出所有网关设备和直连设备
 		 * @description 创建回显数据 查询出所有网关设备和直连设备
 		 */
 		 */
-		async function getMaterDevice() {
+		async function getAllGatewayDeviceAndConnectionDevice() {
 			if (!orgId) return
 			if (!orgId) return
-			const [err, res] = await to(ConfigurationNodeApi.getMasterDevice(orgId))
+			const [err, res] = await to(ConfigurationNodeApi.getAllGatewayDeviceAndConnectionDevice(orgId))
 			allDeviceOptions = res
 			allDeviceOptions = res
 			mountAllDeviceToSelect()
 			mountAllDeviceToSelect()
 		}
 		}
@@ -6072,7 +6072,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 					onlyIconControl: true,
 					onlyIconControl: true,
 					click(node) {
 					click(node) {
 						orgId = node.data.id
 						orgId = node.data.id
-						getMaterDevice()
+						getAllGatewayDeviceAndConnectionDevice()
 					},
 					},
 				},
 				},
 			})
 			})
@@ -6091,9 +6091,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                   <select name="${enumConst.DEVICE}" lay-filter="${enumConst.DEVICE}" lay-verType="tips" lay-verify="required"></select>
                   <select name="${enumConst.DEVICE}" lay-filter="${enumConst.DEVICE}" lay-verType="tips" lay-verify="required"></select>
                 </td>
                 </td>
                 <td>
                 <td>
-                  <select name="${enumConst.SLAVE_DEVICE}" lay-filter="${enumConst.SLAVE_DEVICE}" lay-verType="tips"></select>
-                </td>
-                <td>
                     <form action="" style="display: flex">
                     <form action="" style="display: flex">
                         <div class="override__radio-default">
                         <div class="override__radio-default">
                             <input id="${getRowFilter(addRowNumber)}${sendInstructionWay.ONE_WAR}" type="radio" name="${enumConst.WAY}" lay-ignore value="${sendInstructionWay.ONE_WAR}" title="单向" checked="">
                             <input id="${getRowFilter(addRowNumber)}${sendInstructionWay.ONE_WAR}" type="radio" name="${enumConst.WAY}" lay-ignore value="${sendInstructionWay.ONE_WAR}" title="单向" checked="">
@@ -6123,51 +6120,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 			addRowNumber++
 			addRowNumber++
 		}
 		}
 
 
-		/**
-		 * @description 更新变量选项
-		 */
-		async function updateVariableOptions(data) {
-			if (!data.value) return
-			const [err, res] = await to(ConfigurationNodeApi.getDeviceAttr(data.value))
-			if (!res) return
-			const generateOption = UseLayUi.generateOptionTemplate({ dataSource: res })
-			$(data.elem).parents('tr').find(`select[name="${enumConst.ATTR}"]`).html(generateOption)
-			form.render('select')
-		}
-
-		/**
-		 * @description 选择设备监听事件
-		 */
-		function createSelectDeviceListenEvent() {
-			form.on(`select(${enumConst.DEVICE})`, async (data) => {
-				const filter = $(data.elem).parents('tr').attr('lay-filter')
-				form.val(filter, {
-					[enumConst.SLAVE_DEVICE]: null,
-				})
-				const isGATEWAY = allDeviceOptions.find(item => item.id === data.value)?.deviceType === "GATEWAY"
-				// 网关设备请求子设备
-				$(data.elem).parents('tr').find(`select[name="${enumConst.SLAVE_DEVICE}"]`).attr('lay-verify', '')
-				if (orgId && isGATEWAY && data.value) {
-					const [err, res] = await to(ConfigurationNodeApi.getSlaveDevice(orgId, data.value))
-					if (!res) return
-					const generateOption = UseLayUi.generateOptionTemplate({ dataSource: res })
-					$(data.elem).parents('tr').find(`select[name="${enumConst.SLAVE_DEVICE}"]`).attr('lay-verify', 'required').html(generateOption)
-				}
-				// else {
-				//     updateVariableOptions(data)
-				// }
-				UseLayUi.nextTick(() => form.render(`select`, filter))
-			})
-			// form.on(`select(${ enumConst.SLAVE_DEVICE })`, (data) => {
-			//     updateVariableOptions(data)
-			// })
-		}
 
 
 		/**
 		/**
 		 * @description 删除行
 		 * @description 删除行
 		 */
 		 */
 		function createDeleteRowListenEvent() {
 		function createDeleteRowListenEvent() {
-			$(`.${enumActionEl.DEL_ROW_EL}`).on('click', (event) => {
+			$(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).on('click', `.${enumActionEl.DEL_ROW_EL}`, (event) => {
 				// $(event.target).parents('tr').find('editor')
 				// $(event.target).parents('tr').find('editor')
 				$(event.target).parents('tr').remove()
 				$(event.target).parents('tr').remove()
 			})
 			})
@@ -6181,7 +6139,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 				addRecord()
 				addRecord()
 				const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions })
 				const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions })
 				$(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr`).last().find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
 				$(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr`).last().find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
-				createDeleteRowListenEvent()
 				form.render('select')
 				form.render('select')
 			})
 			})
 		}
 		}
@@ -6195,48 +6152,40 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 		}
 		}
 
 
 		/**
 		/**
-		 * @description 生成事件监听
-		 */
-		function generatorEventListen() {
-			createSelectDeviceListenEvent()
-			createDeleteRowListenEvent()
-			createAddRowListenEvent()
-		}
-
-		/**
-		 * @description 挂载选项 根据行号 key 挂载option
-		 * @param row 行号
-		 * @param key select name
-		 * @param data 数据源
-		 */
-		function mountSelectOptions(row, key, data) {
-			const generateOption = UseLayUi.generateOptionTemplate({ dataSource: data })
-			$(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).find(`tr[lay-filter="${getRowFilter(row)}"] select[name="${key}"]`).html(generateOption)
-		}
-
-		/**
-		 * @description 根据主设备ID获取从设备
+		 * @description 下拉选项挂载
 		 */
 		 */
-		async function getSlaveDeviceByMasterDevice(deviceId, row) {
-			const res = await ConfigurationNodeApi.getSlaveDevice(orgId, deviceId)
-			mountSelectOptions(row, enumConst.SLAVE_DEVICE, res)
+		function createSelectOptionMountEvent(params) {
+			$(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).on('click', '.layui-form-select', event => {
+				const width = event.currentTarget.offsetWidth || 200
+				const height = event.currentTarget.offsetHeight || 38
+				const offset = $(event.currentTarget).offset()
+				$(event.currentTarget).find('dl').css({
+					position: 'fixed',
+					'min-width': width + 'px',
+					top: offset.top  + height + 'px',
+					left: offset.left + 'px'
+				})
+			})
 		}
 		}
 
 
 		/**
 		/**
-		 * @description 根据设备ID获取设备属性
+		 * @description 生成事件监听
 		 */
 		 */
-		async function getDeviceAttrByDeviceId(deviceId, row) {
-			const res = await ConfigurationNodeApi.getDeviceAttr(deviceId)
-			mountSelectOptions(row, enumConst.ATTR, res)
+		function generatorEventListen() {
+			createDeleteRowListenEvent()
+			createAddRowListenEvent()
+			createSelectOptionMountEvent()
 		}
 		}
 
 
 		/**
 		/**
 		 * @description 回显表单数据
 		 * @description 回显表单数据
 		 */
 		 */
 		function echoFormData(info) {
 		function echoFormData(info) {
-			const { content: { data = [] } = {} } = info
-			data.forEach((datum, index) => echoEachData(datum, index))
-			mountAllDeviceToSelect()
+			const { content: { data = [] } = {}, orgId } = info
+			data.forEach((datum, index) => {
+				addRecord(datum)
+				form.val(getRowFilter(index), datum)
+			})
 		}
 		}
 
 
 		/**
 		/**
@@ -6245,33 +6194,17 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 		function echoOrgTree(id) {
 		function echoOrgTree(id) {
 			orgId = id
 			orgId = id
 			const node = UseLayUi.findTreeObjectByField(treeList, id)
 			const node = UseLayUi.findTreeObjectByField(treeList, id)
-			$(`#${enumActionEl.ORG_EL}`).find(`input[name="${enumConst.ORG_ID}"]`).val(orgId).parent().find('span').html(node?.name)
+			orgId = id
+			$(`#${enumActionEl.ORG_EL}`)
+				.find(`input[name="${enumConst.ORG_ID}"]`).val(orgId).parent()
+				.find('span').html(node?.name)
 		}
 		}
 
 
 		/**
 		/**
-		 * @description 回显每条数据
+		 * @description 判断是否为正确的JSON结构
+		 * @param {string} string 
+		 * @returns 
 		 */
 		 */
-		function echoEachData(datum = {}, row) {
-			addRecord(datum)
-			const deviceId = datum[enumConst.DEVICE]
-			const slaveDeviceId = datum[enumConst.SLAVE_DEVICE]
-			const queue = []
-
-			if (slaveDeviceId) {
-				queue.push(() => getSlaveDeviceByMasterDevice(deviceId, row))
-				// queue.push(() => getDeviceAttrByDeviceId(slaveDeviceId, row))
-			}
-			// else {
-			//     queue.push(() => getDeviceAttrByDeviceId(deviceId, row))
-			// }
-
-			Promise
-				.all(queue.map(item => item()))
-				.finally(() => {
-					form.val(getRowFilter(row), datum)
-				})
-		}
-
 		function isJson(string) {
 		function isJson(string) {
 			if (typeof string === 'string') {
 			if (typeof string === 'string') {
 				try {
 				try {
@@ -6368,7 +6301,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         <thead>
                         <thead>
                         <tr>
                         <tr>
                             <th style="text-align:center">选择设备</th>
                             <th style="text-align:center">选择设备</th>
-                            <th style="text-align:center">选择子设备</th>
                             <th style="text-align:center">单向 / 双向</th>
                             <th style="text-align:center">单向 / 双向</th>
                             <th style="text-align:center">下发值</th>
                             <th style="text-align:center">下发值</th>
                             <th style="text-align:center">操作</th>
                             <th style="text-align:center">操作</th>
@@ -6410,10 +6342,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 					const info = getLayerBindInfo('event', type)
 					const info = getLayerBindInfo('event', type)
 					const { content: { data = [] } = {}, orgId } = info
 					const { content: { data = [] } = {}, orgId } = info
 					echoOrgTree(orgId)
 					echoOrgTree(orgId)
+					await getAllGatewayDeviceAndConnectionDevice()
 					if (!info || !data.length) {
 					if (!info || !data.length) {
 						addRecord()
 						addRecord()
 					} else {
 					} else {
-						await getMaterDevice()
 						echoFormData(info)
 						echoFormData(info)
 					}
 					}
 					generatorEventListen()
 					generatorEventListen()
@@ -6728,7 +6660,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 		function createAddRowListenEvent() {
 		function createAddRowListenEvent() {
 			$(`#${enumActionEl.ADD_BTN_EL}`).on('click', () => {
 			$(`#${enumActionEl.ADD_BTN_EL}`).on('click', () => {
 				addRecord()
 				addRecord()
-				createDeleteRowListenEvent()
 			})
 			})
 		}
 		}
 
 
@@ -6736,7 +6667,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 		 * @description 创建删除行事件
 		 * @description 创建删除行事件
 		 */
 		 */
 		function createDeleteRowListenEvent() {
 		function createDeleteRowListenEvent() {
-			$(`.${enumActionEl.DEL_BTN_EL}`).on('click', (event) => {
+			$(`#${enumActionEl.TABLE_BODY_EL}`).on('click', `.${enumActionEl.DEL_BTN_EL}`, (event) => {
 				$(event.target).parents('tr').remove()
 				$(event.target).parents('tr').remove()
 			})
 			})
 		}
 		}

@@ -5497,7 +5497,9 @@ HoverIcons.prototype.createArrow = function(img, tooltip, direction)
 		}
 		}
 	}));
 	}));
 	
 	
-	return arrow;
+	// TODO thingsKit 隐藏cell四周的箭头
+	return document.createElement('div');
+	// return arrow;
 };
 };
 
 
 /**
 /**