resolver-egretimp-plus 0.0.159 → 0.0.161
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/package.json
CHANGED
|
@@ -225,13 +225,13 @@ export function openDailg({
|
|
|
225
225
|
const isList = pagePopupMap?.objOrList == '1'
|
|
226
226
|
if (isList ) {
|
|
227
227
|
const primaryKeys = []
|
|
228
|
-
mapList =
|
|
228
|
+
mapList = outParamMappingList?.reduce((ret, item) => {
|
|
229
229
|
const { orignParam, destParam, primaryKeyFlag = '' } = item
|
|
230
230
|
const destParamArr = destParam ? destParam.split('->') : []
|
|
231
231
|
const transDestParam = destParam ? destParamArr[destParamArr.length - 1] : ''
|
|
232
232
|
ret[transDestParam] = orignParam
|
|
233
233
|
if (primaryKeyFlag == '1') {
|
|
234
|
-
primaryKeys.push(
|
|
234
|
+
primaryKeys.push(orignParam)
|
|
235
235
|
}
|
|
236
236
|
return ret
|
|
237
237
|
}, {})
|
|
@@ -386,7 +386,7 @@ export function openDailg({
|
|
|
386
386
|
const paramsAfterOpenDialog = afterOpenDialog
|
|
387
387
|
if (configAfterOpenDialog || paramsAfterOpenDialog) {
|
|
388
388
|
afterOpenDialog = async (...arg) => {
|
|
389
|
-
|
|
389
|
+
paramsAfterOpenDialog?.(...arg)
|
|
390
390
|
configAfterOpenDialog?.(...arg)
|
|
391
391
|
}
|
|
392
392
|
}
|
|
@@ -92,6 +92,17 @@ export default {
|
|
|
92
92
|
if (isPagePopup.value && isOnlyIconClickFlag.value) {
|
|
93
93
|
delete ret.onClick
|
|
94
94
|
}
|
|
95
|
+
if (ret.onWrapClick) {
|
|
96
|
+
if (ret.onClick) {
|
|
97
|
+
const originClick = ret.onClick
|
|
98
|
+
ret.onClick = function(...arg) {
|
|
99
|
+
originClick(...arg)
|
|
100
|
+
ret.onWrapClick(...arg)
|
|
101
|
+
}
|
|
102
|
+
} else {
|
|
103
|
+
ret.onClick = ret.onWrapClick
|
|
104
|
+
}
|
|
105
|
+
}
|
|
95
106
|
return ret
|
|
96
107
|
})
|
|
97
108
|
|
package/src/utils/defaultVal.js
CHANGED
|
@@ -6,7 +6,7 @@ export default function defaultVal(config) {
|
|
|
6
6
|
const configDefaultVal = config.defaultVal || config.defaultValue
|
|
7
7
|
let defaultVal = null
|
|
8
8
|
try {
|
|
9
|
-
if (/^{\w*}$/.test(configDefaultVal) || /^\[\w*\]$/.test(configDefaultVal)) {
|
|
9
|
+
if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
|
|
10
10
|
defaultVal = JSON.parse(configDefaultVal)
|
|
11
11
|
} else {
|
|
12
12
|
if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate') {
|