This commit is contained in:
RB 2024-03-05 22:28:01 +08:00
parent e83a3277cc
commit 38c50fc7cd
3 changed files with 12 additions and 7 deletions

View file

@ -107,12 +107,14 @@
<span class="custom-control-label">[[${bundle.L('禁用详情页单字段编辑')}]] <i class="support-plat2 mdi mdi-monitor" th:title="${bundle.L('支持 PC')}"></i></span>
</label>
</div>
<div class="mt-2">
<label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
<input class="custom-control-input" type="checkbox" id="enableRecordMerger" />
<span class="custom-control-label">[[${bundle.L('启用记录合并功能')}]] <i class="support-plat2 mdi mdi-monitor" th:title="${bundle.L('支持 PC')}"></i></span>
</label>
</div>
<th:block th:if="${currentEntity == mainEntity || detailEntity == null}">
<div class="mt-2">
<label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
<input class="custom-control-input" type="checkbox" id="enableRecordMerger" />
<span class="custom-control-label">[[${bundle.L('启用记录合并功能')}]] <i class="support-plat2 mdi mdi-monitor" th:title="${bundle.L('支持 PC')}"></i></span>
</label>
</div>
</th:block>
<div class="mt-2">
<label class="custom-control custom-control-sm custom-checkbox custom-control-inline">
<input class="custom-control-input" type="checkbox" id="repeatFieldsCheckMode" />

View file

@ -1590,7 +1590,7 @@ class RbFormImage extends RbFormElement {
// NOOP
} else {
if (!this._fieldValue__input) {
console.warn('No element `_fieldValue__input` defined')
console.log('No element `_fieldValue__input` defined :', this.props.field)
return
}

View file

@ -139,6 +139,9 @@ $(function () {
typeof window.bosskeyTrigger === 'function' && window.bosskeyTrigger()
window.__BOSSKEY = true
}
setTimeout(function () {
--bosskey
}, 50000) // clean
}
})