@ecan-bi/datav 1.0.64 → 1.0.65

package/dist/index.umd.js

@@ -3233,47 +3233,68 @@
         immediate: true,
         deep: true
       });
-      const defaultValue = 0;
-      const value = vue.computed(() => {
+      const myValue = vue.computed(() => {
         const data = vue.unref(myData);
-        if (data == null)
+        const defaultValue = +props2.variableDefaultValue;
+        if (data == null && !isNaN(defaultValue))
           return defaultValue;
-        const values = Object.values(data);
-        const value2 = values[0] * 100;
-        if (!isNaN(value2)) {
-          return props2.decimalFormat ? value2.toFixed(2) : value2;
+        const variables = props2.text.match(/\{.+\}/g) || [];
+        let value;
+        const valueSet = new Set(Object.values(data));
+        for (let i = 0; i < variables.length; i++) {
+          const variable = variables[i];
+          if (valueSet.has(variables[i])) {
+            value = variable;
+            break;
+          }
+        }
+        if (typeof value === "string" && !isNaN(+value)) {
+          value = +value;
+        } else if (!isNaN(defaultValue)) {
+          value = defaultValue;
+        } else {
+          value = 0;
+        }
+        value = value * 100;
+        if (props2.decimalFormat) {
+          value = +value.toFixed(2);
         }
-        return 0;
+        return value;
       });
       const text = vue.computed(() => {
+        var _a2;
         let text2 = props2.text;
+        if (text2 === "")
+          return vue.unref(myValue);
+        const defaultValue = props2.variableDefaultValue;
         const data = vue.unref(myData);
         const variables = text2.match(/\{.+\}/g) || [];
-        if (text2 === "")
-          return vue.unref(value) + "%";
-        for (let i = 0; i < (variables == null ? void 0 : variables.length); i++) {
+        for (let i = 0; i < variables.length; i++) {
           const variable = variables[i];
           let statement = variable.slice(1, variable.length - 1);
-          const textVariables = statement.match(/[a-zA-Z]\w*/g);
+          const textVariables = statement.match(/.*/g);
           for (let j = 0; j < (textVariables == null ? void 0 : textVariables.length); j++) {
-            const textVariable = textVariables[i];
+            const textVariable = (_a2 = textVariables[i]) == null ? void 0 : _a2.trim();
             if (data[textVariable] != null) {
               statement = statement.replace(textVariable, data[textVariable]);
             } else {
-              statement = statement.replace(textVariable, props2.variableDefaultValue);
+              statement = statement.replace(textVariable, defaultValue);
             }
           }
           let usedVariable = statement;
           try {
-            if (/[+\-*/%]+/g.test(statement)) {
+            if (/\w+[+\-*/%]+\w+/g.test(statement)) {
               const eval2 = eval;
               usedVariable = eval2(statement);
             }
           } catch (e) {
             console.error(e);
           }
-          if (props2.decimalFormat) {
-            usedVariable = usedVariable == null ? void 0 : usedVariable.toFixed(2);
+          if (typeof usedVariable === "number" || !isNaN(+usedVariable)) {
+            usedVariable = +usedVariable * 100;
+            if (props2.decimalFormat) {
+              usedVariable = usedVariable.toFixed(2);
+            }
           }
           text2 = text2.replace(variable, usedVariable + "");
         }
@@ -3312,7 +3333,7 @@
         style: style2,
         myWidth,
         text,
-        value,
+        myValue,
         loading,
         click
       };
@@ -3327,7 +3348,7 @@
     }, [
       vue.createVNode(_component_a_progress, {
         class: "progress",
-        percent: _ctx.value,
+        percent: _ctx.myValue,
         width: _ctx.myWidth,
         type: _ctx.strokeType,
         strokeColor: _ctx.strokeColor,
@@ -3357,7 +3378,7 @@
       }, 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-5758f39c"]]);
+  const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-95ca32ca"]]);
   const EcanProportion = withInstall(Proportion);
   const inputProps = {
     ...props,