@ecan-bi/datav 1.0.71 → 1.0.73

package/dist/index.umd.js

@@ -2209,10 +2209,12 @@
       }
     };
   };
-  const useValueFormatter = (formatter = "", value = "") => {
+  const useValueFormatter = (formatter, value) => {
+    if (formatter == null)
+      return value;
     const variables = formatter.match(/\{.*\}/g);
     if (variables == null || variables.length === 0)
-      return formatter;
+      return value;
     for (let i = 0; i < variables.length; i++) {
       const variable = variables[i];
       if (variable == null || variable === "")
@@ -5344,7 +5346,12 @@
     toolboxTop: "top",
     toolboxIconStyleBorderColor: "#666",
     toolboxDownloadUrl: "",
-    toolboxInfoText: "\u5F53\u524D\u65E0\u8BF4\u660E\u4FE1\u606F"
+    toolboxInfoText: "\u5F53\u524D\u65E0\u8BF4\u660E\u4FE1\u606F",
+    areaStyleOpacity: 0,
+    symbolSize: 4,
+    lineStyleWidth: 2,
+    smooth: false,
+    barWidth: "40%"
   };
   const comboGraphComponentProps = transformToComponentProps(comboGraphProps);
   const comboGraphEvents = ["refreshData", "click"];
@@ -5485,16 +5492,37 @@
         const seriesTypes = props2.seriesTypes;
         for (let i = 0; i < len; i++) {
           const seriesType = seriesTypes[i];
-          temp.push({
-            type: seriesType == null ? void 0 : seriesType.type,
-            yAxisIndex: seriesType == null ? void 0 : seriesType.axisIndex,
+          const { type, axisIndex } = seriesType || {};
+          let series2 = {
+            type,
+            yAxisIndex: axisIndex,
             tooltip: {
               valueFormatter(value) {
-                return useValueFormatter(seriesType == null ? void 0 : seriesType.tooltipFormatter, value);
+                return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
               }
             },
             ...dataset[i]
-          });
+          };
+          if (type === "line") {
+            series2 = {
+              ...series2,
+              symbolSize: props2.symbolSize,
+              smooth: props2.smooth,
+              areaStyle: {
+                opacity: props2.areaStyleOpacity
+              },
+              lineStyle: {
+                width: props2.lineStyleWidth
+              }
+            };
+          }
+          if (type === "bar") {
+            series2 = {
+              ...series2,
+              barWidth: props2.barWidth
+            };
+          }
+          temp.push(series2);
         }
         series.value = temp;
       };
@@ -5516,7 +5544,7 @@
         }
         series.value = temp;
       };
-      vue.watch(() => [props2.data, props2.seriesTypes], ([value]) => {
+      vue.watch(() => [props2.data, props2.seriesTypes, props2.symbolSize, props2.smooth, props2.areaStyleOpacity, props2.lineStyleWidth, props2.barWidth], ([value]) => {
         if (props2.dataType === "static" || vue.unref(pageMode) === "design") {
           handleDataset(value);
         }
@@ -5987,7 +6015,7 @@
     type: "ecanTabs",
     name: "\u6807\u7B7E\u9875",
     keyName: "\u6807\u7B7E\u9875",
-    width: "200px",
+    width: "500px",
     height: "400px",
     tabFontSize: "14px",
     backgroundColor: "",