super-pages 0.0.21-up → 0.0.23-up
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/lib/super-pages.js +1931 -1925
- package/lib/super-pages.umd.cjs +5 -5
- package/package.json +2 -2
- package/packages/super-page/src/common-form-page.vue +3 -2
- package/packages/super-page/src/list-toolbar-dynamic-source.vue +95 -89
- package/packages/super-page/src/list-toolbar-page.vue +379 -377
- package/packages/super-page/src/my-button-base.vue +3 -2
- package/packages/super-page/src/util/ListButtonEvent.js +6 -6
- package/packages/super-page/src/util/formButtonEvent.js +3 -3
- package/packages/super-page/src/util/util.js +6 -6
- package/packages/super-page/src/util/workflowButtonEvent.js +2 -2
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
@click="clickMyButton(button)"
|
|
47
47
|
>
|
|
48
48
|
<template v-if="faIcon" #icon>
|
|
49
|
-
<i :class="icon"></i>
|
|
49
|
+
<i :class="icon"></i>
|
|
50
50
|
</template>
|
|
51
51
|
{{ getButtonLabel(button) }}</el-button>
|
|
52
52
|
</span>
|
|
@@ -163,7 +163,8 @@ export default {
|
|
|
163
163
|
let permission = 'true'
|
|
164
164
|
if (
|
|
165
165
|
this.button.isPermission === undefined ||
|
|
166
|
-
this.button.isPermission === 'true'
|
|
166
|
+
this.button.isPermission === 'true' ||
|
|
167
|
+
this.button.isPermission
|
|
167
168
|
) {
|
|
168
169
|
// 表示按钮受权限保护
|
|
169
170
|
permission = this.permissionPrefix + '.' + this.button.code
|
|
@@ -62,7 +62,7 @@ const buttonEvents = {
|
|
|
62
62
|
if (this.additionalParamMap) {
|
|
63
63
|
param.additionalParamMap = this.additionalParamMap
|
|
64
64
|
}
|
|
65
|
-
if (button.jumpPage) {
|
|
65
|
+
if (button.jumpPage && button.jumpPage.jumpPageUrl) {
|
|
66
66
|
let entity
|
|
67
67
|
let dataId
|
|
68
68
|
if (ids && ids.length > 0) {
|
|
@@ -416,7 +416,7 @@ const buttonEvents = {
|
|
|
416
416
|
path = baseUrl + '/dsc/commons/' + tableName
|
|
417
417
|
}
|
|
418
418
|
path = this.getRealRestApiPath(path, system)
|
|
419
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
419
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
420
420
|
const param = {
|
|
421
421
|
ids: ids,
|
|
422
422
|
functionCode: button.functionCode,
|
|
@@ -553,7 +553,7 @@ const buttonEvents = {
|
|
|
553
553
|
param += '&tableName=' + tableName
|
|
554
554
|
}
|
|
555
555
|
if (button) {
|
|
556
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
556
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
557
557
|
param += '&isPermission=' + isPermission
|
|
558
558
|
}
|
|
559
559
|
const baseUrl = this.getBaseUrl(system)
|
|
@@ -651,8 +651,8 @@ const buttonEvents = {
|
|
|
651
651
|
JSON.stringify(this.additionalParamMap)
|
|
652
652
|
)
|
|
653
653
|
}
|
|
654
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
655
|
-
param.append('isPermission', isPermission)
|
|
654
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
655
|
+
param.append('isPermission', isPermission + '')
|
|
656
656
|
|
|
657
657
|
let path = restfulApiPath
|
|
658
658
|
if (system.standard === false && !path) {
|
|
@@ -781,7 +781,7 @@ const buttonEvents = {
|
|
|
781
781
|
}
|
|
782
782
|
)
|
|
783
783
|
.then(() => {
|
|
784
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
784
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
785
785
|
const param = {
|
|
786
786
|
ids: ids,
|
|
787
787
|
formNoRuleCode,
|
|
@@ -58,7 +58,7 @@ const buttonEvents = {
|
|
|
58
58
|
if (needDeleteFileUuidS) {
|
|
59
59
|
param.needDeleteFileUuid = needDeleteFileUuidS
|
|
60
60
|
}
|
|
61
|
-
if (button.jumpPage) {
|
|
61
|
+
if (button.jumpPage && button.jumpPage.jumpPageUrl) {
|
|
62
62
|
let dataId
|
|
63
63
|
if (formData) {
|
|
64
64
|
dataId = formData.id || formData.ID
|
|
@@ -323,7 +323,7 @@ const buttonEvents = {
|
|
|
323
323
|
}
|
|
324
324
|
)
|
|
325
325
|
.then(() => {
|
|
326
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
326
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
327
327
|
const param = {
|
|
328
328
|
entity: formData,
|
|
329
329
|
tableName: tableName,
|
|
@@ -507,7 +507,7 @@ const buttonEvents = {
|
|
|
507
507
|
param += '&tableName=' + tableName
|
|
508
508
|
}
|
|
509
509
|
if (button) {
|
|
510
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
510
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
511
511
|
param += '&isPermission=' + isPermission
|
|
512
512
|
}
|
|
513
513
|
// filePath格式如:用户定义的文件名~~服务器上磁盘中存储的文件路径及文件名。例如:user-info.xls~~iMatrix/b03dr45f5h4g.xls
|
|
@@ -183,7 +183,7 @@ const Util = {
|
|
|
183
183
|
// if (additionalParamMap) {
|
|
184
184
|
// pageSettingEntity.additionalParamMap = additionalParamMap
|
|
185
185
|
// }
|
|
186
|
-
// const path =
|
|
186
|
+
// const path = window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/can-executes'
|
|
187
187
|
// this.$http.post(path, pageSettingEntity).then((result) => {
|
|
188
188
|
// if(result){
|
|
189
189
|
// const canExecute = result.canExecute
|
|
@@ -454,7 +454,7 @@ const Util = {
|
|
|
454
454
|
isPermission
|
|
455
455
|
) {
|
|
456
456
|
// 自定义系统时,封装CommonEntity
|
|
457
|
-
isPermission = isPermission === undefined || isPermission === 'true'
|
|
457
|
+
isPermission = isPermission === undefined || isPermission === 'true' || isPermission
|
|
458
458
|
const param = {
|
|
459
459
|
entity: formData,
|
|
460
460
|
formViewCode: formViewCode,
|
|
@@ -576,7 +576,7 @@ const Util = {
|
|
|
576
576
|
if (this.$refs.superForm) {
|
|
577
577
|
// 通过getViewModels获得处理了下拉框、复选框的值之后的表单数据,用于导出报告使用
|
|
578
578
|
this.$refs.superForm.getViewModels().then(async (viewModels) => {
|
|
579
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
579
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
580
580
|
const param = {
|
|
581
581
|
entity: viewModels,
|
|
582
582
|
fileName: templateUUID, // uuid
|
|
@@ -624,7 +624,7 @@ const Util = {
|
|
|
624
624
|
if (result) {
|
|
625
625
|
if (button.code === 'exportPDF') {
|
|
626
626
|
this.exportFormPdf(fileName, myJsContent, system, param)
|
|
627
|
-
} else {
|
|
627
|
+
} else {
|
|
628
628
|
this.exportFormReportSuccess(
|
|
629
629
|
templateUUID,
|
|
630
630
|
fileName,
|
|
@@ -640,7 +640,7 @@ const Util = {
|
|
|
640
640
|
tableName,
|
|
641
641
|
param
|
|
642
642
|
)
|
|
643
|
-
}
|
|
643
|
+
}
|
|
644
644
|
|
|
645
645
|
}
|
|
646
646
|
})
|
|
@@ -781,7 +781,7 @@ const Util = {
|
|
|
781
781
|
return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase()) // 执行代码
|
|
782
782
|
},
|
|
783
783
|
getBaseUrl(system) {
|
|
784
|
-
//
|
|
784
|
+
// window.$vueApp.config.globalProperties.baseURL 应该是自定义扩展系统的后台访问路径
|
|
785
785
|
let baseUrl = window.$vueApp.config.globalProperties.baseURL
|
|
786
786
|
if (system) {
|
|
787
787
|
baseUrl = getSystemBackendUrl(system.backendUrl)
|
|
@@ -53,7 +53,7 @@ const buttonEvents = {
|
|
|
53
53
|
if (needDeleteFileUuid) {
|
|
54
54
|
param.needDeleteFileUuid = needDeleteFileUuid
|
|
55
55
|
}
|
|
56
|
-
if (button.jumpPage) {
|
|
56
|
+
if (button.jumpPage && button.jumpPage.jumpPageUrl) {
|
|
57
57
|
let dataId
|
|
58
58
|
if (model) {
|
|
59
59
|
dataId = model.id || model.ID
|
|
@@ -1739,7 +1739,7 @@ const buttonEvents = {
|
|
|
1739
1739
|
encodeURI(templateShowPath)
|
|
1740
1740
|
}
|
|
1741
1741
|
if (button) {
|
|
1742
|
-
const isPermission = button.isPermission === undefined || button.isPermission === 'true'
|
|
1742
|
+
const isPermission = button.isPermission === undefined || button.isPermission === 'true' || button.isPermission
|
|
1743
1743
|
param += '&isPermission=' + isPermission
|
|
1744
1744
|
}
|
|
1745
1745
|
const baseUrl = this.getBaseUrl(system)
|