Parcourir la source

修改按钮隐藏判定逻辑:以适应工具端的修改

lph il y a 1 an
Parent
commit
799b3de8c4

+ 0 - 6
zkqy-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/index.vue

@@ -152,8 +152,6 @@ import { Modal, message } from "ant-design-vue";
 import { revoke, nodeSchema } from "../../utils/index";
 import formItemProperties from "./module/formItemProperties";
 import formProperties from "./module/formProperties";
-import { black } from '@/components/updateModule/bpmn-js/lib/draw/BpmnRenderUtil'
-
 
 export default {
   name: "KFormDesign",
@@ -522,12 +520,8 @@ export default {
     }
   },
   created() {
-    let blackList=['评分','警告提示','HTML','富文本','按钮']
     this.loadState = true;
     nodeSchema.addComputed(this.schemaGroup);
-    this.schemaGroup[0].list = this.schemaGroup[0].list.filter(item => {
-      return !blackList.some(v=>v==item.label)
-    })
   }
 };
 </script>

+ 6 - 6
zkqy-ui/src/views/tablelist/commonTable/BtnMenu.vue

@@ -79,17 +79,17 @@ export default {
     judgeBtnHandler(row, con) {
       let { fieldName, refValue, mark } = con;
       switch (mark) {
-        case ">":
+        case "1":
           return row[fieldName] > refValue;
-        case "<":
+        case "2":
           return row[fieldName] < refValue;
-        case "=":
+        case "3":
           return row[fieldName] == refValue;
-        case ">=":
+        case "4":
           return row[fieldName] >= refValue;
-        case "<=":
+        case "5":
           return row[fieldName] <= refValue;
-        case "!=":
+        case "6":
           return row[fieldName] != refValue;
         default:
           return true;