lambo-design-bi 0.0.166 → 0.0.168

package/bi/widget/charts/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <LamboChartsFactory :height="height" :type="chartsType" :data-x="dataX" :data-y="dataY" :data-dim="dataDim">
+  <LamboChartsFactory v-if="dataX" :height="height" :type="chartsType" :data-x="dataX" :data-y="dataY" :data-dim="dataDim">
   </LamboChartsFactory>
 </template>
 <script>

package/bi/widget/charts/util/charts-data-util.js

@@ -89,6 +89,7 @@ export function convertChartsData(rows, columns) {
             rootArr.push(dimDataArr)
           }
         } else {
+          let dimDataArr = []
           for (let i = 0; i < dataX.length; i++) {
             let bizV = dataX[i]
             // 遍历数据
@@ -96,11 +97,12 @@ export function convertChartsData(rows, columns) {
               let rowData = rows[k]
               if (rowData && Object.prototype.hasOwnProperty.call(rowData, xKey) &&
                 bizV === rowData[xKey]) {
-                rootArr.push(rowData[yKey])
+                dimDataArr.push(rowData[yKey])
                 break
               }
             }
           }
+          rootArr.push(dimDataArr)
         }
         dataY = rootArr
       }
@@ -111,7 +113,7 @@ export function convertChartsData(rows, columns) {
         dataY = [...dataYSet]
         let dataDimSet = new Set(dArr)
         dataDim = [...dataDimSet]
-
+        console.log(`dataY:${dataY},dataDim:${dataDim}`)
         if (dataDim && dataDim.length > 0) {
           for (let i = 0; i < dataY.length; i++) {
             let bizV = dataY[i]
@@ -132,6 +134,7 @@ export function convertChartsData(rows, columns) {
             rootArr.push(dimDataArr)
           }
         } else {
+          let dimDataArr = []
           for (let i = 0; i < dataY.length; i++) {
             let bizV = dataY[i]
             // 遍历数据
@@ -139,11 +142,12 @@ export function convertChartsData(rows, columns) {
               let rowData = rows[k]
               if (Object.prototype.hasOwnProperty.call(rowData, yKey) &&
                 bizV === rowData[yKey]) {
-                rootArr.push(rowData[xKey])
+                dimDataArr.push(rowData[xKey])
                 break
               }
             }
           }
+          rootArr.push(dimDataArr)
         }
       }
       dataX = rootArr

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

@@ -40,7 +40,7 @@ export default {
       this.$set(this.tableSearchParams, 'inJson', this.params)
     },
     goDetail(routerName, pageId, row) {
-      let parentPageId = this.widget.options.rootId || ''
+      let parentPageId = this.widget.rootId || ''
       let newQuery = Object.assign({}, this.params, row);
       newQuery['pageId'] = pageId
       newQuery['parentPageId'] = parentPageId

package/package.json

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

package/pub/charts/factory/options.js

@@ -1088,10 +1088,12 @@ export function getECharts(type, dataX, dataY, dataDim) {
     if (type === '30') {
       let newArry = [];
       for (let i = 0; i < dataY.length; i++) {
-        newArry.push({
-          'name': dataX[i],
-          'value': dataY[i],
-        });
+        for (let j = 0; j < dataY[i].length; j++) {
+          newArry.push({
+            'name': dataX[i],
+            'value': dataY[i][j],
+          })
+        }
       }
       opt = {
         backgroundColor: '#fff',
@@ -1200,14 +1202,14 @@ export function getECharts(type, dataX, dataY, dataDim) {
       let colorList = [];
 
       // 将 dataY 转换为带索引的排序数组
-      let sortedIndices = dataY.map((_, index) => index)
-        .sort((a, b) => dataY[b] - dataY[a]); // 根据 dataX 的值降序排列
+      let 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];
         colorList.push(colors[(i + 1) % colors.length]);
         datas.push({
-          value: dataY[index],
+          value: dataY[0][index],
           name: dataX[index], // 获取对应的 dataX 值
         });
       }
@@ -1230,9 +1232,9 @@ export function getECharts(type, dataX, dataY, dataDim) {
               let total = 0;
               let tarValue;
               for (let i = 0, l = dataX.length; i < l; i++) {
-                total += dataY[i];
+                total += dataY[0][i];
                 if (dataX[i] === name) {
-                  tarValue = dataY[i];
+                  tarValue = dataY[0][i];
                 }
               }
               let p;
@@ -1284,15 +1286,15 @@ export function getECharts(type, dataX, dataY, dataDim) {
       let colorList = [];
       let radius = ['40%', '60%']; // 控制饼块粗细的半径范围
       let prevAngle = 0; // 初始角度
-      let sortedIndices = dataY.map((_, index) => index)
-        .sort((a, b) => dataY[b] - dataY[a]); // 根据dataY的值进行降序排序并获取索引
+      let 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];
         colorList.push(colors[(i + 1) % colors.length]);
-        total += dataY[index]; // 使用排序后的数据
+        total += dataY[0][index]; // 使用排序后的数据
         datas.push({
-          value: dataY[index], // 使用排序后的数据
+          value: dataY[0][index], // 使用排序后的数据
           name: dataX[index], // 获取对应的dataY值
         });
       }
@@ -1317,9 +1319,9 @@ export function getECharts(type, dataX, dataY, dataDim) {
               let total = 0;
               let tarValue;
               for (let i = 0, l = dataX.length; i < l; i++) {
-                total += dataY[i];
+                total += dataY[0][i];
                 if (dataX[i] === name) {
-                  tarValue = dataY[i];
+                  tarValue = dataY[0][i];
                 }
               }
               let p;
@@ -1389,12 +1391,12 @@ export function getECharts(type, dataX, dataY, dataDim) {
     else if (type === '33') {
       let data = []
       let sum = 0
-      for (let i = 0; i < dataY.length; i++) {
+      for (let i = 0; i < dataY[0].length; i++) {
         data.push({
           name: dataX[i],
-          value: dataY[i]
+          value: dataY[0][i]
         })
-        sum += dataY[i]
+        sum += dataY[0][i]
       }
 
       opt = {
@@ -1435,10 +1437,10 @@ export function getECharts(type, dataX, dataY, dataDim) {
               if (sum === 0) {
                 p = 0
               } else {
-                p = (accMul(accDiv(dataY[i], sum), 100)).toFixed(2)
+                p = (accMul(accDiv(dataY[0][i], sum), 100)).toFixed(2)
               }
               if (dataX[i] === name) {
-                var tarValue = dataY[i]
+                var tarValue = dataY[0][i]
                 var showName = name.length > 5 ? name.substr(0, 5) + '...' : name
                 var showValue = tarValue.length > 6 ? tarValue.substr(0, 6) + '...' : tarValue
                 return '{a|' + showName + '}' + '{b|' + p + '%}' + '{c|' + showValue + '}'
@@ -1478,10 +1480,10 @@ export function getECharts(type, dataX, dataY, dataDim) {
                 if (sum === 0) {
                   p = 0
                 } else {
-                  p = (accMul(accDiv(dataY[i], sum), 100)).toFixed(2)
+                  p = (accMul(accDiv(dataY[0][i], sum), 100)).toFixed(2)
                 }
                 if (dataX[i] === item.name) {
-                  return item.name + ':<br/>' + p + '%' + '<br/>' + dataY[i]
+                  return item.name + ':<br/>' + p + '%' + '<br/>' + dataY[0][i]
                 }
               }
             },
@@ -1511,10 +1513,10 @@ export function getECharts(type, dataX, dataY, dataDim) {
     }
     else if (type === '34') {
       let newArry = [];
-      for (let i = 0; i < dataY.length; i++) {
+      for (let i = 0; i < dataY[0].length; i++) {
         newArry.push({
           'name': dataX[i],
-          'value': dataY[i],
+          'value': dataY[0][i],
         });
       }
       opt = {
@@ -1642,12 +1644,12 @@ export function getECharts(type, dataX, dataY, dataDim) {
       let total = 0;
       let datas = [];
       let colorList = [];
-      for (let i = 0; i < dataY.length; i++) {
+      for (let i = 0; i < dataY[0].length; i++) {
         colorList.push(colors[(i + 1) % colors.length]);
-        total += dataY[i];
+        total += dataY[0][i];
         var showName = dataX[i].length > 5 ? dataX[i].substr(0, 5) + '...' : dataX[i]
         datas.push({
-          value: dataY[i],
+          value: dataY[0][i],
           name: showName,
         })
       }
@@ -1683,12 +1685,12 @@ export function getECharts(type, dataX, dataY, dataDim) {
             if (name !== null && name !== "" && name !== "__other") {
               let total = 0;
               let tarValue;
-              for (let i = 0, l = dataY.length; i < l; i++) {
-                total += dataY[i];
+              for (let i = 0, l = dataY[0].length; i < l; i++) {
+                total += dataY[0][i];
                 var showName = dataX[i].length > 5 ? dataX[i].substr(0, 5) + '...' : dataX[i]
 
                 if (showName === name) {
-                  tarValue = dataY[i];
+                  tarValue = dataY[0][i];
                 }
               }
               let p;
@@ -1735,15 +1737,15 @@ export function getECharts(type, dataX, dataY, dataDim) {
       }
     }
     else if (type === '36') {
-      let sum = dataY.reduce((a, b) => a + b);
+      let sum = dataY[0].reduce((a, b) => a + b);
       let pieSeries = [];
       let showBackground = false;//是否显示圆环条形背景，true显示，false不显示
       let barOut = 65, barIn = 62, barBroad = 4;//控制圆环条宽度  barOut - barIn = 圆环条宽度，barBroad - 圆环条宽度 = 圆环条间距
-      if (dataY.length <= 7) {//根据数据量选择合适的宽度，7条及以下数据将放宽圆环条
+      if (dataY[0].length <= 7) {//根据数据量选择合适的宽度，7条及以下数据将放宽圆环条
         barOut = 65;
         barIn = 58;
         barBroad = 8;
-      } else if (dataY.length >= 14) {
+      } else if (dataY[0].length >= 14) {
         barOut = 65;
         barIn = 63;
         barBroad = 3;
@@ -1761,11 +1763,11 @@ export function getECharts(type, dataX, dataY, dataDim) {
             show: false
           },
           data: [{
-            value: dataY[index] * dataX.length,
+            value: dataY[0][index] * dataX.length,
             name: name
           },
           {
-            value: sum - dataY[index],
+            value: sum - dataY[0][index],
             name: name,
             itemStyle: {
               normal: {
@@ -1845,10 +1847,10 @@ export function getECharts(type, dataX, dataY, dataDim) {
           formatter: function (name) {
             let total = 0;
             let tarValue;
-            for (let i = 0, l = dataY.length; i < l; i++) {
-              total += dataY[i];
+            for (let i = 0, l = dataY[0].length; i < l; i++) {
+              total += dataY[0][i];
               if (dataX[i] === name) {
-                tarValue = dataY[i];
+                tarValue = dataY[0][i];
               }
             }
             let p;
@@ -1882,15 +1884,15 @@ export function getECharts(type, dataX, dataY, dataDim) {
       };
     }
     else if (type === '37') {
-      let sum = dataY.reduce((a, b) => a + b);
+      let sum = dataY[0].reduce((a, b) => a + b);
       let pieSeries = [];
       let showBackground = true;//是否显示圆环条形背景，true显示，false不显示
       let barOut = 85, barIn = 82, barBroad = 4;//控制圆环条宽度  barOut - barIn = 圆环条宽度，barBroad - 圆环条宽度 = 圆环条间距
-      if (dataY.length <= 7) {//根据数据量选择合适的宽度，7条及以下数据将放宽圆环条
+      if (dataY[0].length <= 7) {//根据数据量选择合适的宽度，7条及以下数据将放宽圆环条
         barOut = 85;
         barIn = 78;
         barBroad = 8;
-      } else if (dataY.length >= 14) {
+      } else if (dataY[0].length >= 14) {
         barOut = 85;
         barIn = 83;
         barBroad = 3;
@@ -1909,7 +1911,7 @@ export function getECharts(type, dataX, dataY, dataDim) {
             show: false
           },
           data: [{
-            value: dataY[index],
+            value: dataY[0][index],
             name: name
           },
           {
@@ -2026,10 +2028,10 @@ export function getECharts(type, dataX, dataY, dataDim) {
             if (name !== null && name !== "" && name !== "__other") {
               let total = 0;
               let tarValue;
-              for (let i = 0, l = dataY.length; i < l; i++) {
-                total += dataY[i];
+              for (let i = 0, l = dataY[0].length; i < l; i++) {
+                total += dataY[0][i];
                 if (dataX[i] === name) {
-                  tarValue = dataY[i];
+                  tarValue = dataY[0][i];
                 }
               }
               let p;
@@ -2074,8 +2076,8 @@ export function getECharts(type, dataX, dataY, dataDim) {
   }
   else if (type === '40' || type === '41' || type === '42' || type === '43') {
     if (type === '40') {
-      const sortedDataX = dataY.slice().sort((a, b) => a - b);
-      let total = dataY.reduce((a, b) => a + b);
+      const sortedDataX = dataY[0].slice().sort((a, b) => a - b);
+      let total = dataY[0].reduce((a, b) => a + b);
       opt = {
         backgroundColor: '#fff',
         color: colors,
@@ -2086,7 +2088,7 @@ export function getECharts(type, dataX, dataY, dataDim) {
           bottom: "10%",
           selectedMode: true,
           data: dataX.map((name, index) => {
-            const value = dataY[index];
+            const value = dataY[0][index];
             let p;
             if (total === 0) {
               p = 0
@@ -2143,19 +2145,19 @@ export function getECharts(type, dataX, dataY, dataDim) {
                 fontSize: 20
               }
             },
-            data: dataY.map((value, index) => {
+            data: dataY[0].map((value, index) => {
               const rank = sortedDataX.indexOf(value) + 1;
               let p;
-              if (dataY.reduce((a, b) => a + b) === 0) {
+              if (dataY[0].reduce((a, b) => a + b) === 0) {
                 p = 0
               } else {
-                p = (accMul(accDiv(value, dataY.reduce((a, b) => a + b)), 100)).toFixed(2)
+                p = (accMul(accDiv(value, dataY[0].reduce((a, b) => a + b)), 100)).toFixed(2)
               }
               let d;
-              if (dataY.reduce((a, b) => a + b)) {
+              if (dataY[0].reduce((a, b) => a + b)) {
                 d = 0
               } else {
-                d = (accMul(accDiv(value, dataY.reduce((a, b) => a + b)), 100)).toFixed(2)
+                d = (accMul(accDiv(value, dataY[0].reduce((a, b) => a + b)), 100)).toFixed(2)
               }
               return {
                 value: rank * 60,
@@ -2214,7 +2216,7 @@ export function getECharts(type, dataX, dataY, dataDim) {
             }
           },
           levels: getLevelOption(),
-          data: generateTestData(dataX, dataY)
+          data: generateTestData(dataX, dataY[0])
         }]
       }
     }

package/util/math-util.js

@@ -1,34 +1,41 @@
 //js除法计算
 export function accDiv(arg1, arg2) {
-  let t1 = 0, t2 = 0, r1, r2;
-  try {
-    t1 = arg1.toString().split(".")[1].length
-  } catch (e) {
-    console.error('accDiv:', e)
+    if (arg2 === 0) {
+    throw new Error('Division by zero');
   }
-  try {
-    t2 = arg2.toString().split(".")[1].length
-  } catch (e) {
-    console.error('accDiv:', e)
+  
+  let t1 = 0, t2 = 0;
+  const str1 = arg1.toString();
+  const str2 = arg2.toString();
+  
+  // 处理arg1的小数位
+  if (str1.includes('.')) {
+    t1 = str1.split('.')[1].length;
+  }
+  
+  // 处理arg2的小数位
+  if (str2.includes('.')) {
+    t2 = str2.split('.')[1].length;
   }
-  r1 = Number(arg1.toString().replace(".", ""))
-  r2 = Number(arg2.toString().replace(".", ""))
+  
+  const r1 = Number(str1.replace('.', ''));
+  const r2 = Number(str2.replace('.', ''));
+  
   return (r1 / r2) * Math.pow(10, t2 - t1);
 }
 
 //js乘法计算
 export function accMul(arg1, arg2) {
   let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
-  try {
-    m += s1.split(".")[1].length
-  } catch (e) {
-    console.error('accMul:', e)
+  
+  // 安全地获取小数位数
+  if (s1.includes('.')) {
+    m += s1.split(".")[1].length;
   }
-  try {
-    m += s2.split(".")[1].length
-  } catch (e) {
-    console.error('accMul:', e)
+  if (s2.includes('.')) {
+    m += s2.split(".")[1].length;
   }
+  
   return accDiv(Number(s1.replace(".", "")) * Number(s2.replace(".", "")), Math.pow(10, m));
 }