service-flow-designer 2.2.7 → 2.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es/designer/common/components/json-view/json-view-dialog.vue.js +1 -1
- package/dist/es/designer/common/components/json-view/json-view.vue.js +52 -2
- package/dist/es/designer/common/components/json-view/json-view.vue2.js +2 -52
- package/dist/es/designer/service-components/database/aggregate-query/filter-conditions.vue.js +13 -13
- package/dist/es/designer/service-flow-view/service-test/service-test.vue.js +1 -1
- package/package.json +2 -2
|
@@ -2,7 +2,7 @@ import { ElDialog as e } from "element-plus/es";
|
|
|
2
2
|
import "element-plus/es/components/base/style/css";
|
|
3
3
|
import "element-plus/es/components/dialog/style/css";
|
|
4
4
|
import { defineComponent as o, ref as t, watch as l, createBlock as s, openBlock as a, withCtx as n, createVNode as p } from "vue";
|
|
5
|
-
import u from "./json-view.
|
|
5
|
+
import u from "./json-view.vue.js";
|
|
6
6
|
const d = o({ name: "JsonViewDialog", inheritAttrs: false, __name: "json-view-dialog", props: { jsonObject: { type: Object, default: () => {
|
|
7
7
|
} }, appendToBody: { type: Boolean, default: false }, modelValue: { type: Boolean, default: false } }, emits: ["update:modelValue"], setup(o2, { emit: d2 }) {
|
|
8
8
|
const m = o2, i = d2, r = t(false);
|
|
@@ -1,4 +1,54 @@
|
|
|
1
|
-
import e from "
|
|
1
|
+
import { defineComponent as e, ref as t, watch as r, onMounted as n, nextTick as o, createElementBlock as i, openBlock as c } from "vue";
|
|
2
|
+
import { EditorView as s, basicSetup as a } from "codemirror";
|
|
3
|
+
import { jsonLanguage as u } from "@codemirror/lang-json";
|
|
4
|
+
import { EditorState as m, Facet as l } from "@codemirror/state";
|
|
5
|
+
import { eclipse as f, githubDark as h, githubLight as d, dracula as g, vscodeDark as p, xcodeDark as v, xcodeLight as j } from "@uiw/codemirror-themes-all";
|
|
6
|
+
const w = e({ name: "JsonView", inheritAttrs: false, __name: "json-view", props: { jsonObject: { type: Object, default: () => {
|
|
7
|
+
} }, height: { type: Number, default: 0 }, theme: { type: String, default: null } }, setup(e2) {
|
|
8
|
+
const w2 = e2, y = t(null), b = t(), x = t("400px");
|
|
9
|
+
function O() {
|
|
10
|
+
y.value && y.value.destroy();
|
|
11
|
+
const e3 = w2.jsonObject ? JSON.stringify(w2.jsonObject, null, 2) : "";
|
|
12
|
+
if (w2.height) x.value = w2.height + "px";
|
|
13
|
+
else if (b.value) {
|
|
14
|
+
const e4 = b.value.getBoundingClientRect();
|
|
15
|
+
(e4.y || 0 === e4.y) && (x.value = window.innerHeight - e4.y - 100 + "px");
|
|
16
|
+
}
|
|
17
|
+
const t2 = function(e4) {
|
|
18
|
+
const t3 = function() {
|
|
19
|
+
if (w2.theme) switch (w2.theme) {
|
|
20
|
+
case "xcodeLight":
|
|
21
|
+
return j;
|
|
22
|
+
case "xcodeDark":
|
|
23
|
+
return v;
|
|
24
|
+
case "vscodeDark":
|
|
25
|
+
return p;
|
|
26
|
+
case "dracula":
|
|
27
|
+
return g;
|
|
28
|
+
case "githubLight":
|
|
29
|
+
return d;
|
|
30
|
+
case "githubDark":
|
|
31
|
+
return h;
|
|
32
|
+
case "eclipse":
|
|
33
|
+
return f;
|
|
34
|
+
}
|
|
35
|
+
return s.theme({});
|
|
36
|
+
}(), r3 = s.theme({ ".cm-content, .cm-gutter": { minHeight: x.value }, "&": { height: x.value, maxHeight: x.value, fontSize: "12px" } });
|
|
37
|
+
return m.create({ doc: e4, extensions: [m.tabSize.of(16), a, u, t3, r3, S.of(true), k] });
|
|
38
|
+
}(e3);
|
|
39
|
+
let r2 = document.getElementById("cf-codemirror-view-json");
|
|
40
|
+
r2 && (y.value = new s({ state: t2, parent: r2 }));
|
|
41
|
+
}
|
|
42
|
+
r(() => w2.jsonObject, (e3) => {
|
|
43
|
+
y.value && O();
|
|
44
|
+
}, { deep: true }), n(() => {
|
|
45
|
+
o(() => {
|
|
46
|
+
O();
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
const S = l.define({ combine: (e3) => e3.some((e4) => e4) }), k = m.transactionFilter.of((e3) => e3.isUserEvent && e3.docChanged && e3.state.facet(S) ? { changes: { from: e3.changes.from, to: e3.changes.to, insert: e3.startState.doc.sliceString(e3.changes.from, e3.changes.to) } } : e3);
|
|
50
|
+
return (e3, t2) => (c(), i("div", { style: { width: "100%" }, ref_key: "cfCodemirrorJsonViewRef", ref: b, id: "cf-codemirror-view-json" }, null, 512));
|
|
51
|
+
} });
|
|
2
52
|
export {
|
|
3
|
-
|
|
53
|
+
w as default
|
|
4
54
|
};
|
|
@@ -1,54 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { EditorView as s, basicSetup as a } from "codemirror";
|
|
3
|
-
import { jsonLanguage as u } from "@codemirror/lang-json";
|
|
4
|
-
import { EditorState as m, Facet as l } from "@codemirror/state";
|
|
5
|
-
import { eclipse as f, githubDark as h, githubLight as d, dracula as g, vscodeDark as p, xcodeDark as v, xcodeLight as j } from "@uiw/codemirror-themes-all";
|
|
6
|
-
const w = e({ name: "JsonView", inheritAttrs: false, __name: "json-view", props: { jsonObject: { type: Object, default: () => {
|
|
7
|
-
} }, height: { type: Number, default: 0 }, theme: { type: String, default: null } }, setup(e2) {
|
|
8
|
-
const w2 = e2, y = t(null), b = t(), x = t("400px");
|
|
9
|
-
function O() {
|
|
10
|
-
y.value && y.value.destroy();
|
|
11
|
-
const e3 = w2.jsonObject ? JSON.stringify(w2.jsonObject, null, 2) : "";
|
|
12
|
-
if (w2.height) x.value = w2.height + "px";
|
|
13
|
-
else if (b.value) {
|
|
14
|
-
const e4 = b.value.getBoundingClientRect();
|
|
15
|
-
(e4.y || 0 === e4.y) && (x.value = window.innerHeight - e4.y - 100 + "px");
|
|
16
|
-
}
|
|
17
|
-
const t2 = function(e4) {
|
|
18
|
-
const t3 = function() {
|
|
19
|
-
if (w2.theme) switch (w2.theme) {
|
|
20
|
-
case "xcodeLight":
|
|
21
|
-
return j;
|
|
22
|
-
case "xcodeDark":
|
|
23
|
-
return v;
|
|
24
|
-
case "vscodeDark":
|
|
25
|
-
return p;
|
|
26
|
-
case "dracula":
|
|
27
|
-
return g;
|
|
28
|
-
case "githubLight":
|
|
29
|
-
return d;
|
|
30
|
-
case "githubDark":
|
|
31
|
-
return h;
|
|
32
|
-
case "eclipse":
|
|
33
|
-
return f;
|
|
34
|
-
}
|
|
35
|
-
return s.theme({});
|
|
36
|
-
}(), r3 = s.theme({ ".cm-content, .cm-gutter": { minHeight: x.value }, "&": { height: x.value, maxHeight: x.value, fontSize: "12px" } });
|
|
37
|
-
return m.create({ doc: e4, extensions: [m.tabSize.of(16), a, u, t3, r3, S.of(true), k] });
|
|
38
|
-
}(e3);
|
|
39
|
-
let r2 = document.getElementById("cf-codemirror-view-json");
|
|
40
|
-
r2 && (y.value = new s({ state: t2, parent: r2 }));
|
|
41
|
-
}
|
|
42
|
-
r(() => w2.jsonObject, (e3) => {
|
|
43
|
-
y.value && O();
|
|
44
|
-
}, { deep: true }), n(() => {
|
|
45
|
-
o(() => {
|
|
46
|
-
O();
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
const S = l.define({ combine: (e3) => e3.some((e4) => e4) }), k = m.transactionFilter.of((e3) => e3.isUserEvent && e3.docChanged && e3.state.facet(S) ? { changes: { from: e3.changes.from, to: e3.changes.to, insert: e3.startState.doc.sliceString(e3.changes.from, e3.changes.to) } } : e3);
|
|
50
|
-
return (e3, t2) => (c(), i("div", { style: { width: "100%" }, ref_key: "cfCodemirrorJsonViewRef", ref: b, id: "cf-codemirror-view-json" }, null, 512));
|
|
51
|
-
} });
|
|
1
|
+
import e from "./json-view.vue.js";
|
|
52
2
|
export {
|
|
53
|
-
|
|
3
|
+
e as default
|
|
54
4
|
};
|
package/dist/es/designer/service-components/database/aggregate-query/filter-conditions.vue.js
CHANGED
|
@@ -11,29 +11,29 @@ import { Minus as v, Plus as E } from "@element-plus/icons-vue";
|
|
|
11
11
|
import { v4 as N } from "uuid";
|
|
12
12
|
import V from "../../../common/components/value-set-input/value-set-input.vue.js";
|
|
13
13
|
import { logicOperators as k } from "../../util/common-options.js";
|
|
14
|
-
const
|
|
15
|
-
const
|
|
14
|
+
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) {
|
|
15
|
+
const I2 = p2, O = (e2) => {
|
|
16
16
|
G(e2);
|
|
17
17
|
};
|
|
18
18
|
function G(e2) {
|
|
19
19
|
e2.$editing = true;
|
|
20
20
|
}
|
|
21
|
-
return (
|
|
22
|
-
const z = l, $ = o, D = a,
|
|
23
|
-
return u(), n(
|
|
24
|
-
if (!l3 || !
|
|
25
|
-
const a2 =
|
|
21
|
+
return (A, B) => {
|
|
22
|
+
const z = l, $ = o, D = a, R = r, x = t, X = e;
|
|
23
|
+
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) {
|
|
24
|
+
if (!l3 || !I2.dataTableColumns) return;
|
|
25
|
+
const a2 = I2.dataTableColumns.filter((e4) => e4.name == l3.propName || e4.dbColumnName == l3.propName), o2 = l3.dataType;
|
|
26
26
|
a2 && a2.length > 0 ? l3.dataType = a2[0].dataType : l3.dataType = "TEXT", o2 != l3.dataType && (l3.operator = null);
|
|
27
|
-
}(
|
|
28
|
-
|
|
27
|
+
}(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) => (() => {
|
|
28
|
+
I2.properties.filterConditions || (I2.properties.filterConditions = []);
|
|
29
29
|
const e3 = { code: N() };
|
|
30
|
-
|
|
31
|
-
})()) }, null, 8, ["icon"])]), _: 1 })]), default: d((e2) => [f("span", null, [i(
|
|
32
|
-
return a2 = e2.$index, e2.row, void
|
|
30
|
+
I2.properties.filterConditions.push(e3), G(e3);
|
|
31
|
+
})()) }, 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) => {
|
|
32
|
+
return a2 = e2.$index, e2.row, void I2.properties.filterConditions.splice(a2, 1);
|
|
33
33
|
var a2;
|
|
34
34
|
} }, null, 8, ["icon", "onClick"])]), _: 2 }, 1024)])]), _: 1 })]), _: 1 }, 8, ["data"]);
|
|
35
35
|
};
|
|
36
36
|
} });
|
|
37
37
|
export {
|
|
38
|
-
|
|
38
|
+
I as default
|
|
39
39
|
};
|
|
@@ -14,7 +14,7 @@ import { json as _ } from "@codemirror/lang-json";
|
|
|
14
14
|
import { EditorState as j } from "@codemirror/state";
|
|
15
15
|
import S from "agilebuilder-ui/src/utils/request";
|
|
16
16
|
import x from "@logicflow/core";
|
|
17
|
-
import O from "../../common/components/json-view/json-view.
|
|
17
|
+
import O from "../../common/components/json-view/json-view.vue.js";
|
|
18
18
|
import { vscodeDark as C } from "@uiw/codemirror-themes-all";
|
|
19
19
|
import N from "./request-params.vue.js";
|
|
20
20
|
import { getSystemBackendUrl as T } from "agilebuilder-ui/src/utils/common-util";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "service-flow-designer",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.12",
|
|
4
4
|
"description": "AgileBuilder Service Flow Designer",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"main": "dist/es/index.js",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@logicflow/layout": "1.2.0-alpha.16",
|
|
62
62
|
"@uiw/codemirror-themes-all": "^4.21.25",
|
|
63
63
|
"@vueuse/core": "^10.9.0",
|
|
64
|
-
"agilebuilder-ui": "1.1.
|
|
64
|
+
"agilebuilder-ui": "1.1.7",
|
|
65
65
|
"codemirror": "^6.0.1",
|
|
66
66
|
"nprogress": "^0.2.0",
|
|
67
67
|
"pinia": "^2.1.7",
|