Commit 708a7869eec2fd9d08aadeda904bd18573427044
Merge branch 'fix/DEFECT-1568' into 'main_dev'
fix: 设备属性绑定新增搜索功能 See merge request yunteng/thingskit-scada!123
Showing
1 changed file
with
4 additions
and
1 deletions
| @@ -9034,6 +9034,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -9034,6 +9034,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
| 9034 | label: '属性', | 9034 | label: '属性', | 
| 9035 | bindValueFiled: enumDataSourceConst.ATTR, | 9035 | bindValueFiled: enumDataSourceConst.ATTR, | 
| 9036 | layFilter: `${componentFilter}--${enumDataSourceConst.ATTR}`, | 9036 | layFilter: `${componentFilter}--${enumDataSourceConst.ATTR}`, | 
| 9037 | + showSearch: true, | ||
| 9037 | className: 'data-source__component-select', | 9038 | className: 'data-source__component-select', | 
| 9038 | ...validateRule, | 9039 | ...validateRule, | 
| 9039 | onClick(data) { | 9040 | onClick(data) { | 
| @@ -13757,6 +13758,7 @@ class UseLayUi { | @@ -13757,6 +13758,7 @@ class UseLayUi { | ||
| 13757 | * @description create layui single select template | 13758 | * @description create layui single select template | 
| 13758 | * @param {string} [options.layFilter] options.layFilter | 13759 | * @param {string} [options.layFilter] options.layFilter | 
| 13759 | * @param {string} [options.bindValueFiled] options.bindValueFiled | 13760 | * @param {string} [options.bindValueFiled] options.bindValueFiled | 
| 13761 | + * @param {string} [options.showSearch] options.laySearch | ||
| 13760 | * @param {string} [options.layVerify] options.layVerify | 13762 | * @param {string} [options.layVerify] options.layVerify | 
| 13761 | * @param {string} [options.layVerType] options.layVerType | 13763 | * @param {string} [options.layVerType] options.layVerType | 
| 13762 | * @param {Function} [options.renderFn] options.renderFn | 13764 | * @param {Function} [options.renderFn] options.renderFn | 
| @@ -13774,6 +13776,7 @@ class UseLayUi { | @@ -13774,6 +13776,7 @@ class UseLayUi { | ||
| 13774 | const { | 13776 | const { | 
| 13775 | elem, | 13777 | elem, | 
| 13776 | layFilter, | 13778 | layFilter, | 
| 13779 | + showSearch, | ||
| 13777 | bindValueFiled, | 13780 | bindValueFiled, | 
| 13778 | layVerify, | 13781 | layVerify, | 
| 13779 | layVerType, | 13782 | layVerType, | 
| @@ -13823,7 +13826,7 @@ class UseLayUi { | @@ -13823,7 +13826,7 @@ class UseLayUi { | ||
| 13823 | <div class="layui-form-item ${className}"> | 13826 | <div class="layui-form-item ${className}"> | 
| 13824 | <label class="layui-form-label">${label}</label> | 13827 | <label class="layui-form-label">${label}</label> | 
| 13825 | <div class="layui-input-block"> | 13828 | <div class="layui-input-block"> | 
| 13826 | - <select name="${bindValueFiled}" ${this.dynamicAttr('lay-filter', layFilter)} ${this.dynamicAttr('lay-verify', layVerify)} ${this.dynamicAttr('lay-verType', layVerType)}> | 13829 | + <select name="${bindValueFiled}" ${showSearch ? 'lay-search' : ''} ${this.dynamicAttr('lay-filter', layFilter)} ${this.dynamicAttr('lay-verify', layVerify)} ${this.dynamicAttr('lay-verType', layVerType)}> | 
| 13827 | ${generateOptionTemplate(dataSource)} | 13830 | ${generateOptionTemplate(dataSource)} | 
| 13828 | </select> | 13831 | </select> | 
| 13829 | </div> | 13832 | </div> |