@ecan-bi/datav 1.1.10 → 1.1.12

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.10 */
+/*! @ecan-bi/datav@1.1.12 */
 (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) {
@@ -1704,7 +1704,7 @@
   const useRequestData = (props2, callBack = () => {
   }) => {
     const {
-      requestUrl: url,
+      requestUrl,
       requestMethod: method,
       requestHeaders: headers,
       requestParams,
@@ -1720,6 +1720,8 @@
       getGlobalModel: (key) => void 0
     });
     const requestData = async (params = {}) => {
+      const url = useVariablesInText(requestUrl);
+      console.log("url", url);
       if (!url || !method || !headers || vue.unref(pageMode) === "design")
         return;
       let _params = {};
@@ -2271,7 +2273,6 @@
         console.warn(e);
       }
     }
-    console.log("\u7ED3\u679C-formatter", formatter);
     return formatter;
   };
   const useIndicatorData = (props2 = {}) => {
@@ -2860,7 +2861,7 @@
             } 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 {
@@ -2939,7 +2940,7 @@
       };
     }
   });
-  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 = vue.resolveComponent("skeleton");
@@ -2957,7 +2958,7 @@
       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 = vue.defineComponent({
     name: "EcanScrollText",