resolver-egretimp-plus 0.0.156 → 0.0.158

package/package.json

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

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

@@ -1,6 +1,6 @@
 <script setup>
 import { computed, defineProps, inject, useAttrs } from 'vue'
-import { commonPropsType, formatDate, hasOwn } from '../../utils/index.js'
+import { commonPropsType, formatDate, formatAmount, hasOwn } from '../../utils/index.js'
 
 const lang = inject('lang')
 const modelValue = defineModel()
@@ -9,6 +9,10 @@ const props = defineProps({
   formatter: {
     type: Function,
     default: null
+  },
+  titleFormatter: {
+    type: Function,
+    default: null
   }
 })
 
@@ -24,8 +28,13 @@ const dateFormat = computed(() => {
   return props.config?.dateFormat
 })
 
+const amountFormat = computed(() => {
+  return props.config?.amountFormat
+})
+
 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()
@@ -33,14 +42,20 @@ const calcProps = computed(() => {
     if (dateFormat.value) {
       desc = formatDate(desc, dateFormat.value)
     }
+    if (amountFormat.value) {
+      desc = formatAmount(desc, amountFormat.value)
+    }
     if (props.formatter && typeof props.formatter === "function") {
-      desc = props.formatter(desc)
+      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

@@ -1,5 +1,5 @@
 <script setup>
-import { commonPropsType, formatDate, getConfigOptions, hasOwn } from '../../utils/index.js'
+import { commonPropsType, formatDate, formatAmount, getConfigOptions, hasOwn } from '../../utils/index.js'
 import { computed, inject, onMounted, reactive, ref, useAttrs, watch } from 'vue'
 
 const attrs = useAttrs()
@@ -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',
@@ -198,6 +202,12 @@ function normalTableRowValue(row) {
     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)
+    }
   })
   return ret
 }

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

@@ -27,7 +27,9 @@ const datePickerProps = computed(() => {
   if (!ret['value-format'] && !ret.valueFormat) {
     ret.valueFormat = 'YYYY-MM-DD'
   }
-  
+  if (props?.config?.displayType) {
+    ret.type = props?.config?.displayType
+  }
   return ret
 })
 const attrs = useAttrs()

package/src/theme/element/components/index.scss

@@ -27,7 +27,9 @@
   --prmary-marign-second: 12px;
   --prmary-marign: 16px
 }
-
+.poppper-class {
+  max-width: calc(100vw - 20px)
+}
 @import './card.scss';
 @import './collapse.scss';
 @import './date.scss';

package/src/utils/common.js

@@ -143,6 +143,28 @@ export function formatDate(date, fmt) {
   return fmt
 }
 
+export const formatAmount = (val, data) => {
+  if (!data) {
+    return val
+  }
+  if (typeof val !== "string" && typeof val !== "number") {
+    return val
+  }
+  let params = isPlainObject(data) ? data : { decimals: 2, isThousandth: true }
+  let str = String(val).replace(/[^\d\.\-]/g, "")
+  if (params?.decimals || params?.decimals == 0) {
+    str = parseFloat(str).toFixed(params.decimals).toString()
+  }
+  let reg = /(\d)(?=(?:\d{3})+$)/g
+  let arr = str.split(".")
+  if (params?.isThousandth) {
+    if (arr[0]) {
+      arr[0] = arr[0].replace(reg, "$1,")
+    }
+  }
+  return arr.join(".")
+}
+
 function padLeftZero(str) {
   return (`00${str}`).substr(str.length)
 }

package/src/utils/render.jsx

@@ -834,7 +834,7 @@ function createFormLable(config, lang = 'zh') {
       </span>
       {
         config.hintFlag == '1' ? (
-          <ElTooltip effect="dark" content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn} placement="top">
+          <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>
           </ElTooltip>
         ) : null