resolver-egretimp-plus 0.0.192 → 0.0.194

package/package.json

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

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/render.jsx

@@ -251,9 +251,7 @@ export function normalConfig({
         ...detailExtendAttrObj
       }
     }
-    if (pageConfig.detailHidden == '1' && pageConfig.hidden != '1') {
-      pageConfig.hidden = '1'
-    }
+    pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
   }
   // 在日志的情况下，配置组件是否显示
   if (mode === MODE.LOG) {
@@ -267,9 +265,7 @@ export function normalConfig({
         ...logExtendAttrObj
       }
     }
-    if (pageConfig.logHidden == '1' && pageConfig.hidden != '1') {
-      pageConfig.hidden = '1'
-    }
+    pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
   }
 
   mapComp[hireRelat] = pageConfig