@ecan-bi/datav 1.4.4 → 1.4.5

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.4.4 */
+/*! @ecan-bi/datav@1.4.5 */
 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, useCssVars, toDisplayString, pushScopeId, popScopeId, createSlots, withModifiers, createTextVNode, Teleport, resolveDynamicComponent, mergeProps, normalizeProps, toHandlers, withDirectives, vShow, reactive, vModelText, getCurrentInstance, onDeactivated, isRef, onActivated, isVNode, Transition, onBeforeUpdate, Comment } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
 import { addListener, removeListener } from "resize-detector";
@@ -1797,15 +1797,10 @@ const styleList = [
     pageMode: "normal"
   }), i = without(styleList, ...r);
   return computed(() => {
-    var o, s, l;
-    const a = pick$1(e, i);
-    if (unref(n) === "design")
-      ((o = e.width) == null ? void 0 : o.suffix) === "%" && (a.width = "100%"), ((s = e.height) == null ? void 0 : s.suffix) === "%" && (a.height = "100%");
-    else {
-      const c = ["width", "height", "top", "left"];
-      for (const f of c)
-        hasOwn(e, f) && (l = e[f]) != null && l.suffix && (a[f] = (e[f].value || 0) + e[f].suffix);
-    }
+    var s, l;
+    const a = pick$1(e, i), o = ["width", "height", "top", "left"];
+    for (const c of o)
+      hasOwn(a, c) && (["width", "height"].includes(c) && ((s = e[c]) == null ? void 0 : s.suffix) === "%" && unref(n) === "design" ? a[c] = "100%" : (l = e[c]) != null && l.suffix && (a[c] = (e[c].value || 0) + e[c].suffix));
     return a;
   });
 }, useOnEvent = (e, r) => {
@@ -8688,7 +8683,7 @@ const runCode = (e, r) => {
       const { calc: pe = [], filter: me = [] } = k.pivotTableCal;
       if (ie.push(...pe), me != null && me.length)
         for (const ve of me) {
-          const Se = ie.find((Ae) => Ae.name === ve.fieldName);
+          const Se = ie.find((Ae) => Ae.columnName === ve.fieldName);
           Se && (Se.conditions || (Se.conditions = []), Se.conditions.push(ve));
         }
     }
@@ -26932,6 +26927,7 @@ const DataSelect = /* @__PURE__ */ _export_sfc$1(_sfc_main$1, [["render", _sfc_r
         });
       }
       const E = [];
+      console.log("filterList", s.value);
       for (const _ of unref(s)) {
         const k = v.find((P) => P.label === _.key);
         k && E.push({
@@ -26969,7 +26965,7 @@ const DataSelect = /* @__PURE__ */ _export_sfc$1(_sfc_main$1, [["render", _sfc_r
         b !== -1 && o.value.splice(b, 1);
       },
       onFilter: (v) => {
-        const { key: b, rule: E = {} } = v || {}, { rule: _, value: k } = E;
+        const { key: b = "", rule: E = {} } = v || {}, { rule: _, value: k } = E;
         if (b && _ && k) {
           const P = s.value.find((D) => D.key === b);
           P ? (P.rule = _, P.value = k) : s.value.push({
@@ -26977,12 +26973,15 @@ const DataSelect = /* @__PURE__ */ _export_sfc$1(_sfc_main$1, [["render", _sfc_r
             rule: _,
             value: k
           });
+        } else {
+          const P = unref(s).findIndex((D) => D.key === b);
+          P !== -1 && s.value.splice(P, 1);
         }
         g();
       }
     };
   }
-}), PivotTableContainer_vue_vue_type_style_index_0_scoped_e892f40b_lang = "";
+}), PivotTableContainer_vue_vue_type_style_index_0_scoped_ec6e5e96_lang = "";
 function _sfc_render(e, r, n, i, a, o) {
   const s = resolveComponent("pivot-table");
   return openBlock(), createElementBlock("div", {
@@ -26998,7 +26997,7 @@ function _sfc_render(e, r, n, i, a, o) {
     }), null, 16, ["pageMode", "calculateList", "onCalculate", "onDeleteCalculate", "onFilter"])
   ], 4);
 }
-const PivotTableContainer = /* @__PURE__ */ _export_sfc$1(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-e892f40b"]]), EcanPivotTable = withInstall$1(PivotTableContainer), components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const PivotTableContainer = /* @__PURE__ */ _export_sfc$1(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ec6e5e96"]]), EcanPivotTable = withInstall$1(PivotTableContainer), components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   EcanBar,
   EcanBorder,