@ecan-bi/datav 1.5.72 → 1.5.74

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.5.72 */
+/*! @ecan-bi/datav@1.5.74 */
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, onBeforeUnmount, normalizeClass as normalizeClass$1, normalizeStyle as normalizeStyle$1, createElementVNode, createCommentVNode, Fragment, renderList, provide, withModifiers, toDisplayString, pushScopeId, popScopeId, Teleport, resolveDynamicComponent, mergeProps, normalizeProps, toHandlers, toRaw, reactive, useCssVars, createSlots, resolveDirective, withDirectives, vShow, createTextVNode, vModelText, getCurrentInstance, onActivated, onDeactivated, isRef, isVNode, Transition, onBeforeUpdate, Comment } from "vue";
 import { throttle as throttle$1, init, use, registerMap } from "echarts/core";
 import { addListener, removeListener } from "resize-detector";
@@ -1642,7 +1642,7 @@ const withInstall$1 = (c, u) => {
     for (const f in c) {
       const d = c[f];
       let p = d == null ? void 0 : d.constructor;
-      ["width", "height", "requestHeaders"].includes(f) ? p = [d == null ? void 0 : d.constructor, Object] : ["left", "top"].includes(f) && (p = [d == null ? void 0 : d.constructor, Number]), u[f] = {
+      ["width", "height", "requestHeaders"].includes(f) ? p = [d == null ? void 0 : d.constructor, Object] : ["left", "top", "lineHeight"].includes(f) && (p = [d == null ? void 0 : d.constructor, Number, Object]), u[f] = {
         type: p,
         default: d
       };
@@ -2682,7 +2682,7 @@ const An = ["keyValue", "conditionKey", "conditionLabel", "conditionName", "cond
           let g = c.modelKey;
           g && c.prop && (g += `-${c.prop}`), c.fieldValue = "${" + g + "}";
         } else
-          c.fieldValue = "${" + c.fieldValue + "}";
+          c.fieldValue = "${" + Ln(c.componentId, c.fieldValue) + "}";
       delete c.dataType;
     }
     mn(c, "activeKey") && delete c.activeKey, mn(c, "radioValue") && delete c.radioValue, mn(c, "indexCode") && (c.hrpIndexCode = c.indexCode, delete c.indexCode), mn(c, "indexCodeNum") && (c.hrpIndexCodeNum = c.indexCodeNum, delete c.indexCodeNum), c.dataType !== "component" && c.useCurrentTime && (c.fieldValue = ce().format(c.dateFormat)), mn(c, "modelKey") && delete c.modelKey, mn(c, "prop") && delete c.prop, delete c.useCurrentTime;
@@ -2749,7 +2749,7 @@ const An = ["keyValue", "conditionKey", "conditionLabel", "conditionName", "cond
       });
       if (Rn != null && Rn.length)
         for (const j of Rn)
-          w.find((vn) => vn.id === j.id) || w.push(j);
+          w.find((vn) => vn.keyName === j.keyName) || w.push(j);
     }
   }
   const Pn = w.length, re = u;
@@ -10778,7 +10778,7 @@ const Render = /* @__PURE__ */ _export_sfc$1(_sfc_main$z, [["render", _sfc_rende
       requestLoaded: yr
     };
   }
-}), Modal_vue_vue_type_style_index_0_scoped_cb5d6923_lang = "", Modal_vue_vue_type_style_index_1_lang = "";
+}), Modal_vue_vue_type_style_index_0_scoped_e8d3acb6_lang = "", Modal_vue_vue_type_style_index_1_lang = "";
 function _sfc_render$D(c, u, f, d, p, m) {
   const g = resolveComponent("close-outlined"), v = resolveComponent("render"), y = resolveComponent("a-modal");
   return openBlock(), createBlock(y, {
@@ -10843,7 +10843,9 @@ function _sfc_render$D(c, u, f, d, p, m) {
                   component: b,
                   onReady: c.onComponentReady
                 }, null, 8, ["component", "onReady"])) : createCommentVNode("", !0)
-              ], 64)) : (openBlock(), createBlock(resolveDynamicComponent(b.type), normalizeProps(mergeProps({ key: 1 }, b)), null, 16))
+              ], 64)) : (openBlock(), createBlock(resolveDynamicComponent(b.type), mergeProps({ key: 1 }, b, {
+                cpntid: b.id
+              }), null, 16, ["cpntid"]))
             ], 64))), 128))
           ], 2)) : renderSlot(c.$slots, "default", { key: 1 }, void 0, !0)
         ], 4)) : createCommentVNode("", !0)
@@ -10852,7 +10854,7 @@ function _sfc_render$D(c, u, f, d, p, m) {
     _: 3
   }, 8, ["getContainer", "wrapClassName", "visible", "width", "destroyOnClose", "style", "onOk", "onCancel", "id"]);
 }
-const Modal = /* @__PURE__ */ _export_sfc$1(_sfc_main$y, [["render", _sfc_render$D], ["__scopeId", "data-v-cb5d6923"]]), EcanModal = withInstall$1(Modal);
+const Modal = /* @__PURE__ */ _export_sfc$1(_sfc_main$y, [["render", _sfc_render$D], ["__scopeId", "data-v-e8d3acb6"]]), EcanModal = withInstall$1(Modal);
 use([
   CanvasRenderer,
   LineChart,
@@ -12915,7 +12917,7 @@ const DrillModal = /* @__PURE__ */ _export_sfc$1(_sfc_main$u, [["render", _sfc_r
     };
     window.addEventListener("message", async (Ir) => {
       var Rr, Lr;
-      if (c.customId === "ProviderConfig") {
+      if (Ir.source !== window && c.customId === "ProviderConfig") {
         const jr = Ir.data || {};
         let Hr = {
           data: {}
@@ -13034,7 +13036,7 @@ const DrillModal = /* @__PURE__ */ _export_sfc$1(_sfc_main$u, [["render", _sfc_r
       isMobile: Rn
     };
   }
-}), ProviderConfig_vue_vue_type_style_index_0_scoped_7b95fe71_lang = "", ProviderConfig_vue_vue_type_style_index_1_lang = "", _hoisted_1$k = ["id"];
+}), ProviderConfig_vue_vue_type_style_index_0_scoped_c845972b_lang = "", ProviderConfig_vue_vue_type_style_index_1_lang = "", _hoisted_1$k = ["id"];
 function _sfc_render$y(c, u, f, d, p, m) {
   const g = resolveComponent("drill-modal"), v = resolveComponent("indicator-detail-modal"), y = resolveComponent("trend-modal");
   return openBlock(), createElementBlock(Fragment, null, [
@@ -13066,7 +13068,7 @@ function _sfc_render$y(c, u, f, d, p, m) {
     }, null, 8, ["theme"])
   ], 64);
 }
-const ProviderConfig = /* @__PURE__ */ _export_sfc$1(_sfc_main$t, [["render", _sfc_render$y], ["__scopeId", "data-v-7b95fe71"]]), EcanProviderConfig = withInstall$1(ProviderConfig), textProps = {
+const ProviderConfig = /* @__PURE__ */ _export_sfc$1(_sfc_main$t, [["render", _sfc_render$y], ["__scopeId", "data-v-c845972b"]]), EcanProviderConfig = withInstall$1(ProviderConfig), textProps = {
   ...props$1,
   name: "文本",
   keyName: "文本",
@@ -30771,40 +30773,37 @@ const lottie = /* @__PURE__ */ getDefaultExportFromCjs(lottieExports), __default
   }
 }), __injectCSSVars__$1 = () => {
   useCssVars((c) => ({
-    "8d74eefa": c.isHoverStyle ? "pointer" : "auto",
-    "7ff7bf46": c.isHoverStyle ? "0.6" : "1"
+    "118bc1b5": c.isHoverStyle ? "pointer" : "auto",
+    b274cb58: c.isHoverStyle ? "0.6" : "1"
   }));
 }, __setup__$1 = __default__$1.setup;
 __default__$1.setup = __setup__$1 ? (c, u) => (__injectCSSVars__$1(), __setup__$1(c, u)) : __injectCSSVars__$1;
-const Image_vue_vue_type_style_index_0_scoped_8b128e89_lang = "", _hoisted_1$3 = ["src"];
+const Image_vue_vue_type_style_index_0_scoped_7bf7ebf4_lang = "", _hoisted_1$3 = ["src"];
 function _sfc_render$7(c, u, f, d, p, m) {
   var g;
-  return openBlock(), createElementBlock(Fragment, null, [
-    c.isAnimation ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-      c.animationSource.directory ? (openBlock(), createElementBlock("div", {
-        key: 0,
-        class: normalizeClass$1(["ecan-image", c.pageMode === "design" ? "component" : ""]),
-        ref: "animation",
-        style: normalizeStyle$1(c.customStyle),
-        onClick: u[0] || (u[0] = (...v) => c.onClick && c.onClick(...v))
-      }, null, 6)) : createCommentVNode("", !0)
-    ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-      c.myImgUrl !== "" ? (openBlock(), createElementBlock("img", {
-        key: 0,
-        class: normalizeClass$1(["ecan-image", c.pageMode === "design" ? "component" : ""]),
-        style: normalizeStyle$1(c.customStyle),
-        src: c.myImgUrl,
-        onClick: u[1] || (u[1] = (...v) => c.onClick && c.onClick(...v))
-      }, null, 14, _hoisted_1$3)) : createCommentVNode("", !0)
-    ], 64)),
+  return openBlock(), createElementBlock("div", {
+    class: normalizeClass$1(["ecan-image", c.pageMode === "design" ? "component" : ""]),
+    style: normalizeStyle$1(c.customStyle)
+  }, [
+    c.isAnimation && c.animationSource.directory ? (openBlock(), createElementBlock("div", {
+      key: 0,
+      class: "full",
+      ref: "animation",
+      onClick: u[0] || (u[0] = (...v) => c.onClick && c.onClick(...v))
+    }, null, 512)) : !c.isAnimation && c.myImgUrl ? (openBlock(), createElementBlock("img", {
+      key: 1,
+      class: "full",
+      src: c.myImgUrl,
+      style: { width: "100%", height: "100%" },
+      onClick: u[1] || (u[1] = (...v) => c.onClick && c.onClick(...v))
+    }, null, 8, _hoisted_1$3)) : createCommentVNode("", !0),
     (c.isAnimation ? !((g = c.animationSource) != null && g.directory) : !c.myImgUrl) ? (openBlock(), createElementBlock("div", {
       key: 2,
-      class: normalizeClass$1(["image-placeholder", c.pageMode === "design" ? "component" : ""]),
-      style: normalizeStyle$1(c.customStyle)
-    }, " 请上传图片 ", 6)) : createCommentVNode("", !0)
-  ], 64);
+      class: normalizeClass$1(["image-placeholder full", c.pageMode === "design" ? "component" : ""])
+    }, " 请上传图片 ", 2)) : createCommentVNode("", !0)
+  ], 6);
 }
-const Image$1 = /* @__PURE__ */ _export_sfc$1(__default__$1, [["render", _sfc_render$7], ["__scopeId", "data-v-8b128e89"]]), EcanImage = withInstall$1(Image$1), iframeProps = {
+const Image$1 = /* @__PURE__ */ _export_sfc$1(__default__$1, [["render", _sfc_render$7], ["__scopeId", "data-v-7bf7ebf4"]]), EcanImage = withInstall$1(Image$1), iframeProps = {
   ...props$1,
   name: "网页",
   keyName: "网页",