Merge branch 'dev-fix-ww' into 'main_dev'

perf: 设备有别名显示别名 See merge request yunteng/thingskit-scada!62

Merge branch 'dev-fix-ww' into 'main_dev'
perf: 设备有别名显示别名 See merge request yunteng/thingskit-scada!62
xp.Huang
2 parents 5d480281 ca4620e4
Showing 2 changed files with 6 additions and 15 deletions
src/main/webapp/js/diagramly/App.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/diagramly/App.js
View file @741429e
+++ b/src/main/webapp/js/diagramly/App.js
View file @741429e
@@ -4133,10 +4133,10 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 					<label style="margin-bottom: 10px; display: block;">访问令牌</label>
 					<div class="layui-form-item" style="display: flex; justify-content: center; aligns-item: center;"> 
 						<div style="width: 70%">
-							<input required lay-verify="required" type="text" name="${field}" lay-verify="title" autocomplete="off" placeholder="请输入访问令牌" class="layui-input">
+							<input required lay-verify="required" type="password" name="${field}" lay-verify="title" autocomplete="off" placeholder="请输入访问令牌" class="layui-input">
 						</div>
 						<button lay-submit lay-filter="${formSubmitFilter}" class="layui-btn layui-btn-normal" style="width: 30%;display: flex; justify-content: center; align-items: center;background-color: #1E9FFF;">
-							<svg t="1682068997810" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="79416" width="24" height="24">
+							<svg style="transform: rotate(180deg);" t="1682068997810" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="79416" width="24" height="24">
 								<path d="M512 928H128c-19.2 0-32-12.8-32-32V128c0-19.2 12.8-32 32-32h384c19.2 0 32 12.8 32 32s-12.8 32-32 32H160v704h352c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#fff" p-id="79417" />
 								<path d="M534.4 736c-9.6 0-16-3.2-22.4-9.6l-192-192c-12.8-12.8-12.8-32 0-44.8l192-192c12.8-12.8 32-12.8 44.8 0 12.8 12.8 12.8 32 0 44.8L387.2 512l169.6 169.6c12.8 12.8 12.8 32 0 44.8-6.4 6.4-16 9.6-22.4 9.6z" fill="#fff" p-id="79418"/>
 								<path d="M896 544H342.4c-19.2 0-32-12.8-32-32s12.8-32 32-32H896c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#fff" p-id="79419" />
--- a/src/main/webapp/js/grapheditor/Format.js
View file @741429e
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @741429e
@@ -6527,7 +6527,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 将设备选项挂载到节点中
          */
         function mountAllDeviceToSelect() {
-            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions })
+            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
             $(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
             UseLayUi.nextTick(() => form.render('select'))
         }
@@ -6635,7 +6635,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function createAddRowListenEvent() {
             $(`#${enumActionEl.ADD_ROW_EL}`).on('click', () => {
                 addRecord()
-                const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions })
+                const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
                 $(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr`).last().find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
                 form.render('select')
             })
@@ -6645,7 +6645,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 设置设备选项
          */
         function setDeviceOptions(row) {
-            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions })
+            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
             $(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr[lay-filter="${getRowFilter(row)}"]`).find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
         }
@@ -14925,7 +14925,7 @@ class HandleDataInteraction {
     sendInstruction(list = []) {
         const queue = []
         const fn = async (way, deviceId, data) => {
-            const [err, res = []] = await to(ConfigurationNodeApi.deviceIsOnLine(deviceId))
+            const [err, res = []] = way === 'twoway' ? await to(ConfigurationNodeApi.deviceIsOnLine(deviceId)) : [null, [{ value: true }]]
             const { value } = res[0] || {}
             if (value) {
                 await to(ConfigurationNodeApi.sendInstruction(way, deviceId, data))
@@ -14947,15 +14947,6 @@ class HandleDataInteraction {
                     fn(way, deviceId, data)
                 })
             }
-            // if (slaveDeviceId) {
-            //     queue.push(() => {
-            //         fn(way, slaveDeviceId, data)
-            //     })
-            // } else if (deviceId) {
-            //     queue.push(() => {
-            //         fn(way, deviceId, data)
-            //     })
-            // }
         }
         Promise.all(queue.map(fn => fn()))