...
|
...
|
@@ -6383,10 +6383,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
6383
|
6383
|
function echoOrgTree(id) {
|
6384
|
6384
|
orgId = id
|
6385
|
6385
|
const node = UseLayUi.findTreeObjectByField(treeList, id)
|
6386
|
|
- orgId = id
|
6387
|
|
- $(`#${enumActionEl.ORG_EL}`)
|
6388
|
|
- .find(`input[name="${enumConst.ORG_ID}"]`).val(orgId).parent()
|
6389
|
|
- .find('span').html(node?.name)
|
|
6386
|
+
|
|
6387
|
+ UseLayUi.nextTick(() => $(`#${enumActionEl.ORG_EL} input[name="${enumConst.ORG_ID}"]`).val(orgId).parent().find('span').html(node?.name))
|
6390
|
6388
|
}
|
6391
|
6389
|
|
6392
|
6390
|
/**
|
...
|
...
|
@@ -6539,6 +6537,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
6539
|
6537
|
}
|
6540
|
6538
|
generatorEventListen()
|
6541
|
6539
|
form.render()
|
|
6540
|
+ echoOrgTree(orgId)
|
6542
|
6541
|
},
|
6543
|
6542
|
})
|
6544
|
6543
|
}
|
...
|
...
|
@@ -6940,6 +6939,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
6940
|
6939
|
contentId: currentPageId.id,
|
6941
|
6940
|
...formVal,
|
6942
|
6941
|
id: graphId,
|
|
6942
|
+ orgId: 'b4dd6e2b-6e0f-413c-bf5a-70133bd571e8',
|
6943
|
6943
|
condition: tableData,
|
6944
|
6944
|
type: event.data.type,
|
6945
|
6945
|
}
|
...
|
...
|
@@ -11573,7 +11573,7 @@ class UseLayUi { |
11573
|
11573
|
<div class="layui-input-block">
|
11574
|
11574
|
<div class="layui-unselect layui-form-select ${SELECT_CLS}">
|
11575
|
11575
|
<div class="layui-select-title">
|
11576
|
|
- <span class="layui-input layui-unselect">请选择</span>
|
|
11576
|
+ <span class="layui-input layui-unselect tree-select__label">请选择</span>
|
11577
|
11577
|
<input ${this.dynamicAttr('lay-verify', layVerify)} ${this.dynamicAttr('lay-verType', layVerType)} type="text" style="visibility: hidden; position: absolute; top: 0" name="${layFilter}">
|
11578
|
11578
|
<i class="layui-edge"></i>
|
11579
|
11579
|
</div>
|
...
|
...
|
@@ -12566,6 +12566,7 @@ class HandleDataSource { |
12566
|
12566
|
const { attr } = this.getBindData(subscriptionId)
|
12567
|
12567
|
node && this.updatePage(() => {
|
12568
|
12568
|
const { data } = message
|
|
12569
|
+ if (!data) return
|
12569
|
12570
|
const [[timespan, value]] = data[attr]
|
12570
|
12571
|
node.setValue(value)
|
12571
|
12572
|
}, node)
|
...
|
...
|
@@ -12661,7 +12662,7 @@ class HandleDataSource { |
12661
|
12662
|
dataZoom: [
|
12662
|
12663
|
{
|
12663
|
12664
|
xAxisIndex: 0,
|
12664
|
|
- show: realDataList.length ? true : false,
|
|
12665
|
+ show: realDataList.length ? true : false,
|
12665
|
12666
|
type: 'slider',
|
12666
|
12667
|
startValue: 0,
|
12667
|
12668
|
endValue: 4
|
...
|
...
|
|