super-page-designer 2.2.22 → 2.2.24

package/dist/es/components/design/utils/page-explore-util.js

@@ -1,23 +1,23 @@
 function e(e2, t, l, o) {
   const i = { uuid: "-1", label: "页面", name: "page", componentIndex: -1 };
   if (!e2 || 0 == e2.length) return [i];
-  const a = [];
+  const p = [];
   for (let o2 = 0; o2 < e2.length; o2++) {
     const i2 = n(e2[o2], t, l);
-    i2 && a.push(i2);
+    i2 && p.push(i2);
   }
-  return i.children = a, [i];
+  return i.children = p, [i];
 }
 function n(e2, t, l, o) {
   const i = [];
-  if (e2.label, e2.items && e2.items.length > 0 && "table" != e2.name) for (let o2 = 0; o2 < e2.items.length; o2++) {
-    const a2 = n(e2.items[o2], t, l);
-    null != a2 && i.push(a2);
+  if (e2.items && e2.items.length > 0 && "table" != e2.name) for (let o2 = 0; o2 < e2.items.length; o2++) {
+    const p2 = n(e2.items[o2], t, l);
+    null != p2 && i.push(p2);
   }
-  const a = e2.props && e2.props.base ? e2.props.base.title : void 0;
-  let p = true;
-  if (0 == i.length && t && (p = false, (e2.type && e2.type.indexOf(t) > -1 || e2.label && e2.label.indexOf(t) > -1 || e2.name && e2.name.indexOf(t) > -1 || a && a.indexOf(t) > -1) && (p = true)), p && e2.componentIndex) {
-    const n2 = { componentIndex: e2.componentIndex, name: e2.name, label: a ? a + "(" + e2.label + ")" : e2.label, uuid: e2.uuid, children: i };
+  const p = e2.props && e2.props.base ? e2.props.base.title : void 0;
+  let s = true;
+  if (0 == i.length && t && (s = false, (e2.type && e2.type.indexOf(t) > -1 || e2.label && e2.label.indexOf(t) > -1 || e2.name && e2.name.indexOf(t) > -1 || p && p.indexOf(t) > -1) && (s = true)), s && e2.componentIndex) {
+    const n2 = { componentIndex: e2.componentIndex, name: e2.name, label: p ? p + "(" + e2.label + ")" : e2.label, uuid: e2.uuid, children: i };
     return null != l && e2.componentIndex && (l.value[e2.componentIndex] = e2), n2;
   }
   return null;

package/dist/es/components/design/utils/page-permission-util.js

@@ -3,82 +3,84 @@ import { getStandPermissionInfo as s, FuncType as n } from "super-page-runtime";
 function o() {
   return [{ value: n.AUTHORIZED, label: "专用" }, { value: n.AUTHENTICATED, label: "公用" }, { value: n.ANONYMOUS, label: "匿名" }];
 }
-function i(o2, i2, u2, t2) {
+function i(o2, i2, t2, u2) {
   o2.pagePermissions || (o2.pagePermissions = []);
-  const c2 = o2.code, p = s(i2);
-  if (!p || !p.functions) return;
-  const l = o2.pagePermissions, a = p.functions, f = [];
-  for (let s2 = 0; s2 < a.length; s2++) {
-    let o3 = a[s2];
-    const r = o3.code ? o3.code : i2, d = l.filter((e2) => {
+  const p2 = o2.code, c = s(i2);
+  if (!c || !c.functions) return;
+  const a = o2.pagePermissions, l = c.functions, f = [];
+  for (let s2 = 0; s2 < l.length; s2++) {
+    let o3 = l[s2];
+    const r = o3.code ? o3.code : i2, d = a.filter((e2) => {
       if (e2.simpleCode == r) return true;
     });
     let m = null;
-    if (m = 0 == s2 && u2 || (o3.label ? o3.label : p.label), d.length > 0) {
+    m = 0 == s2 && t2 || (o3.label ? o3.label : c.label);
+    const h = "/" + p2 + o3.path;
+    if (d.length > 0) {
       const e2 = d[0];
-      e2.name = m, e2.uuids || (e2.uuids = []), t2 && !e2.uuids.includes(t2) && e2.uuids.push(t2), f.push(e2);
+      e2.name = m, e2.path && e2.path === h || (e2.path = h), e2.uuids || (e2.uuids = []), u2 && !e2.uuids.includes(u2) && e2.uuids.push(u2), f.push(e2);
     } else {
-      const s3 = { source: "auto", type: "standard", simpleCode: r, name: m, uuids: [t2], funcType: o3.funcType ? o3.funcType : n.AUTHORIZED, code: c2 + "." + r, path: "/" + c2 + o3.path, uuid: e() };
-      l.push(s3), f.push(s3);
+      const s3 = { source: "auto", type: "standard", simpleCode: r, name: m, uuids: [u2], funcType: o3.funcType ? o3.funcType : n.AUTHORIZED, code: p2 + "." + r, path: h, uuid: e() };
+      a.push(s3), f.push(s3);
     }
   }
   return f;
 }
-function u(e2, o2) {
-  const u2 = o2.code, t2 = e2.events ? e2.events : [], p = e2.props && e2.props.base ? e2.props.base : {}, l = [], a = [];
-  for (let e3 of t2) if (e3.isStandard && e3.eventName) {
+function t(e2, o2) {
+  const t2 = o2.code, u2 = e2.events ? e2.events : [], c = e2.props && e2.props.base ? e2.props.base : {}, a = [], l = [];
+  for (let e3 of u2) if (e3.isStandard && e3.eventName) {
     const o3 = { type: "standard", eventName: e3.eventName };
     if ("click" == e3.name) {
-      o3.name = p.title;
+      o3.name = c.title;
       const i2 = s(e3.eventName);
       if (i2 && i2.functions) {
         for (let s2 of i2.functions) if (s2.funcType == n.AUTHORIZED || !s2.funcType) {
           const n2 = { simpleCode: s2.code ? s2.code : e3.eventName, funcType: s2.funcType };
-          n2.code = u2 + "." + n2.simpleCode, n2.path = "/" + u2 + s2.path, Object.assign(n2, o3), l.push(n2);
+          n2.code = t2 + "." + n2.simpleCode, n2.path = "/" + t2 + s2.path, Object.assign(n2, o3), a.push(n2);
         }
       }
     }
-    a.push(o3);
+    l.push(o3);
   }
-  e2.autoPermissions = l;
+  e2.autoPermissions = a;
   const f = e2.uuid;
   o2.pagePermissions || (o2.pagePermissions = []);
   const r = [];
   for (let e3 of o2.pagePermissions) e3.uuids && e3.uuids.includes(f) && r.push(e3);
   const d = {};
-  if (a) for (let e3 of a) {
+  if (l) for (let e3 of l) {
     const s2 = i(o2, e3.eventName, e3.name, f);
     if (s2) for (let e4 of s2) d[e4.uuid] = true;
   }
-  for (let e3 of r) d[e3.uuid] || "auto" != e3.source || c(o2, e3.simpleCode, f);
+  for (let e3 of r) d[e3.uuid] || "auto" != e3.source || p(o2, e3.simpleCode, f);
 }
-function t(e2, s2) {
+function u(e2, s2) {
   e2.pagePermissions || (e2.pagePermissions = []);
   const n2 = [];
   for (let o2 of e2.pagePermissions) o2.uuids && o2.uuids.includes(s2) && n2.push(o2);
-  for (let o2 of n2) c(e2, o2.simpleCode, s2);
+  for (let o2 of n2) p(e2, o2.simpleCode, s2);
 }
-function c(e2, s2, n2) {
+function p(e2, s2, n2) {
   e2.pagePermissions || (e2.pagePermissions = []);
   const o2 = e2.pagePermissions;
   let i2 = -1;
-  const u2 = o2.length;
-  for (let e3 = 0; e3 < u2; e3++) if (o2[e3].simpleCode == s2) {
+  const t2 = o2.length;
+  for (let e3 = 0; e3 < t2; e3++) if (o2[e3].simpleCode == s2) {
     i2 = e3;
     break;
   }
   if (-1 == i2) return;
-  const t2 = o2[i2];
-  if (t2.uuids && n2) {
-    const e3 = t2.uuids.indexOf(n2);
-    e3 > -1 && t2.uuids.splice(e3, 1);
+  const u2 = o2[i2];
+  if (u2.uuids && n2) {
+    const e3 = u2.uuids.indexOf(n2);
+    e3 > -1 && u2.uuids.splice(e3, 1);
   }
-  t2.uuids && 0 != t2.uuids.length || o2.splice(i2, 1);
+  u2.uuids && 0 != u2.uuids.length || o2.splice(i2, 1);
 }
 export {
   i as addPermission,
-  t as batchRemovePermissions,
-  u as batchUpdatePermissions,
-  c as delPermission,
+  u as batchRemovePermissions,
+  t as batchUpdatePermissions,
+  p as delPermission,
   o as getFunctionTypes
 };

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-design.vue2.js

@@ -6,15 +6,15 @@ import { getCustomTheme as I } from "super-page-runtime";
 import k from "./series/column-line-series-attr.vue.js";
 import D from "../common/common-chart-header.vue.js";
 import { use as F } from "echarts/core";
-import { CanvasRenderer as w } from "echarts/renderers";
-import { LineChart as A, BarChart as O } from "echarts/charts";
-import { GridComponent as R, LegendComponent as T, TitleComponent as _, TooltipComponent as q, ToolboxComponent as z, DataZoomComponent as B } from "echarts/components";
+import { CanvasRenderer as T } from "echarts/renderers";
+import { LineChart as w, BarChart as A } from "echarts/charts";
+import { GridComponent as O, LegendComponent as R, TitleComponent as _, TooltipComponent as q, ToolboxComponent as z, DataZoomComponent as B } from "echarts/components";
 import H from "vue-echarts";
 import "element-plus";
 import "agilebuilder-ui/src/utils/request";
 import "../../../../utils/eventBus.js";
 const S = { style: { position: "absolute", top: "0px", right: "60px", "text-align": "center" } }, E = ["onClick"], G = e({ __name: "column-line-design", props: { pageDesign: {}, configure: {}, indexObj: {}, selectWidget: {} }, emits: ["onSelectWidget", "onCustomAttrWidget"], setup(e2, { emit: G2 }) {
-  F([w, A, R, T, _, q, O, z, B]);
+  F([T, w, O, R, _, q, A, z, B]);
   const J = e2;
   J.configure.props || (J.configure.props = {}), J.configure.items || (J.configure.items = []), 0 == J.configure.items.length && J.configure.items.push({ uuid: h(), index: 1, name: "", type: "bar", label: "柱状图", props: { title: "系列1" }, style: {} }), J.configure.runtime || (J.configure.runtime = {});
   const K = t({}), L = t(""), M = t({}), N = t({}), P = t(null);
@@ -22,30 +22,32 @@ const S = { style: { position: "absolute", top: "0px", right: "60px", "text-alig
     const e3 = C(J.configure, N.value);
     J.configure.runtime.dataConfig = e3;
   }
-  function U() {
+  i(J.configure.style, () => {
+    b(J.configure, K, L, null), J.configure.runtime.style = K.value, J.configure.runtime.class = L.value, N.value = x(J.configure), J.configure.runtime.headerInfo = N.value, V();
+  }, { immediate: true }), i(J.configure.props, () => {
+    V(), Q();
+  }), i(J.configure.items, () => {
+    V();
+  });
+  const U = setTimeout(() => {
+    Q();
+  }, 100);
+  function V() {
     j(J.configure, M), N.value = x(J.configure), P.value = I(J.configure.props.customTheme), J.configure.runtime.chartOption = M.value, J.configure.runtime.headerInfo = N.value, y(J.configure, N.value);
   }
-  function V() {
+  function X() {
     if (J.configure.items) for (let e3 of J.configure.items) e3.selected = false;
   }
-  function X(e3) {
-    V();
+  function Y(e3) {
+    X();
   }
-  i(J.configure.style, () => {
-    b(J.configure, K, L, null), J.configure.runtime.style = K.value, J.configure.runtime.class = L.value, N.value = x(J.configure), J.configure.runtime.headerInfo = N.value, U();
-  }, { immediate: true }), i(J.configure.props, () => {
-    U(), Q();
-  }), i(J.configure.items, () => {
-    U();
-  }), setTimeout(() => {
-    Q();
-  }, 100), o(() => {
-    W(J.configure);
+  o(() => {
+    W(J.configure), U && clearTimeout(U);
   }), J.selectWidget && i(J.selectWidget, () => {
-    null != J.selectWidget && J.selectWidget.value != J.configure.componentIndex && V();
+    null != J.selectWidget && J.selectWidget.value != J.configure.componentIndex && X();
   }), t(null);
-  const Y = G2;
-  return (e3, t2) => (n(), r("div", { style: c([K.value, { position: "relative" }]), class: u([L.value, "amb-widget-chart"]), onClick: s(X, ["stop"]), ref: "thisRef" }, [l(m(D, { headerInfo: N.value }, null, 8, ["headerInfo"]), [[f, N.value.showHeader]]), m(a(H), { ref: "chartRef", theme: P.value, option: M.value, autoresize: "" }, null, 8, ["theme", "option"]), l(g("div", S, [(n(true), r(p, null, d(e3.configure.items, (e4, t3) => (n(), r("label", { class: u([[e4.selected ? "amb-design-chart-series-selected" : ""], "amb-design-chart-series"]), onClick: s((e5) => function(e6, t4) {
+  const Z = G2;
+  return (e3, t2) => (n(), r("div", { style: c([K.value, { position: "relative" }]), class: u([L.value, "amb-widget-chart"]), onClick: s(Y, ["stop"]), ref: "thisRef" }, [l(m(D, { headerInfo: N.value }, null, 8, ["headerInfo"]), [[f, N.value.showHeader]]), m(a(H), { ref: "chartRef", theme: P.value, option: M.value, autoresize: "" }, null, 8, ["theme", "option"]), l(g("div", S, [(n(true), r(p, null, d(e3.configure.items, (e4, t3) => (n(), r("label", { class: u([[e4.selected ? "amb-design-chart-series-selected" : ""], "amb-design-chart-series"]), onClick: s((e5) => function(e6, t4) {
     e6 && e6.preventDefault();
     const i2 = J.configure.items[t4];
     if (!i2.selected) {
@@ -53,7 +55,7 @@ const S = { style: { position: "absolute", top: "0px", right: "60px", "text-alig
         e7.selected = false;
         break;
       }
-      i2.serviceFields = J.configure.serviceFields, i2.serviceDataField = J.configure.serviceDataField, i2.selected = true, Y("onCustomAttrWidget", i2, k);
+      i2.serviceFields = J.configure.serviceFields, i2.serviceDataField = J.configure.serviceDataField, i2.selected = true, Z("onCustomAttrWidget", i2, k);
     }
   }(e5, t3), ["stop"]) }, v(e4.props.title), 11, E))), 256))], 512), [[f, e3.configure.componentIndex == e3.selectWidget.value]])], 6));
 } });

package/dist/es/components/design/views/assemblys/chart/common/common-attr-clickset.vue.js

@@ -1,37 +1,40 @@
-import { defineComponent as e, ref as l, watch as a, resolveComponent as t, createBlock as o, openBlock as i, withCtx as u, createElementVNode as r, createVNode as n, createElementBlock as s, Fragment as c, renderList as d, toDisplayString as f, unref as m } from "vue";
-import { Plus as p, Delete as v } from "@element-plus/icons-vue";
-import { getUuidv4 as b } from "../../../../utils/common-util.js";
-import g from "../../common/common-variable-bind.vue.js";
-const _ = { style: { padding: "8px 0px 0px 0px" } }, V = { style: { float: "left" } }, h = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, w = e({ __name: "common-attr-clickset", props: { configure: {} }, setup(e2) {
-  const w2 = e2;
-  w2.configure.clickSet || (w2.configure.clickSet = {});
-  const k = l(w2.configure.clickSet);
-  function y(e3) {
+import { defineComponent as e, ref as l, onUnmounted as a, watch as t, resolveComponent as o, createBlock as i, openBlock as u, withCtx as r, createElementVNode as n, createVNode as c, createElementBlock as s, Fragment as d, renderList as f, toDisplayString as m, unref as p } from "vue";
+import { Plus as v, Delete as b } from "@element-plus/icons-vue";
+import { getUuidv4 as g } from "../../../../utils/common-util.js";
+import _ from "../../common/common-variable-bind.vue.js";
+const V = { style: { padding: "8px 0px 0px 0px" } }, h = { style: { float: "left" } }, w = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, k = e({ __name: "common-attr-clickset", props: { configure: {} }, setup(e2) {
+  const k2 = e2;
+  k2.configure.clickSet || (k2.configure.clickSet = {});
+  const y = l(k2.configure.clickSet);
+  function x(e3) {
     let l2 = -1;
-    const a2 = k.value.variables.length;
-    for (let t2 = 0; t2 < a2; t2++) if (k.value.variables[t2].uuid == e3.uuid) {
+    const a2 = y.value.variables.length;
+    for (let t2 = 0; t2 < a2; t2++) if (y.value.variables[t2].uuid == e3.uuid) {
       l2 = t2;
       break;
     }
     return l2;
   }
-  function x(e3) {
+  function U(e3) {
     let l2 = -1;
-    e3 && (l2 = y(e3));
-    const a2 = { uuid: b(), fieldName: "" };
-    k.value.variables.splice(l2 + 1, 0, a2);
+    e3 && (l2 = x(e3));
+    const a2 = { uuid: g(), fieldName: "" };
+    y.value.variables.splice(l2 + 1, 0, a2);
   }
-  k.value.variables || (k.value.variables = []), 0 == k.value.variables && x(null);
-  const U = l([]);
-  let C = null, N = null;
-  return a(w2.configure, () => {
+  let C;
+  y.value.variables || (y.value.variables = []), 0 == y.value.variables && U(null), a(() => {
+    C && clearTimeout(C);
+  });
+  const N = l([]);
+  let z = null, F = null;
+  return t(k2.configure, () => {
     !function() {
-      if (w2.configure.serviceFields == C && w2.configure.serviceDataField == N) return;
-      C = w2.configure.serviceFields, N = w2.configure.serviceDataField;
+      if (k2.configure.serviceFields == z && k2.configure.serviceDataField == F) return;
+      z = k2.configure.serviceFields, F = k2.configure.serviceDataField;
       const e3 = [];
-      if (C) {
-        const l2 = N || "";
-        for (let a2 of C) if (!l2 || a2.value.startsWith(l2 + ".")) {
+      if (z) {
+        const l2 = F || "";
+        for (let a2 of z) if (!l2 || a2.value.startsWith(l2 + ".")) {
           const t2 = {};
           if (Object.assign(t2, a2), l2) {
             const e4 = a2.value.substring(l2.length + 1);
@@ -40,21 +43,21 @@ const _ = { style: { padding: "8px 0px 0px 0px" } }, V = { style: { float: "left
           e3.push(t2);
         }
       }
-      U.value = e3;
+      N.value = e3;
     }();
   }, { immediate: true }), (e3, l2) => {
-    const a2 = t("el-switch"), b2 = t("el-form-item"), w3 = t("el-col"), C2 = t("el-row"), N2 = t("el-option"), z = t("el-select"), F = t("el-table-column"), j = t("el-icon"), S = t("el-table"), T = t("el-collapse-item");
-    return i(), o(T, { title: "Click参数设置", name: "clickTrigger", class: "amb-design-attr-group-header" }, { default: u(() => [r("div", _, [n(C2, { style: { "margin-top": "4px" } }, { default: u(() => [n(w3, { span: 9 }, { default: u(() => [n(b2, { label: "选中效果" }, { default: u(() => [n(a2, { modelValue: k.value.selected, "onUpdate:modelValue": l2[0] || (l2[0] = (e4) => k.value.selected = e4) }, null, 8, ["modelValue"])]), _: 1 })]), _: 1 }), n(w3, { span: 12 }, { default: u(() => [n(b2, { label: "多选" }, { default: u(() => [n(a2, { modelValue: k.value.multiple, "onUpdate:modelValue": l2[1] || (l2[1] = (e4) => k.value.multiple = e4) }, null, 8, ["modelValue"])]), _: 1 })]), _: 1 })]), _: 1 }), n(S, { data: k.value.variables, style: { "margin-top": "-15px" } }, { default: u(() => [n(F, { prop: "fieldName", label: "字段", width: "90" }, { default: u((e4) => [n(z, { size: "small", modelValue: e4.row.fieldName, "onUpdate:modelValue": (l3) => e4.row.fieldName = l3, title: e4.row.fieldName, filterable: "", "allow-create": "", clearable: "", placeholder: "请选择" }, { default: u(() => [(i(true), s(c, null, d(U.value, (e5) => (i(), o(N2, { key: e5.value, label: e5.label, value: e5.value }, { default: u(() => [r("span", V, f(e5.label), 1), r("span", h, f(e5.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "title"])]), _: 1 }), n(F, { prop: "variable", label: "设置到" }, { default: u((e4) => [n(g, { modelValue: e4.row.variable, paramTypes: "['data','page']", "onUpdate:modelValue": (l3) => {
-      return a3 = l3, void ((t2 = e4.row) && (t2.variable = a3));
-      var a3, t2;
-    } }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), n(F, { label: "操作", width: "60" }, { default: u((e4) => [n(j, { size: "14", style: { color: "#5893ef", cursor: "pointer", "font-weight": "bold", "margin-right": "8px" }, onClick: (l3) => x(e4.row) }, { default: u(() => [n(m(p))]), _: 2 }, 1032, ["onClick"]), n(j, { size: "14", style: { color: "#5893ef", cursor: "pointer" }, onClick: (l3) => function(e5) {
-      let l4 = y(e5);
-      l4 > -1 && (k.value.variables.splice(l4, 1), 0 == k.value.variables.length && setTimeout(function() {
-        x(null);
-      }, 0));
-    }(e4.row) }, { default: u(() => [n(m(v))]), _: 2 }, 1032, ["onClick"])]), _: 1 })]), _: 1 }, 8, ["data"])])]), _: 1 });
+    const a2 = o("el-switch"), t2 = o("el-form-item"), g2 = o("el-col"), k3 = o("el-row"), z2 = o("el-option"), F2 = o("el-select"), T = o("el-table-column"), j = o("el-icon"), S = o("el-table"), D = o("el-collapse-item");
+    return u(), i(D, { title: "Click参数设置", name: "clickTrigger", class: "amb-design-attr-group-header" }, { default: r(() => [n("div", V, [c(k3, { style: { "margin-top": "4px" } }, { default: r(() => [c(g2, { span: 9 }, { default: r(() => [c(t2, { label: "选中效果" }, { default: r(() => [c(a2, { modelValue: y.value.selected, "onUpdate:modelValue": l2[0] || (l2[0] = (e4) => y.value.selected = e4) }, null, 8, ["modelValue"])]), _: 1 })]), _: 1 }), c(g2, { span: 12 }, { default: r(() => [c(t2, { label: "多选" }, { default: r(() => [c(a2, { modelValue: y.value.multiple, "onUpdate:modelValue": l2[1] || (l2[1] = (e4) => y.value.multiple = e4) }, null, 8, ["modelValue"])]), _: 1 })]), _: 1 })]), _: 1 }), c(S, { data: y.value.variables, style: { "margin-top": "-15px" } }, { default: r(() => [c(T, { prop: "fieldName", label: "字段", width: "90" }, { default: r((e4) => [c(F2, { size: "small", modelValue: e4.row.fieldName, "onUpdate:modelValue": (l3) => e4.row.fieldName = l3, title: e4.row.fieldName, filterable: "", "allow-create": "", clearable: "", placeholder: "请选择" }, { default: r(() => [(u(true), s(d, null, f(N.value, (e5) => (u(), i(z2, { key: e5.value, label: e5.label, value: e5.value }, { default: r(() => [n("span", h, m(e5.label), 1), n("span", w, m(e5.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "title"])]), _: 1 }), c(T, { prop: "variable", label: "设置到" }, { default: r((e4) => [c(_, { modelValue: e4.row.variable, paramTypes: "['data','page']", "onUpdate:modelValue": (l3) => {
+      return a3 = l3, void ((t3 = e4.row) && (t3.variable = a3));
+      var a3, t3;
+    } }, null, 8, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), c(T, { label: "操作", width: "60" }, { default: r((e4) => [c(j, { size: "14", style: { color: "#5893ef", cursor: "pointer", "font-weight": "bold", "margin-right": "8px" }, onClick: (l3) => U(e4.row) }, { default: r(() => [c(p(v))]), _: 2 }, 1032, ["onClick"]), c(j, { size: "14", style: { color: "#5893ef", cursor: "pointer" }, onClick: (l3) => function(e5) {
+      let l4 = x(e5);
+      l4 > -1 && (y.value.variables.splice(l4, 1), 0 == y.value.variables.length && (C = setTimeout(function() {
+        U(null);
+      }, 0)));
+    }(e4.row) }, { default: r(() => [c(p(b))]), _: 2 }, 1032, ["onClick"])]), _: 1 })]), _: 1 }, 8, ["data"])])]), _: 1 });
   };
 } });
 export {
-  w as default
+  k as default
 };

package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js

@@ -1,15 +1,15 @@
-import { defineComponent as e, ref as l, computed as a, resolveComponent as t, createBlock as i, openBlock as r, withCtx as o, createElementVNode as n, createVNode as u, createCommentVNode as s, unref as c, createElementBlock as d, Fragment as p, renderList as m, toDisplayString as f, createTextVNode as g, withDirectives as v, vShow as b } from "vue";
-import y from "../../common/page-permission-select.vue.js";
-import x from "../../form/common/data-origin-service-in.vue.js";
-import { usePageContextStore as V } from "../../../../../../stores/page-store.js";
-import { queryServiceReturnFields as h, queryServiceInfo as _ } from "../../../../utils/page-service-util.js";
-import $ from "../../common/common-variable-bind.vue.js";
-import { getUuidv4 as F } from "../../../../utils/common-util.js";
-import { ElMessageBox as O, ElMessage as S } from "element-plus";
-const j = { style: { padding: "8px 0px 0px 0px" } }, D = { style: { float: "left" } }, w = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, T = { style: { float: "left" } }, U = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, k = { style: { width: "100%", "padding-left": "20px", "margin-bottom": "-15px" } }, z = e({ __name: "common-attr-data", props: { configure: { type: Object, required: true }, defaultType: { type: String, default: "" }, chartType: { type: String, default: "" } }, setup(e2) {
-  const z2 = e2, C = V().pageContext, I = l([]), L = a(() => I.value.filter((e3) => "array" == e3.type || "any" == e3.type || !e3.type)), Q = a(() => I.value.filter((e3) => {
+import { defineComponent as e, ref as l, computed as a, onUnmounted as t, resolveComponent as i, createBlock as r, openBlock as o, withCtx as n, createElementVNode as u, createVNode as s, createCommentVNode as c, unref as d, createElementBlock as p, Fragment as m, renderList as f, toDisplayString as g, createTextVNode as v, withDirectives as b, vShow as y } from "vue";
+import x from "../../common/page-permission-select.vue.js";
+import V from "../../form/common/data-origin-service-in.vue.js";
+import { usePageContextStore as h } from "../../../../../../stores/page-store.js";
+import { queryServiceReturnFields as _, queryServiceInfo as $ } from "../../../../utils/page-service-util.js";
+import F from "../../common/common-variable-bind.vue.js";
+import { getUuidv4 as O } from "../../../../utils/common-util.js";
+import { ElMessageBox as S, ElMessage as j } from "element-plus";
+const D = { style: { padding: "8px 0px 0px 0px" } }, T = { style: { float: "left" } }, w = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, U = { style: { float: "left" } }, k = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, z = { style: { width: "100%", "padding-left": "20px", "margin-bottom": "-15px" } }, C = e({ __name: "common-attr-data", props: { configure: { type: Object, required: true }, defaultType: { type: String, default: "" }, chartType: { type: String, default: "" } }, setup(e2) {
+  const C2 = e2, I = h().pageContext, L = l([]), Q = a(() => L.value.filter((e3) => "array" == e3.type || "any" == e3.type || !e3.type)), q = a(() => L.value.filter((e3) => {
     if ("number" == e3.type || "any" == e3.type || !e3.type) {
-      const l2 = z2.configure.serviceDataField;
+      const l2 = C2.configure.serviceDataField;
       if (!l2 || e3.value.startsWith(l2 + ".")) {
         let a2 = e3.value, t2 = e3.label;
         return l2 && (a2 = a2.substring(l2.length + 1), t2 && (t2 = t2.replace(l2 + ".", ""))), e3.numValue = a2, e3.numLabel = t2, true;
@@ -17,54 +17,57 @@ const j = { style: { padding: "8px 0px 0px 0px" } }, D = { style: { float: "left
     }
     return false;
   }));
-  z2.configure.props.dataOrigin || (z2.configure.props.dataOrigin = {});
-  const q = z2.configure.props.dataOrigin;
-  q.service || (q.service = {});
-  let B = null;
-  function J() {
-    const e3 = q.service.id;
-    if (B != e3) {
-      if (B = e3, !e3) return z2.configure.serviceFields = [], I.value = [], void (z2.configure.serviceDataField = null);
-      h(q.service.simpleCode).then((e4) => {
-        z2.configure.serviceFields = e4, I.value = e4, function() {
-          if (!z2.configure.serviceDataField) return;
+  C2.configure.props.dataOrigin || (C2.configure.props.dataOrigin = {});
+  const B = C2.configure.props.dataOrigin;
+  B.service || (B.service = {});
+  let J = null;
+  function W() {
+    const e3 = B.service.id;
+    if (J != e3) {
+      if (J = e3, !e3) return C2.configure.serviceFields = [], L.value = [], void (C2.configure.serviceDataField = null);
+      _(B.service.simpleCode).then((e4) => {
+        C2.configure.serviceFields = e4, L.value = e4, function() {
+          if (!C2.configure.serviceDataField) return;
           let e5 = false;
-          if (I.value) {
-            for (let l2 of I.value) if (l2.value == z2.configure.serviceDataField) {
+          if (L.value) {
+            for (let l2 of L.value) if (l2.value == C2.configure.serviceDataField) {
               e5 = true;
               break;
             }
           }
-          e5 || (z2.configure.serviceDataField = null);
+          e5 || (C2.configure.serviceDataField = null);
         }();
       });
     }
   }
-  function W(e3) {
-    z2.configure.props.dataOrigin.resultSet = e3, z2.configure.serviceDataField && e3.startsWith("${page.") && _(q.service.simpleCode).then((l2) => {
+  function E(e3) {
+    C2.configure.props.dataOrigin.resultSet = e3, C2.configure.serviceDataField && e3.startsWith("${page.") && $(B.service.simpleCode).then((l2) => {
       var _a;
-      const a2 = (l2.returnValues ? JSON.parse(l2.returnValues) : []).find((e4) => e4.name == z2.configure.serviceDataField);
-      a2 && "array" == a2.type && "object" == ((_a = a2.items[0]) == null ? void 0 : _a.type) && O.confirm("是否需要将服务变量中的对象数组中的属性设值要页面变量中?", "提示", { confirmButtonText: "添加", cancelButtonText: "取消", type: "info" }).then(() => {
+      const a2 = (l2.returnValues ? JSON.parse(l2.returnValues) : []).find((e4) => e4.name == C2.configure.serviceDataField);
+      a2 && "array" == a2.type && "object" == ((_a = a2.items[0]) == null ? void 0 : _a.type) && S.confirm("是否需要将服务变量中的对象数组中的属性设值要页面变量中?", "提示", { confirmButtonText: "添加", cancelButtonText: "取消", type: "info" }).then(() => {
         !function(e4, l3) {
           var _a2;
-          const a3 = e4.replace("${page.", "").replace("}", ""), t2 = C.variables.findIndex((e5) => e5.name == a3), i2 = C.variables[t2];
+          const a3 = e4.replace("${page.", "").replace("}", ""), t2 = I.variables.findIndex((e5) => e5.name == a3), i2 = I.variables[t2];
           i2 && "array" == i2.type && "object" == ((_a2 = i2.items[0]) == null ? void 0 : _a2.type) && (l3.items[0].items.forEach((e5) => {
-            -1 == i2.items[0].items.findIndex((l4) => l4.name == e5.name) && i2.items[0].items.push({ name: e5.name, type: e5.type, alias: e5.alias, code: F() });
-          }), S.success("添加成功"));
+            -1 == i2.items[0].items.findIndex((l4) => l4.name == e5.name) && i2.items[0].items.push({ name: e5.name, type: e5.type, alias: e5.alias, code: O() });
+          }), j.success("添加成功"));
         }(e3, a2);
       }).catch(() => {
       });
     });
   }
-  return setTimeout(() => {
-    J(q.service.id);
-  }, 10), (l2, a2) => {
-    const V2 = t("el-form-item"), h2 = t("el-option"), _2 = t("el-select"), F2 = t("el-text"), O2 = t("el-switch"), S2 = t("el-radio"), z3 = t("QuestionFilled"), I2 = t("el-icon"), B2 = t("el-tooltip"), E = t("el-input"), N = t("el-radio-group"), R = t("el-collapse-item");
-    return r(), i(R, { title: "数据设置", name: "dataSet", class: "amb-design-attr-group-header" }, { default: o(() => [n("div", j, [u(V2, { label: "选择服务", class: "amb-design-attr-item" }, { default: o(() => [u(y, { pageDesign: c(C), rowObj: c(q).service, onlyService: "", "onUpdate:modelValue": a2[0] || (a2[0] = (e3, l3, a3, t2) => function(e4, l4, a4, t3) {
-      q.service.id, q.service.simpleCode = l4, q.service.id = t3, q.service.name = a4, J();
-    }(0, l3, a3, t2)) }, null, 8, ["pageDesign", "rowObj"])]), _: 1 }), u(V2, { label: "数据集", class: "amb-design-attr-item" }, { default: o(() => [u(_2, { modelValue: e2.configure.serviceDataField, "onUpdate:modelValue": a2[1] || (a2[1] = (l3) => e2.configure.serviceDataField = l3), filterable: "", clearable: "", placeholder: "请选择" }, { default: o(() => [(r(true), d(p, null, m(L.value, (e3, l3) => (r(), i(h2, { key: l3, label: e3.label, value: e3.value }, { default: o(() => [n("span", D, f(e3.label), 1), n("span", w, f(e3.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue"]), u(F2, { type: "success", size: "small" }, { default: o(() => a2[7] || (a2[7] = [g("默认为根目录")])), _: 1 })]), _: 1 }), u(V2, { label: "结果设值到", class: "amb-design-attr-item" }, { default: o(() => [(r(), i($, { key: e2.configure.uuid, modelValue: e2.configure.props.dataOrigin.resultSet, "onUpdate:modelValue": W }, null, 8, ["modelValue"]))]), _: 1 }), u(V2, { label: "立即查询", class: "amb-design-attr-item" }, { default: o(() => [u(O2, { modelValue: e2.configure.initializationQuery, "onUpdate:modelValue": a2[2] || (a2[2] = (l3) => e2.configure.initializationQuery = l3) }, null, 8, ["modelValue"])]), _: 1 }), u(V2, { label: "是否导出", class: "amb-design-attr-item" }, { default: o(() => [u(O2, { modelValue: e2.configure.exportable, "onUpdate:modelValue": a2[3] || (a2[3] = (l3) => e2.configure.exportable = l3) }, null, 8, ["modelValue"])]), _: 1 }), u(x, { ref: "dataOriginServiceInRef", dataOrigin: e2.configure.props.dataOrigin }, null, 8, ["dataOrigin"]), "pie" == e2.chartType ? (r(), i(N, { key: 0, modelValue: e2.configure.props.yaxisSource, "onUpdate:modelValue": a2[6] || (a2[6] = (l3) => e2.configure.props.yaxisSource = l3) }, { default: o(() => [v(u(V2, { class: "amb-design-attr-item" }, { label: o(() => [u(S2, { value: "variable" }, { default: o(() => a2[8] || (a2[8] = [g("数据字段")])), _: 1 })]), default: o(() => [u(_2, { size: "small", modelValue: e2.configure.props.yaxisField, "onUpdate:modelValue": a2[4] || (a2[4] = (l3) => e2.configure.props.yaxisField = l3), disabled: "variable" != e2.configure.props.yaxisSource, title: e2.configure.props.yaxisField, style: { width: "160px" }, filterable: "", "allow-create": "", clearable: "", placeholder: "请选择" }, { default: o(() => [(r(true), d(p, null, m(Q.value, (e3) => (r(), i(h2, { key: e3.numValue, label: e3.numLabel, value: e3.numValue }, { default: o(() => [n("span", T, f(e3.numLabel), 1), n("span", U, f(e3.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue", "disabled", "title"])]), _: 1 }, 512), [[b, "pie" == e2.chartType]]), v(u(S2, { value: "formula", style: { "margin-top": "25px" } }, { default: o(() => [a2[10] || (a2[10] = g("计算公式  ")), u(B2, { class: "box-item", effect: "dark", placement: "top-start" }, { content: o(() => a2[9] || (a2[9] = [g("字段值: ${row.字段名}"), n("br", null, null, -1), g(" 最大值: ${max.字段名}"), n("br", null, null, -1), g("    求和: ${sum.字段名}"), n("br", null, null, -1), g("    均值: ${avg.字段名}"), n("br", null, null, -1), g(" 最小值: ${min.字段名}"), n("br", null, null, -1), g(" 最大值: ${max.字段名}"), n("br", null, null, -1), g(" 累计值: ${add.字段名}"), n("br", null, null, -1), g(" 其他可用变量如${page},${data},${task},${request},${context},${system}"), n("br", null, null, -1)])), default: o(() => [u(I2, { size: "16" }, { default: o(() => [u(z3)]), _: 1 })]), _: 1 })]), _: 1 }, 512), [[b, "pie" == e2.chartType]]), v(n("div", k, [u(E, { modelValue: e2.configure.props.formula, "onUpdate:modelValue": a2[5] || (a2[5] = (l3) => e2.configure.props.formula = l3), disabled: "formula" != e2.configure.props.yaxisSource, rows: 4, type: "textarea", placeholder: "支持三元表达式,支持JS函数,如           return ${row.字段名}/${sum.字段名}*100" }, null, 8, ["modelValue", "disabled"])], 512), [[b, "pie" == e2.chartType]])]), _: 1 }, 8, ["modelValue"])) : s("", true)])]), _: 1 });
+  const N = setTimeout(() => {
+    W(B.service.id);
+  }, 10);
+  return t(() => {
+    N && clearTimeout(N);
+  }), (l2, a2) => {
+    const t2 = i("el-form-item"), h2 = i("el-option"), _2 = i("el-select"), $2 = i("el-text"), O2 = i("el-switch"), S2 = i("el-radio"), j2 = i("QuestionFilled"), C3 = i("el-icon"), L2 = i("el-tooltip"), J2 = i("el-input"), N2 = i("el-radio-group"), R = i("el-collapse-item");
+    return o(), r(R, { title: "数据设置", name: "dataSet", class: "amb-design-attr-group-header" }, { default: n(() => [u("div", D, [s(t2, { label: "选择服务", class: "amb-design-attr-item" }, { default: n(() => [s(x, { pageDesign: d(I), rowObj: d(B).service, onlyService: "", "onUpdate:modelValue": a2[0] || (a2[0] = (e3, l3, a3, t3) => function(e4, l4, a4, t4) {
+      B.service.id, B.service.simpleCode = l4, B.service.id = t4, B.service.name = a4, W();
+    }(0, l3, a3, t3)) }, null, 8, ["pageDesign", "rowObj"])]), _: 1 }), s(t2, { label: "数据集", class: "amb-design-attr-item" }, { default: n(() => [s(_2, { modelValue: e2.configure.serviceDataField, "onUpdate:modelValue": a2[1] || (a2[1] = (l3) => e2.configure.serviceDataField = l3), filterable: "", clearable: "", placeholder: "请选择" }, { default: n(() => [(o(true), p(m, null, f(Q.value, (e3, l3) => (o(), r(h2, { key: l3, label: e3.label, value: e3.value }, { default: n(() => [u("span", T, g(e3.label), 1), u("span", w, g(e3.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue"]), s($2, { type: "success", size: "small" }, { default: n(() => a2[7] || (a2[7] = [v("默认为根目录")])), _: 1 })]), _: 1 }), s(t2, { label: "结果设值到", class: "amb-design-attr-item" }, { default: n(() => [(o(), r(F, { key: e2.configure.uuid, modelValue: e2.configure.props.dataOrigin.resultSet, "onUpdate:modelValue": E }, null, 8, ["modelValue"]))]), _: 1 }), s(t2, { label: "立即查询", class: "amb-design-attr-item" }, { default: n(() => [s(O2, { modelValue: e2.configure.initializationQuery, "onUpdate:modelValue": a2[2] || (a2[2] = (l3) => e2.configure.initializationQuery = l3) }, null, 8, ["modelValue"])]), _: 1 }), s(t2, { label: "是否导出", class: "amb-design-attr-item" }, { default: n(() => [s(O2, { modelValue: e2.configure.exportable, "onUpdate:modelValue": a2[3] || (a2[3] = (l3) => e2.configure.exportable = l3) }, null, 8, ["modelValue"])]), _: 1 }), s(V, { ref: "dataOriginServiceInRef", dataOrigin: e2.configure.props.dataOrigin }, null, 8, ["dataOrigin"]), "pie" == e2.chartType ? (o(), r(N2, { key: 0, modelValue: e2.configure.props.yaxisSource, "onUpdate:modelValue": a2[6] || (a2[6] = (l3) => e2.configure.props.yaxisSource = l3) }, { default: n(() => [b(s(t2, { class: "amb-design-attr-item" }, { label: n(() => [s(S2, { value: "variable" }, { default: n(() => a2[8] || (a2[8] = [v("数据字段")])), _: 1 })]), default: n(() => [s(_2, { size: "small", modelValue: e2.configure.props.yaxisField, "onUpdate:modelValue": a2[4] || (a2[4] = (l3) => e2.configure.props.yaxisField = l3), disabled: "variable" != e2.configure.props.yaxisSource, title: e2.configure.props.yaxisField, style: { width: "160px" }, filterable: "", "allow-create": "", clearable: "", placeholder: "请选择" }, { default: n(() => [(o(true), p(m, null, f(q.value, (e3) => (o(), r(h2, { key: e3.numValue, label: e3.numLabel, value: e3.numValue }, { default: n(() => [u("span", U, g(e3.numLabel), 1), u("span", k, g(e3.type), 1)]), _: 2 }, 1032, ["label", "value"]))), 128))]), _: 1 }, 8, ["modelValue", "disabled", "title"])]), _: 1 }, 512), [[y, "pie" == e2.chartType]]), b(s(S2, { value: "formula", style: { "margin-top": "25px" } }, { default: n(() => [a2[10] || (a2[10] = v("计算公式  ")), s(L2, { class: "box-item", effect: "dark", placement: "top-start" }, { content: n(() => a2[9] || (a2[9] = [v("字段值: ${row.字段名}"), u("br", null, null, -1), v(" 最大值: ${max.字段名}"), u("br", null, null, -1), v("    求和: ${sum.字段名}"), u("br", null, null, -1), v("    均值: ${avg.字段名}"), u("br", null, null, -1), v(" 最小值: ${min.字段名}"), u("br", null, null, -1), v(" 最大值: ${max.字段名}"), u("br", null, null, -1), v(" 累计值: ${add.字段名}"), u("br", null, null, -1), v(" 其他可用变量如${page},${data},${task},${request},${context},${system}"), u("br", null, null, -1)])), default: n(() => [s(C3, { size: "16" }, { default: n(() => [s(j2)]), _: 1 })]), _: 1 })]), _: 1 }, 512), [[y, "pie" == e2.chartType]]), b(u("div", z, [s(J2, { modelValue: e2.configure.props.formula, "onUpdate:modelValue": a2[5] || (a2[5] = (l3) => e2.configure.props.formula = l3), disabled: "formula" != e2.configure.props.yaxisSource, rows: 4, type: "textarea", placeholder: "支持三元表达式,支持JS函数,如           return ${row.字段名}/${sum.字段名}*100" }, null, 8, ["modelValue", "disabled"])], 512), [[y, "pie" == e2.chartType]])]), _: 1 }, 8, ["modelValue"])) : c("", true)])]), _: 1 });
   };
 } });
 export {
-  z as default
+  C as default
 };