@ecan-bi/datav 1.0.74 → 1.0.76

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.74 */
+/*! @ecan-bi/datav@1.0.76 */
 var _a, _b, _c;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1724,7 +1724,7 @@ const useRequestData = (props2, callBack = () => {
         _params[key] = useVariablesInText(value);
       }
     });
-    _params = { ..._params, ...params };
+    _params = { ...window.requestParams, ..._params, ...params };
     let urlParams = "";
     const keys = Object.keys(_params);
     const last = keys.length - 1;
@@ -2778,7 +2778,8 @@ const _sfc_main$l = defineComponent({
       var _a2;
       const data = unref(myData);
       let text = props2.text;
-      text = text == null ? void 0 : text.replace(/\n|\\n/g, "<br />");
+      text = text == null ? void 0 : text.replace(/\n|\\n/g, "<br/>");
+      text = text == null ? void 0 : text.replace(/\s/g, "&nbsp;");
       const variables = text.match(/\{\s*[\w\u4e00-\u9fa5]*\s*\}/g);
       if (variables == null || variables.length === 0)
         return text;
@@ -2794,7 +2795,7 @@ const _sfc_main$l = defineComponent({
               if (usedVariable >= 0) {
                 text = text.replace(variable, `<span style="color:#ED6643;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goUp}"/>${usedVariable}%</span>`);
               } else {
-                text = text.replace(variable, `<span style="color: #6ACB97;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goDown}"/>${usedVariable}%</span>`);
+                text = text.replace(variable, `<span style="color: #6ACB97;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goDown}"/>${Math.abs(usedVariable)}%</span>`);
               }
             } else {
               text = text.replace(variable, `<span style="color:${props2.variableColor};font-size:${props2.variableFontSize}">${0}%</span>`);
@@ -2876,7 +2877,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$7));
 }
-const Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-e5026e44"]]);
+const Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-04fdee06"]]);
 const EcanText = withInstall(Text);
 const ScrollText_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$k = defineComponent({
@@ -3194,7 +3195,7 @@ const proportionProps = {
   data: {
     percent: 0.3
   },
-  text: "",
+  text: "{percent}%",
   fontSize: "26px",
   color: "#4091f7",
   strokeWidth: 6,