@ecan-bi/datav 1.0.44 → 1.0.47

package/dist/index.es.js

@@ -1629,7 +1629,7 @@ const lowerCaseIncludes = (v1, v2) => {
 const useVariablesInText = (text, data = {}) => {
   const config2 = window.config || {};
   data = __spreadValues(__spreadValues({}, config2), data);
-  const variables = text.match(/\{.*?\}/g);
+  const variables = text.match(/\{\w*\}/g);
   if (variables == null || variables.length === 0)
     return text;
   for (let i = 0; i < variables.length; i++) {
@@ -2618,9 +2618,10 @@ const _sfc_main$n = defineComponent({
           const requestFnList = requestModelArr[i][1];
           await handleRequestFnList(requestFnList);
         }
-        requestModel.clear();
       } catch (e) {
         console.error(e);
+      } finally {
+        requestModel.clear();
       }
     };
     provide(REQUEST_MODEL, {
@@ -2695,7 +2696,7 @@ const textProps = __spreadProps(__spreadValues({}, props), {
 });
 const textComponentProps = transformToComponentProps(textProps);
 const textEvents = ["refreshData", "click"];
-var Text_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".skeleton-wrapper[data-v-e7487804] {\n  overflow: hidden;\n}\n.ecan-text[data-v-e7487804] {\n  overflow: hidden;\n  display: flex;\n}\n")();
+var Text_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".skeleton-wrapper[data-v-9526cadc] {\n  overflow: hidden;\n}\n.ecan-text[data-v-9526cadc] {\n  overflow: hidden;\n  display: flex;\n}\n")();
 const _sfc_main$l = defineComponent({
   name: "EcanText",
   components: { Skeleton },
@@ -2706,7 +2707,7 @@ const _sfc_main$l = defineComponent({
     const myText = computed(() => {
       let text = props2.text;
       const data = unref(myData);
-      const variables = text.match(/\{.*?\}/g);
+      const variables = text.match(/\{\w*\}/g);
       if (variables == null || variables.length === 0)
         return text;
       for (let i = 0; i < variables.length; i++) {
@@ -2781,7 +2782,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$6));
 }
-var Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-e7487804"]]);
+var Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-9526cadc"]]);
 const EcanText = withInstall(Text);
 var ScrollText_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".red[data-v-0bb717eb] {\n  color: red;\n}\n")();
 const _sfc_main$k = defineComponent({
@@ -3207,7 +3208,7 @@ const proportionProps = __spreadProps(__spreadValues({}, props), {
 });
 const proportionComponentProps = transformToComponentProps(proportionProps);
 const proportionEvents = ["refreshData", "click"];
-var Proportion_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-proportion[data-v-02b500fa] {\n  overflow: hidden;\n}\n.progress[data-v-02b500fa] {\n  width: 100%;\n  height: 100%;\n}\n.format[data-v-02b500fa] {\n  margin: 0 auto;\n}\n")();
+var Proportion_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-proportion[data-v-8be86ed2] {\n  overflow: hidden;\n}\n.progress[data-v-8be86ed2] {\n  width: 100%;\n  height: 100%;\n}\n.format[data-v-8be86ed2] {\n  margin: 0 auto;\n}\n")();
 const _sfc_main$h = defineComponent({
   name: "EcanProportion",
   components: {
@@ -3239,7 +3240,7 @@ const _sfc_main$h = defineComponent({
       var _a2;
       let text2 = props2.text;
       const data = unref(myData);
-      const variables = text2.match(/\{.*?\}/g) || [];
+      const variables = text2.match(/\{\w*\}/g) || [];
       if (text2 === "")
         return unref(value) + "%";
       for (let i = 0; i < variables.length; i++) {
@@ -3268,6 +3269,7 @@ const _sfc_main$h = defineComponent({
       var _a2;
       if (props2.dataType !== "request" || unref(pageMode) === "design")
         return;
+      console.log("\u8BF7\u6C42");
       try {
         loading.value = true;
         const res = await requestData();
@@ -3340,7 +3342,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-02b500fa"]]);
+var Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-8be86ed2"]]);
 const EcanProportion = withInstall(Proportion);
 const inputProps = __spreadProps(__spreadValues({}, props), {
   width: "200px",
@@ -3696,6 +3698,7 @@ const tabsProps = __spreadProps(__spreadValues({}, props), {
   name: "\u6807\u7B7E\u9875",
   keyName: "\u6807\u7B7E\u9875",
   width: "200px",
+  height: "400px",
   tabFontSize: "14px",
   backgroundColor: "",
   activeTabColor: "#1890ff",
@@ -3703,7 +3706,6 @@ const tabsProps = __spreadProps(__spreadValues({}, props), {
   activeTabBackgroundImage: "",
   tabColor: "#333",
   tabBarGutter: "0px",
-  tabHeight: "30px",
   value: "",
   activeKey: 0,
   contains: [],
@@ -3721,7 +3723,7 @@ const tabsProps = __spreadProps(__spreadValues({}, props), {
 });
 const tabsComponentProps = transformToComponentProps(tabsProps);
 const tabsEvents = ["tabChange"];
-var Tabs_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-tabs[data-v-27b19b45] {\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n}\n.tabs-header[data-v-27b19b45] {\n  color: #333333;\n  display: flex;\n  width: 100%;\n}\n.tab[data-v-27b19b45] {\n  display: flex;\n  flex: 1;\n  justify-content: center;\n  align-items: center;\n  background-size: 100% 100%;\n  background-repeat: no-repeat;\n}\n.tab[data-v-27b19b45]:last-child {\n  margin-right: 0 !important;\n}\n.tabs-content[data-v-27b19b45] {\n  flex: 1;\n}\n")();
+var Tabs_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".ecan-tabs[data-v-55d33fb6] {\n  display: flex;\n  flex-direction: column;\n}\n.tabs-header[data-v-55d33fb6] {\n  color: #333333;\n  display: flex;\n  width: 100%;\n}\n.tab[data-v-55d33fb6] {\n  background-size: 100% 100%;\n  background-repeat: no-repeat;\n  padding: 0 12px;\n  cursor: default;\n}\n.tab-inner[data-v-55d33fb6] {\n  padding: 12px 0;\n}\n.tab[data-v-55d33fb6]:last-child {\n  margin-right: 0 !important;\n}\n.tabs-content[data-v-55d33fb6] {\n  flex: 1;\n}\n")();
 const _sfc_main$b = defineComponent({
   name: "EcanTabs",
   props: __spreadValues({}, tabsComponentProps),
@@ -3734,7 +3736,13 @@ const _sfc_main$b = defineComponent({
     }, {
       immediate: true
     });
-    const myData = ref(props2.data);
+    const myData = ref([]);
+    watch(() => props2.data, (data) => {
+      myData.value = data;
+    }, {
+      immediate: true,
+      deep: true
+    });
     const isActive = (index2) => activeKey.value === index2;
     const myValue = ref(props2.value || unref(myData)[0] && ((_a2 = unref(myData)[0]) == null ? void 0 : _a2.value) || "");
     const events = props2.events;
@@ -3769,7 +3777,7 @@ const _sfc_main$b = defineComponent({
     };
   }
 });
-const _withScopeId$1 = (n) => (pushScopeId("data-v-27b19b45"), n = n(), popScopeId(), n);
+const _withScopeId$1 = (n) => (pushScopeId("data-v-55d33fb6"), n = n(), popScopeId(), n);
 const _hoisted_1$3 = ["onClick"];
 const _hoisted_2$1 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "tabs-content" }, null, -1));
 function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
@@ -3789,18 +3797,24 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
           style: normalizeStyle({
             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,
-            height: _ctx.tabHeight
+            marginRight: _ctx.tabBarGutter
           }),
           key: index2,
-          onClick: withModifiers(($event) => _ctx.tabChange(tab, index2), ["stop"])
-        }, toDisplayString(tab.title), 13, _hoisted_1$3);
+          onClick: withModifiers(($event) => _ctx.tabChange(tab, index2), ["prevent", "stop"])
+        }, [
+          createElementVNode("div", {
+            class: "tab-inner",
+            style: normalizeStyle({
+              borderBottom: `1px solid ${_ctx.isActive(index2) ? _ctx.activeTabColor : "transparent"}`
+            })
+          }, toDisplayString(tab.title), 5)
+        ], 12, _hoisted_1$3);
       }), 128))
     ], 4),
     _hoisted_2$1
   ], 4);
 }
-var Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$b], ["__scopeId", "data-v-27b19b45"]]);
+var Tabs = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["render", _sfc_render$b], ["__scopeId", "data-v-55d33fb6"]]);
 const EcanTabs = withInstall(Tabs);
 const pieProps = __spreadProps(__spreadValues({}, props), {
   id: "",