@ecan-bi/datav 1.1.7 → 1.1.9

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.7 */
+/*! @ecan-bi/datav@1.1.9 */
 var _a, _b, _c, _d;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, onBeforeUnmount, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, reactive, createTextVNode, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1493,7 +1493,7 @@ const props = {
   isOpenRequestTimer: false,
   requestInterval: 1,
   requestSort: 0,
-  requestParams: [{ key: "", value: { id: "", prop: "" } }],
+  requestParams: [{ key: null, value: {} }],
   events: [],
   dataType: "static"
 };
@@ -2254,22 +2254,19 @@ const useValueFormatter = (formatter, value) => {
       break;
     let statement = variable.slice(1, -1);
     statement = statement == null ? void 0 : statement.replace(/value/g, value);
-    if (/[+\-*/%]+/g.test(value)) {
-      formatter = formatter.replace(variable, statement);
-    } else {
-      try {
-        let result = statement;
-        if (/[+\-*/%]+/g.test(statement)) {
-          const eval2 = eval;
-          result = eval2(statement);
-        }
-        formatter = formatter.replace(variable, result);
-      } catch (e) {
-        console.error(e);
-        return value;
+    try {
+      let result = statement;
+      if (/[+\-*/%]+/g.test(statement)) {
+        const eval2 = eval;
+        result = eval2(statement);
       }
+      formatter = formatter.replace(variable, result);
+    } catch (e) {
+      formatter = formatter.replace(variable, statement);
+      console.warn(e);
     }
   }
+  console.log("\u7ED3\u679C-formatter", formatter);
   return formatter;
 };
 const useIndicatorData = (props2 = {}) => {
@@ -5875,13 +5872,16 @@ const _sfc_main$7 = defineComponent({
           if (tooltipFormatter === "") {
             tooltipFormatter = "{marker} {a}    {c}";
           }
+          const seriesTypes = props2.seriesTypes;
           for (let i = 0; i < len; i++) {
+            const seriesType = seriesTypes[i];
+            const { tooltipFormatter: _tooltipFormatter } = seriesType || {};
             const { marker, seriesName, name, value, data } = params[i] || {};
             if (i === 0) {
               formatter += `${name}<br/>`;
             }
             formatter += useVariablesInText(
-              tooltipFormatter,
+              _tooltipFormatter || tooltipFormatter,
               {
                 marker,
                 name,
@@ -5901,9 +5901,6 @@ const _sfc_main$7 = defineComponent({
           }
           return formatter;
         },
-        valueFormatter(value) {
-          return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
-        },
         textStyle: {
           color: props2.tooltipTextStyleColor
         }