resolver-egretimp-plus 0.0.191 → 0.0.193

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.191",
+  "version": "0.0.193",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/analysisComponent.jsx

@@ -74,6 +74,8 @@ export default {
     const selects = inject('selects')
 
     definePrivatelyProp(props.config, '_rootValue', rootValue)
+    definePrivatelyProp(props.config, 'router', router)
+    definePrivatelyProp(props.config, 'route', route)
     // 当前组件的实例
     const instance = getCurrentInstance()
     const appContext = instance?.appContext
@@ -84,8 +86,7 @@ export default {
     }
     const onVnodeMounted = (e) => {
       definePrivatelyProp(props.config, 'vmIsBind', true)
-      definePrivatelyProp(props.config, 'router', router)
-      definePrivatelyProp(props.config, 'route', route)
+      
 
       if (props.config.onVnodeMounted && typeof props.config.onVnodeMounted === 'function') {
         const context = {

package/src/components/helper/resolver.js

@@ -11,6 +11,10 @@ export async function executeLoadServices(services = [], { requestTraceId, busin
   delete noramlReqData.notLoad
   const loadServices = services.filter(ser => ser.eventType == '1')
   const mixinServiceConfig = services.find(service => service.serviceType === '1')
+  if (!loadServices || !loadServices.length) {
+    notLoadCb && notLoadCb()
+    return
+  }
   for (let i = 0; i < loadServices.length; i++) {
     const service = loadServices[i]
     const url = service.serviceCode

package/src/components/packages-H5/CmiButton.vue

@@ -59,6 +59,7 @@ const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
 const parentRootValue = inject('_parentRootValue', {})
+const rootInstance = inject('_rootInstance', {})
 
 const routeQuery= route?.query
 
@@ -82,7 +83,8 @@ const buttonAction = (...arg) => {
       routeQuery,
       validate,
       lastClick,
-      parentRootValue
+      parentRootValue,
+      rootInstance
     }, appContext)
   }
   if (actionFnRet !== null && actionFnRet !== undefined) {

package/src/components/packages-web/ElButton.vue

@@ -78,6 +78,7 @@ const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
 const parentRootValue = inject('_parentRootValue', {})
+const rootInstance = inject('_rootInstance', {})
 
 const routeQuery= route?.query
 
@@ -102,7 +103,8 @@ const buttonAction = async (e, params) => {
       routeQuery,
       validate,
       lastClick,
-      parentRootValue
+      parentRootValue,
+      rootInstance
     }, appContext)
   }
   if (actionFnRet !== null && actionFnRet !== undefined) {

package/src/index.jsx

@@ -140,6 +140,7 @@ export default {
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
+    const instance = getCurrentInstance()
     const ruleExecuter = null
     // const ruleExecuter = new RuleExecuter()
     const rootStore = reactive({})
@@ -167,7 +168,6 @@ export default {
     const dataLoad = computed(() => {
       return props.dataLoad || nativeDataLoad.value
     })
-    const instance = getCurrentInstance()
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
     function toExecuteLoadServices(clearFlag) {
       // 触发加载事件执行
@@ -258,6 +258,7 @@ export default {
     provide('buttonActions', props.buttonActions)
     provide('components', toRef(props, 'components'))
     provide('selects', toRef(props, 'selects'))
+    provide('_rootInstance', instance)
     provide('rootValue', computed({
       get() {
         return props.modelValue

package/src/rules/eventsSupplement.js

@@ -68,9 +68,15 @@ const allInitEvents = {
       const { config } = this
       val = config?.bindValue
     }  else {
+      let routeMatchs = null
       const _absoluteTarget = /^_absoluteTarget:(.+)$/
       const matchs = val.match(_absoluteTarget)
-      if (typeof val === 'string' && matchs?.[1]) {
+      if ( typeof val === 'string' && (routeMatchs = val.match(/^_route:(.*)$/))) {
+        const { config } = this
+        const queryKey = routeMatchs[1]
+        const routeQuery = config?.route?.query
+        val = routeQuery?.[queryKey]
+      } else if (typeof val === 'string' && matchs?.[1]) {
         const { dynamicMapComp } = this
         const targetConfig = dynamicMapComp?.[matchs[1]]
         val = targetConfig?.bindValue || ''

package/src/utils/defaultVal.js

@@ -6,7 +6,12 @@ export default function defaultVal(config) {
     const configDefaultVal = config.defaultVal || config.defaultValue
     let defaultVal = null
     try {
-      if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
+      let routeMatchs = null
+      if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
+        const queryKey = routeMatchs[1]
+        const routeQuery = config?.route?.query
+        defaultVal = routeQuery?.[queryKey]
+      } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
         defaultVal = JSON.parse(configDefaultVal)
       } else {
         if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate') {