resolver-egretimp-plus 0.0.85 → 0.0.87

package/package.json

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

package/src/analysisComponent.jsx

@@ -172,8 +172,8 @@ export default {
     const _isH5 = inject('_isH5')
     const lang = inject('lang')
     const rootValue = inject('rootValue')
-    const onClick = (e) => {
-      e.stopPropagation()
+    const onClick = (e, { beforeRequestService, afterRequestService } = {}) => {
+      e?.stopPropagation?.()
       const context = {
         props,
         dynamicMapComp,
@@ -187,10 +187,12 @@ export default {
         appContext
       }
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
-      executeClickEvents()
+      executeClickEvents({ beforeRequestService, afterRequestService })
     }
-    function executeClickEvents() {
+    function executeClickEvents({ beforeRequestService, afterRequestService }) {
       executeEventOrchestration({
+        beforeRequestService,
+        afterRequestService,
         components,
         props,
         requestTraceId: requestTraceId?.value,
@@ -225,7 +227,7 @@ export default {
           onVnodeMounted={onVnodeMounted}
           onVnodeUnmounted={onVnodeUnmounted}
           {...currentAttrs.value}
-          onClick={(e) => {onClick(e);compPropsOnClick?.(e)}}
+          onClick={(e, params) => {onClick(e, params);compPropsOnClick?.(e)}}
           {...componentProps.value}
           {...compProps}
           {...vModelObjs}

package/src/components/childDialog/src/index.vue

@@ -104,8 +104,8 @@ defineExpose({
   <ElConfigProvider :locale="locale">
     <ElDialog class="open-child-frame"
       :close-on-click-modal="false"
-      :width="dialogWidth"
       v-bind="dialogProps"
+      :width="dialogWidth"
       v-model="dialogVisible"
       :style="dialogStyle"
     >

package/src/components/helper/eventOrchestration.js

@@ -453,7 +453,25 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({components, props, requestTraceId, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dialogReq, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({
+  beforeRequestService,
+  afterRequestService,
+  components,
+  props,
+  requestTraceId,
+  axiosInstance,
+  polyfillConfigs,
+  buttonActions,
+  rootValue,
+  confirmInstance,
+  dialogReq,
+  dynamicMapComp,
+  messageInstance,
+  openChildDialog,
+  messageCb,
+  lang,
+  appContext 
+} = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
@@ -475,9 +493,30 @@ export async function executeEventOrchestration({components, props, requestTrace
   
   if (PageServiceMapVOList?.length) {
     // 定义的请求前钩子
-    const beforeRequestService = props.config?.beforeRequestService
+    const configBeforeRequestService = props.config?.beforeRequestService
+    let normalBeforeRequestService = null
+    if (configBeforeRequestService || beforeRequestService) {
+      normalBeforeRequestService = async (...arg) => {
+        let ret = true
+        if (beforeRequestService) {
+          ret = beforeRequestService?.(...arg)
+        }
+        const beforeRequestServiceRetValid = await beforeRequestServiceRet
+        if (!beforeRequestServiceRetValid) {
+          return
+        }
+      }
+      return configBeforeRequestService?.(...arg)
+    }
     // 定义的请求后钩子
-    const afterRequestService = props.config?.afterRequestService
+    const configAfterRequestService = props.config?.afterRequestService
+    let normalAfterRequestService = null
+    if (configAfterRequestService || afterRequestService) {
+      normalAfterRequestService = (...arg) => {
+        afterRequestService?.(...arg)
+        configAfterRequestService?.(...arg)
+      }
+    }
 
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
@@ -491,8 +530,8 @@ export async function executeEventOrchestration({components, props, requestTrace
       messageCb,
       compConfig: props.config,
       dialogReq,
-      beforeRequestService,
-      afterRequestService
+      beforeRequestService: normalBeforeRequestService,
+      afterRequestService: normalAfterRequestService
     })
   }
   const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO

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

@@ -7,7 +7,6 @@ defineOptions({
   inheritAttrs: false
 })
 
-const collapseLimt = 5
 const isCollapse = ref(true)
 const modelValue = defineModel()
 const attrs = useAttrs()
@@ -15,6 +14,9 @@ const lang = inject('lang')
 const props = defineProps({
   ...commonPropsType,
 })
+const collapseLimt = computed(() => {
+  return props.config?.collapseLimt || 5
+})
 const collapseProps = computed(() => {
   return  {
     title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
@@ -28,10 +30,10 @@ const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
 })
 const showCollapseBtn = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')?.length > collapseLimt
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')?.length > collapseLimt.value
 })
 const showPageMeteList = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1').slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1').slice(0, isCollapse.value ? collapseLimt.value : Number.MAX_VALUE)
 })
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1

package/src/components/packages-web/CustomComponentTable.jsx

@@ -469,13 +469,8 @@ export default {
                         }
                         const config = multiPmPageMetaList.value?.[$index]?.[configIdx]
                         return (
-                          <div>
-                            requiredFlag: {config.requiredFlag}
-                            {
-                              tableColumnNotRender(config) ? null :
-                              <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
-                            }
-                          </div>
+                          tableColumnNotRender(config) ? null :
+                          <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
                         )
                       }
                     }}

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

@@ -74,9 +74,10 @@ const parentRootValue = inject('_parentRootValue', {})
 
 const routeQuery= route?.query
 
-const buttonAction = async (...arg) => {
+// params主要用于外部直接调用click方法时候传入的
+const buttonAction = async (e, params) => {
   const lastClick = () => {
-    attrs?.onClick?.(...arg)
+    attrs?.onClick?.(e, params)
   }
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
@@ -113,4 +114,9 @@ const buttonAction = async (...arg) => {
     lastClick()
   }
 }
+defineExpose({
+  click: (params) => {
+    buttonAction(null, params)
+  }
+})
 </script>