lambo-design-bi 0.0.173 → 0.0.175

package/bi/widget/num/index.vue

@@ -1,11 +1,12 @@
 <template>
   <LamboNumberInfoBi :title="title" :sub-title="subTitle" :num="num" :sub-num1="subNum1" :trend1="trend1"
-    :sub-num2="subNum2" :trend2="trend2" :polar1="polar1" :polar2="polar2">
+    :is-drill="isDrill" @on-drill="onDrill" :sub-num2="subNum2" :trend2="trend2" :polar1="polar1" :polar2="polar2">
   </LamboNumberInfoBi>
 </template>
 <script>
 import { getListMapData } from "../api/data"
 import LamboNumberInfoBi from "../../../pub/number-info/index"
+import { pageDrill } from '../util/router-util';
 
 export default {
   name: "BiNumIndex",
@@ -31,13 +32,27 @@ export default {
       polar1: null,
       subNum2: null,
       trend2: null,
-      polar2: null
+      polar2: null,
+      isDrill: false,
+      toPageId: null,
+      toRouteName: null,
+      drillK1: null,
+      drillV1: null,
+      drillK2: null,
+      drillV2: null,
+      drillK3: null,
+      dirllV3: null
     }
   },
   methods: {
     initConfig() {
       this.title = this.widget.options.title || this.widget.name || ''
       this.apiId = this.widget.options.apiId
+      this.toPageId = this.widget.options.toPageId
+      this.toRouteName = this.widget.options.toRouteName
+      if (this.toPageId && this.toRouteName) {
+        this.isDrill = true
+      }
     },
     doSearch() {
       if (!this.apiId) {
@@ -61,7 +76,19 @@ export default {
                 this.polar1 = row['polar1']
               }
               if (Object.prototype.hasOwnProperty.call(row, 'polar2')) {
-                this.polar2 = row['polar2'] 
+                this.polar2 = row['polar2']
+              }
+              if (Object.prototype.hasOwnProperty.call(row, 'drill_k1') && Object.prototype.hasOwnProperty.call(row, 'drill_v1')) {
+                this.drillK1 = row['drill_k1'] || ''
+                this.drillV1 = row['drill_v1'] || ''
+              }
+              if (Object.prototype.hasOwnProperty.call(row, 'drill_k2') && Object.prototype.hasOwnProperty.call(row, 'drill_v2')) {
+                this.drillK2 = row['drill_k2'] || ''
+                this.drillV2 = row['drill_v2'] || ''
+              }
+              if (Object.prototype.hasOwnProperty.call(row, 'drill_k3') && Object.prototype.hasOwnProperty.call(row, 'drill_v3')) {
+                this.drillK3 = row['drill_k3'] || ''
+                this.drillV3 = row['drill_v3'] || ''
               }
             }
           }
@@ -69,6 +96,32 @@ export default {
       }).catch(err => {
         console.error("数据卡片的调用服务[" + this.widget.options.apiId + "]异常：", err)
       })
+    },
+    async onDrill(obj) {
+      let drillKV = {}
+      if (this.drillK1 && this.drillV1) {
+        drillKV[this.drillK1] = this.drillV1
+      }
+      if (this.drillK2 && this.drillV2) {
+        drillKV[this.drillK2] = this.drillV2
+      }
+      if (this.drillK3 && this.drillV3) {
+        drillKV[this.drillK3] = this.drillV3
+      }
+      let drillParams = Object.assign({}, this.params, obj, drillKV)
+      try {
+        await pageDrill(
+          this.$router,
+          this.widget.rootId,
+          this.toPageId,
+          this.toRouteName,
+          drillParams
+        )
+        console.log('number 跳转成功')
+      } catch (error) {
+        console.error('num 跳转失败:', error.msg)
+        this.$message.error(error.msg)
+      }
     }
   },
   created() {

package/bi/widget/page/util/common.js

@@ -153,5 +153,4 @@ export function getSearchFormRes(formParams, pageWidget) {
     }
   }
   return emptySearchArr
-
 }

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

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <LamboPagingTableBi ref="table" :auto-search="false" :columns="columns" :dataUrl="widget.options.url"
-      :export-batch-size="20000" :show-table-option="true" :exportName="widget.name"
+      :export-batch-size="20000" :show-table-option="false" :exportName="widget.name"
       :page-disable="widget.options.isPaging === '0'" :page-size="widget.options.pageSize" :export-request-limit="200"
       :isSingleSelectModel="true" :showSummary="widget.options.isPageSum === '1'" :summary-method="handleSummary"
       @on-data-load="onDataLoad" :searchParams="tableSearchParams">
@@ -41,7 +41,7 @@ export default {
     },
     goDetail(routerName, pageId, row) {
       let parentPageId = this.widget.rootId || ''
-      let newQuery = Object.assign({}, this.params, row);
+      let newQuery = Object.assign({}, this.params, row)
       newQuery['pageId'] = pageId
       newQuery['parentPageId'] = parentPageId
       console.log("goDetail newQuery:", newQuery)

package/bi/widget/util/router-util.js

@@ -0,0 +1,101 @@
+/**
+ * 下钻页公共方法 (Promise)
+ * 
+ * @param {*} router Vue Router 实例
+ * @param {*} fromPageId 源页面ID
+ * @param {*} toPageId 目标页面ID
+ * @param {*} toRouteName 目标路由名称
+ * @param {*} dataObj 传递的数据对象
+ * @returns {Promise} 返回Promise对象
+ */
+export function pageDrill(router, fromPageId, toPageId, toRouteName, dataObj = {}) {
+  return new Promise((resolve, reject) => {
+    // 参数验证
+    if (!fromPageId) {
+      const error = {
+        code: RES_CODE.PARAM_ERROR,
+        msg: "页面跳转失败，跳转参数源页面编码为空",
+        data: fromPageId
+      }
+      console.error("drill 参数 fromPageId 无效:", fromPageId)
+      reject(error)
+      return
+    }
+    if (!toPageId) {
+      const error = {
+        code: RES_CODE.PARAM_ERROR,
+        msg: "页面跳转失败，跳转参数目标页面编码为空",
+        data: toPageId
+      }
+      console.error("drill 参数 toPageId 无效:", toPageId)
+      reject(error)
+      return
+    }
+    if (!toRouteName) {
+      const error = {
+        code: RES_CODE.PARAM_ERROR,
+        msg: "页面跳转失败，跳转参数目标路由名称为空",
+        data: toRouteName
+      }
+      console.error("drill 参数 toRouteName 无效:", toRouteName)
+      reject(error)
+      return
+    }
+
+    // 构造查询参数
+    const drillParams = {
+      ...dataObj,
+      pageId: toPageId,
+      parentPageId: fromPageId,
+      toRouteName: toRouteName
+    }
+    console.log("drill 下钻跳转参数 drillParams:", drillParams)
+
+    // 执行跳转
+    router.push({
+      name: toRouteName,
+      query: drillParams
+    })
+      .then(() => {
+        resolve({
+          code: RES_CODE.SUCCESS,
+          msg: "页面跳转成功",
+          data: null
+        })
+      })
+      .catch(error => {
+        console.error("drill 页面跳转失败:", error)
+
+        let errorMsg = "页面跳转失败，未知原因跳转失败"
+        let errorCode = RES_CODE.PAGE_ERROR
+
+        if (error.name === 'NavigationDuplicated') {
+          errorMsg = "页面跳转失败，跳转同一页面"
+        } else if (error.message && error.message.includes('not found')) {
+          errorMsg = "页面跳转失败，页面不存在"
+        }
+
+        reject({
+          code: errorCode,
+          msg: errorMsg,
+          data: error
+        })
+      })
+  })
+}
+
+/**
+ * 返回状态码
+ */
+export const RES_CODE = {
+  // 成功
+  SUCCESS: 1,
+  // 未知原因失败 
+  UNKNOWN_ERROR: 0,
+  // 参数异常
+  PARAM_ERROR: 1001,
+  // 页面异常
+  PAGE_ERROR: 3001,
+  // 系统异常
+  SYSTEM_ERROR: 5001
+}

package/package.json

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

package/pub/charts/factory/options.js

@@ -1398,11 +1398,14 @@ export function getECharts(type, dataX, dataY, dataDim) {
         })
         sum += dataY[0][i]
       }
-
+      let title33 = ''
+      if(dataDim && dataDim.length > 0){
+        title33 = formatTitle(dataDim[0])
+      }
       opt = {
         backgroundColor: '#fff',
         title: {
-          text: formatTitle(dataDim[0]),
+          text: title33,
           textAlign: 'center',
           textStyle: {
             fontSize: '10px',
@@ -1519,10 +1522,14 @@ export function getECharts(type, dataX, dataY, dataDim) {
           'value': dataY[0][i],
         });
       }
+      let title34 = ''
+      if(dataDim && dataDim.length > 0){
+        title34 = formatTitle(dataDim[0])
+      }
       opt = {
         backgroundColor: '#fff',
         title: {
-          text: formatTitle(dataDim[0]),
+          text: title34,
           textAlign: 'center',
           textStyle: {
             fontSize: '10px',

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

@@ -1,9 +1,11 @@
 <template>
   <div class="ivu-number-info">
-    <div class="ivu-number-info-title-lambo" v-if="title || $slots.title">
+    <div class="ivu-number-info-title-lambo title-div"
+    :class="{ 'isDrill': isDrill }" v-if="title || $slots.title" @click="drill">
       <slot name="title">{{ title }}</slot>
+      <Icon v-if="isDrill" type="ios-redo-outline" />
     </div>
-    <div class="ivu-number-info-subTitle" v-if="subTitle || $slots.subTitle">
+    <div v-if="subTitle" class="ivu-number-info-subTitle">
       <slot name="subTitle">{{ subTitle }}</slot>
     </div>
     <div class="ivu-number-info-value-lambo" :style="valueStyle">
@@ -56,7 +58,8 @@ export default {
       type: String
     },
     subTitle: {
-      type: String
+      type: String,
+      default: ''
     },
     num: {
       type: [String, Number]
@@ -71,7 +74,7 @@ export default {
     },
     polar1: {
       type: String,
-      required: false, 
+      required: false,
       validator(value) {
         return !value || ['pos', 'neg'].includes(value);
       }
@@ -86,7 +89,7 @@ export default {
     },
     polar2: {
       type: String,
-      required: false, 
+      required: false,
       validator(value) {
         return !value || ['pos', 'neg'].includes(value);
       }
@@ -94,6 +97,10 @@ export default {
     gap: {
       type: [String, Number],
       default: 6
+    },
+    isDrill: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -102,6 +109,12 @@ export default {
         'margin-top': this.gap + 'px'
       };
     }
+  },
+  methods: {
+    drill() {
+      console.log("number-info 点击了下钻按钮")
+      this.$emit('on-drill', {})
+    }
   }
 };
 </script>
@@ -124,4 +137,20 @@ export default {
   -webkit-transition: all .2s;
   transition: all .2s
 }
+
+.title-div {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    transition: all 0.2s ease;
+    border-radius: 5px;
+}
+
+.title-div.isDrill {
+    cursor: pointer;
+}
+
+.title-div.isDrill:hover {
+    transform: scale(1.02);
+}
 </style>

package/pub/table/paging-table/index.vue

@@ -218,7 +218,7 @@
       </div>
       </Col>
     </Row>
-    <Row style="margin-top:10px;">
+    <Row>
       <Col span="24">
       <Table v-if="hackReset" ref="tableRef" :border="tableBorder" :columns="tableColumns" :data="tableData"
         :disabledHover="disabledHover" :draggable="draggable" :height="tableHeight" :max-height="tableMaxHeight"