resolver-egretimp-plus 0.0.279 → 0.0.281

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.279",
+  "version": "0.0.281",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",
@@ -11,6 +11,11 @@
     "./const": "./dist/const/index.js",
     "./*": "./*"
   },
+  "scripts": {
+    "build:package": "webpack --config scripts/webpack.config.js",
+    "build:theme": "gulp -f scripts/gulpfile.mjs",
+    "build": "npm run build:package && npm run build:theme"
+  },
   "author": "caowb",
   "license": "ISC",
   "devDependencies": {
@@ -49,10 +54,5 @@
     "vue3-sfc-loader": "^0.9.5",
     "webpack": "^5.90.0",
     "webpack-cli": "^5.1.4"
-  },
-  "scripts": {
-    "build:package": "webpack --config scripts/webpack.config.js",
-    "build:theme": "gulp -f scripts/gulpfile.mjs",
-    "build": "npm run build:package && npm run build:theme"
   }
-}
+}

package/src/components/helper/eventOrchestration.js

@@ -15,7 +15,7 @@ function getPathVal(obj = {}, path) {
       return ret[key]
     }
     return null
-  }, obj) || ''
+  }, obj) ?? ''
 }
 function assignmentPathVal(obj = {}, path, val) {
   let paths = path

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

@@ -91,9 +91,13 @@ export default {
         return normalColumnConfig(config)
       })
     })
+    let pageSize = 5
+    if (props.config?.pageSize) {
+      pageSize = parseInt(props.config.pageSize) || 5
+    }
     const page = reactive({
       pageNum: 1,
-      pageSize: 5,
+      pageSize,
       total: 0,
     })
     const isFrontPage = computed(() => {

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

@@ -38,6 +38,11 @@ export default {
       type: Number,
       default: 2
     },
+    // 保留小数点0后缀
+    decimalSuffix: {
+      type: [Number, String],
+      default: '0'
+    },
     // 在显示金额的时候，可以显示的符号
     canShowFlag: {
       type: Array,
@@ -102,18 +107,10 @@ export default {
         emit('update:modelValue', val)
       }
     })
-    // 如果开启了金额显示的话，需要有currentVal进行中间值展示
-    const currentVal = ref('')
-    watch(modelValue, (val) => {
-      const value = formatValue(val)
-      if (currentVal.value != value) {
-        currentVal.value = value
-      }
-    }, {
-      immediate: true
-    })
+    // 开启金额展示的时候需要isFocus来控制格式的转换
+    const isFocus = ref(false)
     const displayValue = computed(() => {
-      return props.showMoney == '1' ? currentVal.value : modelValue.value
+      return props.showMoney == '1' ? (isFocus.value ? modelValue.value : formatValue(modelValue.value)) : modelValue.value
     })
     const isPagePopup = computed(() => {
       return props.config?.lcpPagePopupMapVO
@@ -132,19 +129,15 @@ export default {
       }
       if (!(isPagePopup.value && !isPagePopupAlwayEdit.value)) {
         ret['onUpdate:modelValue'] = (val) => {
-          if (props.showMoney == '1') {
-            currentVal.value = val
-          } else {
-            modelValue.value = val
-          }
+          modelValue.value = val
         }
         if (props.showMoney == '1') {
           ret['onFocus'] = () => {
-            currentVal.value = parseValue(currentVal.value)
+            isFocus.value = true
           }
           ret['onBlur'] = () => {
-            currentVal.value = formatValue(currentVal.value)
-            modelValue.value = parseValue(currentVal.value)
+            isFocus.value = false
+            modelValue.value = parseValue(formatValue(modelValue.value))
           }
         }
       } else {
@@ -265,7 +258,7 @@ export default {
       if (props.canShowFlag?.includes(String(value).toLowerCase())) {
         return value
       }
-      if (value === null || isNaN(value)) return ''
+      if (value === null || value === undefined) return ''
       let val = parseFloat(value)
       if (isNaN(val)) {
         return ''
@@ -275,7 +268,11 @@ export default {
       val = Math.max(props.min, Math.min(props.max, val))
 
       // 处理千分位
-      const parts = val.toFixed(props.decimal).split('.')
+      val = val.toFixed(props.decimal)
+      if (props.decimalSuffix != '1') {
+        val = parseFloat(val)
+      }
+      const parts = `${val}`.split('.')
       parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, props.moneySeg)
       
       // 添加货币符号
@@ -296,7 +293,16 @@ export default {
         return ''
       }
       // 移除所有非数字字符（保留负号和小数点）
-      const parsed = Number(value.replace(/[^\d.-]/g, ''))
+      let pointCount = 0
+      const repVal = `${value}`.replace(/[^\d.-]/g, '').replace(/(\.\d*)/g, (a) => {
+        const count = pointCount
+        pointCount ++
+        if (!count) {
+          return a
+        }
+        return ''
+      })
+      const parsed = Number(repVal)
       return isNaN(parsed) ? '' : parsed
     }
 

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

@@ -0,0 +1,155 @@
+<template>
+  <ElSelect class="custom-self-select" v-bind="{...attrs, ...selectProps }" v-model="value" @clear="clear">
+    <ElOption v-for="option in options"
+      :key="option.columnValue"
+      :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
+      :value="option.columnValue"
+      :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
+    >
+      <template v-for="(_, key) in optionsSlots" :key="key" v-slot:[key]="scope">
+        <slot :name="key" v-bind="scope"></slot>
+      </template>
+    </ElOption>
+    <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
+      <slot :name="key" v-bind="scope"></slot>
+    </template>
+  </ElSelect>
+</template>
+<script setup>
+import { ElSelect, ElOption } from 'element-plus'
+import { computed, defineProps, inject, useAttrs, useSlots } from 'vue'
+import { commonPropsType, getComponentSolt } from '../../utils/index.js'
+
+const VALUE_TYPES = {
+  LIST: 'list',
+  OBJECT: 'object',
+  STRING: 'string',
+}
+const slots = useSlots()
+const optionsSlots = computed(() => {
+  return getComponentSolt({
+    config: props.config,
+    slotKey: 'optionsSlots'
+  }) || {}
+})
+const modelValue = defineModel()
+const props = defineProps({
+  ...ElSelect.props,
+  ...commonPropsType,
+  multiple: [String, Boolean],
+  filterable: [String, Boolean],
+  multipleLimit: [String, Number],
+  rangeOptions: Array,
+  excludeOptions: Array,
+  // 多选的分割符号
+  separator: {
+    type: [String],
+    default: ','
+  }
+})
+const attrs = useAttrs()
+const separator = computed(() => {
+  return props.separator
+})
+const valueTypes = computed(() => {
+  return props.config?.valueType
+})
+// 值是list 还是,连起来的string
+const isStrVal = computed(() => {
+  // valueType 值为 list 或者 string
+  return valueTypes.value !== VALUE_TYPES.LIST && valueTypes.value !== VALUE_TYPES.OBJECT
+})
+const isObject = computed(() => {
+  return valueTypes.value === VALUE_TYPES.OBJECT
+})
+
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.multiple == '1'
+})
+
+const options = computed(() => {
+  let list = props.options
+  if (props.rangeOptions && props.rangeOptions.length) {
+    list = list?.filter?.(item => props.rangeOptions?.some(subValue => subValue == item.columnValue))
+  }
+  if (props.excludeOptions && props.excludeOptions.length) {
+    list = list?.filter?.(item => !(props.excludeOptions?.some(subValue => subValue == item.columnValue)))
+  }
+  return list
+})
+
+const value = computed({
+  get() {
+    if (isMutiple.value) {
+      const val = modelValue.value || ''
+      return val ? 
+        (
+          isStrVal.value ?
+            val.split(separator.value) :
+            (
+              isObject.value ?
+                Object.values(val || {}) :
+                val
+            )
+        ) :
+        []
+    } else {
+      if (modelValue.value !== null && modelValue.value !== undefined) {
+        if (options.value?.some(item => item.columnValue == modelValue.value)) {
+          props.config.isMatch = true
+          return `${modelValue.value}`
+        } else {
+          props.config.isMatch = false
+          return ''
+        }
+      } else {
+        return ''
+      }
+    }
+  },
+  set(val) {
+    if (isMutiple.value) {
+      modelValue.value = isStrVal.value ? 
+        val.join(separator.value) :
+        (
+          isObject.value ?
+            val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {}) :
+            val
+        )
+    } else {
+      modelValue.value = val
+    }
+  }
+})
+
+const selectProps = computed(() => {
+  const attrs = Object.keys(ElSelect.props).reduce((ret, key) => {
+    ret[key] = props[key]
+    return ret
+  }, {})
+  if (attrs.placeholder === null || attrs.placeholder === undefined) {
+    attrs.placeholder = ''
+  }
+  if (typeof attrs.filterable === 'string') {
+    attrs.filterable = attrs.filterable == '1'
+  }
+  if (typeof attrs.multiple === 'string') {
+    attrs.multiple = attrs.multiple == '1'
+  }
+  if (!attrs['suffix-icon'] && !attrs.suffixIcon) {
+    delete attrs.suffixIcon
+    delete attrs['suffix-icon']
+  }
+  attrs.multipleLimit = Number(parseInt(attrs.multipleLimit || 0))
+  return attrs
+})
+const lang = inject('lang')
+const clear = () => {
+  modelValue.value = ''
+}
+</script>
+<style lang="scss">
+.custom-self-select {
+}
+</style>

package/src/utils/render.jsx

@@ -787,7 +787,7 @@ function getFormItemExtendProps(config, lang, params) {
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
-      'hidden-label': config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1',
+      'hidden-label': (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && !config.showLabel,
       [`label-position-${config['label-position'] || config['labelPosition'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
     style,