lambo-design-bi 0.0.243 → 0.0.244

package/bi/widget/table/paging-table.vue

@@ -1,10 +1,10 @@
 <template>
   <div style="width: 100%">
     <LamboPagingTableBi ref="table" :auto-search="false" :columns="columns" :dataUrl="widget.options.url"
-      :border="tableBorder" :show-table-option="true" :exportName="widget.name"
+      :border="tableBorder" :stripe="tableStripe" :show-table-option="true" :exportName="widget.name"
       :height="tableHeight" :page-disable="widget.options.isPaging === '0'" :page-size="widget.options.pageSize"
       :export-request-limit="200" :isSingleSelectModel="true" :showSummary="widget.options.isAllSum === '1'"
-      :summary-method="handleSummary" :highlightRow="isRowClick" @on-current-change="onCurrentChange"
+      :summary-method="handleSummary" :span-method="tableSpanMethod" :highlightRow="isRowClick" @on-current-change="onCurrentChange"
       @on-data-load="onDataLoad" :searchParams="tableSearchParams" :show-right-context-menu="hasRightContextMenu">
       <div slot="search"></div>
     </LamboPagingTableBi>
@@ -57,7 +57,8 @@ export default {
       previewFileName: '',
       boxShow: false,
       modelWidth: '78%',
-      tableBorder: true
+      tableBorder: true,
+      spanMap: {}
     }
   },
   methods: {
@@ -82,6 +83,7 @@ export default {
     onDataLoad(dataRes) {
       console.log("onDataLoad dataRes:", dataRes)
       const rows = dataRes && dataRes.data && dataRes.data.rows
+      this.rebuildSpanMap(rows) 
       if (this.isRowClick && rows && rows.length > 0) {
         this.$nextTick(() => {
           // 为了排到同一轮事件循环的后面，让 View UI 内部的 setTimeout 0 先跑完，不是为了延后时间多久
@@ -530,6 +532,71 @@ export default {
           this.tableBorder = false
         }
       }
+    },
+    isSpanColumn(column) {
+      return column && (column.isSpan === true || column.isSpan === '1' || column.isSpan === 'true')
+    },
+    getSpanColumnKeys() {
+      const columns = this.columns || []
+      const keys = []
+      columns.forEach(column => {
+        if (this.isSpanColumn(column) && column.key) {
+          keys.push(column.key)
+        }
+      })
+      return keys
+    },
+    // 根据当前数据行重新计算每个合并列的合并跨度
+    // 结构：spanMap[colKey][rowIndex] = rowspan（0 表示该单元格被上一行合并掉）
+    rebuildSpanMap(rows) {
+      const dataRows = Array.isArray(rows) ? rows : []
+      const spanKeys = this.getSpanColumnKeys()
+      if (!spanKeys.length || !dataRows.length) {
+        this.spanMap = {}
+        return
+      }
+      const spanMap = {}
+      spanKeys.forEach(colKey => {
+        const colSpan = new Array(dataRows.length).fill(1)
+        let groupStart = 0
+        for (let i = 1; i < dataRows.length; i++) {
+          const prevValue = dataRows[groupStart] ? dataRows[groupStart][colKey] : undefined
+          const currValue = dataRows[i] ? dataRows[i][colKey] : undefined
+          if (this.isSameSpanValue(prevValue, currValue)) {
+            colSpan[groupStart] += 1
+            colSpan[i] = 0
+          } else {
+            groupStart = i
+          }
+        }
+        spanMap[colKey] = colSpan
+      })
+      this.spanMap = spanMap
+    },
+    isSameSpanValue(a, b) {
+      // 空值（null/undefined/空字符串）不参与合并，避免把缺失值错误地合并在一起
+      if (a === null || a === undefined || a === '') {
+        return false
+      }
+      if (b === null || b === undefined || b === '') {
+        return false
+      }
+      return a === b
+    },
+    tableSpanMethod({ column, rowIndex }) {
+      const colKey = column && column.key
+      if (!colKey) {
+        return [1, 1]
+      }
+      const colSpan = this.spanMap[colKey]
+      if (!colSpan) {
+        return [1, 1]
+      }
+      const rowspan = colSpan[rowIndex]
+      if (rowspan === 0) {
+        return [0, 0]
+      }
+      return [rowspan || 1, 1]
     }
   },
   created() {
@@ -543,6 +610,14 @@ export default {
     isRowClick() {
       return this.widget.options.isRowClick === 1 || this.widget.options.isRowClick === '1'
     },
+    hasSpanColumn() {
+      // 列配置中存在 isSpan 列则启用单元格合并
+      return (this.columns || []).some(column => this.isSpanColumn(column))
+    },
+    tableStripe() {
+      // 出现合并列时关闭斑马，避免合并块与 stripe 视觉冲突；普通表格保留原生斑马
+      return !this.hasSpanColumn
+    },
     tableHeight() {
       const tableHeight = this.widget && this.widget.options ? this.widget.options.tableHeight : ''
       if (tableHeight === null || tableHeight === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambo-design-bi",
-  "version": "0.0.243",
+  "version": "0.0.244",
   "description": "Vue2 BI 数据可视化组件库",
   "main": "index.js",
   "author": "finch",

package/pub/number-info/number-info.vue

@@ -4,7 +4,6 @@
     <div class="ivu-number-info-title-lambo title-div" :class="{ 'isDrill': isDrill }" v-if="title" @click="drill">
       <slot name="title">{{ title }}</slot>
       <div class="cd-right-top">
-        <!-- <Icon type="ios-arrow-round-forward" /> -->
         <Icon v-if="isDrill" type="ios-arrow-round-forward" />
 
         <img class="badge-img" v-if="evaLevel == 'high'"