@idooel/components 0.0.1-beta.99 → 0.0.2

package/packages/table/src/index.vue

@@ -1,336 +1,290 @@
-<template>
-  <div class="g-table__wrapper" :style="{ height: `${height}px` }">
-    <a-table
-      :bordered="bordered"
-      :class="[isNoData && 'g-table__no-data']"
-      :style="{ height: noDataAntTableHeight }"
-      :pagination="false"
-      :loading="loading"
-      :columns="innerColumns"
-      :row-selection="rowSelection"
-      :row-class-name="setRowClassName"
-      :data-source="dataSource"
-      :scroll="getScroll">
-      <template slot="action" slot-scope="record">
-        <Actions v-on="$listeners" :data-source="actions" :record="record"></Actions>
-      </template>
-    </a-table>
-    <div class="g-table__pagination">
-      <a-pagination
-        :show-total="all => `共 ${all} 条数据`"
-        show-size-changer 
-        show-quick-jumper
-        :pageSize="innerPageSize"
-        :current="innerCurrentPage"
-        :pageSizeOptions="pageSizeOptions"
-        @change="onChangePagination"
-        @showSizeChange="onShowSizeChange"
-        :total="total">
-      </a-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import Actions from './action.vue'
-export default {
-  name: 'ele-table',
-  components: {
-    Actions
-  },
-  props: {
-    // ant table wrapper
-    height: {
-      type: Number
-    },
-    width: {
-      type: Number
-    },
-    x: {
-      type: Number,
-      default: 1200
-    },
-    y: {
-      type: Number,
-      default: 200
-    },
-    scroll: {
-      type: Object
-    },
-    rowSelection: {
-      type: Object
-    },
-    actions: {
-      type: Array,
-      default: () => []
-    },
-    total: {
-      type: Number,
-      default: 0
-    },
-    loading: {
-      type: Boolean,
-      default: false
-    },
-    columns: {
-      type: Array,
-      default: () => []
-    },
-    dataSource: {
-      type: Array,
-      default: () => []
-    },
-    pageSize: {
-      type: Number,
-      default: 10
-    },
-    pageSizeOptions: {
-      type: Array,
-      default: () => ['10', '20', '30', '40']
-    },
-    bordered: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      tableHeaderHeight: 0,
-      paginationHeight: 0,
-      innerPageSize: 10,
-      innerCurrentPage: 1,
-      tableContentHeight: 0,
-      obs: [],
-      tableTbodyHeight: 0
-    }
-  },
-  computed: {
-    innerColumns () {
-      return this.columns.filter(col => !Object.keys(col).includes('multiple'))
-    },
-    isNoData () {
-      return !this.dataSource.length
-    },
-    noDataAntTableHeight () {
-      //TODO
-      if (this.dataSource.length) {
-        // return 'auto'
-        return `${this.height - this.paginationHeight - 16}px` 
-      }
-      return `${this.height - this.paginationHeight - 16}px` 
-    },
-    getScrollHeightByHeight () {
-      const height = this.height - this.tableHeaderHeight - this.paginationHeight
-      if (this.tableTbodyHeight == 0) {
-        //暂无数据
-        document.querySelector('.ant-table-body') && (document.querySelector('.ant-table-body').style.height = 'auto')
-      } else if (this.tableTbodyHeight !== 0 && height > this.tableTbodyHeight) {
-        document.querySelector('.ant-table-content') && (document.querySelector('.ant-table-content').style.height = 'inherit')
-        document.querySelector('.ant-table-scroll') && (document.querySelector('.ant-table-scroll').style.height = 'inherit')
-        document.querySelector('.ant-table-body') && (document.querySelector('.ant-table-body').style.height = 'inherit')
-        if (this.tableTbodyHeight > height) {
-          document.querySelector('.ant-table-content').style.height = 'auto'
-          document.querySelector('.ant-table-scroll').style.height = 'auto'
-          document.querySelector('.ant-table-body').style.height = 'auto'
-        }
-        return 0
-        // 0的时候没有y滚动条
-      }
-      return this.height - this.tableHeaderHeight - this.paginationHeight
-    },
-    isFlexColumn () {
-      return this.columns.every(col => !col.width)
-    },
-    getScroll () {
-      if (this.scroll) {
-        return this.scroll
-      } else {
-        if (this.height) {
-          return { x: this.isFlexColumn ?  0 : this.width > this.x ? 0 : this.x, y: this.getScrollHeightByHeight }
-        }
-        return { x: this.isFlexColumn ? 0 : this.width > this.x ? 0 : this.x, y: this.y }
-      }
-    }
-  },
-  watch: {
-    pageSize: {
-      handler (pageSize) {
-        this.innerPageSize = pageSize
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    onShowSizeChange (current, pageSize) {
-      this.innerCurrentPage = current
-      this.innerPageSize = pageSize
-      this.$emit('change-page', current, pageSize)
-    },
-    setPaginationHeight () {
-      this.$nextTick(() => {
-        const { height } = document.querySelector('.g-table__pagination').getBoundingClientRect()
-        this.paginationHeight = height
-      })
-    },
-    setTableHeaderHeight () {
-      this.$nextTick(() => {
-        const el = document.querySelector('.ant-table-header')
-        if (!el) return
-        const { height } = el.getBoundingClientRect()
-        this.tableHeaderHeight = height
-      })
-    },
-    setTableTbodyHeight () {
-      const el = document.querySelector('table .ant-table-tbody')
-      const ob = new ResizeObserver((entries => {
-        if (this.tableHeaderHeight) return
-        for (const _ of entries) {
-          requestAnimationFrame(() => {
-            const { height } = el.getBoundingClientRect()
-            this.tableTbodyHeight = height
-            this.setTableHeaderHeight()
-          })
-        }
-      }))
-      ob.observe(el)
-      this.obs.push(ob)
-    },
-    setRowClassName (record, idx) {
-      return idx % 2 === 0 ? 'g-table__row--even' : 'g-table__row--odd'
-    },
-    onChangePagination (page, pageSize) {
-      this.innerCurrentPage = page
-      this.innerPageSize = pageSize
-      this.$emit('change-page', page, pageSize)
-    }
-  },
-  mounted() {
-    this.setPaginationHeight()
-    setTimeout(() => {
-      this.setTableTbodyHeight()
-    }, 100)
-  },
-  destroyed () {
-    this.obs.forEach(ob => ob.disconnect())
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.g-table__wrapper {
-  ::v-deep .ant-spin-nested-loading {
-    height: inherit;
-    .ant-table-fixed-header {
-      .ant-table-body-inner {
-        overflow: hidden;
-      }
-    }
-    .ant-spin-container {
-      height: inherit;
-      .ant-table {
-        height: inherit;
-        .ant-table-content {
-          // height: inherit;
-          // .ant-table-scroll {
-          //   height: inherit;
-          //   .ant-table-body {
-          //     height: inherit;
-          //   }
-          // }
-        }
-      }
-    }
-  }
-  ::v-deep .ant-table-wrapper {
-    .ant-table {
-      border-width: calc(var(--idooel-border-width) * 1px);
-      border-style: solid;
-      border-color: var(--idooel-border-color);
-    }
-    .ant-table-header {
-      .ant-table-fixed {
-        /* border-bottom: 2px solid #53a8ff !important; */
-      }
-      tr {
-        th {
-          border-bottom-width: calc(var(--idooel-border-width) * 1px);
-          border-bottom-style: solid;
-          border-bottom-color: var(--idooel-border-color);
-        }
-      }
-    }
-    .ant-table-tbody {
-      tr {
-        td {
-          border-color: var(--idooel-column-border-color);
-          border-width: calc(var(--idooel-column-border-width) * 1px);;
-          border-style: solid;
-          border-top: unset;
-          border-left: unset;
-        }
-      }
-    }
-    .ant-table-body {
-      // border-top-width: calc(var(--idooel-border-width) * 1px);
-      // border-top-style: solid;
-      // border-top-color: var(--idooel-border-color);
-    }
-    .ant-table-fixed-left {
-      border-bottom-width: calc(var(--idooel-border-width) * 1px);
-      border-bottom-style: solid;
-      border-bottom-color: var(--idooel-border-color);
-      .ant-table-header {
-        /* border-bottom-width: calc(var(--idooel-border-width) * 1px); */
-        /* border-bottom-style: solid; */
-        /* border-bottom-color: var(--idooel-border-color); */
-      }
-      .ant-table-body-inner {
-        border-right-width: calc(var(--idooel-border-width) * 1px);
-        border-right-style: solid;
-        border-right-color: var(--idooel-border-color);
-      }
-      .ant-table-fixed {
-        border-right-width: calc(var(--idooel-border-width) * 1px);
-        border-right-color: var(--idooel-border-color);
-        border-right-style: solid;
-      }
-    }
-    .ant-table-fixed-right {
-      .ant-table-header {
-        /* border-bottom-width: calc(var(--idooel-border-width) * 1px); */
-        /* border-bottom-color: var(--idooel-border-color); */
-        /* border-bottom-style: solid; */
-      }
-      // border-bottom-width: calc(var(--idooel-border-width) * 1px);
-      // border-bottom-style: solid;
-      // border-bottom-color: var(--idooel-border-color);
-      .ant-table-fixed {
-        border-left-width: calc(var(--idooel-border-width) * 1px);
-        border-left-style: solid;
-        border-left-color: var(--idooel-border-color);
-      }
-    }
-  }
-  padding: 16px;
-  padding-top: unset;
-  ::v-deep .g-table__row--even {
-    background: var(--idooel-row-even-color);
-  }
-  .g-table__row--odd {
-    background: var(--idooel-row-odd-color);
-  }
-  .g-table__pagination {
-    display: flex;
-    flex-direction: row;
-    justify-content: end;
-    border-width: calc(var(--idooel-border-width) * 1px);
-    border-color: var(--idooel-border-color);
-    border-style: solid;
-    border-top: unset;
-    padding-top: 8px;
-    padding-bottom: 8px;
-    position: relative;
-    z-index: 999;
-  }
-}
+<template>
+  <div class="g-table__wrapper" :style="wrapperStyle" :class="{ 'g-table--no-scroll-y': !needScrollY }">
+    <a-table
+      :bordered="bordered"
+      :class="[isNoData && 'g-table__no-data']"
+      :pagination="false"
+      :loading="loading"
+      :columns="innerColumns"
+      :row-selection="rowSelection"
+      :row-class-name="setRowClassName"
+      :data-source="dataSource"
+      :scroll="getScroll">
+      <template slot="action" slot-scope="record">
+        <Actions v-on="$listeners" :data-source="actions" :record="record"></Actions>
+      </template>
+    </a-table>
+    <div class="g-table__pagination">
+      <a-pagination
+        :show-total="all => `共 ${all} 条数据`"
+        show-size-changer 
+        show-quick-jumper
+        :pageSize="innerPageSize"
+        :current="innerCurrentPage"
+        :pageSizeOptions="pageSizeOptions"
+        @change="onChangePagination"
+        @showSizeChange="onShowSizeChange"
+        :total="total">
+      </a-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import Actions from './action.vue'
+export default {
+  name: 'ele-table',
+  components: {
+    Actions
+  },
+  props: {
+    // ant table wrapper
+    height: {
+      type: Number
+    },
+    width: {
+      type: Number
+    },
+    x: {
+      type: Number,
+      default: 1200
+    },
+    y: {
+      type: Number,
+      default: 200
+    },
+    scroll: {
+      type: Object
+    },
+    rowSelection: {
+      type: Object
+    },
+    actions: {
+      type: Array,
+      default: () => []
+    },
+    total: {
+      type: Number,
+      default: 0
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    dataSource: {
+      type: Array,
+      default: () => []
+    },
+    pageSize: {
+      type: Number,
+      default: 10
+    },
+    pageSizeOptions: {
+      type: Array,
+      default: () => ['10', '20', '30', '40']
+    },
+    bordered: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      tableHeaderHeight: 0,
+      paginationHeight: 0,
+      innerPageSize: 10,
+      innerCurrentPage: 1,
+      tableContentHeight: 0,
+      obs: []
+    }
+  },
+  computed: {
+    wrapperStyle () {
+      // 外层容器样式：确保分页始终可见，表格充满剩余空间
+      if (!this.height) return {}
+      return { height: `${this.height}px` }
+    },
+    needScrollY () {
+      // 判断是否需要 y 轴滚动：基于数据行数与可用高度预估
+      if (!this.height) return false
+      
+      const availableHeight = this.getScrollHeightByHeight
+      if (availableHeight <= 0) return false
+      
+      // 预估每行高度（包含边框），antd 默认约 54px
+      const estimatedRowHeight = 54
+      const estimatedTableHeight = this.dataSource.length * estimatedRowHeight
+      
+      return estimatedTableHeight > availableHeight
+    },
+    innerColumns () {
+      return this.columns.filter(col => !Object.keys(col).includes('multiple'))
+    },
+    isNoData () {
+      return !this.dataSource.length
+    },
+    getScrollHeightByHeight () {
+      // 始终返回可用的剩余高度，让表格内容不足时也能占满容器
+      return this.height - this.tableHeaderHeight - this.paginationHeight
+    },
+    isFlexColumn () {
+      return this.columns.every(col => !col.width)
+    },
+    getScroll () {
+      if (this.scroll) {
+        return this.scroll
+      } else {
+        const baseX = this.isFlexColumn ? 0 : (this.width > this.x ? 0 : this.x)
+        if (this.height) {
+          // 计算表体可用高度
+          const availableHeight = this.tableHeaderHeight && this.paginationHeight 
+            ? this.getScrollHeightByHeight 
+            : this.height - 100 // 预估值，给表头和分页留空间
+          
+          if (availableHeight > 50) { // 确保有足够的最小高度
+            console.log('Table scroll config:', { x: baseX, y: availableHeight, height: this.height, headerHeight: this.tableHeaderHeight, paginationHeight: this.paginationHeight })
+            return { x: baseX, y: availableHeight }
+          }
+        }
+        return { x: baseX }
+      }
+    }
+  },
+  watch: {
+    pageSize: {
+      handler (pageSize) {
+        this.innerPageSize = pageSize
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    onShowSizeChange (current, pageSize) {
+      this.innerCurrentPage = current
+      this.innerPageSize = pageSize
+      this.$emit('change-page', current, pageSize)
+    },
+    setPaginationHeight () {
+      this.$nextTick(() => {
+        const { height } = document.querySelector('.g-table__pagination').getBoundingClientRect()
+        this.paginationHeight = height
+      })
+    },
+    setTableHeaderHeight () {
+      this.$nextTick(() => {
+        const el = document.querySelector('.ant-table-header')
+        if (!el) return
+        const { height } = el.getBoundingClientRect()
+        this.tableHeaderHeight = height
+      })
+    },
+    setTableTbodyHeight () {
+      // 简化：仅需要获取表头高度，不再依赖表体高度的动态监听
+      this.$nextTick(() => {
+        this.setTableHeaderHeight()
+      })
+    },
+    setRowClassName (record, idx) {
+      return idx % 2 === 0 ? 'g-table__row--even' : 'g-table__row--odd'
+    },
+    onChangePagination (page, pageSize) {
+      this.innerCurrentPage = page
+      this.innerPageSize = pageSize
+      this.$emit('change-page', page, pageSize)
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.setPaginationHeight()
+      setTimeout(() => {
+        this.setTableTbodyHeight()
+        // 再测一次分页高度，确保初次渲染完成后数值准确
+        this.setPaginationHeight()
+      }, 200)
+    })
+  },
+  destroyed () {
+    this.obs.forEach(ob => ob.disconnect())
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.g-table__wrapper {
+  /* 外层采用列布局，确保分页始终可见，表格充满剩余空间 */
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  /* 表格区域占满剩余空间，启用纵向滚动 */
+  ::v-deep .ant-table-wrapper {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+
+  ::v-deep .ant-spin-nested-loading {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+
+  ::v-deep .ant-spin-container {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+
+  ::v-deep .ant-table {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+
+  /* 确保表体能够正常纵向滚动 */
+  ::v-deep .ant-table-content {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow: hidden;
+  }
+
+  ::v-deep .ant-table-scroll {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  ::v-deep .ant-table-header {
+    flex: 0 0 auto;
+    overflow: hidden;
+  }
+
+  ::v-deep .ant-table-body {
+    flex: 1 1 auto;
+    overflow: auto !important;
+    /* 确保滚动条稳定，避免列宽抖动 */
+    scrollbar-gutter: stable;
+  }
+
+  /* 分页区域固定在底部，不被挤出视口 */
+  .g-table__pagination {
+    flex: 0 0 auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: end;
+    border-top: unset;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    background: #fff;
+    z-index: 999;
+  }
+}
 </style>

package/packages/tabs/index.js

@@ -1,5 +1,5 @@
-import EleTabs from './src/index.vue'
-
-EleTabs.install = Vue => Vue.component(EleTabs.name, EleTabs)
-
+import EleTabs from './src/index.vue'
+
+EleTabs.install = Vue => Vue.component(EleTabs.name, EleTabs)
+
 export default EleTabs