resolver-egretimp-plus 0.0.157 → 0.0.159

package/package.json

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

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

@@ -9,6 +9,10 @@ const props = defineProps({
   formatter: {
     type: Function,
     default: null
+  },
+  titleFormatter: {
+    type: Function,
+    default: null
   }
 })
 
@@ -30,6 +34,7 @@ const amountFormat = computed(() => {
 
 const calcProps = computed(() => {
   let desc = normalVal.value || props.config?.desc
+  let title = lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn
   try {
     if (desc?.toString) {
       desc = desc.toString()
@@ -41,13 +46,16 @@ const calcProps = computed(() => {
       desc = formatAmount(desc, amountFormat.value)
     }
     if (props.formatter && typeof props.formatter === "function") {
-      desc = props.formatter(desc, props.config)
+      desc = props.formatter(desc, props.config, props)
+    }
+    if (props.titleFormatter && typeof props.titleFormatter === "function") {
+      title = props.titleFormatter(title, props.config, props)
     }
   } catch (error) {
     console.log('CmiCell, error==:', error)
   }
   return {
-    title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
+    title,
     desc,
     content: props.config?.content,
     to: props.config?.toHref,

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

@@ -129,8 +129,12 @@ const pmPageMetaList = computed(() => {
 })
 
 const getTableColumnProps = (config) => {
+  let label = lang?.value?.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn
+  if (typeof config.titleFormatter === "function") {
+    label = config.titleFormatter(label, config, props)
+  }
   return {
-    label: lang?.value?.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn,
+    label,
     prop: config.metaCode,
     width: config.columnWidth,
     ellipsis: config.ellipsis === '1',
@@ -202,7 +206,7 @@ function normalTableRowValue(row) {
       ret[config.metaCode] = formatAmount(ret[config.metaCode], config.amountFormat)
     }
     if (typeof config?.formatter === "function") {
-      ret[config.metaCode] = config.formatter(ret[config.metaCode], config)
+      ret[config.metaCode] = config.formatter(ret[config.metaCode], config, props)
     }
   })
   return ret

package/src/utils/render.jsx

@@ -822,10 +822,33 @@ function getFormItemMargins(config) {
   return marginObj
 }
 
+function normalLabelTipContent(content = '') {
+  if (content) {
+    const retList = []
+    const lines = content.split('\n')
+    lines.forEach((str, idx) => {
+      retList.push(str)
+      if (idx !== lines.length - 1) {
+        retList.push(
+          <br></br>
+        )
+      }
+    })
+    return retList
+  }
+  return ''
+}
 function createFormLable(config, lang = 'zh') {
   const ElTooltip = resolveComponent('el-tooltip')
   const elIcon = resolveComponent('el-icon')
   const required = config.requiredFlag === '1'
+  const slots = {}
+  slots.default = () => {
+    return <span class="label-tip"><elIcon><QuestionFilled /></elIcon></span>
+  }
+  slots.content = () => {
+    return normalLabelTipContent(lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn)
+  }
   return (
     <div title={lang.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn} class="custom-label">
       <span class="custom-label-content" style={config.labelStyle}>
@@ -835,7 +858,7 @@ function createFormLable(config, lang = 'zh') {
       {
         config.hintFlag == '1' ? (
           <ElTooltip popper-class="poppper-class" effect="dark" content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn} placement="top">
-            <span class="label-tip"><elIcon><QuestionFilled /></elIcon></span>
+            { slots }
           </ElTooltip>
         ) : null
       }