@ecan-bi/datav 1.1.8 → 1.1.10

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.8 */
+/*! @ecan-bi/datav@1.1.10 */
 (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) {
@@ -2259,22 +2259,19 @@
         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 = {}) => {
@@ -4933,7 +4930,9 @@
     yAxisInverse: false,
     isStack: false,
     labelShow: false,
-    labelFontSize: "12px"
+    labelFontSize: "12px",
+    labelPosition: "inside",
+    labelColor: ""
   };
   const barComponentProps = transformToComponentProps(barProps);
   const barEvents = ["refreshData", "click"];
@@ -4977,7 +4976,9 @@
           }
           item.label = {
             show: props2.labelShow,
-            fontSize: props2.labelFontSize
+            fontSize: props2.labelFontSize,
+            position: props2.labelPosition,
+            color: props2.labelColor
           };
           series2.push(item);
         }
@@ -5909,9 +5910,6 @@
             }
             return formatter;
           },
-          valueFormatter(value) {
-            return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
-          },
           textStyle: {
             color: props2.tooltipTextStyleColor
           }