resolver-egretimp-plus 0.1.45 → 0.1.46
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/dist/h5/index.js +1 -1
- package/dist/web/index.js +1 -1
- package/package.json +1 -1
- package/src/rules/rulesDriver.js +3 -3
package/package.json
CHANGED
package/src/rules/rulesDriver.js
CHANGED
|
@@ -13,7 +13,7 @@ export default function(rules, isInit) {
|
|
|
13
13
|
rules.forEach(rule => {
|
|
14
14
|
if (!rule) return
|
|
15
15
|
const { pmRuleTargetEventVoList, pmRuleTargetEventVOList, relId, tabpanelCode } = rule
|
|
16
|
-
const relIdKey = `${relId}
|
|
16
|
+
const relIdKey = `${relId}__${columnId || ''}${id || ''}__${dynamicHireRelat}`
|
|
17
17
|
if (parseCondition.call(this, rule)) {
|
|
18
18
|
setTimeout(() => {
|
|
19
19
|
recoverCb[relIdKey] && recoverCb[relIdKey].forEach(recover => {
|
|
@@ -35,7 +35,7 @@ export default function(rules, isInit) {
|
|
|
35
35
|
} else {
|
|
36
36
|
const recoverCbKeys = Object.keys(recoverCb)
|
|
37
37
|
const filterKeys = recoverCbKeys.filter(recoverKey => {
|
|
38
|
-
const [recRelId, recDynamicHireRelat] = recoverKey.split('__')
|
|
38
|
+
const [recRelId, _, recDynamicHireRelat] = recoverKey.split('__')
|
|
39
39
|
if (recRelId == relId) {
|
|
40
40
|
if (recDynamicHireRelat === dynamicHireRelat) {
|
|
41
41
|
return true
|
|
@@ -46,7 +46,7 @@ export default function(rules, isInit) {
|
|
|
46
46
|
const relat = relats[index]
|
|
47
47
|
const recRelat = recRelats[index]
|
|
48
48
|
if (!recRelat || relat.code !== recRelat.code) {
|
|
49
|
-
return
|
|
49
|
+
return false
|
|
50
50
|
} else {
|
|
51
51
|
if (relat.idx !== recRelat.idx) {
|
|
52
52
|
return false
|