@ecan-bi/datav 1.0.63 → 1.0.66

package/dist/index.es.js

@@ -2743,7 +2743,7 @@ const textProps = {
   alignItems: "center",
   variableFontSize: "14px",
   data: {},
-  variableDefaultValue: "",
+  variableDefaultValue: "0",
   format: ""
 };
 const textComponentProps = transformToComponentProps(textProps);
@@ -3195,7 +3195,7 @@ const proportionProps = {
   strokeTextWidth: "100%",
   lineHeight: "26px",
   decimalFormat: false,
-  variableDefaultValue: ""
+  variableDefaultValue: "0"
 };
 const proportionComponentProps = transformToComponentProps(proportionProps);
 const proportionEvents = ["refreshData", "click"];
@@ -3227,47 +3227,68 @@ const _sfc_main$h = defineComponent({
       immediate: true,
       deep: true
     });
-    const defaultValue = 0;
-    const value = computed(() => {
+    const myValue = computed(() => {
       const data = 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 = computed(() => {
+      var _a2;
       let text2 = props2.text;
+      if (text2 === "")
+        return unref(myValue);
+      const defaultValue = props2.variableDefaultValue;
       const data = unref(myData);
       const variables = text2.match(/\{.+\}/g) || [];
-      if (text2 === "")
-        return 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 + "");
       }
@@ -3306,7 +3327,7 @@ const _sfc_main$h = defineComponent({
       style: style2,
       myWidth,
       text,
-      value,
+      myValue,
       loading,
       click
     };
@@ -3321,7 +3342,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
   }, [
     createVNode(_component_a_progress, {
       class: "progress",
-      percent: _ctx.value,
+      percent: _ctx.myValue,
       width: _ctx.myWidth,
       type: _ctx.strokeType,
       strokeColor: _ctx.strokeColor,
@@ -3351,7 +3372,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-5758f39c"]]);
+const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-95ca32ca"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = {
   ...props,
@@ -4920,7 +4941,8 @@ const _sfc_main$8 = defineComponent({
   },
   components: {
     Spin,
-    Echarts
+    Echarts,
+    AModal: Modal$1
   },
   setup(props2) {
     const style2 = usePickComponentStyle(props2);
@@ -5937,6 +5959,7 @@ const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4
 const EcanModal = withInstall(Modal);
 const tabsProps = {
   ...props,
+  tabHorizontalPadding: "0px",
   type: "ecanTabs",
   name: "\u6807\u7B7E\u9875",
   keyName: "\u6807\u7B7E\u9875",
@@ -6021,7 +6044,7 @@ const _sfc_main$3 = defineComponent({
     };
   }
 });
-const _withScopeId = (n) => (pushScopeId("data-v-20bbeaac"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-019ea41f"), n = n(), popScopeId(), n);
 const _hoisted_1$3 = ["onClick"];
 const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "tabs-content" }, null, -1));
 function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
@@ -6039,6 +6062,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
         return openBlock(), createElementBlock("div", {
           class: "tab",
           style: 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
@@ -6049,7 +6073,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
           createElementVNode("div", {
             class: "tab-inner",
             style: normalizeStyle({
-              borderBottom: `1px solid ${_ctx.isActive(index2) ? _ctx.activeTabColor : "transparent"}`
+              borderBottom: !_ctx.activeTabBackgroundImage && !_ctx.tabBackgroundImage ? `1px solid ${_ctx.isActive(index2) ? _ctx.activeTabColor : "transparent"}` : ""
             })
           }, toDisplayString(tab.title), 5)
         ], 12, _hoisted_1$3);
@@ -6058,7 +6082,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     _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,
@@ -6086,6 +6110,8 @@ const _sfc_main$2 = defineComponent({
       pageMode: "normal"
     });
     const onClick = () => {
+      if (!props2.linkPage && !props2.href)
+        return;
       const linkPage = props2.linkPage || "";
       const pageUrl = usePageUrl(unref(pageMode), linkPage);
       const href = props2.href;
@@ -6123,7 +6149,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     style: 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,