resolver-egretimp-plus 0.0.163 → 0.0.165

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -543,6 +543,8 @@ function closePage(lcpPageClosedMapVO) {
 }
 
 export async function executeEventOrchestration({
+  beforeDataValidRequestService,
+  afterDataValidRequestService,
   beforeRequestService,
   afterRequestService,
   beforeOpenDialog,
@@ -601,24 +603,51 @@ export async function executeEventOrchestration({
     }
   }
   if (lcpPageRuleVOLis?.length) {
-      // 数据校验服务
-      const validConfig = lcpPageRuleVOLis[0]
-      const valid = await executeDataValid(validConfig, {
-        dynamicMapComp,
-        requestTraceId,
-        rootValue,
-        axiosInstance,
-        mixinServiceConfig,
-        compConfig: props.config,
-        confirmInstance,
-        builtPolyfillReq,
-        beforeRequestService: normalBeforeRequestService,
-        afterRequestService: normalAfterRequestService,
-        lang
-      })
-      if (!valid) {
-        return
+    let normalBeforeDataValidRequestService
+    let normalAfterDataValidRequestService
+    const configBeforeDataValidRequestService = props.config?.beforeDataValidRequestService
+    if (configBeforeDataValidRequestService || beforeDataValidRequestService) {
+      normalBeforeDataValidRequestService = async (...arg) => {
+        let beforeRequestServiceRet = true
+        if (beforeDataValidRequestService) {
+          beforeRequestServiceRet = beforeDataValidRequestService?.(...arg)
+        }
+        const beforeRequestServiceRetValid = await beforeRequestServiceRet
+        if (beforeRequestServiceRetValid === false) {
+          return false
+        }
+        if (configBeforeDataValidRequestService) {
+          return configBeforeDataValidRequestService?.(...arg)
+        } else {
+          return true
+        }
       }
+    }
+    const configAfterDataValidRequestService = props.config?.afterDataValidRequestService
+    if (configAfterDataValidRequestService || afterDataValidRequestService) {
+      normalAfterDataValidRequestService = (...arg) => {
+        afterDataValidRequestService?.(...arg)
+        configAfterDataValidRequestService?.(...arg)
+      }
+    }
+    // 数据校验服务
+    const validConfig = lcpPageRuleVOLis[0]
+    const valid = await executeDataValid(validConfig, {
+      dynamicMapComp,
+      requestTraceId,
+      rootValue,
+      axiosInstance,
+      mixinServiceConfig,
+      compConfig: props.config,
+      confirmInstance,
+      builtPolyfillReq,
+      beforeRequestService: normalBeforeDataValidRequestService,
+      afterRequestService: normalAfterDataValidRequestService,
+      lang
+    })
+    if (!valid) {
+      return
+    }
   }
   
   if (PageServiceMapVOList?.length) {

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

@@ -1,5 +1,5 @@
 <script setup>
-import { commonPropsType, formatDate, formatAmount, getConfigOptions, hasOwn } from '../../utils/index.js'
+import { commonPropsType, formatDate, formatAmount, getConfigOptions, hasOwn, isPlainObject } from '../../utils/index.js'
 import { computed, inject, onMounted, reactive, ref, useAttrs, watch } from 'vue'
 
 const attrs = useAttrs()
@@ -79,6 +79,11 @@ const tableEvents = computed(() => {
       if (attrs.onRowclick) {
         attrs.onRowclick?.(e)
       }
+    },
+    onTogglelandscape: (e) => {
+      if (attrs.onTogglelandscape) {
+        attrs.onTogglelandscape?.(e)
+      }
     }
   }
   return ret
@@ -146,6 +151,80 @@ const tableKey = computed(() => {
   return `${tableProps.value.card}${tableProps.value.display}${!tableProps.value.card ? page.pageNum : 0}`
 })
 
+// 统计行定义 ====start======
+const totalMetaCodes = computed(() => {
+  return props.config?.totalMetaCodes || []
+})
+const normalTotalCodes = computed(() => {
+  return totalMetaCodes.value.map(code => {
+    if (typeof code === 'string') {
+      return {
+        code,
+        totalFn: defaultTotalFn,
+        totalFormatter: defaultTotalFormatter
+      }
+    } else {
+      if (isPlainObject(code) && hasOwn(code, 'code')) {
+        code.totalFn = typeof code.totalFn === 'function' ? code.totalFn : defaultTotalFn
+        code.totalFormatter = typeof code.totalFormatter === 'function' ? code.totalFormatter : defaultTotalFormatter
+        return code
+      }
+      return null
+    }
+  }).filter(codeInfo => !!codeInfo)
+})
+const totalCodeFormatters = (row) => {
+  if (!row?.length) {
+    return []
+  }
+  const totalObj = {
+    [pmPageMetaList.value?.[0]?.metaCode]: lang.value.indexOf('zh') > -1 ? '总计' : 'Total',
+    ...row[0]
+  }
+  normalTotalCodes.value.map((codeInfo) => {
+    const { code, totalFormatter } = codeInfo
+    if (totalFormatter && typeof totalFormatter === 'function') {
+      totalObj[code] = totalFormatter(totalObj[code], totalObj, code)
+    }    
+  })
+  return [totalObj]
+}
+const defaultTotalFormatter = (val, total, code) => {
+  let codeConfig = pmPageMetaList.value?.find(item => item.metaCode == code)
+  if (codeConfig) {
+    normalResult(total, codeConfig)
+    return total[code]
+  }
+  return val
+}
+const defaultTotalFn = (total, val, row) => {
+  if (val === undefined || val === null) {
+    val = !isNaN(Number(val)) ? 0 : ''
+  } else {
+    val = val.toString().replace(/[^\d\.\-]/g, '')
+  }
+  const numFlag = !isNaN(Number(val))
+  if (total === null || total === undefined) {
+    total = numFlag ? 0 : ''
+  }
+  return total + (numFlag ? Number(val) : val)
+}
+const totalRow = computed(() => {
+  if (!normalTableData.value?.length || !totalMetaCodes.value.length || !normalTotalCodes.value.length) {
+    return []
+  }
+  // 进行统计的计算
+  const row = (normalTableData.value || []).reduce((total, row) => {
+    normalTotalCodes.value.forEach(codeInfo => {
+      const { code, totalFn } = codeInfo
+      total[code] = totalFn(total[code], row[code], row)
+    })
+    return total
+  }, { totalFlag: true })
+  return [row]
+})
+// 统计行定义 ====end======
+
 onMounted(() => {
   watch(() => {
     return {
@@ -161,7 +240,7 @@ onMounted(() => {
     setTimeout(() => {
       try {
         // 这边有的时候会报错
-        tableRef.value?.setTableData(val)
+        tableRef.value?.setTableData([...val,...totalCodeFormatters(totalRow.value)])
       } catch (error) {
       }
     }, 100);
@@ -192,28 +271,31 @@ function normalVal(val, options) {
   return val
 }
 
+function normalResult(ret, config) {
+  ret[config.metaCode] = normalVal(ret[config.metaCode], getOptions(config))
+  if (config?.dateFormat) {
+    ret[config.metaCode] = formatDate(ret[config.metaCode], config.dateFormat)
+  }
+  if (config?.amountFormat) {
+    ret[config.metaCode] = formatAmount(ret[config.metaCode], config.amountFormat)
+  }
+  if (typeof config?.formatter === "function") {
+    ret[config.metaCode] = config.formatter(ret[config.metaCode], config, props)
+  }
+}
 
 function normalTableRowValue(row) {
   const ret = {
     ...row
   }
   pmPageMetaList.value.forEach(config => {
-    ret[config.metaCode] = normalVal(ret[config.metaCode], getOptions(config))
-    if (config?.dateFormat) {
-      ret[config.metaCode] = formatDate(ret[config.metaCode], config.dateFormat)
-    }
-    if (config?.amountFormat) {
-      ret[config.metaCode] = formatAmount(ret[config.metaCode], config.amountFormat)
-    }
-    if (typeof config?.formatter === "function") {
-      ret[config.metaCode] = config.formatter(ret[config.metaCode], config, props)
-    }
+    normalResult(ret, config)
   })
   return ret
 }
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick">
+  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{