@ecan-bi/datav 1.0.86 → 1.0.88

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.86 */
+/*! @ecan-bi/datav@1.0.88 */
 (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) {
@@ -1666,23 +1666,45 @@
     }
     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 = () => {
   }) => {
@@ -2218,23 +2240,30 @@
     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;
@@ -2565,7 +2594,7 @@
       ], 4)) : vue.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: "",
@@ -2592,7 +2621,10 @@
       vue.onMounted(() => {
         setTheme();
       });
-      const contextRequestUrl = vue.computed(() => useVariablesInText(props2.contextRequestUrl));
+      const contextRequestUrl = vue.computed(() => {
+        console.log("props.contextRequestUrl", props2.contextRequestUrl);
+        return useVariablesInText(props2.contextRequestUrl);
+      });
       const pageMode = vue.computed(() => props2.pageMode);
       const theme = vue.computed(() => props2.theme);
       const touchEventId = vue.ref("");
@@ -2870,7 +2902,7 @@
       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 = vue.defineComponent({
@@ -2945,7 +2977,7 @@
       style: vue.normalizeStyle(_ctx.style)
     }, vue.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,
@@ -3070,7 +3102,7 @@
       };
     }
   });
-  const _withScopeId$2 = (n) => (vue.pushScopeId("data-v-2d4a657c"), n = n(), vue.popScopeId(), n);
+  const _withScopeId$2 = (n) => (vue.pushScopeId("data-v-33dd5dd2"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$5 = {
     key: 0,
     class: "title"
@@ -3172,7 +3204,7 @@
       }, 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,
@@ -3380,7 +3412,7 @@
       }, 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,
@@ -3651,7 +3683,7 @@
       }, 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,
@@ -3733,7 +3765,7 @@
       }, 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,
@@ -3957,7 +3989,7 @@
     tooltipShow: true,
     tooltipTextStyleColor: "",
     tooltipTrigger: "item",
-    tooltipFormatter: "{b} : {c} ({d}%)",
+    tooltipFormatter: "{marker} {b}   {c} ({d}%)",
     legendShow: true,
     legendTextStyleColor: "#333",
     legendOrient: "vertical",
@@ -4103,7 +4135,27 @@
           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
             }
@@ -4302,16 +4354,15 @@
     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",
@@ -4339,6 +4390,8 @@
     keyTypeDataFieldNames: { name: "name", types: [] },
     dataFieldConfigType: "value",
     graphicConfig: {},
+    tooltipShow: true,
+    tooltipFormatter: "{marker} {a}    {c}",
     toolboxShow: false,
     toolboxOrient: "horizontal",
     toolboxItemSize: 16,
@@ -4431,6 +4484,42 @@
             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: vue.unref(dimensions),
@@ -4475,9 +4564,6 @@
               }
             }
           },
-          tooltip: {
-            trigger: "axis"
-          },
           legend: {
             show: props2.legendShow,
             orient: props2.legendOrient,
@@ -4706,8 +4792,7 @@
     legendLeft: "center",
     tooltipShow: true,
     tooltipTextStyleColor: "",
-    tooltipTrigger: "item",
-    tooltipFormatter: "",
+    tooltipFormatter: "{marker} {a}    {c}",
     xAxisSplitLineShow: true,
     xAxisSplitLineStyleColor: "#333",
     xAxisLabelColor: "#333",
@@ -4853,7 +4938,38 @@
           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
             }
@@ -5097,7 +5213,7 @@
     titleSubtext: "",
     tooltipShow: true,
     tooltipTrigger: "item",
-    tooltipFormatter: "{c}",
+    tooltipFormatter: "{marker} {b}    {c}",
     legendShow: false,
     legendOrient: "horizontal",
     legendTop: "top",
@@ -5259,8 +5375,17 @@
             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"
@@ -5490,7 +5615,7 @@
     tooltipShow: true,
     tooltipTextStyleColor: "",
     tooltipTrigger: "item",
-    tooltipFormatter: "",
+    tooltipFormatter: "{marker} {a}    {c}",
     xAxisSplitLineShow: true,
     xAxisSplitLineStyleColor: "#333",
     xAxisLabelColor: "#333",
@@ -5622,13 +5747,6 @@
           containLabel: props2.gridContainLabel
         },
         color: props2.colors,
-        tooltip: {
-          trigger: "axis",
-          show: props2.tooltipShow,
-          textStyle: {
-            color: props2.tooltipTextStyleColor
-          }
-        },
         legend: {
           show: props2.legendShow,
           orient: props2.legendOrient,
@@ -5638,6 +5756,49 @@
             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: vue.unref(dimensions),
@@ -5685,11 +5846,6 @@
           let series2 = {
             type,
             yAxisIndex: axisIndex,
-            tooltip: {
-              valueFormatter(value) {
-                return useValueFormatter(props2 == null ? void 0 : props2.tooltipFormatter, value);
-              }
-            },
             ...dataset[i]
           };
           if (type === "line") {
@@ -5958,7 +6114,7 @@
       };
     }
   });
-  const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-2f8fd004"), n = n(), vue.popScopeId(), n);
+  const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-4d96083e"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$4 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "top-left border-item" }, null, -1));
   const _hoisted_2$2 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "top-right border-item" }, null, -1));
   const _hoisted_3 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
@@ -6025,7 +6181,7 @@
       ])) : vue.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: "",
@@ -6196,7 +6352,7 @@
       } : 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,
@@ -6285,7 +6441,7 @@
       };
     }
   });
-  const _withScopeId = (n) => (vue.pushScopeId("data-v-0becf31e"), n = n(), vue.popScopeId(), n);
+  const _withScopeId = (n) => (vue.pushScopeId("data-v-e32b1f6e"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$3 = ["onClick"];
   const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "tabs-content" }, null, -1));
   function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
@@ -6323,7 +6479,7 @@
       _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,
@@ -6390,7 +6546,7 @@
       style: vue.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,
@@ -6882,7 +7038,7 @@
       }, 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,
@@ -7088,7 +7244,7 @@
       ])
     ], 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,