lambo-design-bi 0.0.252 → 0.0.254

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

@@ -240,8 +240,8 @@ export default {
             this.lastDocId = doc.docId
             this.lastFileName = doc.docName || (this.cardTitle + '.docx')
             // 发布人/发布时间统一展示在左侧目录下方（数据源 plat_bulletin_publish_doc）
-            this.publisher = doc.publishUserName ? String(doc.publishUserName).trim() : ''
-            this.publishTime = doc.publishTime ? `简报发布时间：${normalizePublishTime(doc.publishTime)}` : ''
+            this.publisher = doc.publishUserName ? `发布人：${String(doc.publishUserName).trim()}` : ''
+            this.publishTime = doc.publishTime ? `发布时间：${normalizePublishTime(doc.publishTime)}` : ''
             this.previewUrl = fileGetUrl + doc.docId
             this.emptyReason = ''
             this.$Message.success({ content: '查询到已发布的简报', duration: 1.8 })

package/bi/widget/num/index.vue

@@ -108,14 +108,15 @@ export default {
               this.subTitle = row['sub_title']
               this.num = row['num']
               this.subNum1 = row['sub_num1']
-              this.trend1 = row['trend1']
+              // 过滤掉前端缺省值'-'的情况，组件传值有要求
+              this.trend1 = row['trend1']==='-'?null:row['trend1']
               this.subNum2 = row['sub_num2']
-              this.trend2 = row['trend2']
+              this.trend2 = row['trend2']==='-'?null:row['trend2']
               if (Object.prototype.hasOwnProperty.call(row, 'polar1')) {
-                this.polar1 = row['polar1']
+                this.polar1 = row['polar1']==='-'?null:row['polar1']
               }
               if (Object.prototype.hasOwnProperty.call(row, 'polar2')) {
-                this.polar2 = row['polar2']
+                this.polar2 = row['polar2']==='-'?null:row['polar2']
               }
               if (Object.prototype.hasOwnProperty.call(row, 'drill_k1') && Object.prototype.hasOwnProperty.call(row, 'drill_v1')) {
                 this.drillK1 = row['drill_k1'] || ''

package/package.json

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

package/pub/charts/factory/options.js

@@ -1159,9 +1159,12 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
             let datas = [];
             let colorList = [];
 
+            let sortedIndices = []
             // 将 dataY 转换为带索引的排序数组
-            let sortedIndices = dataY[0].map((_, index) => index)
-                .sort((a, b) => dataY[0][b] - dataY[0][a]); // 根据 dataX 的值降序排列
+            if (dataY && dataY[0]) {
+                sortedIndices = dataY[0].map((_, index) => index)
+                    .sort((a, b) => dataY[0][b] - dataY[0][a]); // 根据 dataX 的值降序排列
+            }
 
             for (let i = 0; i < sortedIndices.length; i++) {
                 const index = sortedIndices[i];
@@ -1243,8 +1246,12 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
             let colorList = [];
             let radius = ['40%', '60%']; // 控制饼块粗细的半径范围
             let prevAngle = 0; // 初始角度
-            let sortedIndices = dataY[0].map((_, index) => index)
-                .sort((a, b) => dataY[0][b] - dataY[0][a]); // 根据dataY的值进行降序排序并获取索引
+            let sortedIndices = []
+            // 将 dataY 转换为带索引的排序数组
+            if (dataY && dataY[0]) {
+                sortedIndices = dataY[0].map((_, index) => index)
+                    .sort((a, b) => dataY[0][b] - dataY[0][a]); // 根据dataY的值进行降序排序并获取索引
+            }
 
             for (let i = 0; i < sortedIndices.length; i++) {
                 const index = sortedIndices[i];
@@ -1347,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) {
@@ -1459,7 +1468,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                     itemStyle: {
                         normal: {
                             color: function (params) {
-                                return lightColors[params.dataIndex] 
+                                return lightColors[params.dataIndex]
                             }
                         }
                     },
@@ -2097,7 +2106,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                                 fontSize: 20
                             }
                         },
-                        data: dataY[0].map((value, index) => {
+                        data: dataY[0] ? dataY[0].map((value, index) => {
                             const rank = sortedDataX.indexOf(value) + 1;
                             let p;
                             if (dataY[0].reduce((a, b) => a + b) === 0) {
@@ -2117,7 +2126,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                                 showname: dataX[index],
                                 reaVal: d + '%'
                             }
-                        })
+                        }) : []
                     },
                 ]
             };
@@ -2334,7 +2343,11 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                 });
             }
         }
-        const dynamicColors = dataDim.map((_, index) => colors[index % colors.length]);
+
+        let dynamicColors = []
+        if (dataDim) {
+            dynamicColors = dataDim.map((_, index) => colors[index % colors.length])
+        }
         opt = {
             tooltip: {
                 trigger: 'axis',
@@ -2446,7 +2459,10 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
 
             }
         }
-        const dynamicColors = dataDim.map((_, index) => colors[index % colors.length]);
+        let dynamicColors = []
+        if (dataDim) {
+            dynamicColors = dataDim.map((_, index) => colors[index % colors.length])
+        }
 
         opt = {
             tooltip: {
@@ -2524,20 +2540,25 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
             series: series
         };
     } else if (type === '44') {
-        const transData = transpose(dataY);
-        const indicators = dataX.map((name, index) => {
-            let maxValue = 0;
-            for (let i = 0; i < dataY[index].length; i++) {
-                if (dataY[index] && dataY[index][i] > maxValue) {
-                    maxValue = dataY[index][i];
+        const transData = transpose(dataY)
+
+        let indicators = []
+        if (dataX) {
+            indicators = dataX.map((name, index) => {
+                let maxValue = 0
+                for (let i = 0; i < dataY[index].length; i++) {
+                    if (dataY[index] && dataY[index][i] > maxValue) {
+                        maxValue = dataY[index][i];
+                    }
                 }
-            }
-            return {
-                name: name,
-                max: Math.ceil(maxValue)
-            };
-        });
-        const seriesData = [];
+                return {
+                    name: name,
+                    max: Math.ceil(maxValue)
+                }
+            })
+        }
+
+        const seriesData = []
         transData.forEach((data, index) => {
             seriesData.push({
                 name: dataDim[index],
@@ -2552,7 +2573,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                 areaStyle: {
                     color: areaColors[index % areaColors.length]
                 }
-            });
+            })
         });
         opt = {
             legend: {
@@ -3690,7 +3711,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                     fontFamily: 'Microsoft YaHei',
                     color: '#999',
                     fontSize: 10,
-                    formatter: function(value) {
+                    formatter: function (value) {
                         return Math.round(value)
                     }
                 }
@@ -4059,7 +4080,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                     show: true,
                     position: 'top',
                     distance: 5,
-                    formatter: function(params) {
+                    formatter: function (params) {
                         return params.value
                     },
                     fontSize: 11,
@@ -4085,7 +4106,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                 label: {
                     show: true,
                     position: 'right',
-                    formatter: function() {
+                    formatter: function () {
                         return sortedValues[i] + ' ' + badge
                     },
                     fontSize: 11,
@@ -4111,7 +4132,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
             },
             tooltip: {
                 trigger: 'item',
-                formatter: function(params) {
+                formatter: function (params) {
                     if (!params) return ''
                     let idx = params.dataIndex
                     let name = params.name
@@ -4150,7 +4171,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                     fontFamily: 'Microsoft YaHei',
                     color: '#666',
                     fontSize: 12,
-                    formatter: function(value) {
+                    formatter: function (value) {
                         return value === selfLabel ? '{highlight|' + value + '}' : value
                     },
                     rich: {
@@ -4162,7 +4183,6 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                 }
             },
             series: [
-                // 我公司高亮背景
                 ...(selfIndex >= 0 ? [{
                     name: '高亮背景',
                     type: 'bar',
@@ -4215,7 +4235,7 @@ export function getECharts(type, dataX, dataY, dataDim, dataZ) {
                                 label: {
                                     show: true,
                                     position: 'end',
-                                    formatter: function() {
+                                    formatter: function () {
                                         // 第一名始终在最上面一行 (i=0), 排序方向已保证
                                         return (i === 0 ? '🥇 ' : '') + sortedValues[i]
                                     },

package/pub/doc/word/index.vue

@@ -18,7 +18,7 @@
         @click="scrollTo(item)"
       >{{ item.text }}</a>
       <div class="word-nav-publish" v-if="publisher || publishTime">
-        <div v-if="publisher" class="meta-line">发布人：{{ publisher }}</div>
+        <div v-if="publisher" class="meta-line">{{ publisher }}</div>
         <div v-if="publishTime" class="meta-line">{{ publishTime }}</div>
       </div>
     </aside>

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

@@ -29,7 +29,7 @@
         <span class="ivu-number-info-total">
           <slot name="num">{{ num }}</slot>
         </span>
-        <span class="ivu-number-info-subTotal" v-if="subNum1 || subNum2">
+        <span class="ivu-number-info-subTotal">
           <slot name="subNum">
             <template v-if="subNum1">
               <template v-if="trend1">
@@ -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,