resolver-egretimp-plus 0.1.136 → 0.1.138

package/package.json

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

package/src/analysisComponent.jsx

@@ -81,7 +81,7 @@ export default {
     const lang = inject('lang')
     const OPEN_DATA_RULES = inject('OPEN_DATA_RULES')
 
-    const _dialogFooterTeleport = inject('_dialogFooterTeleport')
+    const _dialogFooterTeleport = inject('_dialogFooterTeleport', ref(null))
     const selects = inject('selects')
     const _parentRootValue = inject('_parentRootValue')
     const _parentDynamicMapComp = inject('_parentDynamicMapComp')

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

@@ -661,6 +661,20 @@ export default {
       toopTip.triggerRef = null
     }
 
+    function calcHeadContextWidth(config) {
+      let jianPX = 0
+      if (config.requiredFlag == '1') {
+        jianPX += 11
+      }
+      if (config.hintFlag == '1') {
+        jianPX += 19
+      }
+      if (jianPX) {
+        return `calc(100% - ${jianPX}px)`
+      }
+      return '100%'
+    }
+
     function generateCellSolts(columnConfg, configIdx) {
       let headerKey = 'header'
       let cellKey = 'default'
@@ -671,11 +685,13 @@ export default {
       return {
         [headerKey]: () => {
           let retVnode = (
-            <span className='head-span' title={lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn}>
+            <div className='head-span-new'>
               { columnConfg.requiredFlag == '1' ? <span style="color: rgb(245, 34, 45); margin-right: 3px;">*</span> : '' }
-              { columnConfg.headerRender ? columnConfg.headerRender(h, { props, config: columnConfg, lang, rootValue, selects })
+              <div className='head-span-text' style={{maxWidth: calcHeadContextWidth(columnConfg)}} onMouseenter={(e) => cellMouseEnenter(e)} onMouseleave={(e) => cellMouseout(e)}>
+                { columnConfg.headerRender ? columnConfg.headerRender(h, { props, config: columnConfg, lang, rootValue, selects })
                   : (lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn)
-              }
+                }
+              </div>
               {
                 columnConfg.hintFlag == '1' ? (
                   <ElTooltip effect="dark" content={lang.value.indexOf('zh') > -1 ? columnConfg.hintContentZh : columnConfg.hintContentEn} placement="top">
@@ -683,7 +699,7 @@ export default {
                   </ElTooltip>
                 ) : null
               }
-            </span>
+            </div>
           )
           if (isVirtualized.value) {
             retVnode = (

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

@@ -96,6 +96,16 @@
       overflow: hidden;
       white-space: nowrap;
     }
+    .head-span-new {
+      width: 100%;
+      .head-span-text {
+        display: inline-block;
+        vertical-align:bottom;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+    }
   }
   th.el-table__cell.is-leaf {
     border-bottom: none;