@ecan-bi/datav 1.0.63 → 1.0.66

package/dist/index.umd.js

@@ -2749,7 +2749,7 @@
     alignItems: "center",
     variableFontSize: "14px",
     data: {},
-    variableDefaultValue: "",
+    variableDefaultValue: "0",
     format: ""
   };
   const textComponentProps = transformToComponentProps(textProps);
@@ -3201,7 +3201,7 @@
     strokeTextWidth: "100%",
     lineHeight: "26px",
     decimalFormat: false,
-    variableDefaultValue: ""
+    variableDefaultValue: "0"
   };
   const proportionComponentProps = transformToComponentProps(proportionProps);
   const proportionEvents = ["refreshData", "click"];
@@ -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;
+          }
         }
-        return 0;
+        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 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,
@@ -4926,7 +4947,8 @@
     },
     components: {
       Spin,
-      Echarts
+      Echarts,
+      AModal: antDesignVue.Modal
     },
     setup(props2) {
       const style2 = usePickComponentStyle(props2);
@@ -5943,6 +5965,7 @@
   const EcanModal = withInstall(Modal);
   const tabsProps = {
     ...props,
+    tabHorizontalPadding: "0px",
     type: "ecanTabs",
     name: "\u6807\u7B7E\u9875",
     keyName: "\u6807\u7B7E\u9875",
@@ -6027,7 +6050,7 @@
       };
     }
   });
-  const _withScopeId = (n) => (vue.pushScopeId("data-v-20bbeaac"), n = n(), vue.popScopeId(), n);
+  const _withScopeId = (n) => (vue.pushScopeId("data-v-019ea41f"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$3 = ["onClick"];
   const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "tabs-content" }, null, -1));
   function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
@@ -6045,6 +6068,7 @@
           return vue.openBlock(), vue.createElementBlock("div", {
             class: "tab",
             style: vue.normalizeStyle({
+              padding: `5px ${_ctx.tabHorizontalPadding}`,
               color: _ctx.isActive(index2) ? _ctx.activeTabColor : _ctx.tabColor,
               backgroundImage: _ctx.isActive(index2) ? _ctx.useImagePath(_ctx.activeTabBackgroundImage, true) : _ctx.useImagePath(_ctx.tabBackgroundImage, true),
               marginRight: _ctx.tabBarGutter
@@ -6055,7 +6079,7 @@
             vue.createElementVNode("div", {
               class: "tab-inner",
               style: vue.normalizeStyle({
-                borderBottom: `1px solid ${_ctx.isActive(index2) ? _ctx.activeTabColor : "transparent"}`
+                borderBottom: !_ctx.activeTabBackgroundImage && !_ctx.tabBackgroundImage ? `1px solid ${_ctx.isActive(index2) ? _ctx.activeTabColor : "transparent"}` : ""
               })
             }, vue.toDisplayString(tab.title), 5)
           ], 12, _hoisted_1$3);
@@ -6064,7 +6088,7 @@
       _hoisted_2$1
     ], 4);
   }
-  const Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-20bbeaac"]]);
+  const Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-019ea41f"]]);
   const EcanTabs = withInstall(Tabs);
   const imageProps = {
     ...props,
@@ -6092,6 +6116,8 @@
         pageMode: "normal"
       });
       const onClick = () => {
+        if (!props2.linkPage && !props2.href)
+          return;
         const linkPage = props2.linkPage || "";
         const pageUrl = usePageUrl(vue.unref(pageMode), linkPage);
         const href = props2.href;
@@ -6129,7 +6155,7 @@
       style: vue.normalizeStyle(_ctx.style)
     }, " \u8BF7\u4E0A\u4F20\u56FE\u7247 ", 4));
   }
-  const Image = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-4511899d"]]);
+  const Image = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-ab94aeb2"]]);
   const EcanImage = withInstall(Image);
   const tableProps = {
     ...props,