resolver-egretimp-plus 0.1.87 → 0.1.89

package/package.json

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

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

@@ -28,6 +28,11 @@ const props = defineProps({
     type: [String, Number],
     default: ''
   },
+  // 金额显示的分割，默认‘,’
+  moneySeg: {
+    type: [String],
+    default: ','
+  },
   min: {
     type: Number,
     default: -Infinity
@@ -173,7 +178,8 @@ function formatValue(value) {
     return value
   }
   if (value === null || isNaN(value)) return ''
-  let val = parseFloat(value)
+  let val = `${value}`.replace(props.moneySeg, '')
+  val = parseFloat(val)
   if (isNaN(val)) {
     return ''
   }
@@ -190,7 +196,7 @@ function formatValue(value) {
   }
   const parts = `${val}`.split('.')
   
-  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, props.moneySeg)
   
   // 添加货币符号
   const formatted = parts.join('.')

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

@@ -102,6 +102,7 @@ const initSelEmployee = async () => {
       placeholder: lang?.value?.indexOf('zh') > -1 ? props.placeholder : props.placeholderEn,
       // disabled: props.disabled,
       onSelectedChange: (data, arr) => {
+        console.log('onSelectedChange===:', data, arr)
         emit('change', data, arr, props)
         modelValue.value = data?.join(separator.value) || ''
       },

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

@@ -116,7 +116,7 @@
 }
 
 .CustomComponentCollapse:has(+ .CustomComponentCollapse) {
-  margin-bottom: 12px;
+  margin-bottom: 16px;
 }
 
 // 选择第一个

package/src/utils/defaultVal.js

@@ -13,26 +13,30 @@ export default function defaultVal(config) {
     let defaultVal = null
     try {
       if (typeof configDefaultVal === 'string') {
+        const trimValue = configDefaultVal.trim()
         let routeMatchs = null
-        if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
+        if (routeMatchs = trimValue.match(/^_route:(.*)$/)) {
           const queryKey = routeMatchs[1]
           const routeQuery = config?.route?.query
           defaultVal = routeQuery?.[queryKey]
-        } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
+        } else if (routeMatchs = trimValue.match(/^_native:(.*)$/)) {
+          const val = routeMatchs[1]
+          defaultVal = val
+        } else if (/^_lang$/.test(trimValue)) {
           defaultVal = config?._lang
-        } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
-          defaultVal = JSON.parse(configDefaultVal)
+        } else if (/^{[\w\W]*}$/.test(trimValue) || /^\[[\w\W]*\]$/.test(trimValue)) {
+          defaultVal = JSON.parse(trimValue)
         } else {
-          if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate' || configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
-            if (configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
+          if (trimValue === ARG_FLAGS.CURRENT_DATE || trimValue === 'currentDate' || trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
+            if (trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
             } else {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
             }
-          } else if (['true', 'false'].includes(configDefaultVal)) {
-            defaultVal = configDefaultVal == 'true' ? true : false
+          } else if (['true', 'false'].includes(trimValue)) {
+            defaultVal = trimValue == 'true' ? true : false
           } else {
-            defaultVal = configDefaultVal
+            defaultVal = trimValue
           }
         }
       } else {