resolver-egretimp-plus 0.1.111 → 0.1.112

package/package.json

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

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

@@ -23,10 +23,14 @@ export default {
       triggerRef: null,
       content: ''
     })
-    let pageSize = 5 // 默认每页5条
-    if (props.config?.pageSize) {
-      pageSize = parseInt(props.config.pageSize) || 5
-    }
+
+    // let pageSize = 10 // 默认每页5条
+    // if (props.config?.pageSize) {
+    //   pageSize = parseInt(props.config.pageSize) || 5
+    // }
+    const pageSize = computed(() => {
+      return parseInt(props.config.pageSize) || 5
+    })
     const page = reactive({
       pageNum: 1,
       pageSize,
@@ -252,6 +256,7 @@ export default {
         retObj.className = `${retObj.className || ''} clear-index`
       }
       if (!isVirtualized.value) {
+        retObj.className = `${retObj.className} cell-col-ellipsis`
         if (!retObj.prop) {
           retObj.prop = config.metaCode
         }
@@ -600,7 +605,6 @@ export default {
     const dataList = computed(() => {
       return totalRow.value?.length ? [...tableData.value, ...totalRow.value] : tableData.value
     })
-    // console.log('dynamicMapComp===:', inject('dynamicMapComp'))
 
     function cellMouseEnenter(e) {
       const {overflow, content} = eleIsOverflow(e)
@@ -676,7 +680,7 @@ export default {
           }
           if (isVirtualized.value) {
             retVnode = (
-              <div className="table-v2-cell" onMouseenter={(e) => cellMouseEnenter(e)} onMouseout={(e) => cellMouseout(e)}>
+              <div className="table-v2-cell" onMouseenter={(e) => cellMouseEnenter(e)} onMouseleave={(e) => cellMouseout(e)}>
                 {retVnode}
               </div>
             )

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

@@ -17,4 +17,10 @@
       }
     }
   }
-}
+}
+
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

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

@@ -154,6 +154,14 @@
   .pagination-wrap {
     display: flex;
   }
+  .cell-col-ellipsis {
+    & > .cell > .el-col {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
   // table-v2
   .table-border {
     --el-table-header-bg-color: #f5f6f7;
@@ -181,6 +189,11 @@
     .table-v2-cell {
       padding: 0 16px;
       width: 100%;
+      & > .el-col {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
     .table-v2-common-row {
       border-bottom: none;

package/src/utils/render.jsx

@@ -721,6 +721,12 @@ function generateFormItemPc (config, lang, compProps, params,) {
         return node
       }
     }
+
+    // 表格中的列，不需要form-item的时候，就尽可能不要，可以提升性能
+    
+    if (!props?.rules?.length && props?.class?.['hidden-label'] && config.isColumn) {
+      return node
+    }
     
     const slots = {
       error: (info) => createFormLabelErrorTip(info, config, lang)
@@ -787,6 +793,10 @@ export function generateFormItemPolyfill(config, lang, compProps, _isH5, params)
   }
 }
 
+function isHiddenLable(config) {
+  return (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && config.showLabel != '1'
+}
+
 function getFormItemExtendProps(config, lang, params, compProps) {
   const prop = config.dynamicHireRelat || ''
   // const propAttr = config.dynamicHireRelat ? config.dynamicHireRelat?.split('->') : []
@@ -803,7 +813,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
-      'hidden-label': (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && config.showLabel != '1',
+      'hidden-label': isHiddenLable(config),
       [`label-position-${config['label-position'] || config['labelPosition'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
     style,
@@ -818,17 +828,18 @@ export function getFormItemRule(config, lang, params, compProps, fromCustValid)
   if (config.showMoney && config.metaType == 'ElInput') {
     trigger = 'blur'
   }
-  const rules = [{
+  const rules = []
+  // 是否需要去进行校验
+  const needToValid = !(
+    (compProps?.disabled || isPlainColumn(config, compProps?.disabled)) && config.alongValidate != '1' ||
+    isChainHidden({ config })
+  )
+  if (!needToValid) {
+    return rules
+  }
+  rules.push({
     // required,
     validator: (rule, value, callback) => {
-      if ((compProps?.disabled || isPlainColumn(config, compProps?.disabled)) && config.alongValidate != '1') {
-        callback()
-        return
-      }
-      if (isChainHidden({ config })) {
-        callback()
-        return
-      }
       let val = config?.refValue
       if (fromCustValid) {
         val = value
@@ -850,7 +861,8 @@ export function getFormItemRule(config, lang, params, compProps, fromCustValid)
       }
     },
     trigger,
-  }]
+  })
+
   let regexPattern = []
   if (config.regexPattern) {
     try {
@@ -874,14 +886,6 @@ export function getFormItemRule(config, lang, params, compProps, fromCustValid)
   if (regexPattern?.length) {
     rules.push({
       validator: (rule, value, callback) => {
-        if ((compProps?.disabled || isPlainColumn(config, compProps?.disabled)) && config.alongValidate != '1') {
-        callback()
-          return
-        }
-        if (isChainHidden({ config })) {
-          callback()
-          return
-        }
         const bingdValue = config?.refValue
         if (fromCustValid) {
           val = value
@@ -915,14 +919,6 @@ export function getFormItemRule(config, lang, params, compProps, fromCustValid)
       if (isFunction(validator)) {
         rules.push({
           validator: (rule, value, callback) => {
-            if ((compProps?.disabled || isPlainColumn(config, compProps?.disabled)) && config.alongValidate != '1') {
-              callback()
-              return
-            }
-            if (isChainHidden({ config })) {
-              callback()
-              return
-            }
             return validator(rule, config.refValue, callback, config)
           },
           trigger,
@@ -995,7 +991,7 @@ function createFormLable(config, lang = 'zh') {
     <div title={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)} class="custom-label">
       <span
         onMouseenter={(e) => labelMouseEnenter(e, config, lang)}
-        onMouseout={() => config._labelShowTip = false}
+        onMouseleave={() => config._labelShowTip = false}
         class={`custom-label-content ${required ? 'custom-label-require' : ''}`} style={config.labelStyle}
         onClick={() => config.onLabelClick && config.onLabelClick?.(config)}
       >