resolver-egretimp-plus 0.0.134 → 0.0.136

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,5 +1,5 @@
 import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
-import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, hasOwn } from './utils/index.js'
+import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, hasOwn, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
 import rulesDriver from './rules/rulesDriver'
@@ -127,7 +127,9 @@ export default {
         ruleExecuter.penddingRules[hireRelat] = null
       }
       if (props.config?.immediateClickEvent) {
-        executeClickEvents()
+        setTimeout(() => {
+          executeClickEvents()
+        }, 0);
       }
       // 使用json-rules-engine书写的规则，打开这边，需要对之前的规则进行注释，并且需要再index.js文件中进行开启 ====end====
     }
@@ -200,7 +202,7 @@ export default {
     const _isH5 = inject('_isH5')
     const lang = inject('lang')
     const rootValue = inject('rootValue')
-    const onClick = (e, { beforeRequestService, afterRequestService } = {}) => {
+    const onClick = (e, params) => {
       const context = {
         props,
         dynamicMapComp,
@@ -215,13 +217,21 @@ export default {
       }
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
       if (findComponent(EXECTE_CLICK_EVENT_COMPONENTS, props.config?.renderby || props.config?.metaType) !== -1 ) {
-        executeClickEvents({ beforeRequestService, afterRequestService })
+        executeClickEvents(params)
       }
     }
-    function executeClickEvents({ beforeRequestService, afterRequestService } = {}) {
+    function executeClickEvents(params = {}) {
+      // beforeRequestService,
+      // afterRequestService,
+      // beforeOpenDialog,
+      // afterOpenDialog,
+      // middleOpenDialog,
+      // 目前parmas支持以上五种钩子
+      if (!isPlainObject(params)) {
+        params = {}
+      }
       executeEventOrchestration({
-        beforeRequestService,
-        afterRequestService,
+        ...params,
         components,
         props,
         requestTraceId: requestTraceId?.value,

package/src/components/helper/eventOrchestration.js

@@ -192,6 +192,9 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
 }
 
 export function openDailg({
+  beforeOpenDialog,
+  afterOpenDialog,
+  middleOpenDialog,
   components,
   rootValue,
   polyfillConfigs,
@@ -268,9 +271,25 @@ export function openDailg({
               return retItem
             })
           }
-          // 定义的请求中间钩子
-          const middleOpenDialog = compConfig?.middleOpenDialog
-
+          // 定义打开弹框-中间钩子
+          const configMiddleOpenDialog = compConfig?.middleOpenDialog
+          const parmasMiddleOpenDialog = middleOpenDialog
+          if (configMiddleOpenDialog || parmasMiddleOpenDialog) {
+            middleOpenDialog = async (params) => {
+              let ret = null
+              if (parmasMiddleOpenDialog) {
+                ret = parmasMiddleOpenDialog?.(params)
+              }
+              if (ret) {
+                const outputParams = await ret
+                return configMiddleOpenDialog?.({
+                  ...params,
+                  outputParams
+                })
+              }
+              return configMiddleOpenDialog?.(params)
+            }
+          }
           let middleOpenDialogRet = outResult
           if (middleOpenDialog) {
             middleOpenDialogRet = middleOpenDialog({
@@ -281,7 +300,7 @@ export function openDailg({
               pagePopupMap,
               inputParams: reqData,
               outputParams: outResult
-            })
+            }) || middleOpenDialogRet
           }
           if (isPromise(middleOpenDialogRet)) {
             middleOpenDialogRet.then(res => {
@@ -313,11 +332,26 @@ export function openDailg({
   }
   const dialogProps = parseExtendAttr({extendAttr: pagePopupMap.extendAttr})
 
-  // 定义的请求前钩子
-  const beforeOpenDialog = compConfig?.beforeOpenDialog
-  // // 定义的请求后钩子
-  // const afterOpenDialog = compConfig?.afterOpenDialog
-
+  // 定义的弹框打开前钩子
+  const configBeforeOpenDialog = compConfig?.beforeOpenDialog
+  const paramsBeforeOpenDialog = beforeOpenDialog
+  if (configBeforeOpenDialog || paramsBeforeOpenDialog) {
+    beforeOpenDialog = async (...arg) => {
+      let beforeOpenDialogRet = true
+      if (paramsBeforeOpenDialog) {
+        beforeOpenDialogRet = paramsBeforeOpenDialog?.(...arg)
+      }
+      const beforeOpenDialogRetValid = await beforeOpenDialogRet
+      if (!beforeOpenDialogRetValid) {
+        return
+      }
+      if (configBeforeOpenDialog) {
+        return configBeforeOpenDialog?.(...arg)
+      } else {
+        return true
+      }
+    }
+  }
   let beforeOpenDialogRet = true
   if (beforeOpenDialog) {
     beforeOpenDialogRet = beforeOpenDialog({
@@ -347,8 +381,15 @@ export function openDailg({
   }
 
   function toAfterOpenDialog(outputParams) {
-    // 定义的请求后钩子
-    const afterOpenDialog = compConfig?.afterOpenDialog
+    // 打开弹框-确认后的钩子
+    const configAfterOpenDialog = compConfig?.afterOpenDialog
+    const paramsAfterOpenDialog = afterOpenDialog
+    if (configAfterOpenDialog || paramsAfterOpenDialog) {
+      afterOpenDialog = async (...arg) => {
+        paramsBeforeOpenDialog?.(...arg)
+        configAfterOpenDialog?.(...arg)
+      }
+    }
     afterOpenDialog && afterOpenDialog({
       dynamicMapComp,
       rootValue, 
@@ -497,6 +538,9 @@ function closePage(lcpPageClosedMapVO) {
 export async function executeEventOrchestration({
   beforeRequestService,
   afterRequestService,
+  beforeOpenDialog,
+  afterOpenDialog,
+  middleOpenDialog,
   components,
   props,
   requestTraceId,
@@ -524,16 +568,20 @@ export async function executeEventOrchestration({
     const configBeforeRequestService = props.config?.beforeRequestService
     if (configBeforeRequestService || beforeRequestService) {
       normalBeforeRequestService = async (...arg) => {
-        let ret = true
+        let beforeRequestServiceRet = true
         if (beforeRequestService) {
-          ret = beforeRequestService?.(...arg)
+          beforeRequestServiceRet = beforeRequestService?.(...arg)
         }
         const beforeRequestServiceRetValid = await beforeRequestServiceRet
         if (!beforeRequestServiceRetValid) {
           return
         }
+        if (configBeforeRequestService) {
+          return configBeforeRequestService?.(...arg)
+        } else {
+          return true
+        }
       }
-      return configBeforeRequestService?.(...arg)
     }
     // 定义的请求后钩子
     const configAfterRequestService = props.config?.afterRequestService
@@ -587,6 +635,9 @@ export async function executeEventOrchestration({
 
     const dynamicHireRelat = props.config?.dynamicHireRelat
     openDailg({
+      beforeOpenDialog,
+      afterOpenDialog,
+      middleOpenDialog,
       components,
       rootValue,
       polyfillConfigs,

package/src/index.jsx

@@ -269,7 +269,6 @@ export default {
         return props.modelValue
       },
       set(val) {
-        debugger
         emit('update:modelValue', val)
       }
     })

package/src/renderer.jsx

@@ -37,7 +37,6 @@ export default {
         return props.modelValue
       },
       set(val) {
-        debugger
         emit('update:modelValue', val)
       }
     })

package/src/rules/parseCondition.js

@@ -199,6 +199,9 @@ export function parseCondition(rule) {
   // } else {
     conditionsRet = conditions.map(condition => {
       const { refType, refValue, targetType, targetValue } = condition
+      if (refValue?.indexOf('onlyDisplayPricingParameters') > -1) {
+        debugger
+      }
       // if (refValue === 'studentId') {
       //   debugger
       // }