@ecan-bi/datav 1.1.10 → 1.1.12

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.10 */
+/*! @ecan-bi/datav@1.1.12 */
 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";
@@ -1699,7 +1699,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
 const useRequestData = (props2, callBack = () => {
 }) => {
   const {
-    requestUrl: url,
+    requestUrl,
     requestMethod: method,
     requestHeaders: headers,
     requestParams,
@@ -1715,6 +1715,8 @@ const useRequestData = (props2, callBack = () => {
     getGlobalModel: (key) => void 0
   });
   const requestData = async (params = {}) => {
+    const url = useVariablesInText(requestUrl);
+    console.log("url", url);
     if (!url || !method || !headers || unref(pageMode) === "design")
       return;
     let _params = {};
@@ -2266,7 +2268,6 @@ const useValueFormatter = (formatter, value) => {
       console.warn(e);
     }
   }
-  console.log("\u7ED3\u679C-formatter", formatter);
   return formatter;
 };
 const useIndicatorData = (props2 = {}) => {
@@ -2855,7 +2856,7 @@ const _sfc_main$n = defineComponent({
           } else if (props2.format === "money") {
             usedVariable = +usedVariable;
             if (!isNaN(usedVariable)) {
-              usedVariable = usedVariable.toFixed(2).toLocaleString();
+              usedVariable = formatMoney(usedVariable);
               text = text.replace(variable, `<span style="color:${props2.variableColor};font-size:${props2.variableFontSize}">${usedVariable}</span>`);
             }
           } else {
@@ -2934,7 +2935,7 @@ const _sfc_main$n = defineComponent({
     };
   }
 });
-const Text_vue_vue_type_style_index_0_scoped_445a06d8_lang = "";
+const Text_vue_vue_type_style_index_0_scoped_39de3ad6_lang = "";
 const _hoisted_1$8 = ["innerHTML"];
 function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_skeleton = resolveComponent("skeleton");
@@ -2952,7 +2953,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$8));
 }
-const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-445a06d8"]]);
+const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-39de3ad6"]]);
 const EcanText = withInstall(Text);
 const _sfc_main$m = defineComponent({
   name: "EcanScrollText",