|
@@ -63,7 +63,6 @@ export default {
|
|
|
btnObj.children = btnObj.children.filter((item) => {
|
|
|
return !this.isHiddenBtn(this.row, item.btnShowCondition);
|
|
|
});
|
|
|
- console.log("btnObj", btnObj);
|
|
|
return btnObj;
|
|
|
},
|
|
|
},
|
|
@@ -72,14 +71,13 @@ export default {
|
|
|
isHiddenBtn(row, condition) {
|
|
|
if (condition.length == 0) return false;
|
|
|
let con = JSON.parse(condition);
|
|
|
- let res = con.every((item) => {
|
|
|
- return !this.judgeBtnHandler(row, item);
|
|
|
+ let res = con.some((item) => {
|
|
|
+ return this.judgeBtnHandler(row, item);
|
|
|
});
|
|
|
return res;
|
|
|
},
|
|
|
judgeBtnHandler(row, con) {
|
|
|
let { fieldName, refValue, mark } = con;
|
|
|
- console.log(row[fieldName], mark, refValue);
|
|
|
switch (mark) {
|
|
|
case ">":
|
|
|
return row[fieldName] > refValue;
|
|
@@ -91,6 +89,8 @@ export default {
|
|
|
return row[fieldName] >= refValue;
|
|
|
case "<=":
|
|
|
return row[fieldName] <= refValue;
|
|
|
+ case "!=":
|
|
|
+ return row[fieldName] != refValue;
|
|
|
default:
|
|
|
return true;
|
|
|
}
|