@ecan-bi/datav 1.0.52 → 1.0.53

package/dist/index.es.js

@@ -3206,11 +3206,12 @@ const proportionProps = __spreadProps(__spreadValues({}, props), {
   strokeWidth: 6,
   fontWeight: 400,
   strokeTextWidth: "100%",
-  lineHeight: "26px"
+  lineHeight: "26px",
+  decimalFormat: false
 });
 const proportionComponentProps = transformToComponentProps(proportionProps);
 const proportionEvents = ["refreshData", "click"];
-var Proportion_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-proportion[data-v-206755e6] {\n  overflow: hidden;\n}\n.progress[data-v-206755e6] {\n  width: 100%;\n  height: 100%;\n}\n.format[data-v-206755e6] {\n  margin: 0 auto;\n}\n")();
+var Proportion_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-proportion[data-v-f55c66cc] {\n  overflow: hidden;\n}\n.progress[data-v-f55c66cc] {\n  width: 100%;\n  height: 100%;\n}\n.format[data-v-f55c66cc] {\n  margin: 0 auto;\n}\n")();
 const _sfc_main$h = defineComponent({
   name: "EcanProportion",
   components: {
@@ -3224,41 +3225,55 @@ const _sfc_main$h = defineComponent({
       const width = props2.width;
       return parseFloat(width);
     });
-    const myData = ref(props2.data);
+    const myData = ref({});
+    watch(() => props2.data, () => {
+      if (props2.dataType === "static" || unref(pageMode) === "design") {
+        myData.value = props2.data;
+      }
+    }, {
+      immediate: true,
+      deep: true
+    });
     const defaultValue = 0;
     const value = computed(() => {
-      var _a2;
       const data = unref(myData);
       if (data == null)
         return defaultValue;
       const values = Object.values(data);
-      return ((_a2 = values[0]) != null ? _a2 : 0) * 100;
-    });
-    const useValueKey = computed(() => {
-      const data = unref(myData) || {};
-      return Object.keys(data)[0];
+      const value2 = values[0] * 100;
+      if (!isNaN(value2)) {
+        return props2.decimalFormat ? value2.toFixed(2) : value2;
+      }
+      return 0;
     });
     const text = computed(() => {
-      var _a2;
       let text2 = props2.text;
       const data = unref(myData);
-      const variables = text2.match(/\{\w*\}/g) || [];
+      const variables = text2.match(/\{.*\}/g) || [];
+      console.log("variables", variables);
       if (text2 === "")
         return unref(value) + "%";
       for (let i = 0; i < variables.length; i++) {
         const variable = variables[i];
-        const v = variable.slice(1, variable.length - 1);
-        let usedVariable = "";
-        if (unref(useValueKey) === v) {
-          usedVariable = unref(value).toFixed(2);
-        } else {
-          usedVariable = (_a2 = data[v]) != null ? _a2 : defaultValue;
+        let statement = variable.slice(1, variable.length - 1);
+        const textVariables = statement.match(/[a-zA-Z]\w*/g);
+        console.log("textVariables", textVariables);
+        for (let j = 0; j < textVariables.length; j++) {
+          const textVariable = textVariables[i];
+          if (data[textVariable] != null) {
+            statement = statement.replace(textVariable, data[textVariable]);
+          }
         }
-        if (usedVariable != null) {
-          text2 = text2.replace(variable, usedVariable);
-        } else {
-          text2 = text2.replace(variable, "");
+        console.log("statement", statement);
+        let usedVariable;
+        if (/[+\-*/%]+/g.test(statement)) {
+          const eval2 = eval;
+          usedVariable = eval2(statement);
+        }
+        if (props2.decimalFormat) {
+          usedVariable = usedVariable == null ? void 0 : usedVariable.toFixed(2);
         }
+        text2 = text2.replace(variable, usedVariable + "");
       }
       return text2;
     });
@@ -3343,7 +3358,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["percent", "width", "type", "strokeColor", "strokeLinecap", "trailColor", "strokeWidth", "gapDegree", "onClick"])
   ], 4);
 }
-var Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-206755e6"]]);
+var Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-f55c66cc"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = __spreadProps(__spreadValues({}, props), {
   width: "200px",