service-flow-designer 2.2.4 → 2.2.12

package/dist/es/designer/service-components/database/aggregate-query/config.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -23,7 +23,7 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -48,11 +48,11 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
-}>>, {
+}>> & Readonly<{}>, {
     pageContext: Record<string, any>;
     properties: Record<string, any>;
     service: Record<string, any>;
     logicFlowInstance: Record<string, any>;
     currentNode: Record<string, any>;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/es/designer/service-components/database/aggregate-query/config.vue.js

@@ -1,5 +1,5 @@
 import o from "./config.vue2.js";
-import "./config.vue3.js";
+/* empty css            */
 import e from "../../../../_virtual/_plugin-vue_export-helper.js";
 const r = e(o, [["__scopeId", "data-v-dac15197"]]);
 export {

package/dist/es/designer/service-components/database/aggregate-query/config.vue2.js

@@ -1,4 +1,4 @@
-import { ElMessage as e, ElButton as t, ElInput as s, ElFormItem as o, ElAlert as l, ElText as a, ElRadio as r, ElRadioGroup as p, ElForm as i } from "element-plus/es";
+import { ElForm as e, ElFormItem as t, ElInput as s, ElButton as o, ElAlert as l, ElText as a, ElRadioGroup as r, ElRadio as p, ElMessage as i } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/form/style/css";
 import "element-plus/es/components/radio-group/style/css";
@@ -8,93 +8,91 @@ import "element-plus/es/components/alert/style/css";
 import "element-plus/es/components/form-item/style/css";
 import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/button/style/css";
-import { defineComponent as n, ref as m, onMounted as u, openBlock as c, createElementBlock as d, createVNode as y, withCtx as v, unref as b, createElementVNode as f, createTextVNode as g, pushScopeId as T, popScopeId as C } from "vue";
-import { Search as S, View as x, Check as j } from "@element-plus/icons-vue";
-import h from "../../../common/components/value-set-input/value-set-input.vue.js";
-import w from "../../../common/components/datatable-select.vue.js";
-import { useServiceFlowStore as V } from "../../../../stores/page-store.js";
-import { queryTableFields as _, updateServiceParams as N, updateServiceReturns as q, getBaseUrl as k } from "../../../../utils/common-util.js";
-import F from "agilebuilder-ui/src/utils/request";
+import { defineComponent as n, ref as m, onMounted as u, createElementBlock as c, openBlock as d, createVNode as y, withCtx as v, createElementVNode as b, unref as f, createTextVNode as g } from "vue";
+import { Search as T, View as C, Check as S } from "@element-plus/icons-vue";
+import x from "../../../common/components/value-set-input/value-set-input.vue.js";
+import j from "../../../common/components/datatable-select.vue.js";
+import { useServiceFlowStore as h } from "../../../../stores/page-store.js";
+import { queryTableFields as w, updateServiceParams as V, updateServiceReturns as _, getBaseUrl as N } from "../../../../utils/common-util.js";
+import q from "agilebuilder-ui/src/utils/request";
 import "uuid";
-import O from "./dimension-statistical.vue.js";
+import k from "./dimension-statistical.vue.js";
 import "element-plus/es/components/table/style/css";
 import "element-plus/es/components/tooltip/style/css";
 import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
 import "element-plus/es/components/table-column/style/css";
 import "../../util/common-options.js";
-import U from "./statistical-formula.vue.js";
-import z from "./filter-conditions.vue.js";
-import I from "./sort-conditions.vue.js";
-import M from "../../../common/components/node-base-config.vue.js";
-import { getNodeRuntimeObject as D } from "../../../service-flow-view/flow-util.js";
+import F from "./statistical-formula.vue.js";
+import O from "./filter-conditions.vue.js";
+import U from "./sort-conditions.vue.js";
+import z from "../../../common/components/node-base-config.vue.js";
+import { getNodeRuntimeObject as I } from "../../../service-flow-view/flow-util.js";
 import "codemirror";
 import "@codemirror/lang-sql";
 import "@codemirror/state";
-import E from "../../../common/components/sql-view/sql-view-dialog.vue.js";
+import M from "../../../common/components/sql-view/sql-view-dialog.vue.js";
 import "element-plus/es/components/message/style/css";
-const J = (e2) => (T("data-v-dac15197"), e2 = e2(), C(), e2), B = { style: { position: "absolute", right: "0" } }, A = J(() => f("br", null, null, -1)), G = J(() => f("br", null, null, -1)), H = { style: { display: "flex" } }, K = n({ __name: "config", props: { properties: { type: Object, default: () => ({ search: {}, noData: {}, result: {} }) }, logicFlowInstance: { type: Object, default: () => ({}) }, currentNode: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) }, service: { type: Object, default: () => ({}) } }, setup(n2, { expose: T2 }) {
+const D = { style: { position: "absolute", right: "0" } }, E = { style: { display: "flex" } }, J = n({ __name: "config", props: { properties: { type: Object, default: () => ({ search: {}, noData: {}, result: {} }) }, logicFlowInstance: { type: Object, default: () => ({}) }, currentNode: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) }, service: { type: Object, default: () => ({}) } }, setup(n2, { expose: J2 }) {
   var _a;
-  const C2 = V(), J2 = n2;
-  J2.properties.result || (J2.properties.result = {});
-  const K2 = m(false), L = m(C2.pageContext.systemCode);
-  ((_a = J2.properties) == null ? void 0 : _a.dataTableSystemCode) && (L.value = J2.properties.dataTableSystemCode);
-  const P = m(C2.pageContext.systemVersion), Q = m([]), R = m([]), W = m([]);
-  J2.properties.result.valueSetScope || (J2.properties.result.valueSetScope = "all");
-  const X = m("array"), Y = m(false), Z = m("");
-  function $() {
-    "first" == J2.properties.result.valueSetScope ? X.value = "object" : X.value = "array";
+  const B = h(), A = n2;
+  A.properties.result || (A.properties.result = {});
+  const G = m(false), H = m(B.pageContext.systemCode);
+  ((_a = A.properties) == null ? void 0 : _a.dataTableSystemCode) && (H.value = A.properties.dataTableSystemCode);
+  const K = m(B.pageContext.systemVersion), L = m([]), P = m([]), Q = m([]);
+  A.properties.result.valueSetScope || (A.properties.result.valueSetScope = "all");
+  const R = m("array"), W = m(false), X = m("");
+  function Y() {
+    "first" == A.properties.result.valueSetScope ? R.value = "object" : R.value = "array";
   }
-  function ee() {
-    const e2 = J2.properties.dataTable, t2 = J2.properties.dataTableSystemCode, s2 = J2.properties.dataTableSystemVersion;
-    e2 ? _(t2, s2, e2).then((e3) => {
-      Q.value = e3, R.value = Q.value;
-    }) : (Q.value = [], R.value = Q.value);
+  function Z() {
+    const e2 = A.properties.dataTable, t2 = A.properties.dataTableSystemCode, s2 = A.properties.dataTableSystemVersion;
+    e2 ? w(t2, s2, e2).then((e3) => {
+      L.value = e3, P.value = L.value;
+    }) : (L.value = [], P.value = L.value);
   }
   u(() => {
-    ee(), se();
+    Z(), ee();
   });
-  const te = (e2) => {
-    J2.properties.dataTable = e2.dataTable.name, J2.properties.dataTableSystemCode = e2.system.code, J2.properties.dataTableSystemVersion = e2.system.publishVersion, L.value = J2.properties.dataTableSystemCode, ee();
-  }, se = () => {
-    W.value = [];
+  const $ = (e2) => {
+    A.properties.dataTable = e2.dataTable.name, A.properties.dataTableSystemCode = e2.system.code, A.properties.dataTableSystemVersion = e2.system.publishVersion, H.value = A.properties.dataTableSystemCode, Z();
+  }, ee = () => {
+    Q.value = [];
     const e2 = [];
-    J2.properties.statistics && J2.properties.statistics.forEach((t2) => {
+    A.properties.statistics && A.properties.statistics.forEach((t2) => {
       const s2 = t2.newName ? t2.newName : t2.name;
       s2 && e2.push({ type: "string", name: s2, alias: s2 });
-    }), J2.properties.statisticalFormulas && J2.properties.statisticalFormulas.forEach((t2) => {
+    }), A.properties.statisticalFormulas && A.properties.statisticalFormulas.forEach((t2) => {
       if (t2.formula) {
         const s2 = t2.newName ? t2.newName : t2.name;
         s2 && !e2.includes(s2) && e2.push({ type: "number", name: s2, alias: s2 });
       }
-    }), W.value = e2;
+    }), Q.value = e2;
   };
-  function oe() {
-    if (!J2.properties.result.setTo)
-      return void e.error("请先设置结果参数!");
-    const t2 = "first" == J2.properties.result.valueSetScope ? "object" : "array";
-    N(J2.properties.result.setTo, t2, W.value);
+  function te() {
+    if (!A.properties.result.setTo) return void i.error("请先设置结果参数!");
+    const e2 = "first" == A.properties.result.valueSetScope ? "object" : "array";
+    V(A.properties.result.setTo, e2, Q.value);
   }
-  function le() {
-    if (!J2.properties.result.setTo)
-      return void e.error("请先设置结果参数!");
-    const t2 = "first" == J2.properties.result.valueSetScope ? "object" : "array";
-    q(J2.properties.result.setTo, t2, W.value);
+  function se() {
+    if (!A.properties.result.setTo) return void i.error("请先设置结果参数!");
+    const e2 = "first" == A.properties.result.valueSetScope ? "object" : "array";
+    _(A.properties.result.setTo, e2, Q.value);
   }
-  function ae() {
-    Z.value = "";
-    const e2 = D(J2.logicFlowInstance.getNodeModelById(J2.currentNode.data.id), J2.service);
-    e2.props = JSON.parse(JSON.stringify(J2.properties));
-    const t2 = k(J2.pageContext.backendUrl, J2.pageContext.isTest);
-    F.post(t2 + "/dsc/service-flow/test/database-node/show-sql", e2).then((e3) => {
-      Y.value = true, Z.value = e3;
+  function oe() {
+    X.value = "";
+    const e2 = I(A.logicFlowInstance.getNodeModelById(A.currentNode.data.id), A.service);
+    e2.props = JSON.parse(JSON.stringify(A.properties));
+    const t2 = N(A.pageContext.backendUrl, A.pageContext.isTest);
+    q.post(t2 + "/dsc/service-flow/test/database-node/show-sql", e2).then((e3) => {
+      W.value = true, X.value = e3;
     });
   }
-  return T2({}), (e2, m2) => {
-    const u2 = t, T3 = s, C3 = o, V2 = l, _2 = a, N2 = r, q2 = p, k2 = i;
-    return c(), d("div", null, [y(k2, { "label-width": "100", "label-position": "left", size: "small" }, { default: v(() => [y(M, { properties: n2.properties }, null, 8, ["properties"]), y(C3, { label: "选择数据表" }, { default: v(() => [y(T3, { modelValue: n2.properties.dataTable, "onUpdate:modelValue": m2[1] || (m2[1] = (e3) => n2.properties.dataTable = e3), readonly: "", style: { width: "85%" } }, { append: v(() => [y(u2, { icon: b(S), onClick: m2[0] || (m2[0] = (e3) => K2.value = !K2.value) }, null, 8, ["icon"])]), _: 1 }, 8, ["modelValue"]), f("span", B, [y(u2, { type: "primary", icon: b(x), onClick: ae }, { default: v(() => [g("预览sql")]), _: 1 }, 8, ["icon"])]), y(w, { visible: K2.value, "onUpdate:visible": m2[2] || (m2[2] = (e3) => K2.value = e3), modelValue: n2.properties.dataTable, "onUpdate:modelValue": m2[3] || (m2[3] = (e3) => n2.properties.dataTable = e3), systemCode: L.value, systemVersion: P.value, onSelect: te }, null, 8, ["visible", "modelValue", "systemCode", "systemVersion"])]), _: 1 }), y(V2, { title: "统计维度", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(O, { properties: n2.properties, dataTableColumns: R.value, onChange: se, style: { "margin-bottom": "10 px" } }, null, 8, ["properties", "dataTableColumns"]), y(_2, { style: { "margin-top": "10px", "margin-bottom": "10px", display: "block" }, type: "success" }, { default: v(() => [g("说明：1.支持自定义日期格式,同SimpleDateFormat,yyyy表示年,MM表示2位月..."), A, g("           2.未指定新字段名时,输出字段名同选择的字段名"), G, g("           3.动态维度值有填写时需要匹配才会执行此分组")]), _: 1 }), y(V2, { title: "统计公式", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(U, { properties: n2.properties, dataTableColumns: Q.value, onChange: se }, null, 8, ["properties", "dataTableColumns"]), y(_2, { style: { "margin-top": "10px", "margin-bottom": "10px", display: "block" }, type: "success" }, { default: v(() => [g("说明：1.支持自定义统计公式,如sum(字段1+字段2)")]), _: 1 }), y(V2, { title: "过滤条件", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(z, { properties: n2.properties, dataTableColumns: Q.value }, null, 8, ["properties", "dataTableColumns"]), y(V2, { title: "排序条件", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(I, { properties: n2.properties, dataTableColumns: W.value }, null, 8, ["properties", "dataTableColumns"]), y(V2, { title: "结果设置", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(C3, { label: "", "label-width": "0", style: { width: "100%" } }, { default: v(() => [y(q2, { modelValue: n2.properties.result.valueSetScope, "onUpdate:modelValue": m2[4] || (m2[4] = (e3) => n2.properties.result.valueSetScope = e3), onChange: $, class: "ml-4" }, { default: v(() => [y(N2, { value: "first" }, { default: v(() => [g("仅第一条")]), _: 1 }), y(N2, { value: "all" }, { default: v(() => [g(" 全部 ")]), _: 1 })]), _: 1 }, 8, ["modelValue"])]), _: 1 }), y(C3, { label: "设置到：", style: { width: "100%" } }, { default: v(() => [f("div", H, [y(b(h), { width: "260", paramTypes: ["service"], modelValue: n2.properties.result.setTo, "onUpdate:modelValue": m2[5] || (m2[5] = (e3) => n2.properties.result.setTo = e3), autoCreateFieldType: X.value }, null, 8, ["modelValue", "autoCreateFieldType"]), y(u2, { icon: b(j), type: "primary", onClick: oe, style: { "margin-left": "10px" } }, { default: v(() => [g(" 更新服务变量 ")]), _: 1 }, 8, ["icon"]), y(u2, { icon: b(j), type: "primary", onClick: le, style: { "margin-left": "10px" } }, { default: v(() => [g(" 设置为返回值 ")]), _: 1 }, 8, ["icon"])])]), _: 1 })]), _: 1 }), y(b(E), { sql: Z.value, "model-value": Y.value, "onUpdate:modelValue": m2[6] || (m2[6] = (e3) => Y.value = e3) }, null, 8, ["sql", "model-value"])]);
+  return J2({}), (i2, m2) => {
+    const u2 = o, h2 = s, w2 = t, V2 = l, _2 = a, N2 = p, q2 = r, I2 = e;
+    return d(), c("div", null, [y(I2, { "label-width": "100", "label-position": "left", size: "small" }, { default: v(() => [y(z, { properties: n2.properties }, null, 8, ["properties"]), y(w2, { label: "选择数据表" }, { default: v(() => [y(h2, { modelValue: n2.properties.dataTable, "onUpdate:modelValue": m2[1] || (m2[1] = (e2) => n2.properties.dataTable = e2), readonly: "", style: { width: "85%" } }, { append: v(() => [y(u2, { icon: f(T), onClick: m2[0] || (m2[0] = (e2) => G.value = !G.value) }, null, 8, ["icon"])]), _: 1 }, 8, ["modelValue"]), b("span", D, [y(u2, { type: "primary", icon: f(C), onClick: oe }, { default: v(() => m2[7] || (m2[7] = [g("预览sql")])), _: 1 }, 8, ["icon"])]), y(j, { visible: G.value, "onUpdate:visible": m2[2] || (m2[2] = (e2) => G.value = e2), modelValue: n2.properties.dataTable, "onUpdate:modelValue": m2[3] || (m2[3] = (e2) => n2.properties.dataTable = e2), systemCode: H.value, systemVersion: K.value, onSelect: $ }, null, 8, ["visible", "modelValue", "systemCode", "systemVersion"])]), _: 1 }), y(V2, { title: "统计维度", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(k, { properties: n2.properties, dataTableColumns: P.value, onChange: ee, style: { "margin-bottom": "10 px" } }, null, 8, ["properties", "dataTableColumns"]), y(_2, { style: { "margin-top": "10px", "margin-bottom": "10px", display: "block" }, type: "success" }, { default: v(() => m2[8] || (m2[8] = [g("说明：1.支持自定义日期格式,同SimpleDateFormat,yyyy表示年,MM表示2位月..."), b("br", null, null, -1), g("           2.未指定新字段名时,输出字段名同选择的字段名"), b("br", null, null, -1), g("           3.动态维度值有填写时需要匹配才会执行此分组")])), _: 1 }), y(V2, { title: "统计公式", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(F, { properties: n2.properties, dataTableColumns: L.value, onChange: ee }, null, 8, ["properties", "dataTableColumns"]), y(_2, { style: { "margin-top": "10px", "margin-bottom": "10px", display: "block" }, type: "success" }, { default: v(() => m2[9] || (m2[9] = [g("说明：1.支持自定义统计公式,如sum(字段1+字段2)")])), _: 1 }), y(V2, { title: "过滤条件", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(O, { properties: n2.properties, dataTableColumns: L.value }, null, 8, ["properties", "dataTableColumns"]), y(V2, { title: "排序条件", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(U, { properties: n2.properties, dataTableColumns: Q.value }, null, 8, ["properties", "dataTableColumns"]), y(V2, { title: "结果设置", type: "info", size: "small", closable: false, style: { "margin-bottom": "20px" } }), y(w2, { label: "", "label-width": "0", style: { width: "100%" } }, { default: v(() => [y(q2, { modelValue: n2.properties.result.valueSetScope, "onUpdate:modelValue": m2[4] || (m2[4] = (e2) => n2.properties.result.valueSetScope = e2), onChange: Y, class: "ml-4" }, { default: v(() => [y(N2, { value: "first" }, { default: v(() => m2[10] || (m2[10] = [g("仅第一条")])), _: 1 }), y(N2, { value: "all" }, { default: v(() => m2[11] || (m2[11] = [g(" 全部 ")])), _: 1 })]), _: 1 }, 8, ["modelValue"])]), _: 1 }), y(w2, { label: "设置到：", style: { width: "100%" } }, { default: v(() => [b("div", E, [y(f(x), { width: "260", paramTypes: ["service"], modelValue: n2.properties.result.setTo, "onUpdate:modelValue": m2[5] || (m2[5] = (e2) => n2.properties.result.setTo = e2), autoCreateFieldType: R.value }, null, 8, ["modelValue", "autoCreateFieldType"]), y(u2, { icon: f(S), type: "primary", onClick: te, style: { "margin-left": "10px" } }, { default: v(() => m2[12] || (m2[12] = [g(" 更新服务变量 ")])), _: 1 }, 8, ["icon"]), y(u2, { icon: f(S), type: "primary", onClick: se, style: { "margin-left": "10px" } }, { default: v(() => m2[13] || (m2[13] = [g(" 设置为返回值 ")])), _: 1 }, 8, ["icon"])])]), _: 1 })]), _: 1 }), y(f(M), { sql: X.value, "model-value": W.value, "onUpdate:modelValue": m2[6] || (m2[6] = (e2) => W.value = e2) }, null, 8, ["sql", "model-value"])]);
   };
 } });
 export {
-  K as default
+  J as default
 };

package/dist/es/designer/service-components/database/aggregate-query/dimension-additional.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
@@ -48,10 +48,10 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}>> & {
+}>> & Readonly<{
     onChange?: (...args: any[]) => any;
-}, {
+}>, {
     properties: Record<string, any>;
     dataTableColumns: any[];
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/es/designer/service-components/database/aggregate-query/dimension-statistical.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     change: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
@@ -48,10 +48,10 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}>> & {
+}>> & Readonly<{
     onChange?: (...args: any[]) => any;
-}, {
+}>, {
     properties: Record<string, any>;
     dataTableColumns: any[];
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/es/designer/service-components/database/aggregate-query/dimension-statistical.vue.js

@@ -1,4 +1,4 @@
-import { ElTableColumn as e, ElOption as l, ElSelect as a, ElInput as t, ElButton as o, ElTooltip as n, ElTable as s } from "element-plus/es";
+import { ElTable as e, ElTableColumn as l, ElSelect as a, ElOption as t, ElInput as o, ElTooltip as n, ElButton as s } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/table/style/css";
 import "element-plus/es/components/tooltip/style/css";
@@ -7,8 +7,8 @@ import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
 import "element-plus/es/components/table-column/style/css";
-import { defineComponent as m, openBlock as i, createBlock as p, withCtx as d, createVNode as r, createElementBlock as u, toDisplayString as c, Fragment as y, renderList as w, unref as b, createElementVNode as f } from "vue";
-import { Plus as V, Minus as g } from "@element-plus/icons-vue";
+import { defineComponent as m, createBlock as i, openBlock as p, withCtx as d, createVNode as r, createElementBlock as u, toDisplayString as c, Fragment as y, renderList as w, unref as b, createElementVNode as f } from "vue";
+import { Minus as V, Plus as g } from "@element-plus/icons-vue";
 import { dateFormats as h } from "../../util/common-options.js";
 const k = { key: 0 }, C = { key: 0 }, T = { key: 0 }, _ = { key: 0 }, v = m({ __name: "dimension-statistical", props: { properties: { type: Object, default: () => ({ statistics: {} }) }, dataTableColumns: { type: Array, default: () => [] } }, emits: ["change"], setup(m2, { emit: v2 }) {
   const N = m2, U = v2;
@@ -21,8 +21,8 @@ const k = { key: 0 }, C = { key: 0 }, T = { key: 0 }, _ = { key: 0 }, v = m({ __
     }), U("change", e2);
   };
   return (v3, x) => {
-    const E = e, F = l, A = a, D = t, j = o, I = n, M = s;
-    return i(), p(M, { data: m2.properties.statistics, style: { width: "100%", "margin-bottom": "20px" }, "row-key": "name", onRowDblclick: z, size: "small", border: "", "default-expand-all": "" }, { default: d(() => [r(E, { type: "index", width: "50", label: "序号", align: "center" }), r(E, { prop: "name", label: "字段名" }, { default: d((e2) => [e2.row.$editing ? (i(), p(A, { key: 1, onChange: (l2) => $(l2, e2.row), modelValue: e2.row.name, "onUpdate:modelValue": (l2) => e2.row.name = l2, placeholder: "", size: "small", filterable: "" }, { default: d(() => [(i(true), u(y, null, w(m2.dataTableColumns, (e3) => (i(), p(F, { key: e3.dbColumnName, label: e3.alias + "(" + e3.dbColumnName + ")", value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["onChange", "modelValue", "onUpdate:modelValue"])) : (i(), u("span", k, c(e2.row.name), 1))]), _: 1 }), r(E, { prop: "name", label: "日期格式化", width: "120" }, { default: d((e2) => [e2.row.$editing ? (i(), p(A, { key: 1, disabled: "DATE" !== e2.row.dataType && "TIME" !== e2.row.dataType, filterable: true, "allow-create": true, modelValue: e2.row.dateFormat, "onUpdate:modelValue": (l2) => e2.row.dateFormat = l2, placeholder: "", size: "small" }, { default: d(() => [(i(true), u(y, null, w(b(h), (e3) => (i(), p(F, { key: e3.value, label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["disabled", "modelValue", "onUpdate:modelValue"])) : (i(), u("span", C, c(e2.row.dateFormat), 1))]), _: 1 }), r(E, { prop: "newName", label: "新字段名", width: "160" }, { default: d((e2) => [e2.row.$editing ? (i(), p(D, { key: 1, modelValue: e2.row.newName, "onUpdate:modelValue": (l2) => e2.row.newName = l2, size: "small", onChange: (l2) => U("change", e2.row) }, null, 8, ["modelValue", "onUpdate:modelValue", "onChange"])) : (i(), u("span", T, c(e2.row.newName), 1))]), _: 1 }), r(E, { prop: "dynamicValue", label: "动态维度值" }, { default: d((e2) => [e2.row.$editing ? (i(), p(D, { key: 1, modelValue: e2.row.dynamicValue, "onUpdate:modelValue": (l2) => e2.row.dynamicValue = l2, size: "small" }, null, 8, ["modelValue", "onUpdate:modelValue"])) : (i(), u("span", _, c(e2.row.dynamicValue), 1))]), _: 1 }), r(E, { align: "center", width: "80" }, { header: d(() => [r(I, { effect: "dark", content: "添加", placement: "top" }, { default: d(() => [r(j, { type: "primary", size: "small", icon: b(V), circle: "", onClick: x[0] || (x[0] = (e2) => (N.properties.statistics || (N.properties.statistics = []), void N.properties.statistics.push({ $editing: true }))) }, null, 8, ["icon"])]), _: 1 })]), default: d((e2) => [f("span", null, [r(I, { effect: "dark", content: "删除", placement: "top" }, { default: d(() => [r(j, { type: "danger", size: "small", icon: b(g), circle: "", onClick: (l2) => {
+    const E = l, F = t, A = a, D = o, j = s, I = n, M = e;
+    return p(), i(M, { data: m2.properties.statistics, style: { width: "100%", "margin-bottom": "20px" }, "row-key": "name", onRowDblclick: z, size: "small", border: "", "default-expand-all": "" }, { default: d(() => [r(E, { type: "index", width: "50", label: "序号", align: "center" }), r(E, { prop: "name", label: "字段名" }, { default: d((e2) => [e2.row.$editing ? (p(), i(A, { key: 1, onChange: (l2) => $(l2, e2.row), modelValue: e2.row.name, "onUpdate:modelValue": (l2) => e2.row.name = l2, placeholder: "", size: "small", filterable: "" }, { default: d(() => [(p(true), u(y, null, w(m2.dataTableColumns, (e3) => (p(), i(F, { key: e3.dbColumnName, label: e3.alias + "(" + e3.dbColumnName + ")", value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["onChange", "modelValue", "onUpdate:modelValue"])) : (p(), u("span", k, c(e2.row.name), 1))]), _: 1 }), r(E, { prop: "name", label: "日期格式化", width: "120" }, { default: d((e2) => [e2.row.$editing ? (p(), i(A, { key: 1, disabled: "DATE" !== e2.row.dataType && "TIME" !== e2.row.dataType, filterable: true, "allow-create": true, modelValue: e2.row.dateFormat, "onUpdate:modelValue": (l2) => e2.row.dateFormat = l2, placeholder: "", size: "small" }, { default: d(() => [(p(true), u(y, null, w(b(h), (e3) => (p(), i(F, { key: e3.value, label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["disabled", "modelValue", "onUpdate:modelValue"])) : (p(), u("span", C, c(e2.row.dateFormat), 1))]), _: 1 }), r(E, { prop: "newName", label: "新字段名", width: "160" }, { default: d((e2) => [e2.row.$editing ? (p(), i(D, { key: 1, modelValue: e2.row.newName, "onUpdate:modelValue": (l2) => e2.row.newName = l2, size: "small", onChange: (l2) => U("change", e2.row) }, null, 8, ["modelValue", "onUpdate:modelValue", "onChange"])) : (p(), u("span", T, c(e2.row.newName), 1))]), _: 1 }), r(E, { prop: "dynamicValue", label: "动态维度值" }, { default: d((e2) => [e2.row.$editing ? (p(), i(D, { key: 1, modelValue: e2.row.dynamicValue, "onUpdate:modelValue": (l2) => e2.row.dynamicValue = l2, size: "small" }, null, 8, ["modelValue", "onUpdate:modelValue"])) : (p(), u("span", _, c(e2.row.dynamicValue), 1))]), _: 1 }), r(E, { align: "center", width: "80" }, { header: d(() => [r(I, { effect: "dark", content: "添加", placement: "top" }, { default: d(() => [r(j, { type: "primary", size: "small", icon: b(g), circle: "", onClick: x[0] || (x[0] = (e2) => (N.properties.statistics || (N.properties.statistics = []), void N.properties.statistics.push({ $editing: true }))) }, null, 8, ["icon"])]), _: 1 })]), default: d((e2) => [f("span", null, [r(I, { effect: "dark", content: "删除", placement: "top" }, { default: d(() => [r(j, { type: "danger", size: "small", icon: b(V), circle: "", onClick: (l2) => {
       return a2 = e2.$index, e2.row, N.properties.statistics.splice(a2, 1), void $("", null);
       var a2;
     } }, null, 8, ["icon", "onClick"])]), _: 2 }, 1024)])]), _: 1 })]), _: 1 }, 8, ["data"]);

package/dist/es/designer/service-components/database/aggregate-query/filter-conditions.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -46,8 +46,8 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}>>, {
+}>> & Readonly<{}>, {
     properties: Record<string, any>;
     dataTableColumns: any[];
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/es/designer/service-components/database/aggregate-query/filter-conditions.vue.js

@@ -1,4 +1,4 @@
-import { ElTableColumn as e, ElOption as l, ElSelect as a, ElButton as o, ElTooltip as t, ElTable as r } from "element-plus/es";
+import { ElTable as e, ElTableColumn as l, ElSelect as a, ElOption as o, ElTooltip as t, ElButton as r } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/table/style/css";
 import "element-plus/es/components/tooltip/style/css";
@@ -6,35 +6,34 @@ import "element-plus/es/components/button/style/css";
 import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
 import "element-plus/es/components/table-column/style/css";
-import { defineComponent as p, openBlock as n, createBlock as u, withCtx as d, createVNode as i, createElementBlock as s, toDisplayString as m, Fragment as T, renderList as c, withDirectives as w, vShow as b, unref as y, createElementVNode as f } from "vue";
-import { Plus as v, Minus as E } from "@element-plus/icons-vue";
+import { defineComponent as p, createBlock as n, openBlock as u, withCtx as d, createVNode as i, createElementBlock as s, toDisplayString as m, Fragment as T, renderList as c, withDirectives as w, vShow as b, unref as y, createElementVNode as f } from "vue";
+import { Minus as v, Plus as E } from "@element-plus/icons-vue";
 import { v4 as N } from "uuid";
 import V from "../../../common/components/value-set-input/value-set-input.vue.js";
 import { logicOperators as k } from "../../util/common-options.js";
-const h = { key: 0 }, L = { key: 0 }, _ = { key: 0 }, g = { key: 0 }, C = { key: 0 }, O = { key: 0 }, U = p({ __name: "filter-conditions", props: { properties: { type: Object, default: () => ({ filterConditions: [] }) }, dataTableColumns: { type: Array, default: () => [] } }, setup(p2) {
-  const U2 = p2, I = (e2) => {
+const _ = { key: 0 }, h = { key: 0 }, L = { key: 0 }, g = { key: 0 }, C = { key: 0 }, U = { key: 0 }, I = p({ __name: "filter-conditions", props: { properties: { type: Object, default: () => ({ filterConditions: [] }) }, dataTableColumns: { type: Array, default: () => [] } }, setup(p2) {
+  const I2 = p2, O = (e2) => {
     G(e2);
   };
   function G(e2) {
     e2.$editing = true;
   }
-  return (B, A) => {
-    const z = e, $ = l, D = a, x = o, R = t, F = r;
-    return n(), u(F, { data: p2.properties.filterConditions, style: { width: "100%", "margin-bottom": "20px" }, "row-key": "name", onRowClick: I, size: "small", border: "", "default-expand-all": "" }, { default: d(() => [i(z, { type: "index", width: "50", label: "序号", align: "center" }), i(z, { prop: "leftBracket", label: "((((", width: "60" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, size: "small", modelValue: e2.row.leftBracket, "onUpdate:modelValue": (l2) => e2.row.leftBracket = l2, placeholder: "", clearable: "" }, { default: d(() => [i($, { label: "(", value: "(" }), i($, { label: "((", value: "((" }), i($, { label: "(((", value: "(((" }), i($, { label: "((((", value: "((((" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (n(), s("span", h, m(e2.row.leftBracket), 1))]), _: 1 }), i(z, { prop: "name", label: "字段名" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, modelValue: e2.row.propName, "onUpdate:modelValue": (l2) => e2.row.propName = l2, placeholder: "", filterable: true, "allow-create": true, size: "small", onChange: (l2) => function(e3, l3) {
-      if (!l3 || !U2.dataTableColumns)
-        return;
-      const a2 = U2.dataTableColumns.filter((e4) => e4.name == l3.propName || e4.dbColumnName == l3.propName), o2 = l3.dataType;
+  return (A, B) => {
+    const z = l, $ = o, D = a, R = r, x = t, X = e;
+    return u(), n(X, { data: p2.properties.filterConditions, style: { width: "100%", "margin-bottom": "20px" }, "row-key": "name", onRowClick: O, size: "small", border: "", "default-expand-all": "" }, { default: d(() => [i(z, { type: "index", width: "50", label: "序号", align: "center" }), i(z, { prop: "leftBracket", label: "((((", width: "60" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, size: "small", modelValue: e2.row.leftBracket, "onUpdate:modelValue": (l2) => e2.row.leftBracket = l2, placeholder: "", clearable: "" }, { default: d(() => [i($, { label: "(", value: "(" }), i($, { label: "((", value: "((" }), i($, { label: "(((", value: "(((" }), i($, { label: "((((", value: "((((" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (u(), s("span", _, m(e2.row.leftBracket), 1))]), _: 1 }), i(z, { prop: "name", label: "字段名" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, modelValue: e2.row.propName, "onUpdate:modelValue": (l2) => e2.row.propName = l2, placeholder: "", filterable: true, "allow-create": true, size: "small", onChange: (l2) => function(e3, l3) {
+      if (!l3 || !I2.dataTableColumns) return;
+      const a2 = I2.dataTableColumns.filter((e4) => e4.name == l3.propName || e4.dbColumnName == l3.propName), o2 = l3.dataType;
       a2 && a2.length > 0 ? l3.dataType = a2[0].dataType : l3.dataType = "TEXT", o2 != l3.dataType && (l3.operator = null);
-    }(B.val, e2.row), title: e2.row.propName }, { default: d(() => [(n(true), s(T, null, c(p2.dataTableColumns, (e3) => (n(), u($, { key: e3.dbColumnName, label: e3.alias + "(" + e3.dbColumnName + ")", value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "onChange", "title"])) : (n(), s("span", L, m(e2.row.propName), 1))]), _: 1 }), i(z, { prop: "operator", label: "操作符", width: "100" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, modelValue: e2.row.operator, "onUpdate:modelValue": (l2) => e2.row.operator = l2, placeholder: "", size: "small", title: e2.row.operator }, { default: d(() => [w(i($, { label: "大于", value: "GT" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "小于", value: "LT" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "大于", value: "GT" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), w(i($, { label: "小于", value: "LT" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), i($, { label: "等于", value: "EQ" }), w(i($, { label: "小于等于", value: "LET" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "大于等于", value: "GET" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "小于等于", value: "LET" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), w(i($, { label: "大于等于", value: "GET" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), i($, { label: "不等于", value: "NET" }), w(i($, { label: "包含", value: "CONTAIN" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "左匹配", value: "LEFT_LIKE" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "右匹配", value: "RIGHT_LIKE" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "不包含", value: "NOT_CONTAIN" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), i($, { label: "等于Null", value: "IS_NULL" }), i($, { label: "不等于Null", value: "IS_NOT_NULL" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "title"])) : (n(), s("span", _, m(e2.row.operator), 1))]), _: 1 }), i(z, { prop: "propValue", label: "值" }, { default: d((e2) => [i(y(V), { showLabel: !e2.row.$editing, size: "small", paramTypes: ["system", "context", "service", "request", "fixed"], modelValue: e2.row.propValue, "onUpdate:modelValue": (l2) => e2.row.propValue = l2 }, null, 8, ["showLabel", "modelValue", "onUpdate:modelValue"])]), _: 1 }), i(z, { prop: "rightBracket", label: "))))", width: "60" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, size: "small", modelValue: e2.row.rightBracket, "onUpdate:modelValue": (l2) => e2.row.rightBracket = l2, placeholder: "", clearable: "" }, { default: d(() => [i($, { label: ")", value: ")" }), i($, { label: "))", value: "))" }), i($, { label: ")))", value: ")))" }), i($, { label: "))))", value: "))))" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (n(), s("span", g, m(e2.row.rightBracket), 1))]), _: 1 }), i(z, { prop: "joinSign", label: "连接符", width: "70" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, modelValue: e2.row.logicOperator, "onUpdate:modelValue": (l2) => e2.row.logicOperator = l2, clearable: "", placeholder: "", size: "small" }, { default: d(() => [(n(true), s(T, null, c(y(k), (e3) => (n(), u($, { key: e3.value, label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (n(), s("span", C, m(e2.row.logicOperator), 1))]), _: 1 }), i(z, { prop: "variableIsNull", label: "变量为空时", width: "120" }, { default: d((e2) => [e2.row.$editing ? (n(), u(D, { key: 1, modelValue: e2.row.variableIsNull, "onUpdate:modelValue": (l2) => e2.row.variableIsNull = l2, clearable: "", placeholder: "请选择" }, { default: d(() => [i($, { label: "Null", value: "null" }), i($, { label: "忽略(1=1)", value: "ignore" }), i($, { label: "不符合(1<>1)", value: "notequal" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (n(), s("span", O, m(e2.row.variableIsNull), 1))]), _: 1 }), i(z, { align: "center", width: "60" }, { header: d(() => [i(R, { effect: "dark", content: "添加", placement: "top" }, { default: d(() => [i(x, { type: "primary", size: "small", icon: y(v), circle: "", onClick: A[0] || (A[0] = (e2) => (() => {
-      U2.properties.filterConditions || (U2.properties.filterConditions = []);
+    }(A.val, e2.row), title: e2.row.propName }, { default: d(() => [(u(true), s(T, null, c(p2.dataTableColumns, (e3) => (u(), n($, { key: e3.dbColumnName, label: e3.alias + "(" + e3.dbColumnName + ")", value: e3.dbColumnName }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "onChange", "title"])) : (u(), s("span", h, m(e2.row.propName), 1))]), _: 1 }), i(z, { prop: "operator", label: "操作符", width: "100" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, modelValue: e2.row.operator, "onUpdate:modelValue": (l2) => e2.row.operator = l2, placeholder: "", size: "small", title: e2.row.operator }, { default: d(() => [w(i($, { label: "大于", value: "GT" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "小于", value: "LT" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "大于", value: "GT" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), w(i($, { label: "小于", value: "LT" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), i($, { label: "等于", value: "EQ" }), w(i($, { label: "小于等于", value: "LET" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "大于等于", value: "GET" }, null, 512), [[b, "INTEGER" == e2.row.dataType || "LONG" == e2.row.dataType || "FLOAT" == e2.row.dataType || "DOUBLE" == e2.row.dataType]]), w(i($, { label: "小于等于", value: "LET" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), w(i($, { label: "大于等于", value: "GET" }, null, 512), [[b, "DATE" == e2.row.dataType || "TIME" == e2.row.dataType]]), i($, { label: "不等于", value: "NET" }), w(i($, { label: "包含", value: "CONTAIN" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "左匹配", value: "LEFT_LIKE" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "右匹配", value: "RIGHT_LIKE" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "不包含", value: "NOT_CONTAIN" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), w(i($, { label: "IN", value: "RANGE_QUERY" }, null, 512), [[b, "TEXT" == e2.row.dataType]]), i($, { label: "等于Null", value: "IS_NULL" }), i($, { label: "不等于Null", value: "IS_NOT_NULL" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue", "title"])) : (u(), s("span", L, m(e2.row.operator), 1))]), _: 1 }), i(z, { prop: "propValue", label: "值" }, { default: d((e2) => [i(y(V), { showLabel: !e2.row.$editing, size: "small", paramTypes: ["system", "context", "service", "request", "fixed"], modelValue: e2.row.propValue, "onUpdate:modelValue": (l2) => e2.row.propValue = l2 }, null, 8, ["showLabel", "modelValue", "onUpdate:modelValue"])]), _: 1 }), i(z, { prop: "rightBracket", label: "))))", width: "60" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, size: "small", modelValue: e2.row.rightBracket, "onUpdate:modelValue": (l2) => e2.row.rightBracket = l2, placeholder: "", clearable: "" }, { default: d(() => [i($, { label: ")", value: ")" }), i($, { label: "))", value: "))" }), i($, { label: ")))", value: ")))" }), i($, { label: "))))", value: "))))" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (u(), s("span", g, m(e2.row.rightBracket), 1))]), _: 1 }), i(z, { prop: "joinSign", label: "连接符", width: "70" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, modelValue: e2.row.logicOperator, "onUpdate:modelValue": (l2) => e2.row.logicOperator = l2, clearable: "", placeholder: "", size: "small" }, { default: d(() => [(u(true), s(T, null, c(y(k), (e3) => (u(), n($, { key: e3.value, label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 128))]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (u(), s("span", C, m(e2.row.logicOperator), 1))]), _: 1 }), i(z, { prop: "variableIsNull", label: "变量为空时", width: "120" }, { default: d((e2) => [e2.row.$editing ? (u(), n(D, { key: 1, modelValue: e2.row.variableIsNull, "onUpdate:modelValue": (l2) => e2.row.variableIsNull = l2, clearable: "", placeholder: "请选择" }, { default: d(() => [i($, { label: "Null", value: "null" }), i($, { label: "忽略(1=1)", value: "ignore" }), i($, { label: "不符合(1<>1)", value: "notequal" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])) : (u(), s("span", U, m(e2.row.variableIsNull), 1))]), _: 1 }), i(z, { align: "center", width: "60" }, { header: d(() => [i(x, { effect: "dark", content: "添加", placement: "top" }, { default: d(() => [i(R, { type: "primary", size: "small", icon: y(E), circle: "", onClick: B[0] || (B[0] = (e2) => (() => {
+      I2.properties.filterConditions || (I2.properties.filterConditions = []);
       const e3 = { code: N() };
-      U2.properties.filterConditions.push(e3), G(e3);
-    })()) }, null, 8, ["icon"])]), _: 1 })]), default: d((e2) => [f("span", null, [i(R, { effect: "dark", content: "删除", placement: "top" }, { default: d(() => [i(x, { type: "danger", size: "small", icon: y(E), circle: "", onClick: (l2) => {
-      return a2 = e2.$index, e2.row, void U2.properties.filterConditions.splice(a2, 1);
+      I2.properties.filterConditions.push(e3), G(e3);
+    })()) }, null, 8, ["icon"])]), _: 1 })]), default: d((e2) => [f("span", null, [i(x, { effect: "dark", content: "删除", placement: "top" }, { default: d(() => [i(R, { type: "danger", size: "small", icon: y(v), circle: "", onClick: (l2) => {
+      return a2 = e2.$index, e2.row, void I2.properties.filterConditions.splice(a2, 1);
       var a2;
     } }, null, 8, ["icon", "onClick"])]), _: 2 }, 1024)])]), _: 1 })]), _: 1 }, 8, ["data"]);
   };
 } });
 export {
-  U as default
+  I as default
 };

package/dist/es/designer/service-components/database/aggregate-query/index.js

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import e from "../../../flow/base/AbLogicNode.js";
 import o from "../../../flow/base/AbLogicNodeModel.js";
 import "../../../flow/base/AbLogicResizeNodeModel.js";

package/dist/es/designer/service-components/database/aggregate-query/index.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     graphModel: {
         type: ObjectConstructor;
         default: () => {};
@@ -11,7 +11,7 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     btnClick: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     graphModel: {
@@ -26,11 +26,11 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => {};
     };
-}>> & {
+}>> & Readonly<{
     onBtnClick?: (...args: any[]) => any;
-}, {
+}>, {
     properties: Record<string, any>;
     graphModel: Record<string, any>;
     model: Record<string, any>;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/es/designer/service-components/database/aggregate-query/index.vue.js

@@ -1,5 +1,5 @@
 import e from "./index.vue2.js";
-import "./index.vue3.js";
+/* empty css           */
 import o from "../../../../_virtual/_plugin-vue_export-helper.js";
 const r = o(e, [["__scopeId", "data-v-3c23a172"]]);
 export {

package/dist/es/designer/service-components/database/aggregate-query/index.vue2.js

@@ -1,27 +1,24 @@
 import { ElDivider as e } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/divider/style/css";
-import { defineComponent as t, ref as s, onMounted as r, openBlock as o, createElementBlock as l, createElementVNode as n, normalizeStyle as p, toDisplayString as i, createVNode as a, Fragment as d, renderList as u, pushScopeId as c, popScopeId as m } from "vue";
-import v from "../../../../assets/icon/vardef-v.png.js";
-const f = (e2) => (c("data-v-3c23a172"), e2 = e2(), m(), e2), h = f(() => n("img", { src: v, style: { height: "32px", position: "fixed", left: "0px", top: "0px" } }, null, -1)), g = { class: "serviceflow-nodeTitle" }, b = { class: "serviceflow-nodeContent" }, y = ["title"], x = f(() => n("br", null, null, -1)), w = t({ __name: "index", props: { graphModel: { type: Object, default: () => ({}) }, model: { type: Object, default: () => ({}) }, properties: { type: Object, default: () => ({}) } }, emits: ["btnClick"], setup(t2, { emit: c2 }) {
-  const m2 = t2, v2 = s([]), f2 = s([]);
+import { defineComponent as t, ref as s, onMounted as r, createElementBlock as o, openBlock as l, createElementVNode as n, normalizeStyle as p, createVNode as i, toDisplayString as a, Fragment as u, renderList as d } from "vue";
+import c from "../../../../assets/icon/vardef-v.png.js";
+const m = { class: "serviceflow-nodeTitle" }, v = { class: "serviceflow-nodeContent" }, f = ["title"], h = t({ __name: "index", props: { graphModel: { type: Object, default: () => ({}) }, model: { type: Object, default: () => ({}) }, properties: { type: Object, default: () => ({}) } }, emits: ["btnClick"], setup(t2, { emit: h2 }) {
+  const g = t2, b = s([]), y = s([]);
   return r(() => {
-    m2.graphModel.modelToGraphData().nodes.forEach((e2, t3) => {
-      f2.value.push({ id: e2.id, name: e2.properties.name });
-    }), f2.value.push({ id: "end", name: "结束" }), m2.properties && m2.properties.rules && m2.properties.rules.length > 0 && m2.properties.rules.forEach((e2, t3) => {
-      v2.value.push(e2.name + "->" + function(e3) {
-        if ("end" === e3)
-          return "结束";
-        for (let t4 = 0; t4 < f2.value.length; t4++)
-          if (f2.value[t4].id == e3)
-            return f2.value[t4].name;
+    g.graphModel.modelToGraphData().nodes.forEach((e2, t3) => {
+      y.value.push({ id: e2.id, name: e2.properties.name });
+    }), y.value.push({ id: "end", name: "结束" }), g.properties && g.properties.rules && g.properties.rules.length > 0 && g.properties.rules.forEach((e2, t3) => {
+      b.value.push(e2.name + "->" + function(e3) {
+        if ("end" === e3) return "结束";
+        for (let t4 = 0; t4 < y.value.length; t4++) if (y.value[t4].id == e3) return y.value[t4].name;
       }(e2.to));
     });
   }), (s2, r2) => {
-    const c3 = e;
-    return o(), l("div", null, [h, n("div", { class: "serviceflow-nodeView", style: p({ backgroundColor: t2.properties.backgroundColor }) }, [n("div", g, i(t2.properties.name ? t2.properties.name : "条件判断"), 1), a(c3), n("div", b, [n("div", { class: "serviceflow-nodeContent-desc", title: t2.properties.description }, i(t2.properties.description), 9, y), (o(true), l(d, null, u(v2.value, (e2) => (o(), l("div", null, [n("span", null, i(e2), 1), x]))), 256))])], 4)]);
+    const h3 = e;
+    return l(), o("div", null, [r2[1] || (r2[1] = n("img", { src: c, style: { height: "32px", position: "fixed", left: "0px", top: "0px" } }, null, -1)), n("div", { class: "serviceflow-nodeView", style: p({ backgroundColor: t2.properties.backgroundColor }) }, [n("div", m, a(t2.properties.name ? t2.properties.name : "条件判断"), 1), i(h3), n("div", v, [n("div", { class: "serviceflow-nodeContent-desc", title: t2.properties.description }, a(t2.properties.description), 9, f), (l(true), o(u, null, d(b.value, (e2) => (l(), o("div", null, [n("span", null, a(e2), 1), r2[0] || (r2[0] = n("br", null, null, -1))]))), 256))])], 4)]);
   };
 } });
 export {
-  w as default
+  h as default
 };

package/dist/es/designer/service-components/database/aggregate-query/sort-conditions.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import('vue').DefineComponent<{
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -46,8 +46,8 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}>>, {
+}>> & Readonly<{}>, {
     properties: Record<string, any>;
     dataTableColumns: any[];
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;