resolver-egretimp-plus 0.0.252 → 0.0.254

package/package.json

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

package/src/components/helper/resolver.js

@@ -83,6 +83,7 @@ export async function executeLoadServices(services = [], {
       respCb && respCb(ret?.data?.result)
       return
     }
+    respCb && respCb({})
     messageInstance?.value?.error(ret?.data?.resultMessage || '')
     await Promise.reject()
   }

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

@@ -47,7 +47,7 @@ const tabProps = computed(() => {
     activekey: activeNames.value,
     sticky: props.config?.sticky == '1',
     offsettop: (props.config?.offsetTop || '0') + 'vw',
-    type: props.config.displayType,
+    type: props.config.displayType || props.config.tabType,
     title: lang.value?.indexOf('zh') > -1 ? props.config.metaNameZh : props.config.metaNameEn
   }
 })

package/src/components/packages-web/ElInput.jsx

@@ -21,6 +21,10 @@ export default {
       type: [String, Number],
       default: ''
     },
+    moneySeg: {
+      type: [String],
+      default: ','
+    },
     min: {
       type: Number,
       default: -Infinity
@@ -270,7 +274,7 @@ export default {
 
       // 处理千分位
       const parts = val.toFixed(props.decimal).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/ElText.vue

@@ -1,6 +1,6 @@
 <template>
   <ElText v-bind="{...attrs, ...elRowProps,}" @click="clickAction" >
-    {{props.refValue.value}}
+    {{ labelDesc }}
   </ElText>
 </template>
 <script setup>
@@ -8,6 +8,8 @@ import { ElText } from 'element-plus'
 import { computed, defineProps, inject, getCurrentInstance, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 
+const lang = inject('lang')
+const modelValue = defineModel()
 const appContext = getCurrentInstance()?.appContext
 const props = defineProps({
   ...commonPropsType,
@@ -16,6 +18,14 @@ const props = defineProps({
 })
 const attrs = useAttrs()
 
+const normalVal = computed(() => {
+  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
+  if (findItem) {
+    return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
+  }
+  return modelValue.value
+})
+
 const elRowProps = computed(() => {
   const result = Object.keys(ElText.props).reduce((ret, key) => {
     ret[key] = props[key]
@@ -25,6 +35,9 @@ const elRowProps = computed(() => {
 })
 const buttonActions = inject('buttonActions', {})
 
+const labelDesc = computed(() => {
+  return normalVal.value
+})
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')

package/src/components/styles/CustomComponenTable.scss

@@ -118,6 +118,7 @@
   }
   .hidden-column {
     border: none;
+    overflow: hidden;
     // display: none;
   }
   .hidden-column + .el-table__cell {

package/src/rules/ruleUtils.js

@@ -127,14 +127,12 @@ function getRelateConfigs(codesStr, config, type) {
             const fincCg = cg?.pmPageMetaList?.find(childCg => childCg.metaCode === code)
             if (!fincCg) return
             list.push(fincCg)
-          } else {
-            cg.multiPmPageMetaList.forEach(childCgList => {
-              const fincCg = childCgList.find(childCg => childCg.metaCode === code)
-              if (!fincCg) return
-              list.push(fincCg)
-            })
           }
-          
+          cg.multiPmPageMetaList.forEach(childCgList => {
+            const fincCg = childCgList.find(childCg => childCg.metaCode === code)
+            if (!fincCg) return
+            list.push(fincCg)
+          })
         }
       } else {
         const fincCg = cg?.pmPageMetaList?.find(childCg => childCg.metaCode === code)

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

@@ -3,6 +3,12 @@
   --el-input-text-color: #1f2329;
 }
 
+.ElInput {
+  .el-input {
+    display: flex;
+  }
+}
+
 .el-input__wrapper {
   .el-input__clear {
     svg path {

package/src/utils/common.js

@@ -154,7 +154,7 @@ export const formatAmount = (val, data) => {
     return val
   }
   let params = isPlainObject(data) ? data : { decimals: 2, isThousandth: true }
-  let str = String(val).replace(/[^\d\.\-]/g, "")
+  let str = String(val).replace(/[^\d\.\-\e\E]/g, "")
   if (params?.decimals || params?.decimals == 0) {
     str = parseFloat(str).toFixed(params.decimals).toString()
   }