resolver-egretimp-plus 0.0.160 → 0.0.162
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
|
@@ -135,7 +135,12 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
|
|
|
135
135
|
!isUndefined(dynamicMapComp[configCode]?.refValue) &&
|
|
136
136
|
!isNull(dynamicMapComp[configCode]?.refValue)
|
|
137
137
|
) {
|
|
138
|
-
|
|
138
|
+
let destParamArr
|
|
139
|
+
if (destParam?.indexOf('->') !== -1) {
|
|
140
|
+
destParamArr = destParam?.split('->') || []
|
|
141
|
+
} else {
|
|
142
|
+
destParamArr = destParam?.split('.') || []
|
|
143
|
+
}
|
|
139
144
|
assignmentPathVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
|
|
140
145
|
}
|
|
141
146
|
return ret
|
|
@@ -225,13 +230,13 @@ export function openDailg({
|
|
|
225
230
|
const isList = pagePopupMap?.objOrList == '1'
|
|
226
231
|
if (isList ) {
|
|
227
232
|
const primaryKeys = []
|
|
228
|
-
mapList =
|
|
233
|
+
mapList = outParamMappingList?.reduce((ret, item) => {
|
|
229
234
|
const { orignParam, destParam, primaryKeyFlag = '' } = item
|
|
230
235
|
const destParamArr = destParam ? destParam.split('->') : []
|
|
231
236
|
const transDestParam = destParam ? destParamArr[destParamArr.length - 1] : ''
|
|
232
237
|
ret[transDestParam] = orignParam
|
|
233
238
|
if (primaryKeyFlag == '1') {
|
|
234
|
-
primaryKeys.push(
|
|
239
|
+
primaryKeys.push(orignParam)
|
|
235
240
|
}
|
|
236
241
|
return ret
|
|
237
242
|
}, {})
|
|
@@ -386,7 +391,7 @@ export function openDailg({
|
|
|
386
391
|
const paramsAfterOpenDialog = afterOpenDialog
|
|
387
392
|
if (configAfterOpenDialog || paramsAfterOpenDialog) {
|
|
388
393
|
afterOpenDialog = async (...arg) => {
|
|
389
|
-
|
|
394
|
+
paramsAfterOpenDialog?.(...arg)
|
|
390
395
|
configAfterOpenDialog?.(...arg)
|
|
391
396
|
}
|
|
392
397
|
}
|
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') {
|