@ecan-bi/datav 1.0.86 → 1.0.87

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.86 */
+/*! @ecan-bi/datav@1.0.87 */
 var _a, _b, _c;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -2213,23 +2213,29 @@ const useValueFormatter = (formatter, value) => {
   if (formatter == null)
     return value;
   const variables = formatter.match(/\{.*\}/g);
-  if (variables == null || variables.length === 0)
+  if (variables == null || variables.length === 0) {
     return value;
+  }
   for (let i = 0; i < variables.length; i++) {
     const variable = variables[i];
     if (variable == null || variable === "")
       break;
     let statement = variable.slice(1, -1);
     statement = statement == null ? void 0 : statement.replace(/value/g, value);
-    try {
-      let result = statement;
-      if (/[+\-*/%]+/g.test(statement)) {
-        const eval2 = eval;
-        result = eval2(statement);
+    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;
       }
-      formatter = formatter.replace(variable, result);
-    } catch (e) {
-      console.error(e);
     }
   }
   return formatter;