vue2-client 1.15.54 → 1.15.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.54",
+  "version": "1.15.57",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -878,7 +878,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' }),
+    ...mapState('account', { currUser: 'user', curRoles: 'roles', curPermissions: 'permissions' }),
     queryParamsName () {
       if (this.attr.keyName.startsWith('function')) {
         // 调用异步函数获取内容
@@ -1087,14 +1087,21 @@ export default {
     },
     async showFormItemFunc () {
       if (this.attr.showFormItemFunc) {
-        const obj = executeStrFunctionByContext(this, this.attr.showFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode, this.currUser.permissions, this.currUser.roles])
+        const obj = executeStrFunctionByContext(this, this.attr.showFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode, this.curPermissions, this.curRoles])
         // 判断是 bool 还是  obj  兼容
         if (typeof obj === 'boolean') {
           this.show = obj
         } else if (obj && typeof obj === 'object') {
           // obj 是一个对象，并且不是数组
-          this.show = obj?.show
-          this.readOnly = obj?.readOnly
+          if (obj.hasOwnProperty('show')) {
+            this.show = obj?.show
+          }
+          if (obj.hasOwnProperty('readOnly')) {
+            this.readOnly = obj?.readOnly
+          }
+          if (obj.hasOwnProperty('disabled')) {
+            this.disabled = obj?.disabled
+          }
         }
       } else {
         this.show = true
@@ -1102,14 +1109,21 @@ export default {
     },
     async showQueryFormItemFunc () {
       if (this.attr.showQueryFormItemFunc) {
-        const obj = executeStrFunctionByContext(this, this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode, this.currUser.permissions, this.currUser.roles])
+        const obj = executeStrFunctionByContext(this, this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode, this.curPermissions, this.curRoles])
         // 判断是 bool 还是  obj  兼容
         if (typeof obj === 'boolean') {
           this.show = obj
         } else if (obj && typeof obj === 'object') {
           // obj 是一个对象，并且不是数组
-          this.show = obj?.show
-          this.readOnly = obj?.readOnly
+          if (obj.hasOwnProperty('show')) {
+            this.show = obj?.show
+          }
+          if (obj.hasOwnProperty('readOnly')) {
+            this.readOnly = obj?.readOnly
+          }
+          if (obj.hasOwnProperty('disabled')) {
+            this.disabled = obj?.disabled
+          }
         }
       } else {
         this.show = true