@ecan-bi/datav 1.0.86 → 1.0.87

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.86 */
+/*! @ecan-bi/datav@1.0.87 */
 (function(global, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("echarts/core"), require("resize-detector"), require("ant-design-vue"), require("ant-design-vue/es/spin/style"), require("ant-design-vue/es/skeleton/style"), require("lodash-es"), require("axios"), require("mitt"), require("dayjs"), require("ant-design-vue/es/progress/style"), require("ant-design-vue/es/input/style"), require("ant-design-vue/es/date-picker/style"), require("ant-design-vue/es/date-picker/locale/zh_CN"), require("ant-design-vue/es/select/style"), require("ant-design-vue/es/button/style"), require("ant-design-vue/es/checkbox/style"), require("echarts/renderers"), require("echarts/charts"), require("echarts/components"), require("echarts"), require("ant-design-vue/es/modal/style"), require("ant-design-vue/es/table/style")) : typeof define === "function" && define.amd ? define(["exports", "vue", "echarts/core", "resize-detector", "ant-design-vue", "ant-design-vue/es/spin/style", "ant-design-vue/es/skeleton/style", "lodash-es", "axios", "mitt", "dayjs", "ant-design-vue/es/progress/style", "ant-design-vue/es/input/style", "ant-design-vue/es/date-picker/style", "ant-design-vue/es/date-picker/locale/zh_CN", "ant-design-vue/es/select/style", "ant-design-vue/es/button/style", "ant-design-vue/es/checkbox/style", "echarts/renderers", "echarts/charts", "echarts/components", "echarts", "ant-design-vue/es/modal/style", "ant-design-vue/es/table/style"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@ecan/bi-datav"] = {}, global.vue, global["echarts/core"], global["resize-detector"], global["ant-design-vue"], null, null, global["lodash-es"], global.axios, global.mitt, global.dayjs, null, null, null, global["ant-design-vue/es/date-picker/locale/zh_CN"], null, null, null, global["echarts/renderers"], global["echarts/charts"], global["echarts/components"], global.echarts));
 })(this, function(exports2, vue, core, resizeDetector, antDesignVue, style$1, style$2, lodashEs, axios, mitt, dayjs, style$3, style$4, style$5, locale, style$6, style$7, style$8, renderers, charts, components$1, echarts) {
@@ -2218,23 +2218,29 @@
     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;