Merge branch 'main' of github.com:mineadmin/MineAdmin-Vue

mineadmin · Apr 17, 2024 · e8f4f03 · e8f4f03
2 parents 0ab8844 + 7c179c1
commit e8f4f03
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/components/ma-form/containerItem/card.vue b/src/components/ma-form/containerItem/card.vue
@@ -9,7 +9,10 @@
 -->
 <template>
   <a-card
-    v-if="(typeof props.component?.display == 'undefined' || props.component?.display === true)"
+    v-if="(typeof props.component?.display == 'undefined' ||
+     props.component?.display === true) &&
+     (hasDisplayTrue((props.component?.formList ?? [])) ||
+     props.component?.forceShow)"
     :class="[props.component?.customClass]"
     :extra="props.component?.extra"
     :bordered="props.component?.bordered"
@@ -53,8 +56,13 @@ const props = defineProps({ component: Object })
 const formModel = inject('formModel')
 const getColumnService= inject('getColumnService')
 const columns = inject('columns')
+
+const hasDisplayTrue = (list) => {
+  return list.some(item => item.display === true);
+}
+
 const rv = async (ev, value = undefined) => await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
 
 rv('onCreated')
 onMounted(() => rv('onMounted'))
-</script>
+</script>
diff --git a/src/directives/role/index.js b/src/directives/role/index.js
@@ -11,7 +11,7 @@ const checkRole = (el, binding) => {
       })
 
       if (!isHas && el.parentNode) {
-        el.parentNode.removeChild(el)
+        el.parentNode.remove()
       }
     }
   } else {