@ecan-bi/datav 1.0.53 → 1.0.54

package/dist/index.es.js

@@ -3207,11 +3207,12 @@ const proportionProps = __spreadProps(__spreadValues({}, props), {
   fontWeight: 400,
   strokeTextWidth: "100%",
   lineHeight: "26px",
-  decimalFormat: false
+  decimalFormat: false,
+  textDefaultValue: ""
 });
 const proportionComponentProps = transformToComponentProps(proportionProps);
 const proportionEvents = ["refreshData", "click"];
-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")();
+var Proportion_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-proportion[data-v-f029c988] {\n  overflow: hidden;\n}\n.progress[data-v-f029c988] {\n  width: 100%;\n  height: 100%;\n}\n.format[data-v-f029c988] {\n  margin: 0 auto;\n}\n")();
 const _sfc_main$h = defineComponent({
   name: "EcanProportion",
   components: {
@@ -3220,6 +3221,9 @@ const _sfc_main$h = defineComponent({
   },
   props: __spreadValues({}, proportionComponentProps),
   setup(props2) {
+    const { pageMode } = inject(GLOBAL_CONFIG, {
+      pageMode: "normal"
+    });
     const style2 = usePickComponentStyle(props2);
     const myWidth = computed(() => {
       const width = props2.width;
@@ -3249,37 +3253,41 @@ const _sfc_main$h = defineComponent({
     const text = computed(() => {
       let text2 = props2.text;
       const data = unref(myData);
+      console.log(data);
       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];
         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]);
+          } else {
+            statement = statement.replace(textVariable, props2.textDefaultValue);
           }
         }
         console.log("statement", statement);
-        let usedVariable;
-        if (/[+\-*/%]+/g.test(statement)) {
-          const eval2 = eval;
-          usedVariable = eval2(statement);
+        let usedVariable = statement;
+        try {
+          if (/[+\-*/%]+/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);
         }
+        console.log("usedVariable", usedVariable);
         text2 = text2.replace(variable, usedVariable + "");
       }
+      console.log("text", text2);
       return text2;
     });
-    const { pageMode } = inject(GLOBAL_CONFIG, {
-      pageMode: "normal"
-    });
     const requestData = useRequestData(props2);
     const loading = ref(false);
     const handleRequestData = async () => {
@@ -3358,7 +3366,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-f55c66cc"]]);
+var Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-f029c988"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = __spreadProps(__spreadValues({}, props), {
   width: "200px",