@ecan-bi/datav 1.0.86 → 1.0.88

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.86 */
+/*! @ecan-bi/datav@1.0.88 */
 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";
@@ -1661,23 +1661,45 @@ const lowerCaseIncludes = (v1, v2) => {
   }
   return false;
 };
-const useVariablesInText = (text = "", data = {}) => {
+const useVariablesInText = (formatter = "", data = {}, { useNewline = false, useSpace = false } = {}) => {
   const config2 = window.config || {};
   data = { ...config2, ...data };
-  const variables = text.match(/\{\w*\}/g);
-  if (variables == null || variables.length === 0)
-    return text;
+  const variables = formatter.match(/\{(.+?)\}/g);
+  if (variables == null || variables.length === 0) {
+    return formatter;
+  }
   for (let i = 0; i < variables.length; i++) {
     const variable = variables[i];
-    const v = variable.slice(1, variable.length - 1);
-    const usedVariable = data[v];
-    if (usedVariable != null) {
-      text = text.replace(variable, usedVariable);
-    } else {
-      text = text.replace(variable, "");
+    let statement = variable.slice(1, -1);
+    const reg = /[\u4e00-\u9fa5_a-zA-Z_]+[0-9]*/g;
+    const textVariables = statement.match(reg);
+    for (let j = 0; j < textVariables.length; j++) {
+      const textVariable = textVariables[j];
+      const usedVariable = data[textVariable];
+      if (usedVariable != null) {
+        statement = statement.replace(textVariable, usedVariable);
+      } else {
+        statement = statement.replace(textVariable, "");
+      }
+    }
+    try {
+      if (/[0-9]+(.*)[|+|-|*|/](.*)[0-9]+/g.test(statement)) {
+        const eval2 = eval;
+        statement = eval2(statement);
+      }
+    } catch (e) {
+      console.error(e);
     }
+    formatter = formatter.replace(variable, statement);
+  }
+  if (useNewline) {
+    formatter = formatter == null ? void 0 : formatter.replace(/\n|\\n/g, "<br/>");
+  }
+  if (useSpace) {
+    formatter = formatter == null ? void 0 : formatter.replace(/\s{2,}?/g, "&nbsp;&nbsp;");
   }
-  return text;
+  console.log("formatter", formatter);
+  return formatter;
 };
 const useRequestData = (props2, callBack = () => {
 }) => {
@@ -2213,23 +2235,30 @@ 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 len = variables.length;
+  for (let i = 0; i < len; 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;
@@ -2560,7 +2589,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
     ], 4)) : createCommentVNode("", true)
   ], 512);
 }
-const PageConfig = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$o], ["__scopeId", "data-v-c850087e"]]);
+const PageConfig = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$o], ["__scopeId", "data-v-7b482f6c"]]);
 const EcanPageConfig = withInstall(PageConfig);
 const providerConfig = {
   contextRequestUrl: "",
@@ -2587,7 +2616,10 @@ const _sfc_main$n = defineComponent({
     onMounted(() => {
       setTheme();
     });
-    const contextRequestUrl = computed(() => useVariablesInText(props2.contextRequestUrl));
+    const contextRequestUrl = computed(() => {
+      console.log("props.contextRequestUrl", props2.contextRequestUrl);
+      return useVariablesInText(props2.contextRequestUrl);
+    });
     const pageMode = computed(() => props2.pageMode);
     const theme = computed(() => props2.theme);
     const touchEventId = ref("");
@@ -2865,7 +2897,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$7));
 }
-const Text = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-04fdee06"]]);
+const Text = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-1b461e28"]]);
 const EcanText = withInstall(Text);
 const ScrollText_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$l = defineComponent({
@@ -2940,7 +2972,7 @@ function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
     style: normalizeStyle(_ctx.style)
   }, toDisplayString(_ctx.time), 5);
 }
-const TimeDisplay = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$k], ["__scopeId", "data-v-2da8f6d2"]]);
+const TimeDisplay = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$k], ["__scopeId", "data-v-6f85cdb0"]]);
 const EcanTimeDisplay = withInstall(TimeDisplay);
 const listProps = {
   ...props,
@@ -3065,7 +3097,7 @@ const _sfc_main$j = defineComponent({
     };
   }
 });
-const _withScopeId$2 = (n) => (pushScopeId("data-v-2d4a657c"), n = n(), popScopeId(), n);
+const _withScopeId$2 = (n) => (pushScopeId("data-v-33dd5dd2"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = {
   key: 0,
   class: "title"
@@ -3167,7 +3199,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["loading"])
   ], 4);
 }
-const List = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-2d4a657c"]]);
+const List = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-33dd5dd2"]]);
 const EcanList = withInstall(List);
 const proportionProps = {
   ...props,
@@ -3375,7 +3407,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["percent", "width", "type", "strokeColor", "strokeLinecap", "trailColor", "strokeWidth", "gapDegree", "onClick"])
   ], 4);
 }
-const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-4f7958e8"]]);
+const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-1e9f619c"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = {
   ...props,
@@ -3646,7 +3678,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["value", "options", "getPopupContainer", "field-names", "filter-option", "onChange"])
   ], 4);
 }
-const Select = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-5e92066a"]]);
+const Select = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-38e47a34"]]);
 const EcanSelect = withInstall(Select);
 const rangePickerProps = {
   ...props,
@@ -3728,7 +3760,7 @@ function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["value", "format", "picker", "locale", "getPopupContainer", "onChange"])
   ], 4);
 }
-const RangePicker = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_render$e], ["__scopeId", "data-v-7433eda4"]]);
+const RangePicker = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_render$e], ["__scopeId", "data-v-3acf6a86"]]);
 const EcanRangePicker = withInstall(RangePicker);
 const buttonProps = {
   ...props,
@@ -3952,7 +3984,7 @@ const pieProps = {
   tooltipShow: true,
   tooltipTextStyleColor: "",
   tooltipTrigger: "item",
-  tooltipFormatter: "{b} : {c} ({d}%)",
+  tooltipFormatter: "{marker} {b}   {c} ({d}%)",
   legendShow: true,
   legendTextStyleColor: "#333",
   legendOrient: "vertical",
@@ -4098,7 +4130,27 @@ const _sfc_main$b = defineComponent({
         tooltip: {
           show: props2.tooltipShow,
           trigger: props2.tooltipTrigger,
-          formatter: handleFormatter(props2.tooltipFormatter),
+          formatter: (params) => {
+            const { marker, seriesName, name, value, percent, data: data2 } = params || {};
+            return useVariablesInText(
+              props2.tooltipFormatter,
+              {
+                marker,
+                name,
+                value,
+                percent,
+                a: seriesName,
+                b: name,
+                c: value,
+                d: percent,
+                ...data2
+              },
+              {
+                useNewline: true,
+                useSpace: true
+              }
+            );
+          },
           textStyle: {
             color: props2.tooltipTextStyleColor
           }
@@ -4297,16 +4349,15 @@ const lineProps = {
   left: "",
   rotate: "",
   data: [
-    { name: "\u540D\u79F0\u4E00", value: 335 },
-    { name: "\u540D\u79F0\u4E8C", value: 310 },
-    { name: "\u540D\u79F0\u4E09", value: 234 },
-    { name: "\u540D\u79F0\u56DB", value: 135 },
-    { name: "\u540D\u79F0\u4E94", value: 1548 }
+    { name: "\u540D\u79F0\u4E00", value: 235, type: "\u7C7B\u578B\u4E00" },
+    { name: "\u540D\u79F0\u4E8C", value: 280, type: "\u7C7B\u578B\u4E00" },
+    { name: "\u540D\u79F0\u4E09", value: 230, type: "\u7C7B\u578B\u4E00" },
+    { name: "\u540D\u79F0\u56DB", value: 335, type: "\u7C7B\u578B\u4E00" }
   ],
   titleText: "",
   titleSubtext: "",
   titleLeft: "",
-  legendShow: false,
+  legendShow: true,
   legendOrient: "horizontal",
   legendTop: "top",
   legendLeft: "center",
@@ -4334,6 +4385,8 @@ const lineProps = {
   keyTypeDataFieldNames: { name: "name", types: [] },
   dataFieldConfigType: "value",
   graphicConfig: {},
+  tooltipShow: true,
+  tooltipFormatter: "{marker} {a}    {c}",
   toolboxShow: false,
   toolboxOrient: "horizontal",
   toolboxItemSize: 16,
@@ -4426,6 +4479,42 @@ const _sfc_main$a = defineComponent({
           containLabel: props2.gridContainLabel
         },
         color: props2.colors,
+        tooltip: {
+          trigger: "axis",
+          show: props2.tooltipShow,
+          formatter: (params) => {
+            const len = params.length;
+            let formatter = "";
+            let tooltipFormatter = props2.tooltipFormatter;
+            if (tooltipFormatter === "") {
+              tooltipFormatter = "{marker} {a}    {c}";
+            }
+            for (let i = 0; i < len; i++) {
+              const { marker, seriesName, name, value, data } = params[i] || {};
+              if (i === 0) {
+                formatter += `${name}<br/>`;
+              }
+              formatter += useVariablesInText(
+                tooltipFormatter,
+                {
+                  marker,
+                  name,
+                  value,
+                  a: seriesName,
+                  b: name,
+                  c: value,
+                  ...data
+                },
+                {
+                  useNewline: true,
+                  useSpace: true
+                }
+              );
+              formatter += "<br/>";
+            }
+            return formatter;
+          }
+        },
         xAxis: {
           type: "category",
           data: unref(dimensions),
@@ -4470,9 +4559,6 @@ const _sfc_main$a = defineComponent({
             }
           }
         },
-        tooltip: {
-          trigger: "axis"
-        },
         legend: {
           show: props2.legendShow,
           orient: props2.legendOrient,
@@ -4701,8 +4787,7 @@ const barProps = {
   legendLeft: "center",
   tooltipShow: true,
   tooltipTextStyleColor: "",
-  tooltipTrigger: "item",
-  tooltipFormatter: "",
+  tooltipFormatter: "{marker} {a}    {c}",
   xAxisSplitLineShow: true,
   xAxisSplitLineStyleColor: "#333",
   xAxisLabelColor: "#333",
@@ -4848,7 +4933,38 @@ const _sfc_main$9 = defineComponent({
         tooltip: {
           trigger: "axis",
           show: props2.tooltipShow,
-          formatter: handleFormatter(props2.tooltipFormatter),
+          formatter: (params) => {
+            const len = params.length;
+            let formatter = "";
+            let tooltipFormatter = props2.tooltipFormatter;
+            if (tooltipFormatter === "") {
+              tooltipFormatter = "{marker} {a}    {c}";
+            }
+            for (let i = 0; i < len; i++) {
+              const { marker, seriesName, name, value, data } = params[i] || {};
+              if (i === 0) {
+                formatter += `${name}<br/>`;
+              }
+              formatter += useVariablesInText(
+                tooltipFormatter,
+                {
+                  marker,
+                  name,
+                  value,
+                  a: seriesName,
+                  b: name,
+                  c: value,
+                  ...data
+                },
+                {
+                  useNewline: true,
+                  useSpace: true
+                }
+              );
+              formatter += "<br/>";
+            }
+            return formatter;
+          },
           textStyle: {
             color: props2.tooltipTextStyleColor
           }
@@ -5092,7 +5208,7 @@ const scatterProps = {
   titleSubtext: "",
   tooltipShow: true,
   tooltipTrigger: "item",
-  tooltipFormatter: "{c}",
+  tooltipFormatter: "{marker} {b}    {c}",
   legendShow: false,
   legendOrient: "horizontal",
   legendTop: "top",
@@ -5254,8 +5370,17 @@ const _sfc_main$8 = defineComponent({
           trigger: props2.tooltipTrigger,
           formatter: function(params) {
             var _a2, _b2;
+            const { marker, seriesName } = params;
             const record = (_b2 = (_a2 = params == null ? void 0 : params.data) == null ? void 0 : _a2.record) != null ? _b2 : {};
-            return useVariablesInText(props2.tooltipFormatter, record);
+            const { name, value } = record;
+            return useVariablesInText(props2.tooltipFormatter, {
+              marker,
+              seriesName,
+              a: seriesName,
+              b: name,
+              c: value,
+              ...record
+            });
           },
           axisPointer: {
             type: "cross"
@@ -5485,7 +5610,7 @@ const comboGraphProps = {
   tooltipShow: true,
   tooltipTextStyleColor: "",
   tooltipTrigger: "item",
-  tooltipFormatter: "",
+  tooltipFormatter: "{marker} {a}    {c}",
   xAxisSplitLineShow: true,
   xAxisSplitLineStyleColor: "#333",
   xAxisLabelColor: "#333",
@@ -5617,13 +5742,6 @@ const _sfc_main$6 = defineComponent({
         containLabel: props2.gridContainLabel
       },
       color: props2.colors,
-      tooltip: {
-        trigger: "axis",
-        show: props2.tooltipShow,
-        textStyle: {
-          color: props2.tooltipTextStyleColor
-        }
-      },
       legend: {
         show: props2.legendShow,
         orient: props2.legendOrient,
@@ -5633,6 +5751,49 @@ const _sfc_main$6 = defineComponent({
           color: props2.legendTextStyleColor
         }
       },
+      tooltip: {
+        trigger: "axis",
+        show: props2.tooltipShow,
+        formatter: (params) => {
+          const len = params.length;
+          let formatter = "";
+          let tooltipFormatter = props2.tooltipFormatter;
+          if (tooltipFormatter === "") {
+            tooltipFormatter = "{marker} {a}    {c}";
+          }
+          for (let i = 0; i < len; i++) {
+            const { marker, seriesName, name, value, data } = params[i] || {};
+            if (i === 0) {
+              formatter += `${name}<br/>`;
+            }
+            formatter += useVariablesInText(
+              tooltipFormatter,
+              {
+                marker,
+                name,
+                value,
+                seriesName,
+                a: seriesName,
+                b: name,
+                c: value,
+                ...data
+              },
+              {
+                useNewline: true,
+                useSpace: true
+              }
+            );
+            formatter += "<br/>";
+          }
+          return formatter;
+        },
+        valueFormatter(value) {
+          return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
+        },
+        textStyle: {
+          color: props2.tooltipTextStyleColor
+        }
+      },
       xAxis: {
         type: "category",
         data: unref(dimensions),
@@ -5680,11 +5841,6 @@ const _sfc_main$6 = defineComponent({
         let series2 = {
           type,
           yAxisIndex: axisIndex,
-          tooltip: {
-            valueFormatter(value) {
-              return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
-            }
-          },
           ...dataset[i]
         };
         if (type === "line") {
@@ -5953,7 +6109,7 @@ const _sfc_main$5 = defineComponent({
     };
   }
 });
-const _withScopeId$1 = (n) => (pushScopeId("data-v-2f8fd004"), n = n(), popScopeId(), n);
+const _withScopeId$1 = (n) => (pushScopeId("data-v-4d96083e"), n = n(), popScopeId(), n);
 const _hoisted_1$4 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "top-left border-item" }, null, -1));
 const _hoisted_2$2 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "top-right border-item" }, null, -1));
 const _hoisted_3 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
@@ -6020,7 +6176,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ], 4);
 }
-const Border = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-2f8fd004"]]);
+const Border = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-4d96083e"]]);
 const EcanBorder = withInstall(Border);
 const modalProps = {
   id: "",
@@ -6191,7 +6347,7 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     } : void 0
   ]), 1032, ["getContainer", "wrapClassName", "visible", "width", "destroyOnClose", "style", "onOk", "onCancel"]);
 }
-const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-378919f0"]]);
+const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-24c6a724"]]);
 const EcanModal = withInstall(Modal);
 const tabsProps = {
   ...props,
@@ -6280,7 +6436,7 @@ const _sfc_main$3 = defineComponent({
     };
   }
 });
-const _withScopeId = (n) => (pushScopeId("data-v-0becf31e"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-e32b1f6e"), n = n(), popScopeId(), n);
 const _hoisted_1$3 = ["onClick"];
 const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "tabs-content" }, null, -1));
 function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
@@ -6318,7 +6474,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     _hoisted_2$1
   ], 4);
 }
-const Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-0becf31e"]]);
+const Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-e32b1f6e"]]);
 const EcanTabs = withInstall(Tabs);
 const imageProps = {
   ...props,
@@ -6385,7 +6541,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     style: normalizeStyle(_ctx.style)
   }, " \u8BF7\u4E0A\u4F20\u56FE\u7247 ", 4));
 }
-const Image = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-ab94aeb2"]]);
+const Image = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-f91836f6"]]);
 const EcanImage = withInstall(Image);
 const tableProps = {
   ...props,
@@ -6877,7 +7033,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["loading"])
   ], 4);
 }
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-6da03837"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-0963bd5a"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,
@@ -7083,7 +7239,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const Map$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-04ea2568"]]);
+const Map$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-322b32ca"]]);
 const EcanMap = withInstall(Map$1);
 const components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,