lambo-design-bi 0.0.236 → 0.0.238

package/bi/widget/charts/index.vue

@@ -127,33 +127,75 @@ export default {
         })
       }
     },
-    buildLinkageParams(row) {
-      if (!row || !this.linkKeys) {
-        return {}
+    parseJsonConfig(value, errorMsg) {
+      if (typeof value !== 'string') {
+        return value
       }
-      let keyMap = this.linkKeys
-      if (typeof keyMap === 'string') {
+      const trimValue = value.trim()
+      if (!trimValue) {
+        return value
+      }
+      if ((trimValue.indexOf('{') === 0 && trimValue.lastIndexOf('}') === trimValue.length - 1)
+        || (trimValue.indexOf('[') === 0 && trimValue.lastIndexOf(']') === trimValue.length - 1)) {
         try {
-          keyMap = JSON.parse(keyMap)
+          return JSON.parse(trimValue)
         } catch (e) {
-          console.error("charts联动参数映射JSON解析异常:", this.linkKeys, e)
-          return {}
+          console.error(errorMsg, value, e)
         }
       }
+      return value
+    },
+    getLinkWidgetIds() {
+      if (typeof this.linkWidgetId !== 'string') {
+        return []
+      }
+      return this.linkWidgetId.split(',').map(item => item.trim()).filter(item => item)
+    },
+    isLinkWidget(sourceWidgetId) {
+      const linkWidgetIds = this.getLinkWidgetIds()
+      return linkWidgetIds.indexOf(String(sourceWidgetId)) > -1
+    },
+    getLinkKeyMap(sourceWidgetId) {
+      const keyMap = this.parseJsonConfig(this.linkKeys, "charts联动参数映射JSON解析异常:")
+      if (!keyMap || typeof keyMap !== 'object' || Array.isArray(keyMap)) {
+        return null
+      }
+      const widgetKeyMap = keyMap[sourceWidgetId] || keyMap[String(sourceWidgetId)]
+      if (widgetKeyMap && typeof widgetKeyMap === 'object' && !Array.isArray(widgetKeyMap)) {
+        return widgetKeyMap
+      }
+      return null
+    },
+    buildLinkageParams(row, sourceWidgetId) {
+      if (!row || !this.linkKeys) {
+        return {}
+      }
+      const keyMap = this.getLinkKeyMap(sourceWidgetId)
       if (!keyMap || typeof keyMap !== 'object' || Array.isArray(keyMap)) {
+        console.warn("charts联动参数映射无效:", {
+          sourceWidgetId,
+          linkWidgetId: this.linkWidgetId,
+          linkKeys: this.linkKeys,
+          keyMap
+        })
         return {}
       }
       const params = {}
       Object.keys(keyMap).forEach(paramKey => {
         params[paramKey] = row[keyMap[paramKey]]
       })
+      console.log("charts联动参数:", {
+        sourceWidgetId,
+        keyMap,
+        params
+      })
       return params
     },
     handleTableRowActivated(eventData) {
-      if (!this.linkWidgetId || !eventData || eventData.sourceWidgetId !== this.linkWidgetId) {
+      if (!eventData || !this.isLinkWidget(eventData.sourceWidgetId)) {
         return
       }
-      this.linkageParams = this.buildLinkageParams(eventData.currentRow)
+      this.linkageParams = this.buildLinkageParams(eventData.currentRow, eventData.sourceWidgetId)
       this.doSearch()
     }
   },

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

@@ -2,9 +2,9 @@
   <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"
-      :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"
+      :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"
       @on-data-load="onDataLoad" :searchParams="tableSearchParams" :show-right-context-menu="hasRightContextMenu">
       <div slot="search"></div>
     </LamboPagingTableBi>
@@ -543,6 +543,23 @@ export default {
     isRowClick() {
       return this.widget.options.isRowClick === 1 || this.widget.options.isRowClick === '1'
     },
+    tableHeight() {
+      const tableHeight = this.widget && this.widget.options ? this.widget.options.tableHeight : ''
+      if (tableHeight === null || tableHeight === undefined) {
+        return undefined
+      }
+      const trimHeight = String(tableHeight).trim()
+      const heightNumber = Number(trimHeight)
+      if (trimHeight && !isNaN(heightNumber) && heightNumber > 0) {
+        if (heightNumber <= 50) {
+          const headerHeight = 38.4
+          const rowHeight = 49.1
+          return headerHeight + heightNumber * rowHeight
+        }
+        return heightNumber
+      }
+      return undefined
+    },
     columns() {
       let columns = []
       if (this.widget && Object.prototype.hasOwnProperty.call(this.widget, "options") && Object.prototype.hasOwnProperty.call(this.widget.options, "columns")) {

package/package.json

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