resolver-egretimp-plus 0.0.144 → 0.0.146

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -93,7 +93,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     })
   }
   const beforeRequestServiceRetValid = await beforeRequestServiceRet
-  if (!beforeRequestServiceRetValid) {
+  if (beforeRequestServiceRetValid === false) {
     return
   }
 
@@ -342,8 +342,8 @@ export function openDailg({
         beforeOpenDialogRet = paramsBeforeOpenDialog?.(...arg)
       }
       const beforeOpenDialogRetValid = await beforeOpenDialogRet
-      if (!beforeOpenDialogRetValid) {
-        return
+      if (beforeOpenDialogRetValid === false) {
+        return false
       }
       if (configBeforeOpenDialog) {
         return configBeforeOpenDialog?.(...arg)
@@ -367,7 +367,7 @@ export function openDailg({
   if (beforeOpenDialogRet !== null && beforeOpenDialogRet !== undefined) {
     if (isPromise(beforeOpenDialogRet)) {
       beforeOpenDialogRet.then(res => {
-        if (res) {
+        if (res !== false) {
           toOpenDialog()
         }
       })
@@ -459,7 +459,7 @@ export async function executeDataValid(validConfig, {
     })
   }
   const beforeRequestServiceRetValid = await beforeRequestServiceRet
-  if (!beforeRequestServiceRetValid) {
+  if (beforeRequestServiceRetValid === false) {
     return
   }
   const ret = await buildInRequest(url, {
@@ -573,8 +573,8 @@ export async function executeEventOrchestration({
           beforeRequestServiceRet = beforeRequestService?.(...arg)
         }
         const beforeRequestServiceRetValid = await beforeRequestServiceRet
-        if (!beforeRequestServiceRetValid) {
-          return
+        if (beforeRequestServiceRetValid === false) {
+          return false
         }
         if (configBeforeRequestService) {
           return configBeforeRequestService?.(...arg)

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

@@ -61,13 +61,17 @@ const level = computed(() => {
   return props.config.level || tabpanes.value.find(tabpane => hasOwn(tabpane, 'level'))?.level || 1
 })
 const transTabsProps = computed(() => {
-  return level.value == 1 ? {
+  const polyProps = level.value == 1 ? {
     stretch: true,
     type: 'border-card'
   } : level.value == 2 ? {
   } : level.value == 3 ? {
     type: 'card'
-  } : tabsProps.value
+  } : {}
+  return {
+    ...tabsProps.value,
+    ...polyProps
+  }
 })
 /**
  * 层级为一的时候，并且只有一个页签，激活的页签头，应该有分割线