qj-common 4.1.44 → 4.1.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.1.44",
+  "version": "4.1.45",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/views/templates/templateTable.vue

@@ -444,7 +444,7 @@ import templateTableContent from './templateUi/templateTableContent';
 import tempSelect from './components/temp-select';
 import templateInput from './templateInput';
 const querystring = require('querystring');
-import { isUndefined, cloneDeep } from "lodash";
+import { isUndefined } from "lodash";
 import { parseTime } from '#/utils/index'; //时间格式化
 export default {
   props: ['temInput', 'params', 'temTable', 'temPage', 'temTab', 'url', 'temPageLayout', 'subtotal'],
@@ -454,7 +454,6 @@ export default {
       if (!this.temInput) {
         return this.temInput
       }
-
       if (isUndefined(this.$route.meta.btnRules)) {
         return this.temInput;
       }
@@ -466,7 +465,12 @@ export default {
       let inputData = this.temInput
       const result = inputData[index];
       result.btnArray = result.btnArray.filter(item1 => {
-        return this.$route.meta.btnRules.includes(item1.label)
+        if (item1.menuCode) {
+          return this.$route.meta.btnRules.find(items => items.menuCode == item1.menuCode) != undefined ? true : false
+        } else {
+          return this.$route.meta.btnRules.find(items => items.menuName == item1.label) != undefined ? true : false
+        }
+
       })
       return inputData;
     },
@@ -484,7 +488,12 @@ export default {
       let tabBtnData = this.temTable
 
       tabBtnData['tableBtn'] = tabBtnData['tableBtn'].filter(item1 => {
-        return this.$route.meta.btnRules.includes(item1.label)
+        if (item1.menuCode) {
+
+          return this.$route.meta.btnRules.find(items => items.menuCode == item1.menuCode) != undefined ? true : false
+        } else {
+          return this.$route.meta.btnRules.find(items => items.menuName == item1.label) != undefined ? true : false
+        }
       })
       return tabBtnData;
     },