@ecan-bi/datav 1.1.87 → 1.1.89

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.87 */
+/*! @ecan-bi/datav@1.1.89 */
 import { watch as Q, inject as B, computed as q, unref as k, watchEffect as fo, defineComponent as ee, shallowRef as vt, toRefs as qn, onMounted as Ue, onUnmounted as ft, h as dt, nextTick as mt, createVNode as G, resolveComponent as V, openBlock as E, createElementBlock as O, createBlock as Fe, renderSlot as gt, withCtx as Y, ref as M, normalizeStyle as U, createCommentVNode as Ce, provide as $e, onBeforeUnmount as Tt, toDisplayString as ye, Fragment as Me, renderList as De, createElementVNode as X, normalizeClass as Lt, pushScopeId as mo, popScopeId as go, createSlots as jn, resolveDynamicComponent as Wn, mergeProps as Vn, withModifiers as ho, reactive as Hn, createTextVNode as Ot, withDirectives as Zn, vShow as Jn } from "vue";
 import { throttle as Yn, init as Qn, use as qe, registerMap as Kn } from "echarts/core";
 import { addListener as Xn, removeListener as ea } from "resize-detector";
@@ -149,12 +149,12 @@ const Ea = "x-vue-echarts", Da = "ecTheme", Oa = "ecInitOptions", Fa = "ecUpdate
             throw L;
           }
       }
-      function $() {
+      function z() {
         d.setOption(C || u.value, S.value);
       }
       f.value ? mt(() => {
-        x(), $();
-      }) : $();
+        x(), z();
+      }) : z();
     }
     function _(C, d) {
       e.manualUpdate && (l.value = C), a.value ? a.value.setOption(C, d || {}) : v(C);
@@ -1292,8 +1292,6 @@ const zl = (e) => e.replace(/\\n/g, `
     contextRequestUrl: "",
     touchEventId: ""
   }), { getGlobalModel: p } = B(ge, {
-    // @ts-ignore
-    // eslint-disable-next-line no-void
     getGlobalModel: (s) => {
     }
   }), g = de(t), w = async (s = {}) => {
@@ -1304,15 +1302,14 @@ const zl = (e) => e.replace(/\\n/g, `
       const { key: F, value: h } = T;
       if (typeof h == "object" && h != null && h.id) {
         let C = {};
-        const { id: d, prop: y, propKey: x, operate: $ } = h;
+        const { id: d, prop: y, propKey: x, operate: z } = h;
         d === "THIS" ? C = p(k(f)) || {} : C = p(d) || {};
         const L = k(C[y]);
-        console.log("p", L);
         let A = null;
         if (["date", "range"].some((H) => Dt(C == null ? void 0 : C.type, H))) {
-          const { value: H, type: z, mode: N } = $ || {};
-          if (H && z && N)
-            switch (z) {
+          const { value: H, type: $, mode: N } = z || {};
+          if (H && $ && N)
+            switch ($) {
               case "add":
                 A = k(L).add(H, N);
                 break;
@@ -1468,7 +1465,9 @@ const zl = (e) => e.replace(/\\n/g, `
     }
   }), l = (r = []) => {
     var f;
-    const i = r.length, c = [];
+    const i = r.length;
+    console.log("controlList", r);
+    const c = [];
     for (let p = 0; p < i; p++) {
       const g = r[p], {
         id: w,
@@ -1479,11 +1478,12 @@ const zl = (e) => e.replace(/\\n/g, `
         rule: "NONE",
         label: u,
         fieldName: s,
-        fieldValue: "",
+        fieldValue: "2020-02",
         // 在关联控件中取
+        dateFormat: "YYYY-MM",
         valueType: m
       }, b = a(w) || {};
-      if (Dt(b.type, "date")) {
+      if (console.log("model", b), Dt(b.type, "date")) {
         const { value: v, format: _ } = b || {};
         S.fieldValue = (f = k(v)) == null ? void 0 : f.format(_), S.dateFormat = _;
       }
@@ -1522,10 +1522,10 @@ const zl = (e) => e.replace(/\\n/g, `
     if (Array.isArray(u) && u.length > 0) {
       const A = u.length;
       for (let J = 0; J < A; J++) {
-        const H = u[J] || {}, { label: z = "", name: N = "", show: R = !1, sort: W, customGroup: K, conditions: se } = H;
+        const H = u[J] || {}, { label: $ = "", name: N = "", show: R = !1, sort: W, customGroup: K, conditions: se } = H;
         if (R || A === 1) {
           C = {
-            label: z,
+            label: $,
             columnName: N,
             show: R,
             sort: W,
@@ -1540,10 +1540,10 @@ const zl = (e) => e.replace(/\\n/g, `
     if (Array.isArray(s) && s.length > 0) {
       const A = s.length;
       for (let J = 0; J < A; J++) {
-        const H = s[J] || {}, { label: z = "", name: N = "", show: R = !1, sort: W, customGroup: K, conditions: se } = H;
+        const H = s[J] || {}, { label: $ = "", name: N = "", show: R = !1, sort: W, customGroup: K, conditions: se } = H;
         if (R || A === 1) {
           d = {
-            label: z,
+            label: $,
             columnName: N,
             show: R,
             sort: W,
@@ -1569,8 +1569,7 @@ const zl = (e) => e.replace(/\\n/g, `
       return;
     if (g === "2" && x.length === 0)
       return;
-    let $;
-    (r == null ? void 0 : r.pageMode) === "design" ? $ = r.sqlConditions ?? [] : $ = l(_);
+    const z = l(_);
     try {
       return await Re.post(
         `${Ro}/diagram`,
@@ -1585,7 +1584,7 @@ const zl = (e) => e.replace(/\\n/g, `
           indicatorList: x,
           queryColumns: y,
           pageFlag: !0,
-          sqlConditions: $,
+          sqlConditions: z,
           // fixedDimSql: '',
           dataSourceId: T,
           idxLibMode: F,
@@ -1717,38 +1716,40 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
       theme: r,
       touchEventId: i
     });
-    const c = /* @__PURE__ */ new Map(), f = (z) => c.get(z);
+    const c = /* @__PURE__ */ new Map();
+    console.log("globalModel", c);
+    const f = ($) => c.get($);
     $e(ge, {
       getGlobalModel: f,
-      setGlobalModel: (z, N) => {
-        c.set(z, N);
+      setGlobalModel: ($, N) => {
+        c.set($, N);
       }
     });
     const g = [], w = () => {
       g.pop();
-    }, u = (z) => {
-      g.push(z);
-    }, s = /* @__PURE__ */ new Map(), m = (z) => s.get(z);
+    }, u = ($) => {
+      g.push($);
+    }, s = /* @__PURE__ */ new Map(), m = ($) => s.get($);
     $e(Fo, {
       popUseModalIds: w,
       pushUseModalIds: u,
       getModalModel: m,
-      setModalModel: (z, N) => {
-        s.set(z, N);
+      setModalModel: ($, N) => {
+        s.set($, N);
       }
     });
-    const b = ma(), v = /* @__PURE__ */ new Set(), _ = (z, N) => {
-      v.add(z), b.on(z, (R) => typeof N[R] == "function" && N[R]()), Tt(() => {
-        T(z);
+    const b = ma(), v = /* @__PURE__ */ new Set(), _ = ($, N) => {
+      v.add($), b.on($, (R) => typeof N[R] == "function" && N[R]()), Tt(() => {
+        T($);
       });
-    }, T = (z) => {
-      v.delete(z), b.off(z);
+    }, T = ($) => {
+      v.delete($), b.off($);
     };
     $e(Nt, {
       onEvent: _,
       offEvent: T,
-      emitEvent: (z, N) => {
-        if (z === "PAGE") {
+      emitEvent: ($, N) => {
+        if ($ === "PAGE") {
           const R = g.length;
           let W = [];
           if (R === 0)
@@ -1761,7 +1762,7 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
             b.emit(K, N);
           });
         } else
-          b.emit(z, N);
+          b.emit($, N);
       }
     });
     const h = M(0);
@@ -1770,16 +1771,16 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
         h.value = k(h) + 1;
       }
     });
-    const d = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map(), x = ({ requestFn: z = () => {
+    const d = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map(), x = ({ requestFn: $ = () => {
     }, sortNum: N = 0, id: R = "" }) => {
       if (d.has(N)) {
         const W = d.get(N);
-        W == null || W.push(z);
+        W == null || W.push($);
       } else
-        d.set(N, [z]);
-      y.set(R, z);
-    }, $ = (z) => new Promise((N, R) => {
-      const W = z.map((K) => K());
+        d.set(N, [$]);
+      y.set(R, $);
+    }, z = ($) => new Promise((N, R) => {
+      const W = $.map((K) => K());
       Promise.all(W).then((K) => {
         N(K);
       }).catch((K) => {
@@ -1787,18 +1788,18 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
       });
     }), L = async () => {
       var R;
-      const z = await Co.get(`${Ro}/user/anonymous?username=admin&businessOfficeId=350421`, {
+      const $ = await Co.get(`${Ro}/user/anonymous?username=admin&businessOfficeId=350421`, {
         headers: {
           systemCode: "F72FC50A3D97372514A6AC33333D28FD",
           current_context: "ygt",
           Authentication: ""
         }
-      }), { token: N } = ((R = z.data) == null ? void 0 : R.data) || {};
+      }), { token: N } = ((R = $.data) == null ? void 0 : R.data) || {};
       window.config.indicatorToken = N;
-    }, A = (z) => new Promise(async (N, R) => {
-      if (z) {
-        if (typeof z == "string") {
-          const W = y.get(z);
+    }, A = ($) => new Promise(async (N, R) => {
+      if ($) {
+        if (typeof $ == "string") {
+          const W = y.get($);
           if (typeof W == "function") {
             const K = Re.interceptors.response.use((se) => (N(se), se), (se) => (R(se), Promise.reject(se)));
             W(), Re.interceptors.response.eject(K);
@@ -1812,7 +1813,7 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
           e.pageMode !== "design" && k(h) > 0 && await L();
           for (let se = 0; se < K; se++) {
             const He = W[se][1];
-            await $(He);
+            await z(He);
           }
         } catch (se) {
           console.error(se);
@@ -1829,8 +1830,8 @@ const ql = /* @__PURE__ */ te(Bl, [["render", Gl], ["__scopeId", "data-v-242d350
         b.emit(Ye);
       }
     });
-    const H = (z) => {
-      b.on(Ye, () => z()), Ue(() => {
+    const H = ($) => {
+      b.on(Ye, () => $()), Ue(() => {
         b.off(Ye);
       });
     };
@@ -1989,7 +1990,7 @@ function ti(e, o, t, n, a, l) {
     onClick: o[0] || (o[0] = (...i) => e.click && e.click(...i))
   }, null, 12, ei));
 }
-const oi = /* @__PURE__ */ te(Xl, [["render", ti], ["__scopeId", "data-v-0b7d5c74"]]), ni = oe(oi), ai = ee({
+const oi = /* @__PURE__ */ te(Xl, [["render", ti], ["__scopeId", "data-v-e3658bca"]]), ni = oe(oi), ai = ee({
   name: "EcanScrollText",
   setup() {
     return {
@@ -3284,18 +3285,18 @@ const gr = ee({
           show: e.tooltipShow,
           trigger: e.tooltipTrigger,
           formatter: (C) => {
-            const { marker: d, seriesName: y, name: x, value: $, percent: L, data: A } = C || {};
+            const { marker: d, seriesName: y, name: x, value: z, percent: L, data: A } = C || {};
             return de(
               e.tooltipFormatter,
               {
                 textData: {
                   marker: d,
                   name: x,
-                  value: $,
+                  value: z,
                   percent: L,
                   a: y,
                   b: x,
-                  c: $,
+                  c: z,
                   d: L,
                   ...A
                 }
@@ -3404,15 +3405,15 @@ const gr = ee({
         const C = await b(), { data: d } = C.data || {};
         if (d) {
           const { columns: y = [], rows: x = [] } = ((h = C == null ? void 0 : C.data) == null ? void 0 : h.data) ?? {};
-          let $ = [];
+          let z = [];
           if (y.length > 0) {
             const L = y[0], A = y[1];
-            $ = x.map((J) => ({
+            z = x.map((J) => ({
               name: J[L],
               value: J[A]
             }));
           }
-          g($);
+          g(z);
         }
       } catch (C) {
         console.error(C);
@@ -3643,19 +3644,19 @@ const pr = ee({
           show: e.tooltipShow,
           formatter: (y) => {
             const x = y.length;
-            let $ = "", L = e.tooltipFormatter;
+            let z = "", L = e.tooltipFormatter;
             L === "" && (L = "{marker} {a}    {c}");
             for (let A = 0; A < x; A++) {
-              const { marker: J, seriesName: H, name: z, value: N, data: R } = y[A] || {};
-              A === 0 && ($ += `${z}<br/>`), $ += de(
+              const { marker: J, seriesName: H, name: $, value: N, data: R } = y[A] || {};
+              A === 0 && (z += `${$}<br/>`), z += de(
                 L,
                 {
                   textData: {
                     marker: J,
-                    name: z,
+                    name: $,
                     value: N,
                     a: H,
-                    b: z,
+                    b: $,
                     c: N,
                     ...R
                   }
@@ -3664,9 +3665,9 @@ const pr = ee({
                   useNewline: !0,
                   useSpace: !0
                 }
-              ), $ += "<br/>";
+              ), z += "<br/>";
             }
-            return $;
+            return z;
           }
         },
         xAxis: {
@@ -3749,9 +3750,9 @@ const pr = ee({
         y = Ke(C, A);
       }
       a.value = y.dimensions;
-      const x = y.dataset, $ = [], L = x.length;
+      const x = y.dataset, z = [], L = x.length;
       for (let A = 0; A < L; A++)
-        $.push({
+        z.push({
           type: "line",
           ...x[A],
           symbolSize: e.symbolSize,
@@ -3776,11 +3777,11 @@ const pr = ee({
             width: e.lineStyleWidth
           }
         });
-      n.value = $;
+      n.value = z;
     }, w = (C = [], d, y = !1) => {
-      const $ = Ge(C, y ? d : null);
-      a.value = $.dimensions;
-      const L = $.dataset, A = [], J = L.length;
+      const z = Ge(C, y ? d : null);
+      a.value = z.dimensions;
+      const L = z.dataset, A = [], J = L.length;
       for (let H = 0; H < J; H++)
         A.push({
           type: "line",
@@ -3819,14 +3820,14 @@ const pr = ee({
       try {
         u.value = !0;
         const d = await v(), { columns: y = [], rows: x = [] } = ((C = d == null ? void 0 : d.data) == null ? void 0 : C.data) ?? {};
-        let $;
-        y.length > 0 && ($ = {
+        let z;
+        y.length > 0 && (z = {
           name: y[0],
           types: y.slice(1).map((L) => ({
             label: L,
             value: L
           }))
-        }), w(x, $, !0);
+        }), w(x, z, !0);
       } catch (d) {
         console.error(d);
       } finally {
@@ -4022,9 +4023,9 @@ const kr = ee({
       a.value = !1;
     }, r = q(() => {
       const d = k(n), y = d.length, x = [];
-      for (let $ = 0; $ < y; $++) {
+      for (let z = 0; z < y; z++) {
         const L = {
-          ...d[$],
+          ...d[z],
           type: "bar",
           barWidth: e.barWidth
         };
@@ -4092,11 +4093,11 @@ const kr = ee({
           trigger: "axis",
           show: e.tooltipShow,
           formatter: (x) => {
-            const $ = x.length;
+            const z = x.length;
             let L = "", A = e.tooltipFormatter;
             A === "" && (A = "{marker} {a}    {c}");
-            for (let J = 0; J < $; J++) {
-              const { marker: H, seriesName: z, name: N, value: R, data: W } = x[J] || {};
+            for (let J = 0; J < z; J++) {
+              const { marker: H, seriesName: $, name: N, value: R, data: W } = x[J] || {};
               J === 0 && (L += `${N}<br/>`), L += de(
                 A,
                 {
@@ -4104,7 +4105,7 @@ const kr = ee({
                     marker: H,
                     name: N,
                     value: R,
-                    a: z,
+                    a: $,
                     b: N,
                     c: R,
                     ...W
@@ -4197,11 +4198,11 @@ const kr = ee({
     }), g = (d = [], y = !1) => {
       let x = {};
       if (e.dataFieldConfigType === "key") {
-        const $ = y ? e.keyTypeDataFieldNames : null;
-        x = Ge(d, $);
+        const z = y ? e.keyTypeDataFieldNames : null;
+        x = Ge(d, z);
       } else if (e.dataFieldConfigType === "value") {
-        const $ = y ? e.valueTypeDataFieldNames : null;
-        x = Ke(d, $);
+        const z = y ? e.valueTypeDataFieldNames : null;
+        x = Ke(d, z);
       }
       n.value = x.dataset, i.value = x.dimensions;
     }, w = (d = [], y, x = !1) => {
@@ -4229,7 +4230,7 @@ const kr = ee({
       var d;
       try {
         c.value = !0;
-        const y = await m(), { columns: x = [], rows: $ = [] } = ((d = y == null ? void 0 : y.data) == null ? void 0 : d.data) ?? {};
+        const y = await m(), { columns: x = [], rows: z = [] } = ((d = y == null ? void 0 : y.data) == null ? void 0 : d.data) ?? {};
         let L;
         x.length > 0 && (L = {
           name: x[0],
@@ -4237,7 +4238,7 @@ const kr = ee({
             label: A,
             value: A
           }))
-        }), w($, L, !0);
+        }), w(z, L, !0);
       } catch (y) {
         console.error(y);
       } finally {
@@ -4902,17 +4903,17 @@ const Nr = ee({
         show: e.tooltipShow,
         formatter: (d) => {
           const y = d.length;
-          let x = "", $ = e.tooltipFormatter;
-          $ === "" && ($ = "{marker} {a}    {c}");
+          let x = "", z = e.tooltipFormatter;
+          z === "" && (z = "{marker} {a}    {c}");
           const L = e.seriesTypes;
           for (let A = 0; A < y; A++) {
-            const J = L[A], { tooltipFormatter: H } = J || {}, { marker: z, seriesName: N, name: R, value: W, data: K } = d[A] || {};
+            const J = L[A], { tooltipFormatter: H } = J || {}, { marker: $, seriesName: N, name: R, value: W, data: K } = d[A] || {};
             A === 0 && (x += `${R}<br/>`), x += de(
               // 如果系列有提示框组件就使用自定义，没有就用默认的
-              H || $,
+              H || z,
               {
                 textData: {
-                  marker: z,
+                  marker: $,
                   name: R,
                   value: W,
                   seriesName: N,
@@ -4974,13 +4975,13 @@ const Nr = ee({
         x = Ke(d, H);
       }
       a.value = x.dimensions;
-      const $ = x.dataset, L = [], A = $.length, J = e.seriesTypes;
+      const z = x.dataset, L = [], A = z.length, J = e.seriesTypes;
       for (let H = 0; H < A; H++) {
-        const z = J[H], { type: N, axisIndex: R } = z || {};
+        const $ = J[H], { type: N, axisIndex: R } = $ || {};
         let W = {
           type: N,
           yAxisIndex: R,
-          ...$[H]
+          ...z[H]
         };
         N === "line" && (W = {
           ...W,
@@ -5001,9 +5002,9 @@ const Nr = ee({
     }, p = (d = [], y, x = !1) => {
       const L = Ge(d, x ? y : null);
       a.value = L.dimensions;
-      const A = L.dataset, J = [], H = A.length, z = e.seriesTypes;
+      const A = L.dataset, J = [], H = A.length, $ = e.seriesTypes;
       for (let N = 0; N < H; N++) {
-        const R = z[N];
+        const R = $[N];
         J.push({
           type: R == null ? void 0 : R.type,
           yAxisIndex: R == null ? void 0 : R.axisIndex,
@@ -5057,7 +5058,7 @@ const Nr = ee({
       var d;
       try {
         w.value = !0;
-        const y = await m(), { columns: x = [], rows: $ = [] } = ((d = y == null ? void 0 : y.data) == null ? void 0 : d.data) ?? {};
+        const y = await m(), { columns: x = [], rows: z = [] } = ((d = y == null ? void 0 : y.data) == null ? void 0 : d.data) ?? {};
         let L;
         x.length > 0 && (L = {
           name: x[0],
@@ -5065,7 +5066,7 @@ const Nr = ee({
             label: A,
             value: A
           }))
-        }), p($, L, !0);
+        }), p(z, L, !0);
       } catch (y) {
         console.error(y);
       } finally {
@@ -5351,7 +5352,7 @@ const ss = /* @__PURE__ */ te(qr, [["render", rs], ["__scopeId", "data-v-1550b11
       d();
     }, x = () => {
       d();
-    }, { setModalModel: $, pushUseModalIds: L, popUseModalIds: A } = B(Fo, {
+    }, { setModalModel: z, pushUseModalIds: L, popUseModalIds: A } = B(Fo, {
       pushUseModalIds: (R) => {
       },
       popUseModalIds: () => {
@@ -5362,16 +5363,16 @@ const ss = /* @__PURE__ */ te(qr, [["render", rs], ["__scopeId", "data-v-1550b11
       const R = e.id;
       let W = [];
       const K = e.componentList;
-      console.log("componentList", K), Array.isArray(K) && (W = K.map((se) => se.id), $(R, [...new Set(W)]));
+      console.log("componentList", K), Array.isArray(K) && (W = K.map((se) => se.id), z(R, [...new Set(W)]));
     };
     Q(() => F.value, async (R) => {
       R ? (s.value = !1, L(e.id), J(), await mt(() => {
         b(), window.addEventListener("resize", v), _(), s.value = !0;
       }), h()) : (A(), window.removeEventListener("resize", v), T());
     });
-    const H = q(() => k(f) >= 1), z = q(() => e.fullModal), N = q(() => {
+    const H = q(() => k(f) >= 1), $ = q(() => e.fullModal), N = q(() => {
       let R = "ecan-modal";
-      return k(H) && (R += " ecan-full-width-modal"), k(z) && (R += " ecan-full-modal"), R;
+      return k(H) && (R += " ecan-full-width-modal"), k($) && (R += " ecan-full-modal"), R;
     });
     return me(e, {
       showModal: C
@@ -5382,7 +5383,7 @@ const ss = /* @__PURE__ */ te(qr, [["render", rs], ["__scopeId", "data-v-1550b11
       getContainer: o,
       modalStyle: t,
       modalWith: i,
-      isFullModal: z,
+      isFullModal: $,
       style: w,
       visible: F,
       showModal: C,
@@ -5947,7 +5948,7 @@ const Is = /* @__PURE__ */ te(_s, [["render", Ls], ["__scopeId", "data-v-19bc100
       percentage: ut,
       contrast: ut,
       boolean: y
-    }[D](I) || "", $ = (I, D) => {
+    }[D](I) || "", z = (I, D) => {
       const j = parseFloat(I + "");
       if (D !== "contrast")
         return "";
@@ -5969,11 +5970,11 @@ const Is = /* @__PURE__ */ te(_s, [["render", Ls], ["__scopeId", "data-v-19bc100
     }), H = (I = [], D = []) => {
       const j = I.map((Z) => ({ title: Z, dataIndex: Z, key: Z }));
       r.value = m(j), i.value = D;
-    }, z = nt(e), N = async () => {
+    }, $ = nt(e), N = async () => {
       var I, D, j, Z;
       try {
         F.value = !0;
-        const P = await z();
+        const P = await $();
         H((D = (I = P == null ? void 0 : P.data) == null ? void 0 : I.data) == null ? void 0 : D.columns, (Z = (j = P == null ? void 0 : P.data) == null ? void 0 : j.data) == null ? void 0 : Z.rows);
       } catch (P) {
         console.error(P);
@@ -6102,7 +6103,7 @@ const Is = /* @__PURE__ */ te(_s, [["render", Ls], ["__scopeId", "data-v-19bc100
       customRow: W,
       pagination: d,
       formatFn: x,
-      contrastClass: $,
+      contrastClass: z,
       tableChange: C,
       summaryList: He,
       loading: F,