Merge branch 'fix/DEFECT-1436' into 'main_dev'

fix: DEFECT-1436修复MQTT设备绑定参数设置modbus下发指令错误 See merge request yunteng/thingskit-scada!93

Merge branch 'fix/DEFECT-1436' into 'main_dev'
fix: DEFECT-1436修复MQTT设备绑定参数设置modbus下发指令错误 See merge request yunteng/thingskit-scada!93
xp.Huang
2 parents abc14825 ccb2030b
Showing 2 changed files with 19 additions and 15 deletions
src/main/webapp/index.html
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/index.html
View file @978c606
+++ b/src/main/webapp/index.html
View file @978c606
@@ -22,26 +22,26 @@
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#d89000">
-	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1690081039465">
+	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1690365980745">
 	<!-- load configure file -->
-	<script src="./js/config/config.js?v=1690081039465"></script>
+	<script src="./js/config/config.js?v=1690365980745"></script>
 	<!-- crypto-js	-->
-	<script src="./js/plugin/crypto-js/crypto-js.js?v=1690081039465"></script>
+	<script src="./js/plugin/crypto-js/crypto-js.js?v=1690365980745"></script>
 	<!-- storage persistent	-->
-	<script src="./js/const/persistentStorage.js?v=1690081039465"></script>
+	<script src="./js/const/persistentStorage.js?v=1690365980745"></script>
 	<!-- Global const -->
-	<script src="./js/const/const.js?v=1690081039465"></script>
+	<script src="./js/const/const.js?v=1690365980745"></script>
 	<!-- Axios	-->
-	<script src="./js/plugin/axios/axios.min.js?v=1690081039465"></script>
-	<script src="./js/plugin/axios/DefHttp.js?v=1690081039465"></script>
-	<script src="./js/api/index.js?v=1690081039465"></script>
+	<script src="./js/plugin/axios/axios.min.js?v=1690365980745"></script>
+	<script src="./js/plugin/axios/DefHttp.js?v=1690365980745"></script>
+	<script src="./js/api/index.js?v=1690365980745"></script>
 	<!-- load script -->
-	<script src="./js/config/loadScript.js?v=1690081039465"></script>
+	<script src="./js/config/loadScript.js?v=1690365980745"></script>
 	<!-- act editor -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> -->
@@ -54,7 +54,7 @@
 	<!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> -->
-	<script src="./js/plugin/layui/layui.js?v=1690081039465"></script>
+	<script src="./js/plugin/layui/layui.js?v=1690365980745"></script>
 	<!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css"
 		integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ=="
 		crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -63,7 +63,7 @@
 		crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
 	<!-- 引入修改样式	-->
-	<link rel="stylesheet" href="./styles/formatChange.css?v=1690081039465">
+	<link rel="stylesheet" href="./styles/formatChange.css?v=1690365980745">
 	<script type="text/javascript">
 		/**
@@ -306,7 +306,7 @@
 				var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
 					(hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
-				const releaseVersion = '1690081039465'
+				const releaseVersion = '1690365980745'
 				const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}`
 				function loadAppJS() {
 					mxscript(appMinSrc, function () {
--- a/src/main/webapp/js/grapheditor/Format.js
View file @978c606
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @978c606
@@ -6371,7 +6371,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const { additional = {} } = dataSources[0] || {}
             const { [enumBindKey.EFFECT_SCOPE]: effectScope = 1000 } = additional
             linkageIntervalSelect(effectScope)
-            form.val(CONTAINER_FILTER, additional) 
+            form.val(CONTAINER_FILTER, additional)
         }
         const refresh = echoRefreshFn
@@ -15165,6 +15165,7 @@ class HandleDataSource {
         const { nodeId, attr } = record
         const node = this.getNodeByNodeId(nodeId)
         const { data } = message
+        if (!node) return
         const type = this.getComponentType(node)
         if (node && type === this.componentType.FLOWMETER) {
@@ -15684,7 +15685,6 @@ class HandleDataSource {
     * @return {*}
     */
     getNodeByNodeId(nodeId) {
-        // const nodeId = this.getNodeIdByCmdId(subscriptionId)
         return this.contentAllCell.find(item => item.id === nodeId)
     }
@@ -16032,6 +16032,7 @@ class HandleDataInteraction {
             if (content.transportType === 'TCP' || content.commandType === '1') return
             const jsonCommand = content.jsonCommand || ''
             let defaultValue = { [enumConst.ATTR_PLACEHOLDER]: 0 }
+            if (!document.getElementById(enumActionEl.EDITOR)) return
             const editor = ace.edit(enumActionEl.EDITOR, {
                 maxLines: 18, // 最大行数，超过会自动出现滚动条
                 minLines: 10, // 最小行数，还未到最大行数时，编辑器会自动伸缩大小
@@ -16214,8 +16215,11 @@ class HandleDataInteraction {
             if (commandType == enumCommandType.MODBUS) {
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
-                const { method } = additional
+                const { method, deviceCode } = additional || {} 
+
                 const validate = new Validate([
+                    { value: deviceCode, required: true, message: '未找到设备地址码' },
+                    { value: method, required: true, message: '未找到Modbus命令操作类型' },
                     { value, required: true, message: '下发值是必填项' },
                     ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
                     ...(method == '06' ? [{ value, message: '下发类型必须为整型', validator(value) { return !isNaN(value) && Number(value) % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),