@ecan-bi/datav 1.1.8 → 1.1.10

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.8 */
+/*! @ecan-bi/datav@1.1.10 */
 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";
@@ -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 = {}) => {
@@ -4928,7 +4925,9 @@ const barProps = {
   yAxisInverse: false,
   isStack: false,
   labelShow: false,
-  labelFontSize: "12px"
+  labelFontSize: "12px",
+  labelPosition: "inside",
+  labelColor: ""
 };
 const barComponentProps = transformToComponentProps(barProps);
 const barEvents = ["refreshData", "click"];
@@ -4972,7 +4971,9 @@ const _sfc_main$a = defineComponent({
         }
         item.label = {
           show: props2.labelShow,
-          fontSize: props2.labelFontSize
+          fontSize: props2.labelFontSize,
+          position: props2.labelPosition,
+          color: props2.labelColor
         };
         series2.push(item);
       }
@@ -5904,9 +5905,6 @@ const _sfc_main$7 = defineComponent({
           }
           return formatter;
         },
-        valueFormatter(value) {
-          return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
-        },
         textStyle: {
           color: props2.tooltipTextStyleColor
         }