@ecan-bi/datav 1.1.11 → 1.1.13

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.11 */
+/*! @ecan-bi/datav@1.1.13 */
 (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) {
@@ -1674,7 +1674,7 @@
     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];
@@ -1684,7 +1684,7 @@
         }
       }
       try {
-        if (/[0-9]+(.*)[|+|-|*|/](.*)[0-9]+/g.test(statement)) {
+        if (/[0-9]+(.*)[+|-|*|/](.*)[0-9]+/g.test(statement)) {
           const eval2 = eval;
           statement = eval2(statement);
         }
@@ -1704,7 +1704,7 @@
   const useRequestData = (props2, callBack = () => {
   }) => {
     const {
-      requestUrl: url,
+      requestUrl,
       requestMethod: method,
       requestHeaders: headers,
       requestParams,
@@ -1719,6 +1719,9 @@
     const { getGlobalModel } = vue.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 || vue.unref(pageMode) === "design")
         return;