@jeecg/online 3.4.4-beta2 → 3.5.3-beta
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/AuthButtonTree.js +3 -1
- package/AuthDataTree.js +3 -1
- package/AuthFieldTree.js +3 -1
- package/AuthSetterModal.js +2 -4
- package/CgformCopyList.js +5 -6
- package/CgformModal.js +10 -2
- package/CheckDictTable.js +3 -2
- package/CodeGeneratorModal.js +2 -1
- package/DBAttributeTable.js +14 -2
- package/DetailForm.js +7 -8
- package/EnhanceJsHistory.js +1 -1
- package/FieldExtendJsonModal.js +14 -1
- package/LICENSE +4 -2
- package/OnlineAutoList.js +37 -23
- package/OnlineAutoModal.js +11 -11
- package/OnlineAutoTreeList.js +11 -12
- package/OnlineCustomModal.js +14 -13
- package/OnlineDetailModal.js +17 -11
- package/OnlineForm.js +108 -40
- package/OnlineFormDetail.js +34 -13
- package/OnlineQueryForm.js +17 -11
- package/OnlineSubFormDetail.js +8 -9
- package/PageAttributeTable.js +2 -2
- package/ProcessOnlineForm.js +11 -11
- package/SuperQuery.js +33 -8
- package/cgform.data.js +3 -1
- package/enhance.data.js +1 -1
- package/index.js +19 -17
- package/index2.js +18 -12
- package/package.json +1 -1
- package/style.css +1 -1
- package/useCgformList.js +15 -3
- package/{useAutoForm.js → useExtendComponent.js} +4750 -3501
- package/useListButton.js +13 -53
- package/useSchemas.js +87 -85
- package/FormSchemaFactory.js +0 -1211
package/AuthButtonTree.js
CHANGED
|
@@ -73,6 +73,7 @@ const _sfc_main = defineComponent({
|
|
|
73
73
|
roleId.value = $roleId;
|
|
74
74
|
authMode.value = $authMode;
|
|
75
75
|
checkedKeys.value = [];
|
|
76
|
+
yield loadTree();
|
|
76
77
|
let result = yield loadRoleAuthChecked({
|
|
77
78
|
roleId: $roleId,
|
|
78
79
|
cgformId: props.cgformId,
|
|
@@ -84,6 +85,7 @@ const _sfc_main = defineComponent({
|
|
|
84
85
|
}
|
|
85
86
|
function clearChecked() {
|
|
86
87
|
roleId.value = "";
|
|
88
|
+
loadTree();
|
|
87
89
|
}
|
|
88
90
|
function onSave() {
|
|
89
91
|
return __async(this, null, function* () {
|
|
@@ -177,5 +179,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
177
179
|
], 64))
|
|
178
180
|
]);
|
|
179
181
|
}
|
|
180
|
-
var AuthButtonTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
182
|
+
var AuthButtonTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0e98e024"]]);
|
|
181
183
|
export { AuthButtonTree as default };
|
package/AuthDataTree.js
CHANGED
|
@@ -55,6 +55,7 @@ const _sfc_main = defineComponent({
|
|
|
55
55
|
roleId.value = $roleId;
|
|
56
56
|
authMode.value = $authMode;
|
|
57
57
|
checkedKeys.value = [];
|
|
58
|
+
yield loadTree();
|
|
58
59
|
let result = yield loadRoleAuthChecked({
|
|
59
60
|
roleId: $roleId,
|
|
60
61
|
cgformId: props.cgformId,
|
|
@@ -66,6 +67,7 @@ const _sfc_main = defineComponent({
|
|
|
66
67
|
}
|
|
67
68
|
function clearChecked() {
|
|
68
69
|
roleId.value = "";
|
|
70
|
+
loadTree();
|
|
69
71
|
}
|
|
70
72
|
function onRefresh() {
|
|
71
73
|
loadTree();
|
|
@@ -154,5 +156,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
154
156
|
], 64))
|
|
155
157
|
]);
|
|
156
158
|
}
|
|
157
|
-
var AuthDataTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
159
|
+
var AuthDataTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a8874950"]]);
|
|
158
160
|
export { AuthDataTree as default };
|
package/AuthFieldTree.js
CHANGED
|
@@ -98,6 +98,7 @@ const _sfc_main = defineComponent({
|
|
|
98
98
|
roleId.value = $roleId;
|
|
99
99
|
authMode.value = $authMode;
|
|
100
100
|
checkedKeys.value = [];
|
|
101
|
+
yield loadTree();
|
|
101
102
|
let result = yield loadRoleAuthChecked({
|
|
102
103
|
roleId: $roleId,
|
|
103
104
|
cgformId: props.cgformId,
|
|
@@ -109,6 +110,7 @@ const _sfc_main = defineComponent({
|
|
|
109
110
|
}
|
|
110
111
|
function clearChecked() {
|
|
111
112
|
roleId.value = "";
|
|
113
|
+
loadTree();
|
|
112
114
|
}
|
|
113
115
|
function onRefresh() {
|
|
114
116
|
loadTree();
|
|
@@ -275,5 +277,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
275
277
|
], 64))
|
|
276
278
|
]);
|
|
277
279
|
}
|
|
278
|
-
var AuthFieldTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
280
|
+
var AuthFieldTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-909a7fde"]]);
|
|
279
281
|
export { AuthFieldTree as default };
|
package/AuthSetterModal.js
CHANGED
|
@@ -87,10 +87,8 @@ const _sfc_main = defineComponent({
|
|
|
87
87
|
const hasDataAuth = computed(() => props.tableType == 1 || props.tableType == 2);
|
|
88
88
|
const [registerModal, { closeModal }] = useModalInner((data) => {
|
|
89
89
|
activeKey.value = "field";
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
reset();
|
|
93
|
-
}
|
|
90
|
+
cgformId.value = data.cgformId;
|
|
91
|
+
reset();
|
|
94
92
|
});
|
|
95
93
|
function getActiveRef(key = activeKey.value) {
|
|
96
94
|
var _a;
|
package/CgformCopyList.js
CHANGED
|
@@ -50,22 +50,22 @@ import "./ExtendConfigModal.js";
|
|
|
50
50
|
import "/@/components/Form";
|
|
51
51
|
import "./useOnlineTest.js";
|
|
52
52
|
import "/@/utils";
|
|
53
|
-
import "./
|
|
54
|
-
import "
|
|
53
|
+
import "./useExtendComponent.js";
|
|
54
|
+
import "/@/components/Form/src/componentMap";
|
|
55
|
+
import "/@/utils/propTypes";
|
|
55
56
|
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
56
57
|
import "/@/views/system/user/user.api";
|
|
57
58
|
import "./_commonjsHelpers.js";
|
|
58
59
|
import "/@/store/modules/user";
|
|
59
60
|
import "/@/utils/desform/customExpression";
|
|
60
|
-
import "/@/components/Form/src/componentMap";
|
|
61
|
-
import "./OnlineSelectCascade.js";
|
|
62
61
|
import "/@/store/modules/permission";
|
|
63
|
-
import "/@/utils/propTypes";
|
|
64
62
|
import "/@/hooks/system/useListPage";
|
|
65
63
|
import "vue-router";
|
|
66
64
|
import "/@/components/Form/src/utils/Area";
|
|
67
65
|
import "/@/components/Preview/index";
|
|
68
66
|
import "./LinkTableListPiece.js";
|
|
67
|
+
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
68
|
+
import "./OnlineSelectCascade.js";
|
|
69
69
|
import "/@/components/Loading";
|
|
70
70
|
import "/@/utils/auth";
|
|
71
71
|
import "./JModalTip.js";
|
|
@@ -92,7 +92,6 @@ import "./AuthFieldTree.js";
|
|
|
92
92
|
import "./AuthButtonTree.js";
|
|
93
93
|
import "./AuthDataTree.js";
|
|
94
94
|
import "./clipboard.js";
|
|
95
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
96
95
|
const _sfc_main = defineComponent({
|
|
97
96
|
name: "CgformCopyList",
|
|
98
97
|
components: {
|
package/CgformModal.js
CHANGED
|
@@ -56,11 +56,19 @@ import { simpleDebounce } from "/@/utils/common/compUtils";
|
|
|
56
56
|
import { u as useOnlineTest } from "./useOnlineTest.js";
|
|
57
57
|
import { buildUUID } from "/@/utils/uuid";
|
|
58
58
|
import { sleep } from "/@/utils";
|
|
59
|
-
import { g as getRefPromise } from "./
|
|
59
|
+
import { g as getRefPromise } from "./useExtendComponent.js";
|
|
60
60
|
import { _ as _export_sfc } from "./index.js";
|
|
61
61
|
const list = (params) => defHttp.get({ url: "/online/cgform/head/list", params });
|
|
62
62
|
const doBatchRemove = (idList) => doRemove(idList, 0);
|
|
63
|
+
const doSingleRemove = (pid) => defHttp.delete(
|
|
64
|
+
{ url: "/online/cgform/head/removeRecord", params: { id: pid } },
|
|
65
|
+
{ joinParamsToUrl: true }
|
|
66
|
+
);
|
|
63
67
|
const doBatchDelete = (idList) => doRemove(idList, 1);
|
|
68
|
+
const doSingleDelete = (pid) => defHttp.delete(
|
|
69
|
+
{ url: "/online/cgform/head/delete", params: { id: pid } },
|
|
70
|
+
{ joinParamsToUrl: true }
|
|
71
|
+
);
|
|
64
72
|
function doRemove(idList, flag) {
|
|
65
73
|
return defHttp.delete(
|
|
66
74
|
{
|
|
@@ -769,4 +777,4 @@ var CgformModal$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
|
|
|
769
777
|
__proto__: null,
|
|
770
778
|
"default": CgformModal
|
|
771
779
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
772
|
-
export { CgformModal as C,
|
|
780
|
+
export { CgformModal as C, doSingleDelete as a, doSingleRemove as b, doBatchRemove as c, doCopyOnlineView as d, doBatchDelete as e, doDatabaseSync as f, doCopyTable as g, CgformModal$1 as h, list as l };
|
package/CheckDictTable.js
CHANGED
|
@@ -117,7 +117,7 @@ const _sfc_main = defineComponent({
|
|
|
117
117
|
});
|
|
118
118
|
const { createJPrompt } = useJPrompt();
|
|
119
119
|
function isCustomRegexp(value) {
|
|
120
|
-
return !validTypeValues.value.includes(value);
|
|
120
|
+
return value != null && !validTypeValues.value.includes(value);
|
|
121
121
|
}
|
|
122
122
|
function onAddCustomRegexp(props) {
|
|
123
123
|
createJPrompt({
|
|
@@ -198,6 +198,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
198
198
|
createVNode(_component_a_select, {
|
|
199
199
|
value: props.value,
|
|
200
200
|
options: _ctx.validTypeOptions,
|
|
201
|
+
placeholder: "\u7A7A",
|
|
201
202
|
style: { "width": "100%" },
|
|
202
203
|
onChange: props.triggerChange
|
|
203
204
|
}, {
|
|
@@ -237,5 +238,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
237
238
|
_: 1
|
|
238
239
|
}, 16, ["class", "maxHeight", "loading", "columns", "dataSource"]);
|
|
239
240
|
}
|
|
240
|
-
var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
241
|
+
var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-68f6d466"]]);
|
|
241
242
|
export { CheckDictTable as default };
|
package/CodeGeneratorModal.js
CHANGED
|
@@ -27,8 +27,8 @@ import { b as useCodeGeneratorFormSchemas } from "./useSchemas.js";
|
|
|
27
27
|
import { underLine2CamelCase } from "/@/utils/common/compUtils";
|
|
28
28
|
import CodeFileListModal from "./CodeFileListModal.js";
|
|
29
29
|
import FileSelectModal from "./FileSelectModal.js";
|
|
30
|
+
import { message } from "ant-design-vue";
|
|
30
31
|
import { _ as _export_sfc } from "./index.js";
|
|
31
|
-
import "ant-design-vue";
|
|
32
32
|
import "@ant-design/icons-vue";
|
|
33
33
|
import "/@/hooks/web/usePermission";
|
|
34
34
|
import "/@/utils/helper/validator";
|
|
@@ -195,6 +195,7 @@ const _sfc_main = defineComponent({
|
|
|
195
195
|
pathKey
|
|
196
196
|
});
|
|
197
197
|
} else {
|
|
198
|
+
message.error(res.message);
|
|
198
199
|
reject(res.message);
|
|
199
200
|
}
|
|
200
201
|
});
|
package/DBAttributeTable.js
CHANGED
|
@@ -422,6 +422,17 @@ const _sfc_main = defineComponent({
|
|
|
422
422
|
}
|
|
423
423
|
}
|
|
424
424
|
}
|
|
425
|
+
function handleDisabledDbFieldName(value, _row, rowIndex) {
|
|
426
|
+
if (value === "has_child") {
|
|
427
|
+
return true;
|
|
428
|
+
}
|
|
429
|
+
if (value === "id") {
|
|
430
|
+
if (rowIndex === 0) {
|
|
431
|
+
return true;
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
return false;
|
|
435
|
+
}
|
|
425
436
|
function tableAddLine(newLine) {
|
|
426
437
|
tableRef.value.pushRows(newLine);
|
|
427
438
|
if (!addBatching.value) {
|
|
@@ -480,6 +491,7 @@ const _sfc_main = defineComponent({
|
|
|
480
491
|
handleDragged,
|
|
481
492
|
handleInserted,
|
|
482
493
|
handleValueChange,
|
|
494
|
+
handleDisabledDbFieldName,
|
|
483
495
|
validateData,
|
|
484
496
|
getRemoveIds,
|
|
485
497
|
validateExistIndex
|
|
@@ -501,14 +513,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
501
513
|
dataSource: _ctx.dataSource,
|
|
502
514
|
toolbar: _ctx.actionButton,
|
|
503
515
|
maxHeight: _ctx.tableHeight.normal,
|
|
504
|
-
disabledRows: { dbFieldName:
|
|
516
|
+
disabledRows: { dbFieldName: _ctx.handleDisabledDbFieldName }
|
|
505
517
|
}, _ctx.tableProps, {
|
|
506
518
|
onAdded: _ctx.handleAdded,
|
|
507
519
|
onRemoved: _ctx.handleRemoved,
|
|
508
520
|
onDragged: _ctx.handleDragged,
|
|
509
521
|
onInserted: _ctx.handleInserted,
|
|
510
522
|
onValueChange: _ctx.handleValueChange
|
|
511
|
-
}), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
|
|
523
|
+
}), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "disabledRows", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
|
|
512
524
|
}
|
|
513
525
|
var DBAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
|
|
514
526
|
export { DBAttributeTable as default };
|
package/DetailForm.js
CHANGED
|
@@ -46,22 +46,18 @@ import { getFileAccessHttpUrl } from "/@/utils/common/compUtils";
|
|
|
46
46
|
import { createImgPreview } from "/@/components/Preview/index";
|
|
47
47
|
import { useMessage } from "/@/hooks/web/useMessage";
|
|
48
48
|
import { DownloadOutlined, EyeOutlined, PaperClipOutlined } from "@ant-design/icons-vue";
|
|
49
|
-
import { L as LinkTableCard } from "./
|
|
49
|
+
import { L as LinkTableCard } from "./useExtendComponent.js";
|
|
50
50
|
import { _ as _export_sfc } from "./index.js";
|
|
51
|
-
import "
|
|
51
|
+
import "/@/components/Form/src/componentMap";
|
|
52
|
+
import "/@/components/Modal";
|
|
53
|
+
import "/@/components/Form/index";
|
|
52
54
|
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
53
55
|
import "/@/views/system/user/user.api";
|
|
54
56
|
import "./_commonjsHelpers.js";
|
|
55
57
|
import "/@/store/modules/user";
|
|
56
58
|
import "/@/utils";
|
|
57
59
|
import "/@/utils/desform/customExpression";
|
|
58
|
-
import "/@/components/Form/src/componentMap";
|
|
59
|
-
import "./OnlineSelectCascade.js";
|
|
60
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
61
|
-
import "vue-router";
|
|
62
60
|
import "/@/store/modules/permission";
|
|
63
|
-
import "/@/components/Modal";
|
|
64
|
-
import "/@/components/Form/index";
|
|
65
61
|
import "./pick.js";
|
|
66
62
|
import "./_flatRest.js";
|
|
67
63
|
import "./isArray.js";
|
|
@@ -69,7 +65,10 @@ import "./toString.js";
|
|
|
69
65
|
import "./_arrayPush.js";
|
|
70
66
|
import "/@/components/Table";
|
|
71
67
|
import "/@/hooks/system/useListPage";
|
|
68
|
+
import "vue-router";
|
|
72
69
|
import "./LinkTableListPiece.js";
|
|
70
|
+
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
71
|
+
import "./OnlineSelectCascade.js";
|
|
73
72
|
import "/@/components/Loading";
|
|
74
73
|
import "/@/utils/auth";
|
|
75
74
|
import "./JModalTip.js";
|
package/EnhanceJsHistory.js
CHANGED
|
@@ -221,7 +221,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
221
221
|
_: 1
|
|
222
222
|
}, 8, ["onRegister", "confirmLoading", "onCancel"]);
|
|
223
223
|
}
|
|
224
|
-
var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-
|
|
224
|
+
var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3072773c"]]);
|
|
225
225
|
var EnhanceJsHistory$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
226
226
|
__proto__: null,
|
|
227
227
|
"default": EnhanceJsHistory
|
package/FieldExtendJsonModal.js
CHANGED
|
@@ -67,6 +67,7 @@ const _sfc_main = defineComponent({
|
|
|
67
67
|
extendConfig.text = "";
|
|
68
68
|
extendConfig.orderRule = "";
|
|
69
69
|
extendConfig.validateError = "";
|
|
70
|
+
extendConfig.labelLength = 4;
|
|
70
71
|
}
|
|
71
72
|
const extendConfig = reactive({
|
|
72
73
|
uploadnum: 0,
|
|
@@ -76,7 +77,8 @@ const _sfc_main = defineComponent({
|
|
|
76
77
|
text: "",
|
|
77
78
|
multiSelect: true,
|
|
78
79
|
orderRule: "",
|
|
79
|
-
validateError: ""
|
|
80
|
+
validateError: "",
|
|
81
|
+
labelLength: 4
|
|
80
82
|
});
|
|
81
83
|
const fieldShowType = ref("");
|
|
82
84
|
const rowKey = ref("");
|
|
@@ -170,6 +172,14 @@ const _sfc_main = defineComponent({
|
|
|
170
172
|
componentProps: {
|
|
171
173
|
placeholder: "\u8BF7\u8F93\u5165\u6821\u9A8C\u63D0\u793A\u6587\u672C"
|
|
172
174
|
}
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
label: "label\u957F\u5EA6",
|
|
178
|
+
field: "labelLength",
|
|
179
|
+
component: "InputNumber",
|
|
180
|
+
componentProps: {
|
|
181
|
+
placeholder: "\u8BF7\u8F93\u5165label\u957F\u5EA6"
|
|
182
|
+
}
|
|
173
183
|
}
|
|
174
184
|
];
|
|
175
185
|
const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
|
|
@@ -222,6 +232,9 @@ const _sfc_main = defineComponent({
|
|
|
222
232
|
if (data.validateError) {
|
|
223
233
|
obj.validateError = data.validateError;
|
|
224
234
|
}
|
|
235
|
+
if (data.labelLength) {
|
|
236
|
+
obj.labelLength = data.labelLength;
|
|
237
|
+
}
|
|
225
238
|
console.log("obj....", obj);
|
|
226
239
|
for (let key in obj) {
|
|
227
240
|
if (obj[key] === "") {
|
package/LICENSE
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
## 协议和授权
|
|
2
2
|
|
|
3
3
|
Jeecg Boot Online 低代码模块并非开源软件部分,作者保留全部的权利。
|
|
4
|
-
|
|
4
|
+
此部分不提供源码,仅提供功能,大家可以免费使用,采用LGPL开源协议(不二次改造、不拆分出jeecgboot之外使用,就不产生侵权)。
|
|
5
5
|
擅自编译、改造、传播,即属严重侵权行为,与盗窃无异。产生的一切任何后果责任由侵权者自负。
|
|
6
6
|
|
|
7
|
-
http://www.jeecg.com
|
|
7
|
+
http://www.jeecg.com
|
|
8
|
+
|
|
9
|
+
具体开源协议参考:https://github.com/jeecgboot/jeecg-boot/blob/master/LICENSE
|
package/OnlineAutoList.js
CHANGED
|
@@ -18,15 +18,15 @@ var __async = (__this, __arguments, generator) => {
|
|
|
18
18
|
step((generator = generator.apply(__this, __arguments)).next());
|
|
19
19
|
});
|
|
20
20
|
};
|
|
21
|
+
import { ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, createBlock, normalizeClass, withCtx, createTextVNode, createCommentVNode, Fragment, renderList, toDisplayString, withDirectives, vShow, createElementVNode, mergeProps, toHandlers, resolveDynamicComponent, normalizeProps, guardReactiveProps } from "vue";
|
|
21
22
|
import { BasicTable, TableAction } from "/@/components/Table";
|
|
22
23
|
import { useMessage } from "/@/hooks/web/useMessage";
|
|
23
24
|
import OnlineAutoModal from "./OnlineAutoModal.js";
|
|
24
25
|
import OnlineCustomModal from "./OnlineCustomModal.js";
|
|
25
26
|
import OnlineDetailModal from "./OnlineDetailModal.js";
|
|
26
|
-
import { watch, resolveComponent, openBlock, createElementBlock, createVNode, createBlock, normalizeClass, withCtx, createTextVNode, createCommentVNode, Fragment, renderList, toDisplayString, withDirectives, vShow, createElementVNode, mergeProps, toHandlers, resolveDynamicComponent, normalizeProps, guardReactiveProps } from "vue";
|
|
27
27
|
import JImportModal from "/@/components/Form/src/jeecg/components/JImportModal.vue";
|
|
28
28
|
import { u as useOnlineTableContext, a as useListButton } from "./useListButton.js";
|
|
29
|
-
import { a as OnlinePopModal,
|
|
29
|
+
import { a as OnlinePopModal, d as useEnhance, o as useTableColumns, g as getRefPromise } from "./useExtendComponent.js";
|
|
30
30
|
import OnlineQueryForm from "./OnlineQueryForm.js";
|
|
31
31
|
import OnlineSuperQuery from "./SuperQuery.js";
|
|
32
32
|
import { createContext } from "/@/hooks/core/useContext";
|
|
@@ -35,14 +35,15 @@ import { _ as _export_sfc } from "./index.js";
|
|
|
35
35
|
import "/@/components/Modal";
|
|
36
36
|
import "./OnlineForm.js";
|
|
37
37
|
import "/@/components/Form/index";
|
|
38
|
-
import "./FormSchemaFactory.js";
|
|
39
|
-
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
40
38
|
import "/@/utils/http/axios";
|
|
41
39
|
import "/@/utils";
|
|
42
40
|
import "/@/components/Loading";
|
|
43
41
|
import "/@/components/jeecg/JVxeTable/types";
|
|
44
42
|
import "/@/utils/auth";
|
|
45
43
|
import "@ant-design/icons-vue";
|
|
44
|
+
import "/@/utils/cache";
|
|
45
|
+
import "/@/utils/common/compUtils";
|
|
46
|
+
import "/@/store/modules/user";
|
|
46
47
|
import "./pick.js";
|
|
47
48
|
import "./_flatRest.js";
|
|
48
49
|
import "./isArray.js";
|
|
@@ -51,34 +52,32 @@ import "./_arrayPush.js";
|
|
|
51
52
|
import "./omit.js";
|
|
52
53
|
import "./_baseClone.js";
|
|
53
54
|
import "./_baseSlice.js";
|
|
55
|
+
import "/@/components/jeecg/comment/CommentPanel.vue";
|
|
56
|
+
import "./OnlineFormDetail.js";
|
|
57
|
+
import "./DetailForm.js";
|
|
58
|
+
import "/@/utils/propTypes";
|
|
59
|
+
import "/@/utils/dict";
|
|
60
|
+
import "/@/utils/dict/JDictSelectUtil";
|
|
61
|
+
import "/@/utils/dict/index";
|
|
62
|
+
import "/@/api/common/api";
|
|
63
|
+
import "/@/components/Form/src/utils/Area";
|
|
64
|
+
import "/@/components/Preview/index";
|
|
65
|
+
import "/@/components/Form/src/componentMap";
|
|
66
|
+
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
54
67
|
import "/@/views/system/user/user.api";
|
|
55
68
|
import "./_commonjsHelpers.js";
|
|
56
|
-
import "/@/store/modules/user";
|
|
57
69
|
import "/@/utils/desform/customExpression";
|
|
58
|
-
import "/@/components/Form/src/componentMap";
|
|
59
|
-
import "./OnlineSelectCascade.js";
|
|
60
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
61
|
-
import "vue-router";
|
|
62
70
|
import "/@/store/modules/permission";
|
|
63
|
-
import "/@/utils/propTypes";
|
|
64
|
-
import "/@/utils/dict/JDictSelectUtil";
|
|
65
|
-
import "/@/utils/common/compUtils";
|
|
66
71
|
import "/@/hooks/system/useListPage";
|
|
67
|
-
import "
|
|
68
|
-
import "/@/components/Preview/index";
|
|
72
|
+
import "vue-router";
|
|
69
73
|
import "./LinkTableListPiece.js";
|
|
74
|
+
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
75
|
+
import "./OnlineSelectCascade.js";
|
|
70
76
|
import "./JModalTip.js";
|
|
71
77
|
import "ant-design-vue";
|
|
72
78
|
import "@vueuse/core";
|
|
73
|
-
import "/@/components/jeecg/comment/CommentPanel.vue";
|
|
74
|
-
import "./OnlineFormDetail.js";
|
|
75
|
-
import "./DetailForm.js";
|
|
76
|
-
import "/@/utils/dict";
|
|
77
|
-
import "/@/utils/dict/index";
|
|
78
|
-
import "/@/api/common/api";
|
|
79
79
|
import "./OnlineSubFormDetail.js";
|
|
80
80
|
import "/@/router";
|
|
81
|
-
import "/@/utils/cache";
|
|
82
81
|
import "/@/hooks/core/onMountedOrActivated";
|
|
83
82
|
import "/@/hooks/system/useMethods";
|
|
84
83
|
import "./SuperQueryValComponent.vue_vue_type_script_lang.js";
|
|
@@ -165,6 +164,17 @@ const _sfc_main = {
|
|
|
165
164
|
registerDetailModal,
|
|
166
165
|
registerBpmModal
|
|
167
166
|
} = useListButton(onlineTableContext, onlineExtConfigJson);
|
|
167
|
+
const exportLoading = ref(false);
|
|
168
|
+
function onExportExcelOverride() {
|
|
169
|
+
return __async(this, null, function* () {
|
|
170
|
+
try {
|
|
171
|
+
exportLoading.value = true;
|
|
172
|
+
yield onExportExcel();
|
|
173
|
+
} finally {
|
|
174
|
+
setTimeout(() => exportLoading.value = false, 1500);
|
|
175
|
+
}
|
|
176
|
+
});
|
|
177
|
+
}
|
|
168
178
|
const {
|
|
169
179
|
columns,
|
|
170
180
|
actionColumn,
|
|
@@ -218,6 +228,7 @@ const _sfc_main = {
|
|
|
218
228
|
}
|
|
219
229
|
function onQueryFormLoaded(json) {
|
|
220
230
|
return __async(this, null, function* () {
|
|
231
|
+
console.log("onQueryFormLoaded", json);
|
|
221
232
|
yield getRefPromise(superQueryButtonRef);
|
|
222
233
|
superQueryButtonRef.value.init(json);
|
|
223
234
|
});
|
|
@@ -259,6 +270,8 @@ const _sfc_main = {
|
|
|
259
270
|
handleEdit,
|
|
260
271
|
onImportExcel,
|
|
261
272
|
onExportExcel,
|
|
273
|
+
exportLoading,
|
|
274
|
+
onExportExcelOverride,
|
|
262
275
|
cgTopButtonList,
|
|
263
276
|
cgLinkButtonList,
|
|
264
277
|
cgButtonJsHandler,
|
|
@@ -370,13 +383,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
370
383
|
key: 2,
|
|
371
384
|
preIcon: "ant-design:export-outlined",
|
|
372
385
|
type: "primary",
|
|
373
|
-
|
|
386
|
+
loading: _ctx.exportLoading,
|
|
387
|
+
onClick: _ctx.onExportExcelOverride
|
|
374
388
|
}, {
|
|
375
389
|
default: withCtx(() => [
|
|
376
390
|
createTextVNode(" \u5BFC\u51FA")
|
|
377
391
|
]),
|
|
378
392
|
_: 1
|
|
379
|
-
}, 8, ["onClick"])) : createCommentVNode("", true),
|
|
393
|
+
}, 8, ["loading", "onClick"])) : createCommentVNode("", true),
|
|
380
394
|
_ctx.cgTopButtonList && _ctx.cgTopButtonList.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 3 }, renderList(_ctx.cgTopButtonList, (item, index) => {
|
|
381
395
|
return openBlock(), createElementBlock(Fragment, null, [
|
|
382
396
|
item.optType == "js" ? (openBlock(), createBlock(_component_a_button, {
|
package/OnlineAutoModal.js
CHANGED
|
@@ -20,14 +20,12 @@ var __async = (__this, __arguments, generator) => {
|
|
|
20
20
|
};
|
|
21
21
|
import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createCommentVNode, createVNode } from "vue";
|
|
22
22
|
import { BasicModal } from "/@/components/Modal";
|
|
23
|
-
import OnlineForm from "./OnlineForm.js";
|
|
24
|
-
import {
|
|
23
|
+
import { O as OnlineForm } from "./OnlineForm.js";
|
|
24
|
+
import { p as useAutoModal } from "./useExtendComponent.js";
|
|
25
25
|
import CommentPanel from "/@/components/jeecg/comment/CommentPanel.vue";
|
|
26
26
|
import { _ as _export_sfc } from "./index.js";
|
|
27
27
|
import "/@/hooks/web/useMessage";
|
|
28
28
|
import "/@/components/Form/index";
|
|
29
|
-
import "./FormSchemaFactory.js";
|
|
30
|
-
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
31
29
|
import "/@/utils/http/axios";
|
|
32
30
|
import "/@/utils";
|
|
33
31
|
import "/@/components/Loading";
|
|
@@ -36,6 +34,9 @@ import "/@/utils/auth";
|
|
|
36
34
|
import "@ant-design/icons-vue";
|
|
37
35
|
import "/@/hooks/core/useContext";
|
|
38
36
|
import "/@/utils/mitt";
|
|
37
|
+
import "/@/utils/cache";
|
|
38
|
+
import "/@/utils/common/compUtils";
|
|
39
|
+
import "/@/store/modules/user";
|
|
39
40
|
import "./pick.js";
|
|
40
41
|
import "./_flatRest.js";
|
|
41
42
|
import "./isArray.js";
|
|
@@ -44,23 +45,22 @@ import "./_arrayPush.js";
|
|
|
44
45
|
import "./omit.js";
|
|
45
46
|
import "./_baseClone.js";
|
|
46
47
|
import "./_baseSlice.js";
|
|
48
|
+
import "/@/components/Form/src/componentMap";
|
|
49
|
+
import "/@/utils/propTypes";
|
|
50
|
+
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
47
51
|
import "/@/views/system/user/user.api";
|
|
48
52
|
import "./_commonjsHelpers.js";
|
|
49
|
-
import "/@/store/modules/user";
|
|
50
53
|
import "/@/utils/desform/customExpression";
|
|
51
|
-
import "/@/components/Form/src/componentMap";
|
|
52
|
-
import "./OnlineSelectCascade.js";
|
|
53
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
54
|
-
import "vue-router";
|
|
55
54
|
import "/@/store/modules/permission";
|
|
56
|
-
import "/@/utils/propTypes";
|
|
57
55
|
import "/@/utils/dict/JDictSelectUtil";
|
|
58
|
-
import "/@/utils/common/compUtils";
|
|
59
56
|
import "/@/components/Table";
|
|
60
57
|
import "/@/hooks/system/useListPage";
|
|
58
|
+
import "vue-router";
|
|
61
59
|
import "/@/components/Form/src/utils/Area";
|
|
62
60
|
import "/@/components/Preview/index";
|
|
63
61
|
import "./LinkTableListPiece.js";
|
|
62
|
+
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
63
|
+
import "./OnlineSelectCascade.js";
|
|
64
64
|
import "./JModalTip.js";
|
|
65
65
|
import "ant-design-vue";
|
|
66
66
|
import "@vueuse/core";
|
package/OnlineAutoTreeList.js
CHANGED
|
@@ -26,7 +26,7 @@ import OnlineCustomModal from "./OnlineCustomModal.js";
|
|
|
26
26
|
import { ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, createBlock, normalizeClass, withCtx, createTextVNode, createCommentVNode, Fragment, renderList, toDisplayString, withDirectives, vShow, createElementVNode, mergeProps, toHandlers, resolveDynamicComponent, normalizeProps, guardReactiveProps } from "vue";
|
|
27
27
|
import JImportModal from "/@/components/Form/src/jeecg/components/JImportModal.vue";
|
|
28
28
|
import { u as useOnlineTableContext, a as useListButton } from "./useListButton.js";
|
|
29
|
-
import {
|
|
29
|
+
import { d as useEnhance, o as useTableColumns, g as getRefPromise } from "./useExtendComponent.js";
|
|
30
30
|
import { defHttp } from "/@/utils/http/axios";
|
|
31
31
|
import OnlineQueryForm from "./OnlineQueryForm.js";
|
|
32
32
|
import OnlineSuperQuery from "./SuperQuery.js";
|
|
@@ -34,8 +34,6 @@ import { _ as _export_sfc } from "./index.js";
|
|
|
34
34
|
import "/@/components/Modal";
|
|
35
35
|
import "./OnlineForm.js";
|
|
36
36
|
import "/@/components/Form/index";
|
|
37
|
-
import "./FormSchemaFactory.js";
|
|
38
|
-
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
39
37
|
import "/@/utils";
|
|
40
38
|
import "/@/components/Loading";
|
|
41
39
|
import "/@/components/jeecg/JVxeTable/types";
|
|
@@ -43,6 +41,9 @@ import "/@/utils/auth";
|
|
|
43
41
|
import "@ant-design/icons-vue";
|
|
44
42
|
import "/@/hooks/core/useContext";
|
|
45
43
|
import "/@/utils/mitt";
|
|
44
|
+
import "/@/utils/cache";
|
|
45
|
+
import "/@/utils/common/compUtils";
|
|
46
|
+
import "/@/store/modules/user";
|
|
46
47
|
import "./pick.js";
|
|
47
48
|
import "./_flatRest.js";
|
|
48
49
|
import "./isArray.js";
|
|
@@ -51,26 +52,25 @@ import "./_arrayPush.js";
|
|
|
51
52
|
import "./omit.js";
|
|
52
53
|
import "./_baseClone.js";
|
|
53
54
|
import "./_baseSlice.js";
|
|
55
|
+
import "/@/components/jeecg/comment/CommentPanel.vue";
|
|
56
|
+
import "/@/components/Form/src/componentMap";
|
|
57
|
+
import "/@/utils/propTypes";
|
|
58
|
+
import "/@/components/Form/src/jeecg/components/JUpload";
|
|
54
59
|
import "/@/views/system/user/user.api";
|
|
55
60
|
import "./_commonjsHelpers.js";
|
|
56
|
-
import "/@/store/modules/user";
|
|
57
61
|
import "/@/utils/desform/customExpression";
|
|
58
|
-
import "/@/components/Form/src/componentMap";
|
|
59
|
-
import "./OnlineSelectCascade.js";
|
|
60
|
-
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
61
|
-
import "vue-router";
|
|
62
62
|
import "/@/store/modules/permission";
|
|
63
|
-
import "/@/utils/propTypes";
|
|
64
63
|
import "/@/utils/dict/JDictSelectUtil";
|
|
65
|
-
import "/@/utils/common/compUtils";
|
|
66
64
|
import "/@/hooks/system/useListPage";
|
|
65
|
+
import "vue-router";
|
|
67
66
|
import "/@/components/Form/src/utils/Area";
|
|
68
67
|
import "/@/components/Preview/index";
|
|
69
68
|
import "./LinkTableListPiece.js";
|
|
69
|
+
import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
|
|
70
|
+
import "./OnlineSelectCascade.js";
|
|
70
71
|
import "./JModalTip.js";
|
|
71
72
|
import "ant-design-vue";
|
|
72
73
|
import "@vueuse/core";
|
|
73
|
-
import "/@/components/jeecg/comment/CommentPanel.vue";
|
|
74
74
|
import "./OnlineFormDetail.js";
|
|
75
75
|
import "./DetailForm.js";
|
|
76
76
|
import "/@/utils/dict";
|
|
@@ -78,7 +78,6 @@ import "/@/utils/dict/index";
|
|
|
78
78
|
import "/@/api/common/api";
|
|
79
79
|
import "./OnlineSubFormDetail.js";
|
|
80
80
|
import "/@/router";
|
|
81
|
-
import "/@/utils/cache";
|
|
82
81
|
import "/@/hooks/core/onMountedOrActivated";
|
|
83
82
|
import "/@/hooks/system/useMethods";
|
|
84
83
|
import "./SuperQueryValComponent.vue_vue_type_script_lang.js";
|