@ecan-bi/datav 1.1.12 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.es.js +6 -5
- package/dist/index.es.js.map +1 -1
- package/dist/index.umd.js +6 -5
- package/dist/index.umd.js.map +1 -1
- package/dist/style.css +1 -1
- package/package.json +1 -1
package/dist/index.es.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @ecan-bi/datav@1.1.
|
|
1
|
+
/*! @ecan-bi/datav@1.1.13 */
|
|
2
2
|
var _a, _b, _c, _d;
|
|
3
3
|
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";
|
|
4
4
|
import { throttle, init, use, registerMap } from "echarts/core";
|
|
@@ -1669,7 +1669,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
|
|
|
1669
1669
|
for (let i = 0; i < variables.length; i++) {
|
|
1670
1670
|
const variable = variables[i];
|
|
1671
1671
|
let statement = variable.slice(1, -1);
|
|
1672
|
-
const reg = /[\u4e00-\
|
|
1672
|
+
const reg = /[\u4e00-\u9fa5a-z-_A-Z]+[0-9]*/g;
|
|
1673
1673
|
const textVariables = statement.match(reg);
|
|
1674
1674
|
for (let j = 0; j < textVariables.length; j++) {
|
|
1675
1675
|
const textVariable = textVariables[j];
|
|
@@ -1679,7 +1679,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
|
|
|
1679
1679
|
}
|
|
1680
1680
|
}
|
|
1681
1681
|
try {
|
|
1682
|
-
if (/[0-9]+(.*)[
|
|
1682
|
+
if (/[0-9]+(.*)[+|-|*|/](.*)[0-9]+/g.test(statement)) {
|
|
1683
1683
|
const eval2 = eval;
|
|
1684
1684
|
statement = eval2(statement);
|
|
1685
1685
|
}
|
|
@@ -1714,9 +1714,10 @@ const useRequestData = (props2, callBack = () => {
|
|
|
1714
1714
|
const { getGlobalModel } = inject(GLOBAL_MODEL, {
|
|
1715
1715
|
getGlobalModel: (key) => void 0
|
|
1716
1716
|
});
|
|
1717
|
+
console.log("requestUrl", requestUrl);
|
|
1718
|
+
const url = useVariablesInText(requestUrl);
|
|
1719
|
+
console.log("url", url);
|
|
1717
1720
|
const requestData = async (params = {}) => {
|
|
1718
|
-
const url = useVariablesInText(requestUrl);
|
|
1719
|
-
console.log("url", url);
|
|
1720
1721
|
if (!url || !method || !headers || unref(pageMode) === "design")
|
|
1721
1722
|
return;
|
|
1722
1723
|
let _params = {};
|