imatrix-ui 2.8.22 → 2.8.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.22",
+  "version": "2.8.23",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/super-grid/src/super-grid.vue

@@ -1388,10 +1388,29 @@ export default {
             JSON.parse(JSON.stringify(this.gridData))
           )
         } else {
-          return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
+          const isCanRefreshTableData = this.canRefreshTableData(gridParams)
+          if (isCanRefreshTableData) {
+            // 可以刷新表格记录
+            return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
+          } else {
+            // 子表无记录时不需要刷新子表记录
+            this.hasLoadData = true
+            gridParams.loaded = true
+          }
         }
       }
     },
+    canRefreshTableData (gridParams) {
+      let isCanRefreshTableData = false
+      if (gridParams.options && !gridParams.options.isFormSubTable) {
+        // 如果不是子表时
+        isCanRefreshTableData = true
+      } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.canRrefreshSubtableData !== undefined && gridParams.options.canRrefreshSubtableData === true) {
+        // 是子表，且配置了子表无记录时更新子表记录集合
+        isCanRefreshTableData = true
+      }
+      return isCanRefreshTableData
+    },
     getSubTableGridData(subTableData) {
       let gridData = subTableData
       if (this.isSubTableShowPage === true) {
@@ -2017,6 +2036,7 @@ export default {
     handleSizeChange(val) {
       if (!this.options || !this.options.isPageShow) {
         // console.log(`每页 ${val} 条`)
+        this.currentPage = 1
         this.pageSize = val
         this.changePage()
       }

package/src/styles/theme/gray/sidebar.scss

@@ -79,8 +79,11 @@
       }
 
       .el-menu {
+        position: static;
         border: none;
-        height: 100%;
+        // height: 100%;
+        height: auto;
+        max-height: 100vh;
         width: 100% !important;
         background-color: #FFF;
         color: #000D1F
@@ -188,13 +191,22 @@
     }
   }
 
+  .sidebar-container-popper .el-menu{
+    // height: 100vh;
+    height: auto;
+    max-height: 100vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+    scroll-behavior: smooth;
+  }
+
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
     font-weight: 500;
   }
 
-  .sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
+  .sidebar-container-popper .el-menu-item.is-active,.sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
     background-color: #EBECFF !important;
     color: #3D4CF2;
     font-weight: 500;

package/src/views/dsc-component/Sidebar/SidebarItem.vue

@@ -8,7 +8,7 @@
       </app-link>
     </template>
 
-    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" popper-class="sidebar-container-popper">
+    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" :popper-append-to-body="false" popper-class="sidebar-container-popper">
       <template v-slot:title>
         <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>