+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- + 添加筛选条件
-
-
- 收起筛选
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/Code/Fe/src/components/searchOverall/style/index.scss b/Code/Fe/src/components/searchOverall/style/index.scss
index 8794ede..6bd0f43 100644
--- a/Code/Fe/src/components/searchOverall/style/index.scss
+++ b/Code/Fe/src/components/searchOverall/style/index.scss
@@ -1,4 +1,4 @@
- .searchOverallComponent{
+.searchOverallComponent{
height: 0;
transition:all 0.5s;
z-index: 1;
@@ -31,7 +31,7 @@
// flex-direction: column;
// width: 100%;
// height: 100%;
- max-height: 170px;
+ max-height: var(--navFilterMaxHeight);
overflow: auto;
.el-form {
diff --git a/Code/Fe/src/components/tableTree/index.vue b/Code/Fe/src/components/tableTree/index.vue
index bbcfc4f..4b723da 100644
--- a/Code/Fe/src/components/tableTree/index.vue
+++ b/Code/Fe/src/components/tableTree/index.vue
@@ -11,7 +11,7 @@
:icon="item.icon"
:size="item.size"
@click="headerButtonsHandle(item)"
- v-permission="item.permission"
+ v-permission="item.permission || []"
>{{item.label}}
@@ -31,7 +31,7 @@
:icon="item.icon"
:size="item.size"
@click="headerButtonsHandle(item)"
- v-permission="item.permission"
+ v-permission="item.permission || []"
>{{item.label}}
@@ -75,7 +75,7 @@
:style="item.style"
v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
:icon="item.icon"
- v-permission="item.permission"
+ v-permission="item.permission || []"
>{{item.label}}