lambo-design-bi 0.0.243 → 0.0.245

package/bi/widget/bulletin/api/bulletin.js

@@ -0,0 +1,66 @@
+import biConfig from "../../config/config"
+import ajax from "@lambo-design/shared/utils/ajax"
+
+/**
+ * 获取简报右侧摘要（data 阶段，单接口）
+ * 后端：GET /bs/bulletin/data/summary，服务端读四个 *_api_id 分别取数并归一为 BulletinSummary
+ * 前端直接使用返回结构，不再逐段请求。
+ *
+ * @param {*} bulletinWidgetId 简报控件 id
+ * @param {*} params 页面级查询条件
+ * @returns { code, data: { title, meta, conclusions[], metrics[], highlights[], risks[], advices[], warnings[] } }
+ */
+export function getBulletinSummary(bulletinWidgetId, params) {
+  return ajax.request({
+    url: biConfig.dataServerContext + '/bs/bulletin/data/summary',
+    method: 'get',
+    params: {
+      bulletinWidgetId: bulletinWidgetId,
+      params: JSON.stringify(params || {})
+    }
+  })
+}
+
+/**
+ * 查询简报已发布成品附件（data 阶段）
+ * 后端：GET /bs/bulletin/data/publishedDocs，读 plat_bulletin_publish_doc 中 is_publish='1'，
+ * 按 bulletinWidgetId + params（期间按 period_type 落列 / 组织）过滤。
+ *
+ * @param {*} bulletinWidgetId 简报控件 id（= plat_bulletin.bulletin_id）
+ * @param {*} params 页面级查询条件（如 period / orgCode）
+ * @returns { code, data: [{ bulletinId, docId, docName, periodYear, comId, distCtId, publishTime, ... }] }
+ */
+export function getPublishedBulletinDocs(bulletinWidgetId, params) {
+  return ajax.request({
+    url: biConfig.dataServerContext + '/bs/bulletin/data/publishedDocs',
+    method: 'get',
+    params: {
+      bulletinWidgetId: bulletinWidgetId,
+      params: JSON.stringify(params || {})
+    }
+  })
+}
+
+/**
+ * 查询简报发布成品列表（data 阶段）
+ * 后端：GET /bs/bulletin/doc/list，按 简报×期间×组织 查已发布成品
+ * 固定参数外，透传 query 上的额外字段（如命中的原始期间字段名 period_year 等）
+ *
+ * @param {*} query { bulletinId, periodValue, comId, isPublish, offset, limit, ...额外期间字段 }
+ * @returns { code, data: { rows: [{ docId, docName, isPublish, ... }], total } }
+ */
+export function listBulletinPublishDoc(query) {
+  const q = query || {}
+  return ajax.request({
+    url: biConfig.dataServerContext + '/bs/bulletin/doc/list',
+    method: 'get',
+    params: Object.assign({}, q, {
+      offset: q.offset != null ? q.offset : 0,
+      limit: q.limit != null ? q.limit : 10,
+      bulletinId: q.bulletinId || '',
+      periodValue: q.periodValue || '',
+      comId: q.comId || '',
+      isPublish: q.isPublish || ''
+    })
+  })
+}

package/bi/widget/bulletin/bulletin-widget.vue

@@ -0,0 +1,440 @@
+<!-- eslint-disable -->
+<template>
+  <div class="bulletin-widget">
+    <div class="bulletin-header" v-if="hasTitle">
+      <div class="bulletin-title">{{ cardTitle }}</div>
+      <div class="bulletin-subtitle" v-if="subTitle">{{ subTitle }}</div>
+    </div>
+
+    <div
+      class="bulletin-body"
+      :class="{ 'is-empty': !previewUrl }"
+      :style="containerStyle || {}">
+      <div v-if="querying && !previewUrl" class="bulletin-placeholder">
+        <p>加载简报中…</p>
+      </div>
+      <div v-else-if="emptyReason === 'invalid'" class="bulletin-placeholder">
+        <p>请先选择查询条件</p>
+        <p class="hint">选择简报期间与组织后查看简报</p>
+      </div>
+      <div v-else-if="!previewUrl" class="bulletin-placeholder">
+        <p>尚未发布简报</p>
+        <p class="hint">该期间/组织暂无已发布的简报成品</p>
+      </div>
+      <template v-else>
+        <div
+          class="bulletin-download-fab"
+          title="下载简报"
+          @click="doDownload">
+          <Icon type="md-download" />
+        </div>
+        <lambo-doc-word
+          :url="previewUrl"
+          :key="previewUrl"
+          :report="summary" />
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import LamboDocWord from '@/components/lambo/pub/doc/word/index.vue'
+import { parseStyleStr } from '../util/css-util'
+import { getBulletinSummary, listBulletinPublishDoc } from './api/bulletin'
+import { fileGetUrl } from '../api/config'
+
+// 统一日志前缀，便于在控制台按关键字过滤简报组件的关键过程
+const LOG = '[BiBulletin]'
+
+// 摘要空对象骨架，摘要内容未加载/缺省时兜底，避免 lambo-doc-word 内部空指针
+const EMPTY_SUMMARY = Object.freeze({
+  title: '',
+  meta: '',
+  conclusions: [],
+  metrics: [],
+  highlights: [],
+  risks: [],
+  advices: []
+})
+
+// 期间类型 → params 里期间值的候选 qKey（0年/1半年/2季度/3月）
+const PERIOD_KEY_CANDIDATES = {
+  '0': ['period_year', 'periodYear'],
+  '1': ['period_half_year', 'periodHalfYear'],
+  '2': ['period_quarter', 'periodQuarter'],
+  '3': ['period_month', 'periodMonth']
+}
+// 组织编码候选 qKey
+const COM_ID_CANDIDATES = ['comId', 'com_id']
+const DIST_CT_ID_CANDIDATES = ['distCtId', 'dist_ct_id']
+
+// 从 params 里按候选 key 取首个非空项，返回命中的 { key, value }；均未命中返回 null
+function firstNonBlankEntry(obj, keys) {
+  if (!obj || !Array.isArray(keys)) return null
+  for (const k of keys) {
+    const v = obj[k]
+    if (v !== null && v !== undefined && String(v).length > 0) {
+      return { key: k, value: Array.isArray(v) ? v.join(',') : String(v) }
+    }
+  }
+  return null
+}
+
+export default {
+  name: "BiBulletin",
+  components: { LamboDocWord },
+  props: {
+    widget: {
+      type: Object,
+      default: () => ({})
+    },
+    params: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      containerStyle: {},
+      subTitle: null,
+      // docx 态
+      querying: false,
+      previewUrl: '',
+      lastDocId: '',
+      lastFileName: '',
+      // 空态原因：'' 无 / 'invalid' 查询条件不足（校验未过）/ 'empty' 已查询但无成品
+      emptyReason: '',
+      // 摘要（data 阶段）
+      summaryLoading: false,
+      summaryData: null
+    }
+  },
+  computed: {
+    bulletinOptions() {
+      return Object.assign({}, this.widget.options || {}, this.widget.optsion || {})
+    },
+    cardTitle() {
+      return this.bulletinOptions.title || this.widget.name || '简报'
+    },
+    hasTitle() {
+      return !!(this.cardTitle && this.cardTitle.length > 0)
+    },
+    // 右侧摘要数据源：data 阶段拉取的 summaryData，缺省用空骨架
+    summary() {
+      const s = this.summaryData
+      if (!s || typeof s !== 'object') return { ...EMPTY_SUMMARY, title: this.cardTitle }
+      return Object.assign({}, EMPTY_SUMMARY, { title: this.cardTitle }, s)
+    }
+  },
+  watch: {
+    // params 变化（页面查询条件切换：期间/组织）时，只重跑 data 阶段（docx + 摘要），不重拉 config
+    params: {
+      deep: true,
+      handler(val, oldVal) {
+        console.log(LOG, 'params 变化，重跑 data 阶段', { oldVal, val })
+        this.loadData(this.params)
+      }
+    }
+  },
+  methods: {
+    initConfig() {
+      if (this.bulletinOptions) {
+        if (Object.prototype.hasOwnProperty.call(this.bulletinOptions, "subTitle")) {
+          this.subTitle = this.bulletinOptions["subTitle"] || ''
+        }
+        if (Object.prototype.hasOwnProperty.call(this.bulletinOptions, "style")) {
+          this.containerStyle = parseStyleStr(this.bulletinOptions["style"] || {}) || {}
+        }
+      }
+    },
+    loadData(params) {
+      console.log(LOG, 'loadData 开始 data 阶段', { bulletinId: this.widget && this.widget.id, params })
+      // 摘要依赖已发布成品：仅当 loadDoc 命中成品后才拉摘要，未命中则不查摘要
+      this.loadDoc(params)
+    },
+    // 清空右侧摘要
+    clearSummary() {
+      this.summaryData = null
+    },
+    // 清空 docx 预览态（未命中/查询失败/校验不通过时展示空态）
+    clearPreview(reason) {
+      this.lastDocId = ''
+      this.lastFileName = ''
+      this.previewUrl = ''
+      this.emptyReason = reason || ''
+    },
+    loadDoc(params) {
+      if (this.querying) {
+        console.log(LOG, 'loadDoc 跳过：正在查询中')
+        return
+      }
+      const bulletinWidgetId = this.widget && this.widget.id
+      if (!bulletinWidgetId) {
+        console.warn(LOG, 'loadDoc 中止：简报id为空')
+        this.clearSummary()
+        this.$Message.error({ content: '简报id为空，无法加载', duration: 2.5 })
+        return
+      }
+
+      // 期间/组织/物流中心：把命中的字段名(key)与值(value)一并作为请求参数
+      // - 固定名（periodValue / comId / distCtId）：后端 /doc/list 当前实际用于过滤的参数名
+      // - entry.key：命中的原始字段名（如 period_year / com_id），作为预留一并传递
+      const periodEntry = this.resolvePeriodEntry(params)
+      const comEntry = firstNonBlankEntry(params, COM_ID_CANDIDATES)
+      const distCtEntry = firstNonBlankEntry(params, DIST_CT_ID_CANDIDATES)
+
+      // 查询前置校验：periodValue 必须有值，且 comId / distCtId 至少有一个有值，否则不查、展示空态并提示
+      if (!periodEntry) {
+        console.log(LOG, 'loadDoc 跳过查询：期间值为空，展示空态')
+        this.clearPreview('invalid')
+        this.clearSummary()
+        this.$Message.warning({ content: '请选择简报期间', duration: 2 })
+        return
+      }
+      if (!comEntry && !distCtEntry) {
+        console.log(LOG, 'loadDoc 跳过查询：组织与物流中心均为空，展示空态')
+        this.clearPreview('invalid')
+        this.clearSummary()
+        this.$Message.warning({ content: '请选择简报组织', duration: 2 })
+        return
+      }
+
+      const query = {
+        bulletinId: bulletinWidgetId,
+        isPublish: '1',
+        offset: 0,
+        limit: 1
+      }
+      query.periodValue = periodEntry.value
+      query[periodEntry.key] = periodEntry.value
+      if (comEntry) {
+        query.comId = comEntry.value
+        query[comEntry.key] = comEntry.value
+      }
+      if (distCtEntry) {
+        query.distCtId = distCtEntry.value
+        query[distCtEntry.key] = distCtEntry.value
+      }
+      console.log(LOG, 'loadDoc 查询已发布成品', { bulletinWidgetId, periodEntry, comEntry, distCtEntry })
+      this.querying = true
+      listBulletinPublishDoc(query)
+        .then(res => {
+          const body = res && res.data
+          const rows = (body && body.data && Array.isArray(body.data.rows)) ? body.data.rows : []
+          if (body && body.code === 1 && rows.length > 0 && rows[0].docId) {
+            const doc = rows[0]
+            console.log(LOG, 'loadDoc 命中已发布成品，直接渲染', { docId: doc.docId, docName: doc.docName })
+            this.lastDocId = doc.docId
+            this.lastFileName = doc.docName || (this.cardTitle + '.docx')
+            this.previewUrl = fileGetUrl + doc.docId
+            this.emptyReason = ''
+            this.$Message.info({ content: '已展示最近发布的简报', duration: 1.8 })
+            // 命中成品后才拉右侧摘要
+            this.loadSummary(params)
+            return
+          }
+          // 未命中已发布成品 → 空态，同时清空摘要（不再查摘要）
+          console.log(LOG, 'loadDoc 未命中已发布成品，展示空态', { code: body && body.code, rowCount: rows.length })
+          this.clearPreview('empty')
+          this.clearSummary()
+        })
+        .catch(err => {
+          console.warn(LOG, 'loadDoc 查询发布成品失败，展示空态：', err)
+          this.clearPreview('empty')
+          this.clearSummary()
+        })
+        .finally(() => {
+          this.querying = false
+        })
+    },
+    // 依据简报期间类型（periodType）从 params 里解析期间键值对，用于查发布成品
+    // 返回命中的 { key, value }（key 为 params 里实际命中的期间字段名）；无有效期间时返回 null
+    resolvePeriodEntry(params) {
+      const periodType = this.bulletinOptions.periodType != null ? String(this.bulletinOptions.periodType) : ''
+      // periodType 缺省或非 0/1/2/3 → 无对应候选 key，直接返回 null，避免 firstNonBlankEntry 遍历 undefined 抛错
+      if (!periodType) {
+        console.warn(LOG, 'resolvePeriodEntry periodType 为空，跳过期间解析')
+        return null
+      }
+      const candidates = PERIOD_KEY_CANDIDATES[periodType]
+      if (!Array.isArray(candidates) || candidates.length < 1) {
+        console.warn(LOG, 'resolvePeriodEntry periodType 无对应候选 key', { periodType })
+        return null
+      }
+      const entry = firstNonBlankEntry(params, candidates)
+      console.log(LOG, 'resolvePeriodEntry', { periodType, candidates, entry })
+      return entry
+    },
+    // data 阶段之二：获取右侧摘要（单接口，后端已聚合四段）
+    loadSummary(params) {
+      const bulletinWidgetId = this.widget && this.widget.id
+      if (!bulletinWidgetId) {
+        console.warn(LOG, 'loadSummary 中止：简报id为空')
+        this.summaryData = null
+        return
+      }
+      console.log(LOG, 'loadSummary 请求摘要', { bulletinWidgetId, params })
+      this.summaryLoading = true
+      getBulletinSummary(bulletinWidgetId, params || {})
+        .then(res => {
+          const body = res && res.data
+          if (!body || body.code !== 1) {
+            console.warn(LOG, 'loadSummary 失败：', body)
+            this.summaryData = null
+            return
+          }
+          this.summaryData = (body.data && typeof body.data === 'object') ? body.data : null
+          const s = this.summaryData || {}
+          console.log(LOG, 'loadSummary 成功', {
+            conclusions: (s.conclusions || []).length,
+            metrics: (s.metrics || []).length,
+            highlights: (s.highlights || []).length,
+            risks: (s.risks || []).length,
+            advices: (s.advices || []).length,
+            warnings: (s.warnings || []).length
+          })
+        })
+        .catch(err => {
+          console.error(LOG, 'loadSummary 异常：', err)
+          this.summaryData = null
+        })
+        .finally(() => {
+          this.summaryLoading = false
+        })
+    },
+    // 下载：用当前展示的已发布成品 docId
+    doDownload() {
+      if (!this.lastDocId) {
+        console.log(LOG, 'doDownload 中止：尚无可下载的简报')
+        this.$Message.info({ content: '暂无已发布的简报可下载', duration: 1.8 })
+        return
+      }
+      console.log(LOG, 'doDownload 下载', { docId: this.lastDocId, fileName: this.lastFileName })
+      this.triggerDownload(this.lastDocId, this.lastFileName)
+    },
+    triggerDownload(docId, fileName) {
+      const url = fileGetUrl + docId
+      // 用隐式 <a download> 触发下载，避免弹新页签打断阅读
+      try {
+        const a = document.createElement('a')
+        a.href = url
+        a.download = fileName || ''
+        a.style.display = 'none'
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+      } catch (e) {
+        console.warn(LOG, 'triggerDownload 降级 window.open', e)
+        window.open(url)
+      }
+    }
+  },
+  created() {
+    console.log(LOG, 'created config 阶段解析', { widget: this.widget, options: this.bulletinOptions })
+    // config 阶段：由父页面完成配置装配，此处仅解析结构性配置
+    this.initConfig()
+  },
+  mounted() {
+    // params 已有值（父组件同步传入）→ 直接加载；否则等 watcher 触发
+    // if (this.params && Object.keys(this.params).length > 0) {
+    //   console.log(LOG, 'mounted params 已就绪，直接加载', { params: this.params })
+    //   this.loadData(this.params)
+    // } else {
+    //   console.log(LOG, 'mounted params 为空，等 watcher 触发')
+    // }
+  }
+}
+</script>
+
+<style scoped>
+.bulletin-widget {
+  width: 100%;
+}
+/* 自绘标题栏：无边框，仅与下方内容留间距 */
+.bulletin-header {
+  padding: 0 0 12px;
+}
+.bulletin-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #17233d;
+  line-height: 1.4;
+}
+.bulletin-subtitle {
+  margin-top: 2px;
+  color: #999;
+  font-size: 12px;
+  line-height: 1.4;
+}
+.bulletin-body {
+  width: 100%;
+  /* 定位上下文：悬浮下载按钮相对本容器绝对定位 */
+  position: relative;
+  /* 有文档预览时给 lambo-doc-word 一个明确的高度基线，其内部 word-preview 使用 height:100% */
+  height: 720px;
+  min-height: 480px;
+}
+/* 悬浮下载按钮：自定义 FAB，悬浮在预览区右上角上层，hover 点亮为主题蓝 */
+.bulletin-download-fab {
+  position: absolute;
+  top: 16px;
+  right: 16px;
+  z-index: 10;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 20px;
+  color: #2d8cf0;
+  cursor: pointer;
+  border-radius: 6px;
+  background: linear-gradient(135deg, rgba(255, 255, 255, 0.95), rgba(240, 247, 255, 0.9));
+  backdrop-filter: blur(8px);
+  -webkit-backdrop-filter: blur(8px);
+  border: 1px solid rgba(45, 140, 240, 0.15);
+  box-shadow: 0 4px 14px rgba(31, 45, 61, 0.12);
+  transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
+}
+.bulletin-download-fab:hover {
+  color: #fff;
+  background: linear-gradient(135deg, #2d8cf0, #57a3f3);
+  border-color: transparent;
+  transform: translateY(-2px);
+  box-shadow: 0 8px 20px rgba(45, 140, 240, 0.4);
+}
+.bulletin-download-fab:active {
+  transform: translateY(0);
+  box-shadow: 0 3px 10px rgba(45, 140, 240, 0.35);
+}
+/* 空态/加载态：无文档时高度自适应内容，避免撑出大片空白 */
+.bulletin-body.is-empty {
+  height: auto;
+  min-height: 0;
+}
+.bulletin-placeholder {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 6px;
+  color: #94a3b8;
+  font-size: 13px;
+  background: #f8fafc;
+  border: 1px dashed #e2e8f0;
+  border-radius: 6px;
+}
+/* 空态容器高度自适应时，用内边距撑出紧凑高度而非塌陷 */
+.bulletin-body.is-empty .bulletin-placeholder {
+  height: auto;
+  padding: 48px 16px;
+}
+.bulletin-placeholder p {
+  margin: 0;
+}
+.bulletin-placeholder .hint {
+  font-size: 12px;
+  color: #cbd5e1;
+}
+</style>

package/bi/widget/charts/index.vue

@@ -1,12 +1,12 @@
 <template>
   <LamboChartsFactory v-if="dataX" :height="height" :type="chartsType" :data-x="dataX" :data-y="dataY"
-    :data-dim="dataDim" :charts-note="chartsNote">
+    :data-dim="dataDim" :data-z="dataZ" :charts-note="chartsNote">
   </LamboChartsFactory>
 </template>
 <script>
 import { getListMapData } from "../api/data"
 import LamboChartsFactory from "../../../pub/charts/factory/charts-factory.vue"
-import { convertChartsData, convertChartsDataType42 } from "./util/charts-data-util"
+import { convertChartsData, convertChartsDataType42, convertChartsDataType46, convertChartsDataType48, convertChartsDataType49, convertChartsDataType50, convertChartsDataType52 } from "./util/charts-data-util"
 import { EventBus, EVENT_TYPES } from '../util/event-bus'
 
 export default {
@@ -29,6 +29,7 @@ export default {
       dataX: null,
       dataY: null,
       dataDim: null,
+      dataZ: null,
       height: null,
       columns: null,
       xKey: null,
@@ -69,6 +70,40 @@ export default {
       this.linkWidgetId = this.widget.options.linkWidgetId || ''
       this.linkKeys = this.widget.options.linkKeys || null
     },
+    handleRows(rows) {
+      if (!rows || !this.columns) return
+      let resObj = {}
+      if (this.chartsType === '42') {
+        resObj = convertChartsDataType42(rows, this.columns)
+      } else if (this.chartsType === '46' || this.chartsType === '47') {
+        // 46: 普通气泡图  47: 象限气泡图
+        resObj = convertChartsDataType46(rows, this.columns)
+      } else if (this.chartsType === '48') {
+        // 48: 差距瀑布图
+        resObj = convertChartsDataType48(rows, this.columns)
+      } else if (this.chartsType === '49') {
+        // 49: 子弹图
+        resObj = convertChartsDataType49(rows, this.columns)
+      } else if (this.chartsType === '50') {
+        // 50: 组内排名图
+        resObj = convertChartsDataType50(rows, this.columns)
+      } else if (this.chartsType === '52') {
+        // 52: 热力分布图
+        resObj = convertChartsDataType52(rows, this.columns)
+      } else {
+        resObj = convertChartsData(rows, this.columns)
+      }
+      console.log("chartsType:", this.chartsType, "resObj:", resObj)
+      if (resObj) {
+        this.dataX = resObj.dataX
+        this.dataY = resObj.dataY
+        this.dataDim = resObj.dataDim
+        this.dataZ = resObj.dataZ || null
+      } else {
+        console.error("charts数据服务[" + this.widget.name + "]数据转换失败：" + resObj)
+        this.$Message.warning("charts数据服务[" + this.widget.name + "]数据转换失败")
+      }
+    },
     doSearch() {
       if (!this.apiId) {
         this.$Message.warning("组件[" + this.widget.name + "]未配置数据接口")
@@ -79,24 +114,7 @@ export default {
           console.error("charts数据服务[" + this.widget.options.apiId + "]请求失败：" + res.data.message)
         } else {
           if (res.data.data.rows.length > 0) {
-            let rows = res.data.data.rows
-            if (rows && this.columns) {
-              let resObj = {}
-              if (this.chartsType === '42') {
-                resObj = convertChartsDataType42(rows, this.columns)
-              } else {
-                resObj = convertChartsData(rows, this.columns)
-              }
-              console.log( "chartsType:", this.chartsType, "resObj:", resObj)
-              if (resObj) {
-                this.dataX = resObj.dataX
-                this.dataY = resObj.dataY
-                this.dataDim = resObj.dataDim
-              } else {
-                console.error("charts数据服务[" + this.widget.name + "]数据转换失败：" + resObj)
-                this.$Message.warning("charts数据服务[" + this.widget.name + "]数据转换失败")
-              }
-            }
+            this.handleRows(res.data.data.rows)
           } else {
             console.warn("charts数据服务[" + this.widget.options.apiId + "]请求数据为空：" + res.data.message)
             this.dataX = []