lambo-design-bi 0.0.253 → 0.0.255

package/bi/widget/page/child-page-tm.vue

@@ -30,6 +30,7 @@ import { deepCopy } from "@lambo-design/shared/utils/assist"
 import { getWidgetName } from '../util/widget-map'
 import { setRouteCfg2Search, getInitSearchRes, getSearchFormRes } from './util/common'
 import { EventBus, EVENT_TYPES } from '../util/event-bus'
+import { clearDimensionState } from '../util/dimension-state'
 
 export default {
   name: 'BiChildPageTm',
@@ -116,6 +117,9 @@ export default {
     }
   },
   created() {
+    // 每页开始先清空维度列显隐单例，避免从上一个维度报表带入残留；
+    // 本页若有维度查询表单，其 created 会重新写入
+    clearDimensionState()
     this.getConfig()
   },
   mounted() {
@@ -135,16 +139,20 @@ export default {
   },
   computed: {
     shouldShowLamboIndicator() {
-      if (!this.childPageWidget ||
-        !this.childPageWidget.search ||
-        !this.childPageWidget.search.widgets) {
+      if (!this.childPageWidget || !this.childPageWidget.search) {
         return false
       }
-      // 过滤出searchType不等于'A0'的widgets
-      const filteredWidgets = this.childPageWidget.search.widgets.filter(item =>
+      // 过滤出searchType不等于'A0'的普通查询条件
+      const normalWidgets = (this.childPageWidget.search.widgets || []).filter(item =>
         item && item.options && item.options.searchType !== 'A0'
       )
-      return filteredWidgets.length > 0
+      if (normalWidgets.length > 0) {
+        return true
+      }
+      // 只有维度条件时也展示（v1只取dims[0]）
+      const dims = (this.childPageWidget.search.options && this.childPageWidget.search.options.dims) || []
+      return dims.length > 0 && (((dims[0].widgets || []).length > 0) ||
+        ((dims[0].options && dims[0].options.dataList) || []).length > 0)
     }
   },
   beforeDestroy() {

package/bi/widget/page/index-page-tm.vue

@@ -27,6 +27,7 @@ import { deepCopy } from "@lambo-design/shared/utils/assist"
 import { getWidgetName } from '../util/widget-map'
 import { setRouteCfg2Search, getInitSearchRes, getSearchFormRes } from './util/common'
 import { EventBus, EVENT_TYPES } from '../util/event-bus'
+import { clearDimensionState } from '../util/dimension-state'
 
 export default {
   name: 'BiIndexPageTm',
@@ -110,6 +111,9 @@ export default {
     }
   },
   created() {
+    // 每页开始先清空维度列显隐单例，避免从上一个维度报表带入残留；
+    // 本页若有维度查询表单，其 created 会重新写入
+    clearDimensionState()
     this.getConfig()
   },
   mounted() {
@@ -119,16 +123,20 @@ export default {
   },
   computed: {
     shouldShowLamboIndicator() {
-      if (!this.pageWidget ||
-        !this.pageWidget.search ||
-        !this.pageWidget.search.widgets) {
+      if (!this.pageWidget || !this.pageWidget.search) {
         return false
       }
-      // 过滤出searchType不等于'A0'的widgets
-      const filteredWidgets = this.pageWidget.search.widgets.filter(item =>
+      // 过滤出searchType不等于'A0'的普通查询条件
+      const normalWidgets = (this.pageWidget.search.widgets || []).filter(item =>
         item && item.options && item.options.searchType !== 'A0'
       )
-      return filteredWidgets.length > 0
+      if (normalWidgets.length > 0) {
+        return true
+      }
+      // 只有维度条件时也展示（v1只取dims[0]）
+      const dims = (this.pageWidget.search.options && this.pageWidget.search.options.dims) || []
+      return dims.length > 0 && (((dims[0].widgets || []).length > 0) ||
+        ((dims[0].options && dims[0].options.dataList) || []).length > 0)
     }
   },
   beforeDestroy() {

package/bi/widget/search/search-form.vue

@@ -1,12 +1,39 @@
 <template>
-  <div class="bi-search-form" v-if="widget.widgets && widget.widgets.length > 0">
+  <div class="bi-search-form" v-if="hasSearchContent">
     <LamboQueryFilter :default-rows="2" :label-width="150" :span="8" :showSearchIcon="true" :autocomplete="'on'" :hideResetButton="true" @do-search="doSearch" @on-reset="onReset">
-      <div v-for="(item, index) in widget.widgets" :key="index">
-        <FormItem v-if="item.options.searchType !== 'A0'" :label="item.name">
+      <!-- 普通查询条件 -->
+      <div v-for="(item, index) in normalWidgets" :key="'search-' + index">
+        <FormItem :label="item.name">
           <BiSearchItem :widget="item"></BiSearchItem>
         </FormItem>
       </div>
     </LamboQueryFilter>
+    <!-- 维度区固定在查询按钮下方：标签 + 明细下拉；明细默认收起，开关追加在标签后方 -->
+    <Form v-if="dimTagOptions.length > 0" class="bi-dim-form" label-position="right" :label-width="150">
+      <FormItem :label="dimensionLabel">
+        <div class="bi-dim-tags-row">
+          <div class="bi-dim-tags-row__tags">
+            <BiTagSelect v-model="dimSelected" :options="dimTagOptions" @on-change="onDimTagsChange"></BiTagSelect>
+          </div>
+          <Button type="text" class="bi-dim-detail-toggle" :title="dimDetailsCollapsed ? '展开维度明细' : '收起维度明细'"
+            @click="dimDetailsCollapsed = !dimDetailsCollapsed">
+            <Icon :type="'ios-arrow-down'" :size="16"
+              :class="{ 'bi-dim-detail-toggle__icon--open': !dimDetailsCollapsed }" />
+          </Button>
+        </div>
+      </FormItem>
+      <div v-show="!dimDetailsCollapsed" class="bi-dim-details">
+        <Row>
+          <!-- 栅格与普通查询条件一致：固定 span=8（QueryFilter 传 span=8），一行三个 -->
+          <Col v-for="(dim, index) in dimensionWidgets" :key="'dimension-' + (dim.id || index)" :span="8">
+            <!-- 下拉框始终展示，未选标签/未选明细时为空态，只控制列显隐，不上送查询参数 -->
+            <FormItem :label="dim.name">
+              <BiSearchItem :widget="dim" :data-list="getDimDataList(dim)"></BiSearchItem>
+            </FormItem>
+          </Col>
+        </Row>
+      </div>
+    </Form>
   </div>
 </template>
 <script>
@@ -14,6 +41,7 @@ import LamboQueryFilter from "@lambo-design/query-filter"
 import { deepCopy } from "@lambo-design/shared/utils/assist"
 import moment from 'moment'
 import BiSearchItem from "./search-item.vue"
+import BiTagSelect from "./tag-select.vue"
 import {
   SEARCH_DICT,
   DATE_RANGE_PFIX,
@@ -21,10 +49,12 @@ import {
   DEFAULT_YEAR_FORMAT,
   DEFAULT_MONTH_FORMAT
 } from '../../../util/constants'
+import { EventBus, EVENT_TYPES } from '../util/event-bus'
+import { setDimensionBlock, clearDimensionState } from '../util/dimension-state'
 
 export default {
   name: 'BiSearchForm',
-  components: { LamboQueryFilter, BiSearchItem },
+  components: { LamboQueryFilter, BiSearchItem, BiTagSelect },
   props: {
     widget: {
       type: Object,
@@ -33,49 +63,270 @@ export default {
   },
   data() {
     return {
-      cacheWidget: {}
+      cacheWidget: {},
+      // 维度明细默认收起，开关在维度标签后方
+      dimDetailsCollapsed: true
+    }
+  },
+  computed: {
+    // 普通查询条件（隐形查询条件A0不展示，但仍参与传参）
+    normalWidgets() {
+      let list = this.widget.widgets || []
+      return list.filter(item => item && item.options && item.options.searchType !== SEARCH_DICT.NOT_SHOW_INPUT.id)
+    },
+    // 维度区块节点：后端输出在 search.options.dims，v1 只支持一个维度块
+    dimensionBlock() {
+      let dims = this.widget.options && this.widget.options.dims
+      return Array.isArray(dims) && dims.length > 0 ? dims[0] : null
+    },
+    dimensionWidgets() {
+      return (this.dimensionBlock && this.dimensionBlock.widgets) || []
+    },
+    dimensionLabel() {
+      return (this.dimensionBlock && this.dimensionBlock.name) || '统计维度'
+    },
+    hasSearchContent() {
+      return this.normalWidgets.length > 0 || this.dimTagOptions.length > 0
+    },
+    // 维度标签的可选项：取维度容器自身的 dataList（K 与明细的 pDimKey 对应）
+    dimTagOptions() {
+      let dataList = (this.dimensionBlock && this.dimensionBlock.options && this.dimensionBlock.options.dataList) || []
+      return dataList.map(item => ({ K: item.K, V: item.V }))
+    },
+    // 已选维度标识，代理到 dimension.options.val
+    dimSelected: {
+      get() {
+        let val = this.dimensionBlock && this.dimensionBlock.options && this.dimensionBlock.options.val
+        return Array.isArray(val) ? val : []
+      },
+      set(val) {
+        if (this.dimensionBlock && this.dimensionBlock.options) {
+          this.$set(this.dimensionBlock.options, 'val', val)
+        }
+      }
+    },
+  },
+  watch: {
+    // 维度标签/明细值/级联变化后，修剪失效明细值并广播列显隐
+    'widget.options.dims': {
+      deep: true,
+      handler() {
+        if (!this.dimensionBlock) {
+          clearDimensionState()
+          EventBus.$emit(EVENT_TYPES.DIMENSION_COLUMNS_CHANGED, {})
+          return
+        }
+        this.syncCheckedTagsFromDetails()
+        this.syncEmptyDetailTags()
+        this.pruneInvalidDimVals()
+        this.scheduleDimPublish()
+      }
     }
   },
   methods: {
+    // 维度标识：明细用 pDimKey 关联容器标签（容器 dataList 的 K），缺退化 qKey/id
+    getDimKey(item) {
+      return (item.options && (item.options.pDimKey || item.options.qKey)) || item.id
+    },
+    // 多选明细默认全选（取 dataList 全部 K；级联过滤仍在下拉数据与修剪环节生效）
+    fillDimDetailAll(dim) {
+      if (!dim.options || dim.options.searchType !== SEARCH_DICT.MUlTI_SELECT.id) {
+        return
+      }
+      let allKs = (dim.options.dataList || [])
+        .map(row => row && row.K)
+        .filter(k => k !== undefined && k !== null && k !== '')
+      this.$set(dim.options, 'val', allKs)
+      this.$set(dim.options, 'valName', '')
+    },
+    onDimTagsChange(selected) {
+      // 对比变更前的标签：取消勾选清空明细值；新勾选的多选明细默认全选
+      let prev = this._prevDimTags || []
+      this.dimensionWidgets.forEach(item => {
+        if (!item.options) {
+          return
+        }
+        let dimKey = this.getDimKey(item)
+        if (selected.indexOf(dimKey) === -1) {
+          let resetVal = Array.isArray(item.options.val) ? [] : ''
+          this.$set(item.options, 'val', resetVal)
+          this.$set(item.options, 'valName', '')
+        } else if (prev.indexOf(dimKey) === -1 && item.options.searchType === SEARCH_DICT.MUlTI_SELECT.id) {
+          this.fillDimDetailAll(item)
+        }
+      })
+      this._prevDimTags = selected.slice()
+    },
+    // 联动：明细下拉直接选择了值时，自动勾选对应维度标签（与清空明细取消标签对称）
+    syncCheckedTagsFromDetails() {
+      let selected = this.dimSelected.slice()
+      let changed = false
+      this.dimensionWidgets.forEach(item => {
+        if (!item.options) {
+          return
+        }
+        let dimKey = this.getDimKey(item)
+        if (selected.indexOf(dimKey) > -1) {
+          return
+        }
+        let val = item.options.val
+        let hasVal = Array.isArray(val) ? val.length > 0 : (val !== '' && val !== null && val !== undefined)
+        if (hasVal) {
+          selected.push(dimKey)
+          changed = true
+        }
+      })
+      if (changed) {
+        this.dimSelected = selected
+        this._prevDimTags = selected.slice()
+      }
+    },
+    // 联动：标签选中但多选明细被清空（一个都不选）时，自动取消该标签
+    syncEmptyDetailTags() {
+      let selected = this.dimSelected.slice()
+      let changed = false
+      this.dimensionWidgets.forEach(item => {
+        if (!item.options || item.options.searchType !== SEARCH_DICT.MUlTI_SELECT.id) {
+          return
+        }
+        let dimKey = this.getDimKey(item)
+        if (selected.indexOf(dimKey) === -1) {
+          return
+        }
+        if (Array.isArray(item.options.val) && item.options.val.length === 0) {
+          selected = selected.filter(k => k !== dimKey)
+          changed = true
+        }
+      })
+      if (changed) {
+        this.dimSelected = selected
+        this._prevDimTags = selected.slice()
+      }
+    },
+    /**
+     * 获取维度明细的下拉数据（级联时按父维度选中值静态过滤 dataList）
+     * cascade: { parentQKey: 父维度qKey, refKey: 本维度数据中关联父维度值的字段（缺省取parentQKey） }
+     * 父维度未选标签/未选明细值时不加约束；后续若改为接口级联可在此处扩展
+     */
+    getDimDataList(dim, visiting) {
+      let rawList = (dim.options && dim.options.dataList) || []
+      let cascade = dim.options && dim.options.cascade
+      if (!cascade || !cascade.parentQKey) {
+        return rawList
+      }
+      visiting = visiting || []
+      let dimKey = this.getDimKey(dim)
+      if (visiting.indexOf(dimKey) > -1) {
+        return rawList // 级联环保护
+      }
+      let parent = this.dimensionWidgets.find(item => this.getDimKey(item) === cascade.parentQKey)
+      if (!parent || !parent.options) {
+        return rawList
+      }
+      // 父维度标签未选中时不加约束
+      if (this.dimSelected.indexOf(cascade.parentQKey) === -1) {
+        return rawList
+      }
+      let parentVals = parent.options.val
+      if (!Array.isArray(parentVals) || parentVals.length === 0) {
+        return rawList // 父维度没有选中明细值，不加约束
+      }
+      // 父级合法值需同时满足父级自身的级联过滤结果
+      let legalParentKs = this.getDimDataList(parent, visiting.concat(dimKey)).map(row => row && row.K)
+      let allowVals = parentVals.filter(v => legalParentKs.indexOf(v) > -1)
+      if (allowVals.length === 0) {
+        return rawList
+      }
+      let refKey = cascade.refKey || cascade.parentQKey
+      return rawList.filter(row => row && allowVals.indexOf(row[refKey]) > -1)
+    },
+    // 修剪维度明细中已不在有效下拉列表内的值（仅处理下拉类型10/20）
+    pruneInvalidDimVals() {
+      this.dimensionWidgets.forEach(item => {
+        if (!item.options) {
+          return
+        }
+        let searchType = item.options.searchType
+        if (searchType !== SEARCH_DICT.SINGLE_SELECT.id && searchType !== SEARCH_DICT.MUlTI_SELECT.id) {
+          return
+        }
+        let legalKs = this.getDimDataList(item).map(row => row && row.K)
+        let val = item.options.val
+        if (Array.isArray(val)) {
+          if (val.length === 0) {
+            return
+          }
+          let kept = val.filter(v => legalKs.indexOf(v) > -1)
+          if (kept.length !== val.length) {
+            this.$set(item.options, 'val', kept)
+          }
+        } else if (val !== '' && val !== null && val !== undefined) {
+          if (legalKs.indexOf(val) === -1) {
+            this.$set(item.options, 'val', '')
+          }
+        }
+      })
+    },
+    // 维度变化只影响列显隐，合并到 nextTick 广播一次，避免修剪引发的重复触发
+    scheduleDimPublish() {
+      if (this._dimPublishScheduled) {
+        return
+      }
+      this._dimPublishScheduled = true
+      this.$nextTick(() => {
+        this._dimPublishScheduled = false
+        this.publishDimensionState()
+      })
+    },
+    publishDimensionState() {
+      let visibility = setDimensionBlock(this.dimensionBlock)
+      console.log('publish visibility:', JSON.parse(JSON.stringify(visibility || {})))
+      EventBus.$emit(EVENT_TYPES.DIMENSION_COLUMNS_CHANGED, visibility)
+    },
+    // 按单个查询项配置组装查询参数（仅普通查询项；维度不上送）
+    appendItemParams(params, item) {
+      if (item.options && Object.prototype.hasOwnProperty.call(item.options, "qKey")) {
+        let qKey = item.options.qKey
+        if (Object.prototype.hasOwnProperty.call(item.options, "val") && item.options.val) {
+          let val = item.options.val
+          if (Array.isArray(val)) {
+            if (item.options.searchType === SEARCH_DICT.MUlTI_DATE.id) {
+              if (val && Array.isArray(val) && val.length === 2 && val[0] && val[1]) {
+                params[qKey + DATE_RANGE_PFIX.START] = moment(val[0]).format(DEFAULT_DATE_FORMAT)
+                params[qKey + DATE_RANGE_PFIX.END] = moment(val[1]).format(DEFAULT_DATE_FORMAT)
+              }
+            } else {
+              params[qKey] = val.join()
+            }
+          } else {
+            if (item.options.searchType === SEARCH_DICT.SINGLE_DATE.id) {
+              params[qKey] = moment(val).format(DEFAULT_DATE_FORMAT)
+            } else if (item.options.searchType === SEARCH_DICT.SINGLE_YEAR.id) {
+              params[qKey] = moment(val).format(DEFAULT_YEAR_FORMAT)
+            } else if (item.options.searchType === SEARCH_DICT.SINGLE_MONTH.id) {
+              params[qKey] = moment(val).format(DEFAULT_MONTH_FORMAT)
+            }
+            else {
+              params[qKey] = val
+            }
+          }
+        }
+        // TODO：这里传null还是不传后面看下
+        // else {
+        //   params[qKey] = null
+        // }
+      }
+    },
     doSearch() {
       let params = {}
       let searchList = this.widget.widgets
       console.log("search-from doSearch this.widget.widgets:", searchList)
       if (searchList) {
         searchList.map(item => {
-          if (item.options && Object.prototype.hasOwnProperty.call(item.options, "qKey")) {
-            let qKey = item.options.qKey
-            if (Object.prototype.hasOwnProperty.call(item.options, "val") && item.options.val) {
-              let val = item.options.val
-              if (Array.isArray(val)) {
-                if (item.options.searchType === SEARCH_DICT.MUlTI_DATE.id) {
-                  if (val && Array.isArray(val) && val.length === 2 && val[0] && val[1]) {
-                    params[qKey + DATE_RANGE_PFIX.START] = moment(val[0]).format(DEFAULT_DATE_FORMAT)
-                    params[qKey + DATE_RANGE_PFIX.END] = moment(val[1]).format(DEFAULT_DATE_FORMAT)
-                  }
-                } else {
-                  params[qKey] = val.join()
-                }
-              } else {
-                if (item.options.searchType === SEARCH_DICT.SINGLE_DATE.id) {
-                  params[qKey] = moment(val).format(DEFAULT_DATE_FORMAT)
-                } else if (item.options.searchType === SEARCH_DICT.SINGLE_YEAR.id) {
-                  params[qKey] = moment(val).format(DEFAULT_YEAR_FORMAT)
-                } else if (item.options.searchType === SEARCH_DICT.SINGLE_MONTH.id) {
-                  params[qKey] = moment(val).format(DEFAULT_MONTH_FORMAT)
-                }
-                else {
-                  params[qKey] = val
-                }
-              }
-            }
-            // TODO：这里传null还是不传后面看下
-            // else {
-            //   params[qKey] = null
-            // }
-          }
+          this.appendItemParams(params, item)
         })
       }
+      // 维度（标签/明细）只控制表格列显隐，不进查询参数
       console.log("search-from doSearch params:", params)
       this.$emit("on-search", params)
     },
@@ -87,11 +338,49 @@ export default {
           this.$set(this.widget, 'widgets', cacheSearchList)
         }
       }
+      // 维度区块一并恢复缓存（含标签选中和明细值），watcher 会重新广播列显隐
+      if (this.cacheWidget && this.cacheWidget.options && Object.prototype.hasOwnProperty.call(this.cacheWidget.options, "dims")) {
+        this.$set(this.widget.options, 'dims', deepCopy(this.cacheWidget.options.dims))
+        let resetVal = this.dimensionBlock && this.dimensionBlock.options && this.dimensionBlock.options.val
+        this._prevDimTags = Array.isArray(resetVal) ? resetVal.slice() : []
+      }
       this.doSearch()
     }
   },
   created() {
     console.log("search-form created -- widget:", this.widget)
+    let dims = this.widget.options && this.widget.options.dims
+    if (Array.isArray(dims) && dims.length > 1) {
+      console.warn("search-form -- v1仅支持一个维度块，忽略其余dims数量:", dims.length - 1)
+    }
+    if (this.dimensionBlock) {
+      if (!this.dimensionBlock.options) {
+        this.$set(this.dimensionBlock, 'options', {})
+      }
+      let blockOptions = this.dimensionBlock.options
+      if (!Array.isArray(blockOptions.val)) {
+        this.$set(blockOptions, 'val', blockOptions.val ? String(blockOptions.val).split(',') : [])
+      }
+      // 多选下拉的明细值规范为数组
+      this.dimensionWidgets.forEach(item => {
+        if (item.options && item.options.searchType === SEARCH_DICT.MUlTI_SELECT.id && !Array.isArray(item.options.val)) {
+          this.$set(item.options, 'val', item.options.val ? String(item.options.val).split(',') : [])
+        }
+      })
+      this._prevDimTags = (Array.isArray(blockOptions.val) ? blockOptions.val : []).slice()
+      // 默认已勾选标签（如 ALL_SELECT）的多选明细，空值补全为全选，保持初始全部列可见
+      this.dimensionWidgets.forEach(item => {
+        if (item.options && item.options.searchType === SEARCH_DICT.MUlTI_SELECT.id
+          && this._prevDimTags.indexOf(this.getDimKey(item)) > -1
+          && Array.isArray(item.options.val) && item.options.val.length === 0) {
+          this.fillDimDetailAll(item)
+        }
+      })
+      // 初始列显隐写入共享状态（表格创建时直接读取，无需等事件）
+      setDimensionBlock(this.dimensionBlock)
+    } else {
+      clearDimensionState()
+    }
   },
   mounted() {
     this.cacheWidget = deepCopy(this.widget)
@@ -104,5 +393,68 @@ export default {
   ::v-deep .ivu-form-item {
     margin-bottom: 8px;
   }
+
+  /* 维度区与普通查询条件同属一个 Form 视觉流：
+     不额外加上间距（QueryFilter 末行 FormItem 的 margin-bottom 已提供行间距），
+     label 右对齐 150px、FormItem 8px 间距均沿用 iView/外层 scoped 规则 */
+  .bi-dim-form {
+    margin-top: 0;
+  }
+
+  /* 覆盖 label-left 的左对齐为右对齐：仅作用于维度区，不影响其他表单；
+     !important 防止被 iView 内置 .ivu-form-label-left 规则压过 */
+  .bi-dim-form ::v-deep .ivu-form-item-label {
+    text-align: right !important;
+    padding-left: 0 !important;
+  }
+
+  /* 标签复选框与明细折叠图标同一行：标签占满剩余空间，图标固定右侧 */
+  .bi-dim-tags-row {
+    display: flex;
+    align-items: center;
+  }
+
+  .bi-dim-tags-row__tags {
+    flex: 1;
+    min-width: 0;
+  }
+
+  .bi-dim-detail-toggle {
+    flex: none;
+    width: 24px;
+    height: 32px;
+    margin-left: 4px;
+    padding: 0;
+    line-height: 1;
+    color: #808695;
+  }
+
+  .bi-dim-detail-toggle:hover {
+    color: var(--primary-color, #2d8cf0);
+  }
+
+  .bi-dim-detail-toggle ::v-deep i {
+    line-height: 1;
+    transition: transform .2s ease;
+  }
+
+  .bi-dim-detail-toggle ::v-deep .bi-dim-detail-toggle__icon--open {
+    transform: rotate(180deg);
+  }
+
+  /* 明细区紧跟标签行，行距与普通条件行间距一致（8px 来自 FormItem margin） */
+  .bi-dim-details {
+    margin-top: 0;
+  }
+
+  /* element-ui 多选下拉已选标签默认 12px，归一为 iView 控件文字 14px，
+     与普通查询条件视觉一致（仅作用于维度区，不改公共多选组件） */
+  .bi-dim-form ::v-deep .el-select__tags-text {
+    font-size: 14px;
+  }
+
+  .bi-dim-form ::v-deep .el-tag--mini {
+    font-size: 14px;
+  }
 }
 </style>

package/bi/widget/search/search-item.vue

@@ -13,11 +13,11 @@
     </div>
     <div v-else-if="widget.options.searchType === searchDict.SINGLE_SELECT.id"> <!-- 单选下拉框 -->
       <Select v-model="widget.options.val" class="lambo-query-class" filterable :clearable="true" placeholder="请选择">
-        <Option v-for="(item, index) in widget.options.dataList" :key="index" :value="item.K"> {{ item.V }}</Option>
+        <Option v-for="(item, index) in effectiveDataList" :key="index" :value="item.K"> {{ item.V }}</Option>
       </Select>
     </div>
     <div v-else-if="widget.options.searchType === searchDict.MUlTI_SELECT.id"> <!-- 多选下拉框 -->
-      <LamboElMultiSelect v-model="widget.options.val" :data="widget.options.dataList"></LamboElMultiSelect>
+      <LamboElMultiSelect v-model="widget.options.val" :data="effectiveDataList"></LamboElMultiSelect>
     </div>
     <div v-else-if="widget.options.searchType === searchDict.SINGLE_HELP.id"> <!-- 单选帮助框 -->
       <Input class="lambo-display-none" v-model="helpVal" />
@@ -95,6 +95,18 @@ export default {
       type: Object,
       default: () => ({})
     },
+    /**
+     * 外部传入的下拉数据（如维度级联过滤后的列表），不传时使用 widget.options.dataList
+     */
+    dataList: {
+      type: Array,
+      default: null
+    },
+  },
+  computed: {
+    effectiveDataList() {
+      return this.dataList || (this.widget.options && this.widget.options.dataList) || []
+    }
   },
   data() {
     return {

package/bi/widget/search/tag-select.vue

@@ -0,0 +1,100 @@
+<!-- eslint-disable -->
+<template>
+  <div class="bi-tag-select">
+    <Checkbox class="bi-tag-select-item" :value="checkAll" :indeterminate="indeterminate"
+      :disabled="disabled || options.length === 0" @on-change="onCheckAllChange">全选</Checkbox>
+    <Checkbox v-for="item in options" :key="item.K" class="bi-tag-select-item" :value="isChecked(item.K)"
+      :disabled="disabled" @on-change="checked => onItemChange(item.K, checked)">{{ item.V }}</Checkbox>
+  </div>
+</template>
+<script>
+/**
+ * 维度标签多选组件（基于 iView Checkbox，带全选/半选）
+ * 用法：<BiTagSelect v-model="selected" :options="[{K:'01',V:'区域'}]" />
+ * 说明：不使用 CheckboxGroup——其根节点是 block div 会把内容挤到下一行；
+ *      独立 Checkbox 作为行内元素排在同一行，沿用 FormItem 32px 行盒垂直对齐。
+ *      项目 viewUI（@lambo-design/core，iView 分支）无 TagSelect/Space，
+ *      view-ui-plus 同名组件为 Vue3 实现，故在此实现
+ */
+export default {
+  name: 'BiTagSelect',
+  model: {
+    prop: 'value',
+    event: 'input'
+  },
+  props: {
+    // 选中值数组（元素为 options 的 K）
+    value: {
+      type: Array,
+      default: () => []
+    },
+    // 可选项 [{ K, V }]
+    options: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    checkAll() {
+      return this.options.length > 0 && this.options.every(item => this.value.indexOf(item.K) > -1)
+    },
+    // 部分选中：半选态（浏览器对 indeterminate 复选框点击后为勾选，天然触发全选）
+    indeterminate() {
+      return this.value.length > 0 && !this.checkAll
+    }
+  },
+  methods: {
+    isChecked(k) {
+      return this.value.indexOf(k) > -1
+    },
+    emitValue(valArr) {
+      this.$emit('input', valArr)
+      this.$emit('on-change', valArr)
+    },
+    onCheckAllChange(checked) {
+      if (this.disabled) {
+        return
+      }
+      this.emitValue(checked ? this.options.map(item => item.K) : [])
+    },
+    onItemChange(k, checked) {
+      if (this.disabled) {
+        return
+      }
+      let valArr = (this.value || []).slice()
+      let idx = valArr.indexOf(k)
+      if (checked && idx === -1) {
+        valArr.push(k)
+      } else if (!checked && idx > -1) {
+        valArr.splice(idx, 1)
+      }
+      this.emitValue(valArr)
+    }
+  }
+}
+</script>
+<style scoped>
+/* 不使用 flex：FormItem content 为 32px 行盒，checkbox 作为行内元素
+   靠 vertical-align:middle 与表单 label/其他控件对齐（同 iView 官方表现）；
+   根容器仅负责超宽换行 */
+/* 字号/颜色显式对齐 iView 输入框（14px/#515a6e）：
+   旁边的多选下拉已选项是 element-ui mini tag 12px，
+   不随之缩小——14px 是表单正文标准，缩小反而与其他查询条件不一致 */
+.bi-tag-select {
+  line-height: 32px;
+  font-size: 14px;
+  color: #515a6e;
+}
+
+.bi-tag-select ::v-deep .bi-tag-select-item {
+  margin-right: 12px;
+  vertical-align: middle;
+  font-size: 14px;
+  font-weight: normal;
+  color: #515a6e;
+}
+</style>

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

@@ -28,6 +28,8 @@ import LamboDocPreview from '../../../pub/doc/preview/index.vue'
 import { accAdd } from '../../../util/math-util'
 import { fileGetUrl } from '../../../bi/widget/api/config'
 import { EventBus, EVENT_TYPES } from '../util/event-bus'
+import { getDimColumnVisibility } from '../util/dimension-state'
+import { filterColumnsByDimension } from '../util/dimension-util'
 
 export default {
   name: 'BiPagingTable',
@@ -58,10 +60,16 @@ export default {
       boxShow: false,
       modelWidth: '78%',
       tableBorder: true,
-      spanMap: {}
+      spanMap: {},
+      // 维度列显隐映射（列key -> 是否显示），由查询表单的维度区块驱动
+      dimColumnVisibility: {}
     }
   },
   methods: {
+    // 维度选择变化：只切换列显隐，不重新查询数据
+    onDimColumnsChanged(visibility) {
+      this.dimColumnVisibility = visibility || {}
+    },
     doSearch() {
       // eslint-disable-next-line
       this.widget.options.url = biConfig.dataServerContext + biConfig.dataServiceUri + this.widget.options.apiId
@@ -602,14 +610,26 @@ export default {
   created() {
     console.log("BiPagingTable -- created() -- this.widget:", this.widget)
     this.initConfig()
+    // 仅参与维度过滤的表格（plat_table.is_dim=1）读取初始值并监听变化（不触发数据查询）
+    if (this.isDimTable) {
+      this.dimColumnVisibility = getDimColumnVisibility()
+      EventBus.$on(EVENT_TYPES.DIMENSION_COLUMNS_CHANGED, this.onDimColumnsChanged)
+    }
   },
   mounted() {
     this.doSearch()
   },
+  beforeDestroy() {
+    EventBus.$off(EVENT_TYPES.DIMENSION_COLUMNS_CHANGED, this.onDimColumnsChanged)
+  },
   computed: {
     isRowClick() {
       return this.widget.options.isRowClick === 1 || this.widget.options.isRowClick === '1'
     },
+    // 是否参与维度列过滤（plat_table.is_dim=1 才随维度标签/明细切换列显隐）
+    isDimTable() {
+      return this.widget.options.isDim === 1 || this.widget.options.isDim === '1'
+    },
     hasSpanColumn() {
       // 列配置中存在 isSpan 列则启用单元格合并
       return (this.columns || []).some(column => this.isSpanColumn(column))
@@ -695,6 +715,10 @@ export default {
             this.$Message.info("表格头配置数据解析异常")
             columns = []
           }
+          // 维度（标签/明细）只控制列显隐：仅参与维度过滤的表格执行，非维度列始终保留
+          if (this.isDimTable) {
+            columns = filterColumnsByDimension(columns, this.dimColumnVisibility)
+          }
         }
       }
       return columns

package/bi/widget/util/dimension-state.js

@@ -0,0 +1,22 @@
+/**
+ * 维度列显隐状态（模块级单例）
+ *
+ * search-form 负责写入并通过 EventBus 广播；表格组件创建时先读一次初始值，
+ * 之后监听 DIMENSION_COLUMNS_CHANGED 事件增量更新，避免组件创建先后导致漏收事件。
+ */
+import { buildDimColumnVisibility } from './dimension-util'
+
+let currentVisibility = {}
+
+export function setDimensionBlock(block) {
+  currentVisibility = buildDimColumnVisibility(block)
+  return currentVisibility
+}
+
+export function getDimColumnVisibility() {
+  return currentVisibility
+}
+
+export function clearDimensionState() {
+  currentVisibility = {}
+}

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

@@ -0,0 +1,90 @@
+/**
+ * 维度区块的列显隐规则（纯函数，便于单测）
+ *
+ * 维度只控制页面内表格列是否显示，不参与查询参数：
+ * - 维度标签未选中：该维度关联的列全部隐藏
+ * - 选中标签、明细不选：显示该维度关联的整组列（dataList 全部 K）
+ * - 选中标签、明细选了具体项：只显示选中项 K 对应的列
+ *
+ * dataList 每项的 K 直接对应表格 columns 中的 key，无需在列配置上额外标记
+ */
+
+/**
+ * 归一化维度明细值为数组（10单选为字符串、20多选为数组）
+ */
+function normalizeVals(val) {
+  if (Array.isArray(val)) {
+    return val
+  }
+  return val ? [val] : []
+}
+
+/**
+ * 由维度区块配置和当前选择，构建 列key -> 是否显示 的映射
+ * 同一列 key 归属多个维度时，任一维度允许显示则显示（OR）
+ *
+ * @param {object} block search.options.dims[0]
+ * @returns {object} visibility 只包含归属维度的列 key
+ */
+export function buildDimColumnVisibility(block) {
+  const visibility = {}
+  if (!block || !block.widgets) {
+    return visibility
+  }
+  const selectedTags = block.options && Array.isArray(block.options.val) ? block.options.val : []
+
+  block.widgets.forEach(dim => {
+    if (!dim || !dim.options) {
+      return
+    }
+    const dimKey = dim.options.pDimKey || dim.options.qKey || dim.id
+    const tagSelected = selectedTags.indexOf(dimKey) > -1
+    const detailVals = normalizeVals(dim.options.val)
+    const colKeys = (dim.options.dataList || [])
+      .map(opt => opt && opt.K)
+      .filter(k => k !== undefined && k !== null && k !== '')
+
+    colKeys.forEach(k => {
+      const visible = tagSelected && (detailVals.length === 0 || detailVals.indexOf(k) > -1)
+      if (visibility[k] !== true) {
+        // 同一列被多个维度引用时取 OR
+        visibility[k] = visible
+      }
+    })
+  })
+
+  return visibility
+}
+
+/**
+ * 按维度列显隐映射递归过滤表格列：
+ * - 叶子列：不属于任何维度（序号、固定列、年龄分布等非维度列）始终保留；属于维度的按映射决定
+ * - 多级表头分组列（含 children）：递归过滤子列，子列全部隐藏时整组隐藏；
+ *   标签未选中时该组叶子在映射中均为 false，分组自然消失
+ * 入参 columns 由 columns 计算属性每次重新 JSON.parse 生成，可直接改写 children
+ */
+export function filterColumnsByDimension(columns, visibility) {
+  if (!columns || columns.length === 0) {
+    return columns || []
+  }
+  if (!visibility || Object.keys(visibility).length === 0) {
+    return columns
+  }
+  const filterCols = (cols) => cols.filter(col => {
+    if (!col) {
+      return false
+    }
+    if (Array.isArray(col.children) && col.children.length > 0) {
+      col.children = filterCols(col.children)
+      return col.children.length > 0
+    }
+    if (col.key === undefined || col.key === null) {
+      return true
+    }
+    if (!Object.prototype.hasOwnProperty.call(visibility, col.key)) {
+      return true
+    }
+    return visibility[col.key] === true
+  })
+  return filterCols(columns)
+}

package/bi/widget/util/event-bus.js

@@ -7,5 +7,7 @@ export const EventBus = new Vue()
 export const EVENT_TYPES = {
   NUM_IDX_ACTIVATED: 'num-idx-activated',
   NUM_IDX_DEACTIVATED: 'num-idx-deactivated',
-  TABLE_ROW_ACTIVATED: 'table-row-activated'
+  TABLE_ROW_ACTIVATED: 'table-row-activated',
+  // 维度选择变化，payload 为 列key -> 是否显示 的映射
+  DIMENSION_COLUMNS_CHANGED: 'dimension-columns-changed'
 }

package/package.json

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

package/pub/charts/factory/options.js

@@ -1354,12 +1354,14 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
         } else if (type === '33') {
             let data = []
             let sum = 0
-            for (let i = 0; i < dataY[0].length; i++) {
-                data.push({
-                    name: dataX[i],
-                    value: dataY[0][i]
-                })
-                sum += dataY[0][i]
+            if (dataY && dataY.length > 0) {
+                for (let i = 0; i < dataY[0].length; i++) {
+                    data.push({
+                        name: dataX[i],
+                        value: dataY[0][i]
+                    })
+                    sum += dataY[0][i]
+                }
             }
             let title33 = ''
             if (dataDim && dataDim.length > 0) {

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

@@ -65,7 +65,6 @@
   </div>
 </template>
 <script>
-import { oneOf } from 'view-ui-plus/src/utils/assist'
 import Trend from 'view-ui-plus/src/components/trend'
 import 'view-ui-plus/dist/styles/viewuiplus.css'
 import { EVENT_TYPES, EventBus } from '../../bi/widget/util/event-bus'
@@ -88,24 +87,15 @@ export default {
       type: [String, Number]
     },
     trend1: {
-      validator(value) {
-        return oneOf(value, ['up', 'down']);
-      }
     },
     polar1: {
       type: String,
-      required: false,
-      validator(value) {
-        return !value || ['pos', 'neg'].includes(value);
-      }
+      required: false
     },
     subNum2: {
       type: [String, Number]
     },
     trend2: {
-      validator(value) {
-        return oneOf(value, ['up', 'down']);
-      }
     },
     polar2: {
       type: String,