@ecan-bi/datav 1.1.11 → 1.1.13

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.11 */
+/*! @ecan-bi/datav@1.1.13 */
 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";
@@ -1669,7 +1669,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
   for (let i = 0; i < variables.length; i++) {
     const variable = variables[i];
     let statement = variable.slice(1, -1);
-    const reg = /[\u4e00-\u9fa5_a-zA-Z_]+[0-9]*/g;
+    const reg = /[\u4e00-\u9fa5a-z-_A-Z]+[0-9]*/g;
     const textVariables = statement.match(reg);
     for (let j = 0; j < textVariables.length; j++) {
       const textVariable = textVariables[j];
@@ -1679,7 +1679,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
       }
     }
     try {
-      if (/[0-9]+(.*)[|+|-|*|/](.*)[0-9]+/g.test(statement)) {
+      if (/[0-9]+(.*)[+|-|*|/](.*)[0-9]+/g.test(statement)) {
         const eval2 = eval;
         statement = eval2(statement);
       }
@@ -1699,7 +1699,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
 const useRequestData = (props2, callBack = () => {
 }) => {
   const {
-    requestUrl: url,
+    requestUrl,
     requestMethod: method,
     requestHeaders: headers,
     requestParams,
@@ -1714,6 +1714,9 @@ const useRequestData = (props2, callBack = () => {
   const { getGlobalModel } = inject(GLOBAL_MODEL, {
     getGlobalModel: (key) => void 0
   });
+  console.log("requestUrl", requestUrl);
+  const url = useVariablesInText(requestUrl);
+  console.log("url", url);
   const requestData = async (params = {}) => {
     if (!url || !method || !headers || unref(pageMode) === "design")
       return;