高级筛选等组件同步更新

Code/Fe/src/components/ErrorLog/index.vue

@@ -1,15 +1,31 @@
 <template>
   <div v-if="errorLogs.length>0">
-    <el-badge :is-dot="true" style="line-height: 25px;margin-top: -5px;" @click.native="dialogTableVisible=true">
-      <el-button style="padding: 8px 10px;" size="small" type="danger">
-        <svg-icon icon-class="bug" />
+    <el-badge 
+      :is-dot="true" 
+      style="line-height: 10px;" 
+      @click.native="dialogTableVisible=true"
+    >
+      <el-button style="padding: 4px" size="small" type="danger">
+        <svg-icon icon-class="svg_bug" style="font-size: 16px;"/>
       </el-button>
     </el-badge>
 
-    <el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body>
+    <el-dialog 
+      :visible.sync="dialogTableVisible" 
+      width="80%" 
+      append-to-body
+      :close-on-click-modal="true"
+      :show-close="true"
+    >
       <div slot="title">
         <span style="padding-right: 10px;">Error Log</span>
-        <el-button size="mini" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>
+        <el-button 
+          size="mini" 
+          type="primary" 
+          icon="el-icon-delete" 
+          @click="clearAll"
+          style="float: right;margin-right: 30px;"
+        >清除全部</el-button>
       </div>
       <el-table :data="errorLogs" border>
         <el-table-column label="Message">

Code/Fe/src/components/addEditFromApiPop/index.vue

@@ -69,7 +69,7 @@
                     :disabled="Boolean(item.disabled)"
                   >
                     <el-option
-                      v-for="item in getItemEnums(item)"
+                      v-for="item in item.enums_list"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -247,24 +247,6 @@ export default {
         }
       })
     },
-    // 获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 关闭弹窗
     close() {
       this.show = false

Code/Fe/src/components/currenButton/innerButton.vue

@@ -16,9 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
       >{{ item.label }}</el-button>
-      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>

Code/Fe/src/components/currenDescriptions/index.vue

@@ -146,9 +146,11 @@ export default {
     // 转义枚举值
     initApiEnumList(item,data){
       let _item_enumList = {}
+      if(item.enums_list){
         item.enums_list.forEach((item,key)=>{
           _item_enumList[item.value] = item.label
         })
+      }
       return _item_enumList[data] || '未定义'
     },
   }

Code/Fe/src/components/filterForDetailPage/index.vue

@@ -30,6 +30,7 @@
                     :multipleSelection="multipleSelection"
                     :MaxResultCount="PageListParams.MaxResultCount"
                     :setUTableHeight="setUTableHeight"
+                    :selectMaxHeight="'116px'"
                     @topbutton="topbutton"
                     @inlineDialog="inlineDialog"
                     @sortChange="sortChange"

Code/Fe/src/components/searchOverall/index.vue

@@ -32,6 +32,7 @@
       <!-- 高级筛选界面 -->
       <div v-if="isShow && isShowMoreList" class="moreListOuter">
         <curren-Form
+          :style="`--navFilterMaxHeight: ${selectMaxHeight};`"
           class="navFilter"
           size="medium"
           labelWidth="0"
@@ -94,7 +95,7 @@
                     :rules="rules && rules.value ? rules.value : []"
                   >
                     <el-select
-                    v-if="Object.keys(inputOrSelect(item.column)).length > 0"
+                      v-if="inputOrSelect(item.column)"
                       v-model="item.value"
                       placeholder="请选择内容"
                       :disabled="item.column == '' || item.hide ? true : false"
@@ -103,9 +104,7 @@
                       clearable
                     >
                       <el-option
-                      v-for="item in $staticOptions[
-                        inputOrSelect(item.column).filters
-                      ]()"
+                        v-for="item in inputOrSelect(item.column)"
                         :key="item.value"
                         :label="item.label"
                         :value="
@@ -118,7 +117,7 @@
                     </el-select>
                     <!-- 日期时间 -->
                     <el-date-picker
-                  v-else-if="getColumnType(item.column) == 'dateTime'"
+                    v-else-if="getColumnType(item.column) == 'datetime'"
                       type="datetime"
                       v-model="item.value"
                       :placeholder="'选择日期时间'"
@@ -259,6 +258,11 @@ export default {
       }
     },
     props: {
+      // 筛选条件最大高度
+      selectMaxHeight:{
+        type: String,
+        default: '174px'
+      },
       // 筛选遮罩高度
       searchOverallCoverHeight:{
         type: String,
@@ -455,8 +459,8 @@ export default {
       getColumnType(val) {
         var columnsType = this.tableColumns.filter(item => item.prop == val)
         if (columnsType.length > 0) {
-        if (columnsType[0].type) {
-          return columnsType[0].type
+          if (columnsType[0].apiBaseType) {
+            return columnsType[0].apiBaseType
           } 
         }  else {
           return ''
@@ -497,19 +501,15 @@ export default {
       },
       // 设置moreList列表的内容项是input还是select
       inputOrSelect(val) {
-      let data
+        let data = null
         if (val) {
           this.tableColumns.forEach((key) => {
             if (val == key.prop) {
-            if (key.filters) {
-              data = key
-            } else {
-              data = {}
+              if (key.enums_list && key.enums_list.length > 0) {
+                data = key.enums_list
               } 
             }
           })
-      } else {
-        data = {}
         } 
         return data
       },

Code/Fe/src/components/searchOverall/style/index.scss

@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 170px;
+     max-height: var(--navFilterMaxHeight);
      overflow: auto;
   
      .el-form {

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}}</el-button>
       </div>
       <div class="query-box">
@@ -31,7 +31,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
     </div>
@@ -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}}</el-button>
         </template>
       </el-table-column>

Code/Fe/src/components/umyTable/index.vue

@@ -167,7 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
-          v-permission="itemButton.permission"
+          v-permission="itemButton.permission || []"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>