@jeecg/online 3.4.3-beta → 3.4.3
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/AuthButtonConfig.js +1 -2
- package/AuthButtonTree.js +1 -2
- package/AuthDataConfig.js +1 -2
- package/AuthDataTree.js +1 -2
- package/AuthFieldConfig.js +1 -2
- package/AuthFieldTree.js +1 -2
- package/AuthManagerDrawer.js +1 -2
- package/AuthSetterModal.js +1 -2
- package/CgformCopyList.js +0 -2
- package/CheckDictTable.js +3 -3
- package/CodeFileListModal.js +1 -2
- package/CodeFileViewModal.js +1 -2
- package/CodeGeneratorModal.js +1 -2
- package/CustomButtonList.js +1 -2
- package/DBAttributeTable.js +2 -2
- package/DbToOnlineModal.js +1 -2
- package/DetailForm.js +16 -14
- package/EnhanceJavaModal.js +1 -2
- package/EnhanceJsModal.js +8 -2
- package/EnhanceSqlModal.js +1 -2
- package/ExtendConfigModal.js +2 -2
- package/FileSelectModal.js +1 -2
- package/ForeignKeyTable.js +2 -2
- package/IndexTable.js +2 -2
- package/JModalTip.js +2 -2
- package/LeftDepart.js +2 -2
- package/LeftRole.js +1 -2
- package/LeftUser.js +1 -2
- package/LinkTableConfigModal.js +2 -3
- package/LinkTableFieldConfigModal.js +1 -2
- package/LinkTableListPiece.js +2 -2
- package/ModalFormDemo.js +1 -2
- package/OnlCgReportList.js +34 -0
- package/OnlineAutoList.js +2 -4
- package/OnlineAutoModal.js +9 -7
- package/OnlineAutoTreeList.js +2 -4
- package/OnlineCustomModal.js +3 -5
- package/OnlineDetailModal.js +2 -4
- package/OnlineForm.js +21 -8
- package/OnlineFormDetail.js +3 -5
- package/OnlineQueryForm.js +2 -4
- package/OnlineSearchFormItem.js +2 -5
- package/OnlineSubFormDetail.js +2 -4
- package/OnlineSuperQuery.js +5 -4
- package/PageAttributeTable.js +1 -2
- package/ProcessOnlineForm.js +2 -4
- package/QueryTable.js +2 -2
- package/index.js +345 -31
- package/index2.js +3 -5
- package/main.index.js +3 -3
- package/package.json +1 -1
- package/style.css +1 -1
- package/useAutoForm.js +66 -47
- package/useListButton.js +8 -4
- package/useSchemas.js +18 -4
- package/JOnlineSearchSelect.js +0 -115
- package/LICENSE +0 -7
- package/OnlineSelectCascade.js +0 -231
package/useAutoForm.js
CHANGED
|
@@ -45,8 +45,8 @@ import { useUserStore } from "/@/store/modules/user";
|
|
|
45
45
|
import { defHttp } from "/@/utils/http/axios";
|
|
46
46
|
import { replaceAll, goJmReportViewPage, importViewsFile } from "/@/utils";
|
|
47
47
|
import * as CustomExpression from "/@/utils/desform/customExpression";
|
|
48
|
-
import { add
|
|
49
|
-
import OnlineSelectCascade from "./
|
|
48
|
+
import { add } from "/@/components/Form/src/componentMap";
|
|
49
|
+
import { _ as _export_sfc, O as OnlineSelectCascade } from "./index.js";
|
|
50
50
|
import { usePermissionStore } from "/@/store/modules/permission";
|
|
51
51
|
import { propTypes } from "/@/utils/propTypes";
|
|
52
52
|
import { PrinterOutlined, DiffOutlined, FormOutlined, PlusOutlined, EditOutlined, MinusCircleFilled } from "@ant-design/icons-vue";
|
|
@@ -62,7 +62,6 @@ import { useRouter } from "vue-router";
|
|
|
62
62
|
import { getAreaTextByCode } from "/@/components/Form/src/utils/Area";
|
|
63
63
|
import { createImgPreview } from "/@/components/Preview/index";
|
|
64
64
|
import LinkTableListPiece from "./LinkTableListPiece.js";
|
|
65
|
-
import { _ as _export_sfc } from "./index.js";
|
|
66
65
|
import { Loading } from "/@/components/Loading";
|
|
67
66
|
import { getToken } from "/@/utils/auth";
|
|
68
67
|
import JModalTip from "./JModalTip.js";
|
|
@@ -73,10 +72,13 @@ var dayjs_min = { exports: {} };
|
|
|
73
72
|
!function(t, e) {
|
|
74
73
|
module.exports = e();
|
|
75
74
|
}(commonjsGlobal, function() {
|
|
76
|
-
var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h2 = "quarter", c = "year", d = "date",
|
|
75
|
+
var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h2 = "quarter", c = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
|
|
76
|
+
var e2 = ["th", "st", "nd", "rd"], n2 = t2 % 100;
|
|
77
|
+
return "[" + t2 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
|
|
78
|
+
} }, m = function(t2, e2, n2) {
|
|
77
79
|
var r2 = String(t2);
|
|
78
80
|
return !r2 || r2.length >= e2 ? t2 : "" + Array(e2 + 1 - r2.length).join(n2) + t2;
|
|
79
|
-
},
|
|
81
|
+
}, v = { s: m, z: function(t2) {
|
|
80
82
|
var e2 = -t2.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
|
|
81
83
|
return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
|
|
82
84
|
}, m: function t2(e2, n2) {
|
|
@@ -90,14 +92,14 @@ var dayjs_min = { exports: {} };
|
|
|
90
92
|
return { M: f, y: c, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: h2 }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
|
|
91
93
|
}, u: function(t2) {
|
|
92
94
|
return void 0 === t2;
|
|
93
|
-
} },
|
|
94
|
-
D[
|
|
95
|
+
} }, g = "en", D = {};
|
|
96
|
+
D[g] = M;
|
|
95
97
|
var p = function(t2) {
|
|
96
98
|
return t2 instanceof _;
|
|
97
99
|
}, S = function t2(e2, n2, r2) {
|
|
98
100
|
var i2;
|
|
99
101
|
if (!e2)
|
|
100
|
-
return
|
|
102
|
+
return g;
|
|
101
103
|
if ("string" == typeof e2) {
|
|
102
104
|
var s2 = e2.toLowerCase();
|
|
103
105
|
D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
|
|
@@ -108,13 +110,13 @@ var dayjs_min = { exports: {} };
|
|
|
108
110
|
var a2 = e2.name;
|
|
109
111
|
D[a2] = e2, i2 = a2;
|
|
110
112
|
}
|
|
111
|
-
return !r2 && i2 && (
|
|
113
|
+
return !r2 && i2 && (g = i2), i2 || !r2 && g;
|
|
112
114
|
}, w = function(t2, e2) {
|
|
113
115
|
if (p(t2))
|
|
114
116
|
return t2.clone();
|
|
115
117
|
var n2 = "object" == typeof e2 ? e2 : {};
|
|
116
118
|
return n2.date = t2, n2.args = arguments, new _(n2);
|
|
117
|
-
}, O =
|
|
119
|
+
}, O = v;
|
|
118
120
|
O.l = S, O.i = p, O.w = function(t2, e2) {
|
|
119
121
|
return w(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
|
|
120
122
|
};
|
|
@@ -133,7 +135,7 @@ var dayjs_min = { exports: {} };
|
|
|
133
135
|
if (e2 instanceof Date)
|
|
134
136
|
return new Date(e2);
|
|
135
137
|
if ("string" == typeof e2 && !/Z$/i.test(e2)) {
|
|
136
|
-
var r2 = e2.match(
|
|
138
|
+
var r2 = e2.match($);
|
|
137
139
|
if (r2) {
|
|
138
140
|
var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
|
|
139
141
|
return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
|
|
@@ -147,7 +149,7 @@ var dayjs_min = { exports: {} };
|
|
|
147
149
|
}, m2.$utils = function() {
|
|
148
150
|
return O;
|
|
149
151
|
}, m2.isValid = function() {
|
|
150
|
-
return !(this.$d.toString() ===
|
|
152
|
+
return !(this.$d.toString() === l);
|
|
151
153
|
}, m2.isSame = function(t2, e2) {
|
|
152
154
|
var n2 = w(t2);
|
|
153
155
|
return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
|
|
@@ -162,69 +164,69 @@ var dayjs_min = { exports: {} };
|
|
|
162
164
|
}, m2.valueOf = function() {
|
|
163
165
|
return this.$d.getTime();
|
|
164
166
|
}, m2.startOf = function(t2, e2) {
|
|
165
|
-
var n2 = this, r2 = !!O.u(e2) || e2, h3 = O.p(t2),
|
|
167
|
+
var n2 = this, r2 = !!O.u(e2) || e2, h3 = O.p(t2), l2 = function(t3, e3) {
|
|
166
168
|
var i2 = O.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
|
|
167
169
|
return r2 ? i2 : i2.endOf(a);
|
|
168
|
-
},
|
|
170
|
+
}, $2 = function(t3, e3) {
|
|
169
171
|
return O.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
|
|
170
|
-
}, y2 = this.$W, M3 = this.$M, m3 = this.$D,
|
|
172
|
+
}, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
|
|
171
173
|
switch (h3) {
|
|
172
174
|
case c:
|
|
173
|
-
return r2 ?
|
|
175
|
+
return r2 ? l2(1, 0) : l2(31, 11);
|
|
174
176
|
case f:
|
|
175
|
-
return r2 ?
|
|
177
|
+
return r2 ? l2(1, M3) : l2(0, M3 + 1);
|
|
176
178
|
case o:
|
|
177
|
-
var
|
|
178
|
-
return
|
|
179
|
+
var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
|
|
180
|
+
return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
|
|
179
181
|
case a:
|
|
180
182
|
case d:
|
|
181
|
-
return
|
|
183
|
+
return $2(v2 + "Hours", 0);
|
|
182
184
|
case u:
|
|
183
|
-
return
|
|
185
|
+
return $2(v2 + "Minutes", 1);
|
|
184
186
|
case s:
|
|
185
|
-
return
|
|
187
|
+
return $2(v2 + "Seconds", 2);
|
|
186
188
|
case i:
|
|
187
|
-
return
|
|
189
|
+
return $2(v2 + "Milliseconds", 3);
|
|
188
190
|
default:
|
|
189
191
|
return this.clone();
|
|
190
192
|
}
|
|
191
193
|
}, m2.endOf = function(t2) {
|
|
192
194
|
return this.startOf(t2, false);
|
|
193
195
|
}, m2.$set = function(t2, e2) {
|
|
194
|
-
var n2, o2 = O.p(t2), h3 = "set" + (this.$u ? "UTC" : ""),
|
|
196
|
+
var n2, o2 = O.p(t2), h3 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = h3 + "Date", n2[d] = h3 + "Date", n2[f] = h3 + "Month", n2[c] = h3 + "FullYear", n2[u] = h3 + "Hours", n2[s] = h3 + "Minutes", n2[i] = h3 + "Seconds", n2[r] = h3 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
|
|
195
197
|
if (o2 === f || o2 === c) {
|
|
196
198
|
var y2 = this.clone().set(d, 1);
|
|
197
|
-
y2.$d[$2
|
|
199
|
+
y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
|
|
198
200
|
} else
|
|
199
|
-
|
|
201
|
+
l2 && this.$d[l2]($2);
|
|
200
202
|
return this.init(), this;
|
|
201
203
|
}, m2.set = function(t2, e2) {
|
|
202
204
|
return this.clone().$set(t2, e2);
|
|
203
205
|
}, m2.get = function(t2) {
|
|
204
206
|
return this[O.p(t2)]();
|
|
205
207
|
}, m2.add = function(r2, h3) {
|
|
206
|
-
var d2,
|
|
208
|
+
var d2, l2 = this;
|
|
207
209
|
r2 = Number(r2);
|
|
208
|
-
var
|
|
209
|
-
var e2 = w(
|
|
210
|
-
return O.w(e2.date(e2.date() + Math.round(t2 * r2)),
|
|
210
|
+
var $2 = O.p(h3), y2 = function(t2) {
|
|
211
|
+
var e2 = w(l2);
|
|
212
|
+
return O.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
|
|
211
213
|
};
|
|
212
|
-
if (
|
|
214
|
+
if ($2 === f)
|
|
213
215
|
return this.set(f, this.$M + r2);
|
|
214
|
-
if (
|
|
216
|
+
if ($2 === c)
|
|
215
217
|
return this.set(c, this.$y + r2);
|
|
216
|
-
if (
|
|
218
|
+
if ($2 === a)
|
|
217
219
|
return y2(1);
|
|
218
|
-
if (
|
|
220
|
+
if ($2 === o)
|
|
219
221
|
return y2(7);
|
|
220
|
-
var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[
|
|
222
|
+
var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[$2] || 1, m3 = this.$d.getTime() + r2 * M3;
|
|
221
223
|
return O.w(m3, this);
|
|
222
224
|
}, m2.subtract = function(t2, e2) {
|
|
223
225
|
return this.add(-1 * t2, e2);
|
|
224
226
|
}, m2.format = function(t2) {
|
|
225
227
|
var e2 = this, n2 = this.$locale();
|
|
226
228
|
if (!this.isValid())
|
|
227
|
-
return n2.invalidDate ||
|
|
229
|
+
return n2.invalidDate || l;
|
|
228
230
|
var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = O.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, f2 = n2.months, h3 = function(t3, n3, i3, s3) {
|
|
229
231
|
return t3 && (t3[n3] || t3(e2, r2)) || i3[n3].slice(0, s3);
|
|
230
232
|
}, c2 = function(t3) {
|
|
@@ -232,15 +234,15 @@ var dayjs_min = { exports: {} };
|
|
|
232
234
|
}, d2 = n2.meridiem || function(t3, e3, n3) {
|
|
233
235
|
var r3 = t3 < 12 ? "AM" : "PM";
|
|
234
236
|
return n3 ? r3.toLowerCase() : r3;
|
|
235
|
-
},
|
|
237
|
+
}, $2 = { YY: String(this.$y).slice(-2), YYYY: this.$y, M: a2 + 1, MM: O.s(a2 + 1, 2, "0"), MMM: h3(n2.monthsShort, a2, f2, 3), MMMM: h3(f2, a2), D: this.$D, DD: O.s(this.$D, 2, "0"), d: String(this.$W), dd: h3(n2.weekdaysMin, this.$W, o2, 2), ddd: h3(n2.weekdaysShort, this.$W, o2, 3), dddd: o2[this.$W], H: String(s2), HH: O.s(s2, 2, "0"), h: c2(1), hh: c2(2), a: d2(s2, u2, true), A: d2(s2, u2, false), m: String(u2), mm: O.s(u2, 2, "0"), s: String(this.$s), ss: O.s(this.$s, 2, "0"), SSS: O.s(this.$ms, 3, "0"), Z: i2 };
|
|
236
238
|
return r2.replace(y, function(t3, e3) {
|
|
237
|
-
return e3 ||
|
|
239
|
+
return e3 || $2[t3] || i2.replace(":", "");
|
|
238
240
|
});
|
|
239
241
|
}, m2.utcOffset = function() {
|
|
240
242
|
return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
|
|
241
|
-
}, m2.diff = function(r2, d2,
|
|
242
|
-
var
|
|
243
|
-
return
|
|
243
|
+
}, m2.diff = function(r2, d2, l2) {
|
|
244
|
+
var $2, y2 = O.p(d2), M3 = w(r2), m3 = (M3.utcOffset() - this.utcOffset()) * e, v2 = this - M3, g2 = O.m(this, M3);
|
|
245
|
+
return g2 = ($2 = {}, $2[c] = g2 / 12, $2[f] = g2, $2[h2] = g2 / 3, $2[o] = (v2 - m3) / 6048e5, $2[a] = (v2 - m3) / 864e5, $2[u] = v2 / n, $2[s] = v2 / e, $2[i] = v2 / t, $2)[y2] || v2, l2 ? g2 : O.a(g2);
|
|
244
246
|
}, m2.daysInMonth = function() {
|
|
245
247
|
return this.endOf(f).$D;
|
|
246
248
|
}, m2.$locale = function() {
|
|
@@ -270,7 +272,7 @@ var dayjs_min = { exports: {} };
|
|
|
270
272
|
return t2.$i || (t2(e2, _, w), t2.$i = true), w;
|
|
271
273
|
}, w.locale = S, w.isDayjs = p, w.unix = function(t2) {
|
|
272
274
|
return w(1e3 * t2);
|
|
273
|
-
}, w.en = D[
|
|
275
|
+
}, w.en = D[g], w.Ls = D, w.p = {}, w;
|
|
274
276
|
});
|
|
275
277
|
})(dayjs_min);
|
|
276
278
|
var dayjs = dayjs_min.exports;
|
|
@@ -779,6 +781,10 @@ const _sfc_main$4 = {
|
|
|
779
781
|
request: {
|
|
780
782
|
type: Boolean,
|
|
781
783
|
default: true
|
|
784
|
+
},
|
|
785
|
+
isVxeTableData: {
|
|
786
|
+
type: Boolean,
|
|
787
|
+
default: false
|
|
782
788
|
}
|
|
783
789
|
},
|
|
784
790
|
emits: ["success", "rendered", "dataChange"],
|
|
@@ -865,6 +871,9 @@ const _sfc_main$4 = {
|
|
|
865
871
|
dbData.value = Object.assign({}, formData);
|
|
866
872
|
let arr = realFormFieldNames.value;
|
|
867
873
|
let values = pick(formData, ...arr);
|
|
874
|
+
if (props.isVxeTableData === true) {
|
|
875
|
+
values = Object.assign({}, values, record2);
|
|
876
|
+
}
|
|
868
877
|
yield setFieldsValue(values);
|
|
869
878
|
});
|
|
870
879
|
}
|
|
@@ -1564,12 +1573,18 @@ function useAutoModal(isBpm, { emit } = {}, callback) {
|
|
|
1564
1573
|
topTipVisible.value = false;
|
|
1565
1574
|
successThenClose.value = true;
|
|
1566
1575
|
}
|
|
1576
|
+
function onCloseEvent() {
|
|
1577
|
+
if (onlineFormCompRef.value) {
|
|
1578
|
+
onlineFormCompRef.value.onCloseModal();
|
|
1579
|
+
}
|
|
1580
|
+
}
|
|
1567
1581
|
return {
|
|
1568
1582
|
title,
|
|
1569
1583
|
modalWidth,
|
|
1570
1584
|
registerModal,
|
|
1571
1585
|
closeModal,
|
|
1572
1586
|
modalObject,
|
|
1587
|
+
onCloseEvent,
|
|
1573
1588
|
cgButtonList,
|
|
1574
1589
|
handleCgButtonClick,
|
|
1575
1590
|
disableSubmit,
|
|
@@ -1606,7 +1621,7 @@ function useFixedHeightModal() {
|
|
|
1606
1621
|
popModalFixedWidth.value = tempWidth;
|
|
1607
1622
|
const popBodyStyle = ref({});
|
|
1608
1623
|
function resetBodyStyle() {
|
|
1609
|
-
let height = window.innerHeight -
|
|
1624
|
+
let height = window.innerHeight - 210;
|
|
1610
1625
|
popBodyStyle.value = {
|
|
1611
1626
|
height: height + "px",
|
|
1612
1627
|
overflowY: "auto"
|
|
@@ -1644,6 +1659,10 @@ const _sfc_main$3 = defineComponent({
|
|
|
1644
1659
|
saveClose: {
|
|
1645
1660
|
type: Boolean,
|
|
1646
1661
|
default: false
|
|
1662
|
+
},
|
|
1663
|
+
isVxeTableData: {
|
|
1664
|
+
type: Boolean,
|
|
1665
|
+
default: false
|
|
1647
1666
|
}
|
|
1648
1667
|
},
|
|
1649
1668
|
components: {
|
|
@@ -1783,11 +1802,12 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
1783
1802
|
isTree: _ctx.isTreeForm,
|
|
1784
1803
|
pidField: _ctx.pidFieldName,
|
|
1785
1804
|
request: _ctx.request,
|
|
1805
|
+
isVxeTableData: _ctx.isVxeTableData,
|
|
1786
1806
|
onRendered: _ctx.renderSuccess,
|
|
1787
1807
|
onSuccess: _ctx.handleSuccess,
|
|
1788
1808
|
onDataChange: _ctx.handleDataChange,
|
|
1789
1809
|
"modal-class": "jeecg-online-pop-modal"
|
|
1790
|
-
}, null, 8, ["id", "disabled", "form-template", "isTree", "pidField", "request", "onRendered", "onSuccess", "onDataChange"])
|
|
1810
|
+
}, null, 8, ["id", "disabled", "form-template", "isTree", "pidField", "request", "isVxeTableData", "onRendered", "onSuccess", "onDataChange"])
|
|
1791
1811
|
]),
|
|
1792
1812
|
_: 1
|
|
1793
1813
|
}, 16, ["width", "bodyStyle", "footer", "onRegister", "onOk"]);
|
|
@@ -3243,7 +3263,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
3243
3263
|
createVNode(_component_a_button, { onClick: $setup.handleAddRecord }, {
|
|
3244
3264
|
default: withCtx(() => [
|
|
3245
3265
|
createVNode(_component_PlusOutlined),
|
|
3246
|
-
createTextVNode("\u8BB0 \
|
|
3266
|
+
createTextVNode("\u8BB0 \u5F55")
|
|
3247
3267
|
]),
|
|
3248
3268
|
_: 1
|
|
3249
3269
|
}, 8, ["onClick"])
|
|
@@ -3317,7 +3337,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
3317
3337
|
}, null, 8, ["id", "onRegister", "onSuccess"])
|
|
3318
3338
|
]);
|
|
3319
3339
|
}
|
|
3320
|
-
var LinkTableCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
3340
|
+
var LinkTableCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2325e7c8"]]);
|
|
3321
3341
|
var LinkTableCard$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
3322
3342
|
__proto__: null,
|
|
3323
3343
|
"default": LinkTableCard
|
|
@@ -3329,7 +3349,6 @@ function useFormItems(props, onlineFormRef) {
|
|
|
3329
3349
|
add("OnlineSelectCascade", OnlineSelectCascade);
|
|
3330
3350
|
add("LinkTableSelect", LinkTableSelect);
|
|
3331
3351
|
add("LinkTableCard", LinkTableCard);
|
|
3332
|
-
console.log(" componentMap val =", componentMap);
|
|
3333
3352
|
const modalClass = props.modalClass;
|
|
3334
3353
|
const formSchemas = ref([]);
|
|
3335
3354
|
const tableName = ref("");
|
package/useListButton.js
CHANGED
|
@@ -653,7 +653,9 @@ function useListButton(onlineTableContext, extConfigJson) {
|
|
|
653
653
|
});
|
|
654
654
|
}
|
|
655
655
|
function getActions(record) {
|
|
656
|
-
|
|
656
|
+
let bpmStatusValue = getBpmStatusValue(record);
|
|
657
|
+
let canEdit = bpmStatusValue && bpmStatusValue == "1" || !bpmStatusValue;
|
|
658
|
+
if (toRaw(buttonSwitch.update) === true && canEdit) {
|
|
657
659
|
return [
|
|
658
660
|
{
|
|
659
661
|
label: "\u7F16\u8F91",
|
|
@@ -696,8 +698,8 @@ function useListButton(onlineTableContext, extConfigJson) {
|
|
|
696
698
|
});
|
|
697
699
|
}
|
|
698
700
|
if (onlineTableContext["hasBpmStatus"] === true && toRaw(buttonSwitch.bpm) === true) {
|
|
699
|
-
let
|
|
700
|
-
if (!
|
|
701
|
+
let bpmStatusValue2 = getBpmStatusValue(record);
|
|
702
|
+
if (!bpmStatusValue2 || bpmStatusValue2 == "1") {
|
|
701
703
|
arr.push(getSubmitFlowButton(record));
|
|
702
704
|
} else {
|
|
703
705
|
arr.push(getViewBpmGraphicButton(record));
|
|
@@ -717,7 +719,9 @@ function useListButton(onlineTableContext, extConfigJson) {
|
|
|
717
719
|
});
|
|
718
720
|
}
|
|
719
721
|
}
|
|
720
|
-
|
|
722
|
+
let bpmStatusValue = getBpmStatusValue(record);
|
|
723
|
+
let canDelete = bpmStatusValue && bpmStatusValue == "1" || !bpmStatusValue;
|
|
724
|
+
if (toRaw(buttonSwitch.delete) === true && canDelete) {
|
|
721
725
|
arr.push(getDeleteButton(record));
|
|
722
726
|
}
|
|
723
727
|
let buttonList = cgLinkButtonList;
|
package/useSchemas.js
CHANGED
|
@@ -152,10 +152,7 @@ function useFormSchemas(_props, handlers) {
|
|
|
152
152
|
defaultValue: "normal",
|
|
153
153
|
componentProps: {
|
|
154
154
|
options: [
|
|
155
|
-
{ label: "\u9ED8\u8BA4\u4E3B\u9898", value: "normal" }
|
|
156
|
-
{ label: "ERP\u4E3B\u9898(\u4E00\u5BF9\u591A)", value: "erp" },
|
|
157
|
-
{ label: "\u5185\u5D4C\u5B50\u8868\u4E3B\u9898(\u4E00\u5BF9\u591A)", value: "innerTable" },
|
|
158
|
-
{ label: "TAB\u4E3B\u9898(\u4E00\u5BF9\u591A)", value: "tab" }
|
|
155
|
+
{ label: "\u9ED8\u8BA4\u4E3B\u9898", value: "normal" }
|
|
159
156
|
]
|
|
160
157
|
},
|
|
161
158
|
dynamicDisabled: ({ model }) => model.tableType === 1
|
|
@@ -632,6 +629,23 @@ function useCodeGeneratorFormSchemas(_, handlers, single) {
|
|
|
632
629
|
},
|
|
633
630
|
getColSize.value
|
|
634
631
|
),
|
|
632
|
+
mapFormSchema(
|
|
633
|
+
{
|
|
634
|
+
label: "\u9875\u9762\u4EE3\u7801",
|
|
635
|
+
field: "vueStyle",
|
|
636
|
+
required: true,
|
|
637
|
+
component: "RadioGroup",
|
|
638
|
+
defaultValue: "vue3",
|
|
639
|
+
componentProps: {
|
|
640
|
+
options: [
|
|
641
|
+
{ label: "Vue3", value: "vue3" },
|
|
642
|
+
{ label: "Vue3 \u539F\u751F", value: "vue3Native" },
|
|
643
|
+
{ label: "Vue2", value: "vue" }
|
|
644
|
+
]
|
|
645
|
+
}
|
|
646
|
+
},
|
|
647
|
+
getColSize.value
|
|
648
|
+
),
|
|
635
649
|
{ label: "\u9700\u8981\u751F\u6210\u7684\u4EE3\u7801", field: "codeTypes", component: "Input", show: false }
|
|
636
650
|
]);
|
|
637
651
|
return { formSchemas };
|
package/JOnlineSearchSelect.js
DELETED
|
@@ -1,115 +0,0 @@
|
|
|
1
|
-
import { useDebounceFn } from "@vueuse/core";
|
|
2
|
-
import { defHttp } from "/@/utils/http/axios";
|
|
3
|
-
import { useMessage } from "/@/hooks/web/useMessage";
|
|
4
|
-
import { ref, watch, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString } from "vue";
|
|
5
|
-
import { _ as _export_sfc } from "./index.js";
|
|
6
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
7
|
-
import "vue-router";
|
|
8
|
-
const { createMessage: $message } = useMessage();
|
|
9
|
-
const _sfc_main = {
|
|
10
|
-
name: "JOnlineSearchSelect",
|
|
11
|
-
props: {
|
|
12
|
-
placeholder: {
|
|
13
|
-
type: String,
|
|
14
|
-
default: "",
|
|
15
|
-
required: false
|
|
16
|
-
},
|
|
17
|
-
value: {
|
|
18
|
-
type: String,
|
|
19
|
-
required: false
|
|
20
|
-
},
|
|
21
|
-
sql: {
|
|
22
|
-
type: String,
|
|
23
|
-
required: true
|
|
24
|
-
}
|
|
25
|
-
},
|
|
26
|
-
emits: ["update:value"],
|
|
27
|
-
setup(props, { emit }) {
|
|
28
|
-
let selected = ref("");
|
|
29
|
-
let selectOptions = ref([]);
|
|
30
|
-
watch(
|
|
31
|
-
() => props.value,
|
|
32
|
-
(newVal) => {
|
|
33
|
-
if (!newVal) {
|
|
34
|
-
selected.value = void 0;
|
|
35
|
-
} else {
|
|
36
|
-
selected.value = newVal;
|
|
37
|
-
}
|
|
38
|
-
},
|
|
39
|
-
{ immediate: true }
|
|
40
|
-
);
|
|
41
|
-
watch(
|
|
42
|
-
() => props.sql,
|
|
43
|
-
() => {
|
|
44
|
-
resetOptions();
|
|
45
|
-
},
|
|
46
|
-
{ immediate: true }
|
|
47
|
-
);
|
|
48
|
-
const handleSearch = useDebounceFn(searchByKeyword, 800);
|
|
49
|
-
function searchByKeyword(keyword = "") {
|
|
50
|
-
let params = {
|
|
51
|
-
keyword
|
|
52
|
-
};
|
|
53
|
-
let url = "/online/cgreport/api/getReportDictList?sql=" + props.sql;
|
|
54
|
-
defHttp.get({ url, params }, { isTransformResponse: false }).then((res) => {
|
|
55
|
-
if (res.success) {
|
|
56
|
-
if (res.result && res.result.length > 0) {
|
|
57
|
-
selectOptions.value = res.result;
|
|
58
|
-
} else {
|
|
59
|
-
selectOptions.value = [];
|
|
60
|
-
}
|
|
61
|
-
} else {
|
|
62
|
-
$message.warning(res.message);
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
function handleChange(value) {
|
|
67
|
-
emit("update:value", value);
|
|
68
|
-
if (!value || value == "") {
|
|
69
|
-
resetOptions();
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
function resetOptions() {
|
|
73
|
-
selectOptions.value = [];
|
|
74
|
-
searchByKeyword();
|
|
75
|
-
}
|
|
76
|
-
return {
|
|
77
|
-
selectOptions,
|
|
78
|
-
handleSearch,
|
|
79
|
-
handleChange,
|
|
80
|
-
selected
|
|
81
|
-
};
|
|
82
|
-
}
|
|
83
|
-
};
|
|
84
|
-
function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
85
|
-
const _component_a_select_option = resolveComponent("a-select-option");
|
|
86
|
-
const _component_a_select = resolveComponent("a-select");
|
|
87
|
-
return openBlock(), createBlock(_component_a_select, {
|
|
88
|
-
value: $setup.selected,
|
|
89
|
-
placeholder: $props.placeholder,
|
|
90
|
-
"show-search": "",
|
|
91
|
-
"default-active-first-option": false,
|
|
92
|
-
"show-arrow": true,
|
|
93
|
-
"filter-option": false,
|
|
94
|
-
"not-found-content": null,
|
|
95
|
-
onSearch: $setup.handleSearch,
|
|
96
|
-
onChange: $setup.handleChange,
|
|
97
|
-
allowClear: ""
|
|
98
|
-
}, {
|
|
99
|
-
default: withCtx(() => [
|
|
100
|
-
(openBlock(true), createElementBlock(Fragment, null, renderList($setup.selectOptions, (d) => {
|
|
101
|
-
return openBlock(), createBlock(_component_a_select_option, {
|
|
102
|
-
key: d.value
|
|
103
|
-
}, {
|
|
104
|
-
default: withCtx(() => [
|
|
105
|
-
createTextVNode(toDisplayString(d.text), 1)
|
|
106
|
-
]),
|
|
107
|
-
_: 2
|
|
108
|
-
}, 1024);
|
|
109
|
-
}), 128))
|
|
110
|
-
]),
|
|
111
|
-
_: 1
|
|
112
|
-
}, 8, ["value", "placeholder", "onSearch", "onChange"]);
|
|
113
|
-
}
|
|
114
|
-
var JOnlineSearchSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
|
|
115
|
-
export { JOnlineSearchSelect as default };
|