resolver-egretimp-plus 0.0.126 → 0.0.128

package/package.json

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

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

@@ -27,6 +27,9 @@ export default {
       if (props.config?.icon) {
         ret.suffixIcon = props.config?.icon
       }
+      if (props.config?.maxLength) {
+        ret.maxlength = parseInt(props.config.maxLength)
+      }
       return ret
     })
     const normalInputProps = computed(() => {
@@ -164,6 +167,7 @@ export default {
           {
             polyfillInputWrap(
               <div v-else class="input-wrap" ref={(e) => inputWrapRef.value = e}>
+                maxlength: {normalInputProps.maxlength}
                 <ElInput {...vmodelProps.value} {...{...normalAttrs.value, ...normalInputProps.value}}>
                   {
                     getInputSolts()

package/src/utils/render.jsx

@@ -746,7 +746,7 @@ function getFormItemRule(config, lang, params) {
           return
         }
         const val = (config.bindValue === null || config.bindValue === undefined) ? '' : config.bindValue
-
+        if (!val) callback() // 为空不进行正则校验
         for (let i = 0; i < regexPattern.length; i++) {
           const validInfo = regexPattern[i]
           const { reg, tip, tipEn } = validInfo

package/src/utils/valid.js

@@ -20,8 +20,9 @@ function validFailAction(errInfo, dynamicMapComp) {
     while (oneKey.indexOf('->') > -1) {
       const compInfo = dynamicMapComp[oneKey]
       compInfo && referComps.unshift(compInfo)
-      oneKey = oneKey.replace(/->[^(->)]+$/, '')
-      oneKey = oneKey.replace(/\[\d+\]$/, '')
+      oneKey = oneKey?.split('->')?.slice(0, -1)?.join('->') || ''
+      // oneKey = oneKey.replace(/->[^(->)]+$/, '')
+      // oneKey = oneKey.replace(/\[\d+\]$/, '')
     }
     const compInfo = dynamicMapComp[oneKey]
     compInfo && referComps.unshift(compInfo)

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

@@ -1,102 +0,0 @@
-<script setup>
-import { ElInput } from 'element-plus'
-import { computed, defineProps, useAttrs } from 'vue'
-import { commonPropsType, isElement } from '../../utils/index.js'
-import { ref } from 'vue';
-import { onMounted } from 'vue';
-import { getDomWidth } from '../../utils/dom.js';
-import { watch } from 'vue';
-import { nextTick } from 'vue';
-
-const isOverflow = ref(false)
-const inputWrapRef = ref(null)
-const calcSpanRef = ref(null)
-const props = defineProps({
-  ...commonPropsType,
-  ...ElInput.props
-})
-const inputProps = computed(() => {
-  const ret = Object.keys(ElInput.props).reduce((total, key) => {
-    total[key] = props[key]
-    return total
-  }, {})
-  if (props.config?.icon) {
-    ret.suffixIcon = props.config?.icon
-  }
-  return ret
-})
-const showTooltip = computed(() => {
-  return props?.config?.showTooltip == '1' && props.disabled
-})
-const attrs = useAttrs()
-const modelValue = defineModel()
-
-
-const tooltipCalc = (() => {
-  let unWatch = null
-  let onResize = null
-  return {
-    clear: () => {
-      unWatch && unWatch()
-      onResize && window.removeEventListener('resize', onResize)
-    },
-    calc() {
-      this.clear()
-      let inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
-      let textLengthWidth = getDomWidth(calcSpanRef.value, -22)
-      isOverflow.value = inputWrapWidth < textLengthWidth
-      unWatch = watch(() => modelValue.value, (val) => {
-        nextTick(() => {
-          textLengthWidth = getDomWidth(calcSpanRef.value, -22)
-          isOverflow.value = inputWrapWidth < textLengthWidth
-        })
-      })
-      onResize = () => {
-        inputWrapWidth = getDomWidth(inputWrapRef.value, 0)
-        isOverflow.value = inputWrapWidth < textLengthWidth
-        console.log('isOverflow==:', isOverflow.value, inputWrapWidth)
-      }
-      window.addEventListener('resize', onResize)
-    }
-  }
-})()
-
-onMounted(() => {
-  watch(showTooltip, (val) => {
-    if (val) {
-      tooltipCalc?.calc()
-    }
-  }, {
-    immediate: true
-  })
-})
-</script>
-<template>
-  <div class="input-contrainer">
-    <span ref="calcSpanRef" class="calc-span">{{ modelValue }}</span>
-    <el-tooltip v-if="isOverflow" :content="modelValue" placement="top">
-      <div class="input-wrap" :ref="(e) => inputWrapRef = e">
-        <ElInput v-model="modelValue" v-bind="{...attrs, ...inputProps}"></ElInput>
-      </div>
-    </el-tooltip>
-    <div v-else class="input-wrap" :ref="(e) => inputWrapRef = e">
-      <ElInput v-model="modelValue" v-bind="{...attrs, ...inputProps}"></ElInput>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.input-contrainer {
-  width: 100%;
-  .calc-span {
-    white-space: nowrap;
-    position: absolute;
-    visibility: hidden;
-    padding: 0 11px;
-    box-sizing: border-box;
-  }
-  .input-wrap{
-    width: 100%;
-  }
-}
-</style>