resolver-egretimp-plus 0.0.155 → 0.0.157

package/package.json

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

package/src/components/icons/loading.vue

@@ -1,5 +1,5 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
+  <svg class="loadin-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
     <path
       fill="currentColor"
       d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32m0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32m448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32m-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32M195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248m452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248M828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0m-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0"
@@ -11,3 +11,9 @@ defineOptions({
   name: 'Loading',
 })
 </script>
+<style lang="scss">
+.loadin-svg {
+  width: 1em;
+  height: 1em;
+}
+</style>

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()
@@ -24,6 +24,10 @@ const dateFormat = computed(() => {
   return props.config?.dateFormat
 })
 
+const amountFormat = computed(() => {
+  return props.config?.amountFormat
+})
+
 const calcProps = computed(() => {
   let desc = normalVal.value || props.config?.desc
   try {
@@ -33,8 +37,11 @@ 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)
     }
   } catch (error) {
     console.log('CmiCell, error==:', error)

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()
@@ -198,6 +198,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)
+    }
   })
   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/components/packages-web/ElInputNumber.vue

@@ -14,6 +14,7 @@ const props = defineProps({
   ...ElInputNumber.props,
   ...commonPropsType,
   step: [String, Number],
+  precision: [String, Number],
   modeValue: [String, Number]
 })
 const textAlignClass = computed(() => {
@@ -26,13 +27,13 @@ const inputNumberProps = computed(() => {
     return ret
   }, {})
   if (props.config?.maxValue && !isNaN(props.config.maxValue)) {
-    ret.max = props.config.maxValue
+    ret.max =parseFloat(props.config.maxValue)
   }
   if (props.config?.minValue && !isNaN(props.config.minValue)) {
-    ret.min = props.config.minValue
+    ret.min = parseFloat(props.config.minValue)
   }
   if (props.config?.precise && !isNaN(props.config.minValue)) {
-    ret.precision = props.config.precise
+    ret.precision = parseInt(props.config.precise)
   }
   if (ret.step) {
     ret.step = parseFloat(ret.step)

package/src/components/tabs/src/tab-nav.jsx

@@ -328,7 +328,9 @@ const TabNav = defineComponent({
 
         const tabLabelContent = pane.slots.label?.() || pane.props.label
         const tabindex = !disabled && pane.active ? 0 : -1
-
+        if (hidden) {
+          return null
+        }
         return (
           <div
             ref={`tab-${uid}`}

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