@ecan-bi/datav 1.0.66 → 1.0.68

package/dist/index.es.js

@@ -3230,26 +3230,33 @@ const _sfc_main$h = defineComponent({
     const myValue = computed(() => {
       const data = unref(myData);
       const defaultValue = +props2.variableDefaultValue;
-      if (data == null && !isNaN(defaultValue))
-        return defaultValue;
+      if (data == null) {
+        if (!isNaN(defaultValue)) {
+          return defaultValue;
+        } else {
+          return 0;
+        }
+      }
       const variables = props2.text.match(/\{.+\}/g) || [];
       let value;
-      const valueSet = new Set(Object.values(data));
+      const valueSet = new Set(Object.keys(data));
       for (let i = 0; i < variables.length; i++) {
         const variable = variables[i];
-        if (valueSet.has(variables[i])) {
-          value = variable;
+        const key = variable.slice(1, variable.length - 1);
+        if (valueSet.has(key)) {
+          value = data[key];
           break;
         }
       }
-      if (typeof value === "string" && !isNaN(+value)) {
-        value = +value;
+      if (typeof value === "number") {
+        value = value * 100;
+      } else if (typeof value === "string" && !isNaN(+value)) {
+        value = +value * 100;
       } else if (!isNaN(defaultValue)) {
-        value = defaultValue;
+        value = defaultValue * 100;
       } else {
         value = 0;
       }
-      value = value * 100;
       if (props2.decimalFormat) {
         value = +value.toFixed(2);
       }
@@ -3372,7 +3379,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["percent", "width", "type", "strokeColor", "strokeLinecap", "trailColor", "strokeWidth", "gapDegree", "onClick"])
   ], 4);
 }
-const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-95ca32ca"]]);
+const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-4f7958e8"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = {
   ...props,
@@ -3695,18 +3702,19 @@ const _sfc_main$c = defineComponent({
     const style2 = usePickComponentStyle(props2);
     const emitEvent = useEmitEvent(props2);
     const click = emitEvent("click", () => {
+      const url = unref(myHref);
       if (props2.target === "event") {
         window.parent.postMessage({
           type: "openPage",
-          url: unref(myHref)
+          url
         }, "*");
       }
     });
     const myText = computed(() => useVariablesInText(props2.text));
-    const myHref = computed(() => useVariablesInText(props2.href));
+    const myHref = computed(() => useVariablesInText(props2.href) || null);
     const myTarget = computed(() => {
       const target = props2.target;
-      if (target === "event") {
+      if (target === "event" || unref(myHref) == null) {
         return void 0;
       } else {
         const map = {