Commit 55a008e98eeb40d9c993aecabf062c47f8f15a6e
1 parent
b9ad850a
perf: send command add helpMessage
Showing
2 changed files
with
12 additions
and
4 deletions
@@ -5184,7 +5184,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -5184,7 +5184,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
5184 | $(hasExistEl).each((i) => { | 5184 | $(hasExistEl).each((i) => { |
5185 | $(hasExistEl[i]).attr('disabled', true) | 5185 | $(hasExistEl[i]).attr('disabled', true) |
5186 | }) | 5186 | }) |
5187 | - | 5187 | + |
5188 | for (const item of act) { | 5188 | for (const item of act) { |
5189 | const flag = !item.condition || !item.condition?.length | 5189 | const flag = !item.condition || !item.condition?.length |
5190 | $(`.interaction__container input[name="${item.type}"]`).attr('disabled', flag) | 5190 | $(`.interaction__container input[name="${item.type}"]`).attr('disabled', flag) |
@@ -6478,7 +6478,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -6478,7 +6478,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
6478 | * @description 创建组织树 | 6478 | * @description 创建组织树 |
6479 | */ | 6479 | */ |
6480 | async function createOrgTreeSelect() { | 6480 | async function createOrgTreeSelect() { |
6481 | - const [err, treeList] = await to(ConfigurationNodeApi.getOrgTree()) | 6481 | + const [err, res] = await to(ConfigurationNodeApi.getOrgTree()) |
6482 | + treeList = res | ||
6482 | if (err) return | 6483 | if (err) return |
6483 | UseLayUi.createTreeSelect({ | 6484 | UseLayUi.createTreeSelect({ |
6484 | elem: `#${enumActionEl.ORG_EL}`, | 6485 | elem: `#${enumActionEl.ORG_EL}`, |
@@ -6488,7 +6489,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -6488,7 +6489,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
6488 | layVerify: 'required', | 6489 | layVerify: 'required', |
6489 | layVerType: 'tips', | 6490 | layVerType: 'tips', |
6490 | treeProps: { | 6491 | treeProps: { |
6491 | - data: treeList, | 6492 | + data: res, |
6492 | onlyIconControl: true, | 6493 | onlyIconControl: true, |
6493 | click(node) { | 6494 | click(node) { |
6494 | recordData.orgId = node.data.id | 6495 | recordData.orgId = node.data.id |
@@ -7066,7 +7067,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -7066,7 +7067,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
7066 | </div> | 7067 | </div> |
7067 | </div> | 7068 | </div> |
7068 | <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none"> | 7069 | <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none"> |
7069 | - <label class="layui-form-label">单向/双向</label> | 7070 | + <label class="layui-form-label">单向/双向 ${createHelpMessage(`单向:服务器向网关设备、直连设备发送指令。发送指令后,设备不会返回任何信息。\n |
7071 | + 双向:服务器向网关设备、直连设备发送指令。发送指令后,设备返回响应信息。`, 'way')}</label> | ||
7070 | <div class="layui-input-block"> | 7072 | <div class="layui-input-block"> |
7071 | <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked=""> | 7073 | <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked=""> |
7072 | <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向"> | 7074 | <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向"> |