@ecan-bi/datav 1.5.73 → 1.5.74

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.5.73 */
+/*! @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";
@@ -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;
@@ -12917,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: {}
@@ -13036,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, [
@@ -13068,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: "文本",