Merge branch 'ww' into 'main'

fix: subscribe value same on different page bind same device

See merge request huang/thingskit-drawio!38

@@ -6,6 +6,8 @@ const del = require('del')
 const path = require('path')
 const { readFileSync, writeFileSync } = require('fs')
 
+let oldTimespan = '?v=1659335275728'
+
 /**
  * @descritpion 清除dist 文件夹
  * @param {*} cb 
@@ -66,10 +68,19 @@ function reductionFile(cb) {
 }
 
 function generatoreVersion(cb) {
+
   const reg = /const\s+releaseVersion\s?=\s?.*/g
+  const regTimespan = /\?v=(\d+)/g
+  const timespan = Date.now()
+
   const string = readFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), { encoding: 'utf-8' })
-  const newString = string.replace(reg, `const releaseVersion = '${encodeURIComponent(Date.now())}'`)
+
+  let newString = string.replace(reg, `const releaseVersion = '${encodeURIComponent(Date.now())}'`)
+
+  newString = string.replace(regTimespan, `?v=${timespan}`)
+
   writeFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), newString, { encoding: 'utf-8' })
+
   cb()
 }
 

@@ -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">
+	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1659336383769">
 
 	<!-- load configure file -->
-	<script src="./js/config/config.js"></script>
+	<script src="./js/config/config.js?v=1659336383769"></script>
 
 	<!-- crypto-js	-->
-	<script src="./js/plugin/crypto-js/crypto-js.js"></script>
+	<script src="./js/plugin/crypto-js/crypto-js.js?v=1659336383769"></script>
 
 	<!-- storage persistent	-->
-	<script src="./js/const/persistentStorage.js"></script>
+	<script src="./js/const/persistentStorage.js?v=1659336383769"></script>
 	<!-- Global const -->
-	<script src="./js/const/const.js"></script>
+	<script src="./js/const/const.js?v=1659336383769"></script>
 
 	<!-- Axios	-->
-	<script src="./js/plugin/axios/axios.min.js"></script>
-	<script src="./js/plugin/axios/DefHttp.js"></script>
-	<script src="./js/api/index.js"></script>
+	<script src="./js/plugin/axios/axios.min.js?v=1659336383769"></script>
+	<script src="./js/plugin/axios/DefHttp.js?v=1659336383769"></script>
+	<script src="./js/api/index.js?v=1659336383769"></script>
 
 	<!-- load script -->
-	<script src="./js/config/loadScript.js"></script>
+	<script src="./js/config/loadScript.js?v=1659336383769"></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"></script>
+	<script src="./js/plugin/layui/layui.js?v=1659336383769"></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">
+	<link rel="stylesheet" href="./styles/formatChange.css?v=1659336383769">
 
 	<script type="text/javascript">
 		/**

@@ -5179,6 +5179,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         const act = currentNodeData.act ?? []
         const event = currentNodeData.event ?? []
         const actionType = {}
+
+        const hasExistEl = $(`.layui-form[lay-filter="${CONTAINER_FILTER}"]`).find('input[type="checkbox"]')
+        $(hasExistEl).each((i) => {
+            $(hasExistEl[i]).attr('disabled', true)
+        })
+
         for (const item of act) {
             const flag = !item.condition || !item.condition?.length
             $(`.interaction__container input[name="${item.type}"]`).attr('disabled', flag)
@@ -5189,6 +5195,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             $(`.interaction__container input[name="${item.type}"]`).attr('disabled', flag)
             actionType[item.type] = item.enabled
         }
+
         form.val(CONTAINER_FILTER, actionType)
     }
 
@@ -6471,7 +6478,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 创建组织树
          */
         async function createOrgTreeSelect() {
-            const [err, treeList] = await to(ConfigurationNodeApi.getOrgTree())
+            const [err, res] = await to(ConfigurationNodeApi.getOrgTree())
+            treeList = res
             if (err) return
             UseLayUi.createTreeSelect({
                 elem: `#${enumActionEl.ORG_EL}`,
@@ -6481,7 +6489,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 layVerify: 'required',
                 layVerType: 'tips',
                 treeProps: {
-                    data: treeList,
+                    data: res,
                     onlyIconControl: true,
                     click(node) {
                         recordData.orgId = node.data.id
@@ -7059,7 +7067,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         </div>
                     </div>
                     <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none">
-                        <label class="layui-form-label">单向/双向</label>
+                        <label class="layui-form-label">单向/双向 ${createHelpMessage(`单向：服务器向网关设备、直连设备发送指令。发送指令后，设备不会返回任何信息。\n
+                        双向：服务器向网关设备、直连设备发送指令。发送指令后，设备返回响应信息。`, 'way')}</label>
                         <div class="layui-input-block">
                             <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked="">
                             <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向">
@@ -12530,7 +12539,7 @@ class UseLayUi {
 
     static topMsg(msg, options, icon) {
         const { layer } = layui
-        layer.msg(`<div style="padding: 20px; display: flex; align-items: center;"><i class="layui-layer-ico layui-layer-ico6" style="width: 30px;height: 30px;"></i><span style="margin-left: 5px">${msg}</span></div>`, { ...options, type: 1, icon, time: 2000, })
+        layer.msg(`<div style="padding: 20px; display: flex; align-items: center;"><i class="layui-layer-ico layui-layer-ico${icon}" style="width: 30px;height: 30px;"></i><span style="margin-left: 5px">${msg}</span></div>`, { ...options, type: 1, icon, time: 2000, })
     }
 
     static topSuccessMsg(msg = '操作成功', options) {
@@ -12801,7 +12810,7 @@ class Ws {
      * @description 发送消息
      */
     send(message) {
-        if (this.ws.readyState !== 1) {
+        if (!this.ws || this.ws.readyState !== 1) {
             this.errorStack.push(message)
             return
         }
@@ -12832,6 +12841,7 @@ class Ws {
         this.close()
         this.ws = null
         this.errorStack = null
+        Ws.instance = null
     }
 
     /**
@@ -13020,6 +13030,7 @@ class DispatchCenter {
      * @description 建立socket连接
      */
     connectSocket() {
+        Ws.instance?.destroy?.()
         this.socket = Ws.getInstance({ url: GLOBAL_WS_URL(), onmessageCallback: this.socketOnmessage })
     }
 
@@ -13061,9 +13072,6 @@ class DispatchCenter {
         if (!id) return
         const [err, res] = await to(ConfigurationNodeApi.getConfigurationInfo('CONTENT', id))
         this.contentData = res
-        // const { dataSources } = this.contentData = res
-        // const tsSubCmds = this.generatorDataSourceMapping(dataSources)
-        // this.sendMessageToGetRealTimeData({ tsSubCmds })
     }
 
     /**
@@ -14121,6 +14129,7 @@ class HandleDataInteraction {
 
                 },
                 async success(layero, index) {
+                    $('.layui-layer-setwin a').removeAttr('href')
                     form.render()
                 },
             })

@@ -589,3 +589,9 @@
   top: -130px;
   z-index: 99;
 }
+
+.way .thingskit-help-container {
+  width: 220px;
+  top: -130px; 
+  z-index: 99;
+}