|
|
@@ -42,7 +42,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
|
|
|
if(i==0){
|
|
|
span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';//display:block;
|
|
|
}else{
|
|
|
- span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
|
|
|
+ span=span+'<span style="padding:0 0 0 20px;width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
|
|
|
}
|
|
|
if(dbtpls[i].dbField=="true"){
|
|
|
me.searchFieldArray=dbtpls[i].field;
|
|
|
@@ -68,11 +68,19 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
|
|
|
}
|
|
|
//加载数据
|
|
|
var data,dbCondition=[];
|
|
|
- if(me.dbtplcondition){
|
|
|
- dbCondition = [{
|
|
|
- type: 'condition',
|
|
|
- value:me.dbtplcondition,
|
|
|
- }];
|
|
|
+ if(me.dbfinds){
|
|
|
+ var dbtplcondition = "";
|
|
|
+ for (let index = 0; index < dbfinds.length; index++) {
|
|
|
+ var item = dbfinds[index].from;
|
|
|
+ dbtplcondition+= "upper("+item+") like '%"+queryString.toUpperCase()+"%' or ";
|
|
|
+ }
|
|
|
+ dbtplcondition = "(" + dbtplcondition.substring(0,dbtplcondition.length-4) + ")";
|
|
|
+ if(dbtplcondition.length>0){
|
|
|
+ dbCondition = [{
|
|
|
+ type: 'condition',
|
|
|
+ value:dbtplcondition
|
|
|
+ }];
|
|
|
+ }
|
|
|
}
|
|
|
//添加默认条件
|
|
|
if(me.defaultCondition) {
|