super-page-designer 2.2.51-sit3 → 2.2.51-sit6
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/components/design/utils/common-util.js +3 -0
- package/dist/es/components/design/utils/page-table-util.d.ts +1 -1
- package/dist/es/components/design/utils/page-table-util.js +4 -4
- package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-showcondition.vue.js +11 -11
- package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +1 -1
- package/dist/es/components/design/views/design/page-event/page-event-content.vue.js +1 -1
- package/package.json +4 -4
- /package/dist/es/components/design/views/assemblys/common/{common-variable-bind.vue3.js → common-variable-bind.vue2.js} +0 -0
|
@@ -38,4 +38,4 @@ export declare function tableResetConfigIndo(configure: object, moduleValue: any
|
|
|
38
38
|
export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): any;
|
|
39
39
|
export declare function getTableNameByTableUuid(pageDesign: any, tableUuid: any): any;
|
|
40
40
|
export declare function getModelOptionsByFields(dataFieldList: any): any;
|
|
41
|
-
export declare function getTableConfigByTableUuid(pageDesign: any, configure: any): any;
|
|
41
|
+
export declare function getTableConfigByTableUuid(pageDesign: any, configure: any, tableConfigure?: any): any;
|
|
@@ -231,11 +231,11 @@ function T(e2) {
|
|
|
231
231
|
t2.push({ value: e3.dbColumnName, label: e3.alias, alias: e3.alias, dataType: e3.dataType });
|
|
232
232
|
}), t2;
|
|
233
233
|
}
|
|
234
|
-
function N(e2, t2) {
|
|
234
|
+
function N(e2, t2, r2) {
|
|
235
235
|
var _a;
|
|
236
|
-
const
|
|
237
|
-
let
|
|
238
|
-
return (t2 == null ? void 0 : t2.props.base.tableUuid) ? (
|
|
236
|
+
const a2 = e2 ? e2.pageType : null;
|
|
237
|
+
let s2, n2;
|
|
238
|
+
return r2 ? s2 = r2 : (t2 == null ? void 0 : t2.props.base.tableUuid) ? (n2 = t2.props.base.tableUuid, s2 = i(e2, n2)) : a2 && "list" === a2 && ((_a = e2 == null ? void 0 : e2.tableUuids) == null ? void 0 : _a.length) > 0 ? (n2 = e2 == null ? void 0 : e2.tableUuids[0], s2 = i(e2, n2)) : (e2 == null ? void 0 : e2.currentTableConfig) && (s2 = e2.currentTableConfig), s2;
|
|
239
239
|
}
|
|
240
240
|
export {
|
|
241
241
|
O as changeFeieldToMap,
|
|
@@ -10,12 +10,12 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
10
10
|
} }, pageDesign: { type: Object, default: () => {
|
|
11
11
|
} }, row: { type: Object, default: () => {
|
|
12
12
|
} } }, emits: ["update:data"], setup(e2, { emit: k2 }) {
|
|
13
|
-
const N = y(),
|
|
14
|
-
|
|
13
|
+
const N = y(), C = h(), O = e2, j = k2, U = l(300), x = l([]);
|
|
14
|
+
O.data && (x.value = O.data);
|
|
15
15
|
const B = l(false);
|
|
16
16
|
let L;
|
|
17
|
-
const M =
|
|
18
|
-
!M || "form" !== M && "list" !== M || (L =
|
|
17
|
+
const M = O.pageDesign ? O.pageDesign.pageType : null;
|
|
18
|
+
!M || "form" !== M && "list" !== M || (L = O.pageDesign.modelFields);
|
|
19
19
|
const I = l(null);
|
|
20
20
|
L && L.length > 0 && (I.value = V(L));
|
|
21
21
|
const S = l(null);
|
|
@@ -23,7 +23,7 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
23
23
|
e3 && (S.value = V(e3.modelFields));
|
|
24
24
|
}
|
|
25
25
|
function D() {
|
|
26
|
-
E(T(
|
|
26
|
+
E(T(O.pageDesign, O.configure, O.tableConfigure));
|
|
27
27
|
let e3 = window.innerHeight - 140 - 176;
|
|
28
28
|
e3 > 500 ? e3 = 500 : e3 < 100 && (e3 = 100), U.value = e3, B.value = true;
|
|
29
29
|
}
|
|
@@ -42,8 +42,8 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
42
42
|
const a2 = { uuid: w(), leftBracket: "", propName: "", operator: "", propValueType: "", rightBracket: "", joinSign: "", dataType: "" };
|
|
43
43
|
x.value.splice(l2 + 1, 0, a2);
|
|
44
44
|
}
|
|
45
|
-
E(
|
|
46
|
-
|
|
45
|
+
E(O.tableConfigure), a(() => x.value, (e3) => {
|
|
46
|
+
j("update:data", { row: O.row, data: x.value });
|
|
47
47
|
}, { deep: true });
|
|
48
48
|
const G = l({});
|
|
49
49
|
function W(e3) {
|
|
@@ -55,7 +55,7 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
55
55
|
let a3, t2 = [];
|
|
56
56
|
l2.propName = e3;
|
|
57
57
|
let o2 = "";
|
|
58
|
-
if (e3 && e3.startsWith("${") && (a3 = e3.substring(2, e3.length - 1), a3.startsWith("page.") || (a3.startsWith("data.") ? (a3 = a3.substring(5), t2 = I.value, t2 && 0 !== t2.length || (t2 = N.pageContextVarOptions.dataOptions)) : a3.startsWith("row.") && (a3 = a3.substring(4), t2 = S.value, t2 && 0 !== t2.length || (t2 =
|
|
58
|
+
if (e3 && e3.startsWith("${") && (a3 = e3.substring(2, e3.length - 1), a3.startsWith("page.") || (a3.startsWith("data.") ? (a3 = a3.substring(5), t2 = I.value, t2 && 0 !== t2.length || (t2 = N.pageContextVarOptions.dataOptions)) : a3.startsWith("row.") && (a3 = a3.substring(4), t2 = S.value, t2 && 0 !== t2.length || (t2 = C.columnList)))), t2 && a3) {
|
|
59
59
|
const e4 = t2.find((e5) => e5.value == a3);
|
|
60
60
|
e4 && (o2 = e4.dataType);
|
|
61
61
|
}
|
|
@@ -63,8 +63,8 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
return (l2, a2) => {
|
|
66
|
-
const w2 = t("el-button"), y2 = t("el-row"), h2 = t("Top"), V2 = t("el-icon"), T2 = t("Bottom"), k3 = t("el-table-column"), N2 = t("el-option"),
|
|
67
|
-
return u(), o(r, null, [d("div", null, [p(w2, { type: "primary", onClick: D }, { default: i(() => a2[1] || (a2[1] = [n("编辑")])), _: 1 })]), p(
|
|
66
|
+
const w2 = t("el-button"), y2 = t("el-row"), h2 = t("Top"), V2 = t("el-icon"), T2 = t("Bottom"), k3 = t("el-table-column"), N2 = t("el-option"), C2 = t("el-select"), O2 = t("el-table"), j2 = t("el-dialog");
|
|
67
|
+
return u(), o(r, null, [d("div", null, [p(w2, { type: "primary", onClick: D }, { default: i(() => a2[1] || (a2[1] = [n("编辑")])), _: 1 })]), p(j2, { modelValue: B.value, "onUpdate:modelValue": a2[0] || (a2[0] = (e3) => B.value = e3), title: e2.title, width: "900", "append-to-body": "" }, { default: i(() => [p(y2, { style: { "padding-bottom": "8px" } }, { default: i(() => [p(w2, { icon: s(b), plain: "", type: "primary", onClick: A }, { default: i(() => a2[2] || (a2[2] = [n(" 添加 ")])), _: 1 }, 8, ["icon"])]), _: 1 }), p(O2, { border: "", "highlight-current-row": "", onCurrentChange: W, data: x.value, style: { width: "100%" } }, { default: i(() => [p(k3, { label: "", width: "50" }, { default: i((e3) => [d("div", _, [p(V2, { size: "14", style: { cursor: "pointer" }, onClick: (l3) => function(e4) {
|
|
68
68
|
let l4 = z(e4);
|
|
69
69
|
if (l4 < 1) return;
|
|
70
70
|
const a3 = x.value;
|
|
@@ -74,7 +74,7 @@ const _ = { style: { "text-align": "center", margin: "0px -8px", "padding-top":
|
|
|
74
74
|
if (-1 == l4 || x.value.length == l4 + 1) return;
|
|
75
75
|
const a3 = x.value;
|
|
76
76
|
[a3[l4], a3[l4 + 1]] = [a3[l4 + 1], a3[l4]];
|
|
77
|
-
}(e3.row) }, { default: i(() => [p(T2)]), _: 2 }, 1032, ["onClick"])])]), _: 1 }), p(k3, { prop: "leftBracket", label: "(", width: "80" }, { default: i((e3) => [p(
|
|
77
|
+
}(e3.row) }, { default: i(() => [p(T2)]), _: 2 }, 1032, ["onClick"])])]), _: 1 }), p(k3, { prop: "leftBracket", label: "(", width: "80" }, { default: i((e3) => [p(C2, { modelValue: e3.row.leftBracket, "onUpdate:modelValue": (l3) => e3.row.leftBracket = l3, clearable: "", placeholder: "请选择" }, { default: i(() => [p(N2, { label: "", value: "" }), p(N2, { label: "(", value: "(" }), p(N2, { label: "((", value: "((" }), p(N2, { label: "(((", value: "(((" }), p(N2, { label: "((((", value: "((((" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "propName", label: "字段名(*)", width: "150" }, { default: i((l3) => [p(v, { modelValue: l3.row.propName, dataModelOptions: I.value, objModelOptions: S.value, paramTypes: e2.paramTypes, "onUpdate:modelValue": (e3) => q(e3, l3.row, "propName") }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "paramTypes", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "operator", label: "操作符", width: "90" }, { default: i((e3) => [p(C2, { modelValue: e3.row.operator, "onUpdate:modelValue": (l3) => e3.row.operator = l3, clearable: "", placeholder: "请选择" }, { default: i(() => [s(g)(e3.row.dataType) ? (u(), m(N2, { key: 0, label: "大于", value: "GT" })) : c("", true), s(g)(e3.row.dataType) ? (u(), m(N2, { key: 1, label: "小于", value: "LT" })) : c("", true), "date" == e3.row.dataType || "datetime" == e3.row.dataType ? (u(), m(N2, { key: 2, label: "晚于", value: "GT" })) : c("", true), "date" == e3.row.dataType || "datetime" == e3.row.dataType ? (u(), m(N2, { key: 3, label: "早于", value: "LT" })) : c("", true), p(N2, { label: "等于", value: "EQ" }), s(g)(e3.row.dataType) ? (u(), m(N2, { key: 4, label: "小于等于", value: "LET" })) : c("", true), s(g)(e3.row.dataType) ? (u(), m(N2, { key: 5, label: "大于等于", value: "GET" })) : c("", true), "date" == e3.row.dataType || "datetime" == e3.row.dataType ? (u(), m(N2, { key: 6, label: "不晚于", value: "LET" })) : c("", true), "date" == e3.row.dataType || "datetime" == e3.row.dataType ? (u(), m(N2, { key: 7, label: "不早于", value: "GET" })) : c("", true), p(N2, { label: "不等于", value: "NET" }), p(N2, { label: "包含", value: "CONTAIN" }), p(N2, { label: "不包含", value: "NOT_CONTAIN" }), p(N2, { label: "等于Null", value: "IS_NULL" }), p(N2, { label: "不等于Null", value: "IS_NOT_NULL" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "propValue", label: "值(*)", width: "150" }, { default: i((e3) => [p(v, { modelValue: e3.row.propValue, dataModelOptions: I.value, objModelOptions: S.value, "onUpdate:modelValue": (l3) => q(l3, e3.row, "propValue") }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "rightBracket", label: ")", width: "80" }, { default: i((e3) => [p(C2, { modelValue: e3.row.rightBracket, "onUpdate:modelValue": (l3) => e3.row.rightBracket = l3, placeholder: "请选择", clearable: "" }, { default: i(() => [p(N2, { label: "", value: "" }), p(N2, { label: ")", value: ")" }), p(N2, { label: "))", value: "))" }), p(N2, { label: ")))", value: ")))" }), p(N2, { label: "))))", value: "))))" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "joinSign", label: "并且/或者", width: "80" }, { default: i((e3) => [p(C2, { modelValue: e3.row.joinSign, "onUpdate:modelValue": (l3) => e3.row.joinSign = l3, clearable: "", placeholder: "请选择" }, { default: i(() => [p(N2, { label: "或者", value: "or" }), p(N2, { label: "并且", value: "and" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), p(k3, { prop: "variableIsNull", label: "变量为空时", width: "120" }, { default: i((e3) => [p(C2, { modelValue: e3.row.variableIsNull, "onUpdate:modelValue": (l3) => e3.row.variableIsNull = l3, clearable: "", placeholder: "请选择" }, { default: i(() => [p(N2, { label: "Null", value: "null" }), p(N2, { label: "忽略(1=1)", value: "ignore" }), p(N2, { label: "不符合(1<>1)", value: "notequal" })]), _: 2 }, 1032, ["modelValue", "onUpdate:modelValue"])]), _: 1 }), p(k3, { label: "操作", width: "60" }, { default: i((e3) => [p(V2, { size: "14", style: { color: "#5893ef", cursor: "pointer", "font-weight": "bold", "margin-right": "8px", "margin-left": "6px" }, onClick: (l3) => A(e3.row) }, { default: i(() => [p(s(b))]), _: 2 }, 1032, ["onClick"]), p(V2, { size: "14", style: { color: "#5893ef", cursor: "pointer" }, onClick: (l3) => function(e4) {
|
|
78
78
|
let l4 = z(e4);
|
|
79
79
|
l4 > -1 && x.value.splice(l4, 1);
|
|
80
80
|
}(e3.row) }, { default: i(() => [p(s(f))]), _: 2 }, 1032, ["onClick"])]), _: 1 })]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["modelValue", "title"])], 64);
|
|
@@ -72,7 +72,7 @@ const F = { style: { margin: "10px" } }, z = { class: "amb-design-tool", style:
|
|
|
72
72
|
}
|
|
73
73
|
if (a2) {
|
|
74
74
|
if (Object.assign(a2, n2), e3.customEvents[l2] = a2, "customFunc" !== a2.name && a2.componentUuid) {
|
|
75
|
-
const t3 = S(e3, a2.componentUuid);
|
|
75
|
+
const t3 = S({ items: [e3] }, a2.componentUuid);
|
|
76
76
|
if (t3 && t3.events) {
|
|
77
77
|
const e4 = t3.events.findIndex((e5) => e5.name == a2.name && e5.componentUuid == a2.componentUuid);
|
|
78
78
|
e4 > -1 && (t3.events[e4] = a2);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "super-page-designer",
|
|
3
|
-
"version": "2.2.51-
|
|
3
|
+
"version": "2.2.51-sit6",
|
|
4
4
|
"description": "AgileBuilder super page designer",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"main": "dist/es/index.js",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@vitejs/plugin-vue": "^5.0.4",
|
|
30
30
|
"@vueuse/core": "^10.9.0",
|
|
31
31
|
"agilebuilder-private-libs": "1.0.26",
|
|
32
|
-
"agilebuilder-ui": "1.1.19-
|
|
32
|
+
"agilebuilder-ui": "1.1.19-sit3",
|
|
33
33
|
"echarts": "^5.5.0",
|
|
34
34
|
"element-plus": "^2.6.1",
|
|
35
35
|
"font-awesome": "^4.7.0",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"pinia": "^2.1.7",
|
|
41
41
|
"qrcode": "^1.5.3",
|
|
42
42
|
"quill": "^2.0.1",
|
|
43
|
-
"service-flow-designer": "2.2.51-
|
|
44
|
-
"super-page-runtime": "2.2.51-
|
|
43
|
+
"service-flow-designer": "2.2.51-sit5",
|
|
44
|
+
"super-page-runtime": "2.2.51-sit4",
|
|
45
45
|
"uuid": "^9.0.1",
|
|
46
46
|
"vite": "^5.1.6",
|
|
47
47
|
"vite-plugin-node-stdlib-browser": "^0.2.1",
|