resolver-egretimp-plus 0.0.186 → 0.0.188
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 +2 -2
- package/package.json +1 -1
- package/src/analysisComponent.jsx +4 -4
- package/src/components/packages-web/CustomComponentCycle.vue +2 -2
- package/src/components/packages-web/CustomComponentCycleTabPane.vue +2 -2
- package/src/components/packages-web/CustomComponentTable.jsx +2 -2
- package/src/hooks/index.js +2 -2
- package/src/rules/eventsSupplement.js +3 -3
- package/src/utils/common.js +1 -0
package/package.json
CHANGED
|
@@ -83,7 +83,7 @@ export default {
|
|
|
83
83
|
definePrivatelyProp(props.config, 'vm', e)
|
|
84
84
|
}
|
|
85
85
|
const onVnodeMounted = (e) => {
|
|
86
|
-
props.config
|
|
86
|
+
definePrivatelyProp(props.config, 'vmIsBind', true)
|
|
87
87
|
definePrivatelyProp(props.config, 'router', router)
|
|
88
88
|
definePrivatelyProp(props.config, 'route', route)
|
|
89
89
|
|
|
@@ -200,9 +200,9 @@ export default {
|
|
|
200
200
|
const configLinks = [parent, ...props.additionConfigs, props.config]
|
|
201
201
|
configLinks.reduce((parent, config) => {
|
|
202
202
|
definePrivatelyProp(config, 'parent', parent)
|
|
203
|
-
|
|
204
|
-
config.
|
|
205
|
-
|
|
203
|
+
definePrivatelyProp(config, 'dynamicMapComp', dynamicMapComp)
|
|
204
|
+
const dynamicHireRelat = parent?.dynamicHireRelat ? `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
|
|
205
|
+
definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
|
|
206
206
|
config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
|
|
207
207
|
return config
|
|
208
208
|
})
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
</template>
|
|
12
12
|
<script setup>
|
|
13
13
|
import { computed, defineModel, watch, reactive } from 'vue'
|
|
14
|
-
import { commonPropsType, cloneDeep } from '../../utils/index.js'
|
|
14
|
+
import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/index.js'
|
|
15
15
|
import { ElRow, ElCard } from 'element-plus'
|
|
16
16
|
import Renderer from '../../renderer.jsx'
|
|
17
17
|
|
|
@@ -71,7 +71,7 @@ watch(() => {
|
|
|
71
71
|
}
|
|
72
72
|
})
|
|
73
73
|
}
|
|
74
|
-
props.config
|
|
74
|
+
definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
|
|
75
75
|
}, {
|
|
76
76
|
immediate: true
|
|
77
77
|
})
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
import { ElTabPane, ElRow } from 'element-plus'
|
|
13
13
|
import Renderer from '../../renderer.jsx'
|
|
14
14
|
import { computed, inject, reactive, watch, defineModel, defineProps } from 'vue'
|
|
15
|
-
import { commonPropsType, cloneDeep } from '../../utils/index.js'
|
|
15
|
+
import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/index.js'
|
|
16
16
|
import { TabPane } from '../tabs'
|
|
17
17
|
|
|
18
18
|
const props = defineProps({
|
|
@@ -78,7 +78,7 @@ watch(() => {
|
|
|
78
78
|
}
|
|
79
79
|
})
|
|
80
80
|
}
|
|
81
|
-
props.config
|
|
81
|
+
definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
|
|
82
82
|
}, {
|
|
83
83
|
immediate: true
|
|
84
84
|
})
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { ElTable, ElTableColumn, ElPagination } from 'element-plus'
|
|
3
3
|
import Renderer from '../../renderer.jsx'
|
|
4
4
|
import { computed, inject, watch, h, ref, reactive } from 'vue'
|
|
5
|
-
import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN } from '../../utils/index.js'
|
|
5
|
+
import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp } from '../../utils/index.js'
|
|
6
6
|
import '../styles/CustomComponenTable.scss'
|
|
7
7
|
|
|
8
8
|
export default {
|
|
@@ -277,7 +277,7 @@ export default {
|
|
|
277
277
|
}
|
|
278
278
|
})
|
|
279
279
|
}
|
|
280
|
-
props.config
|
|
280
|
+
definePrivatelyProp(props.config, 'multiPmPageMetaList', list)
|
|
281
281
|
}, {
|
|
282
282
|
immediate: true,
|
|
283
283
|
deep: true,
|
package/src/hooks/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { computed, inject, nextTick, reactive } from "vue"
|
|
2
2
|
import rulesDriver from '../rules/rulesDriver'
|
|
3
3
|
import defaultVal from '../utils/defaultVal.js'
|
|
4
|
-
import {isNonRefType, modelValueDeepMerge } from "../utils"
|
|
4
|
+
import {definePrivatelyProp, isNonRefType, modelValueDeepMerge } from "../utils"
|
|
5
5
|
|
|
6
6
|
export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
|
|
7
7
|
const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
|
|
@@ -50,7 +50,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
|
|
|
50
50
|
_mapComp,
|
|
51
51
|
messageInstance
|
|
52
52
|
}, currentRules, true)
|
|
53
|
-
config
|
|
53
|
+
definePrivatelyProp(config, 'eventInit', true)
|
|
54
54
|
}, 0)
|
|
55
55
|
}
|
|
56
56
|
}
|
|
@@ -59,7 +59,7 @@ const allInitEvents = {
|
|
|
59
59
|
try {
|
|
60
60
|
val = JSON.parse(targetObjVal)
|
|
61
61
|
} catch (err) {
|
|
62
|
-
val = targetObjVal
|
|
62
|
+
val = targetObjVal || ''
|
|
63
63
|
}
|
|
64
64
|
if (typeof val === 'number') {
|
|
65
65
|
val = `${val}`
|
|
@@ -75,9 +75,9 @@ const allInitEvents = {
|
|
|
75
75
|
const targetConfig = dynamicMapComp?.[matchs[1]]
|
|
76
76
|
val = targetConfig?.bindValue || ''
|
|
77
77
|
} else {
|
|
78
|
-
const _assginKey = /^_assgin:(
|
|
78
|
+
const _assginKey = /^_assgin:(.*)$/
|
|
79
79
|
const matchs = val.match(_assginKey)
|
|
80
|
-
if (matchs
|
|
80
|
+
if (matchs) {
|
|
81
81
|
val = matchs?.[1]
|
|
82
82
|
} else {
|
|
83
83
|
const curVal = getConfigValue.call(this, targetObj, true)
|
package/src/utils/common.js
CHANGED