resolver-egretimp-plus 0.0.143 → 0.0.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "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/CustomComponentTable.jsx

@@ -473,12 +473,16 @@ export default {
                           { columnConfg.headerRender ? columnConfg.headerRender(h, { props, config: columnConfg, lang, rootValue, selects })
                               : (lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn)
                           }
+                          {
+                            columnConfg.hintFlag == '1' ? (
+                              <ElTooltip effect="dark" content={lang.value.indexOf('zh') > -1 ? columnConfg.hintContentZh : columnConfg.hintContentEn} placement="top">
+                                <elIcon style="fontSize: 16px; verticalAlign: middle; margin-left: 3px;"><QuestionFilled /></elIcon>
+                              </ElTooltip>
+                            ) : null
+                          }
                         </span>
                       ),
-                      // default: ({row, $index}) => {
-                      //   return getValue($index)?.[columnConfg.metaCode]
-                      // }
-                      default: ({row, $index}) => {
+                      default: ({row, column, $index}) => {
                         if (row.totalFlag) {
                           return totalCodeRenders.value[columnConfg.metaCode] ? totalCodeRenders.value[columnConfg.metaCode]({
                             val: row[columnConfg.metaCode],
@@ -489,7 +493,7 @@ export default {
                         const config = multiPmPageMetaList.value?.[$index]?.[configIdx]
                         return (
                           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>
+                          <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" rowScope={{row, $index}} modelValue={getValue($index)} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
                         )
                       }
                     }}