resolver-egretimp-plus 0.1.91 → 0.1.93

package/package.json

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

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

@@ -181,14 +181,15 @@ function filterChange(e) {
 }
 .filter-header-wrap {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
   width: 100%;
   .filte-title {
     max-width: 50%;
   }
   .filter-input {
-    max-width: 50%;
+    flex: 1;
+    margin-left: 16px;
   }
 }
 </style>

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

@@ -24,6 +24,16 @@ const props = defineProps({
   isPointer: {
     type: [String, Number]
   },
+  // 多选的分割符号
+  separator: {
+    type: [String],
+    default: ','
+  },
+  // 多选显示时候 分隔的符号
+  separatorDesc: {
+    type: [String],
+    default: null
+  },
   showMoney: {
     type: [String, Number],
     default: ''
@@ -161,14 +171,14 @@ function selectFormat(value) {
   // 在满足多选，并且不是str格式的时候，就表示value为数组类型，取反就表示不满足的时候，需要转换成数组格式进行计算
   if (!(multiple && !isStrVal)) {
     try {
-      valList = valList ? (valList?.split(',') || []) : []
+      valList = valList ? (valList?.split(props.separator) || []) : []
     } catch (error) {
       debugger
     }
   }
   return valList?.reduce((ret, val) => {
     const str = props?.options?.find(item => item.columnValue == val)?.[lang?.value?.indexOf('zh') > -1 ? 'columnDesc_zh' : 'columnDesc'] || ''
-    return `${ret}${ret ? ',' : ''}${str}`
+    return `${ret}${ret ? (props.separatorDesc || props.separator) : ''}${str}`
   }, '')
 }
 

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

@@ -54,7 +54,7 @@ const value = computed({
     if (isNaN(Number(modeValue.value))) {
       return modeValue.value
     } else {
-      if (datePickerProps.valueFormat === 'timestamp' || `${modeValue.value}`.length >= 13) {
+      if (datePickerProps.value.valueFormat === 'timestamp' || `${modeValue.value}`.length >= 13) {
         return Number(modeValue.value)
       }
       return modeValue.value
@@ -71,6 +71,9 @@ watch(value, () => {
 })
 
 const disabledDate = (date) => {
+  if (datePickerProps.value?.disabledDate?.(date)) {
+    return true
+  }
   const currentDateStr = dayjs(date).format('YYYY-MM-DD')
   const currentDateUnix = dayjs(currentDateStr).unix()
   if (props.min) {

package/src/resolver-H5.vue

@@ -20,7 +20,7 @@ const props = defineProps({
   },
   copyModal: {
     type: [Object, Function],
-    default: () => copyModal
+    default: () => null
   },
   confirmInstance: {
     type: [Object, Function],

package/src/utils/render.jsx

@@ -975,10 +975,26 @@ function createFormLable(config, lang = 'zh') {
   }
   return (
     <div title={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)} class="custom-label">
-      <span class="custom-label-content" style={config.labelStyle} onClick={() => config.onLabelClick && config.onLabelClick?.(config)}>
+      <span
+        onMouseenter={(e) => labelMouseEnenter(e, config, lang)}
+        onMouseout={() => config._labelShowTip = false}
+        class="custom-label-content" style={config.labelStyle}
+        onClick={() => config.onLabelClick && config.onLabelClick?.(config)}
+      >
         {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null}
         <span>{lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}</span>
       </span>
+      {
+        config._labelShowTip ? 
+          <ElTooltip
+            placement="top"
+            visible={config._labelShowTip && !!config._triggerRef}
+            content={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}
+            virtualTriggering
+            virtualRef={config._triggerRef}
+          ></ElTooltip>
+          : null
+      }
       {
         config.hintFlag == '1' ? (
           <ElTooltip popper-class="poppper-class" effect="dark" content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn} placement="top">
@@ -1074,3 +1090,26 @@ export function getComponentSolt({
   }
   return {}
 }
+
+function labelMouseEnenter(e, config, lang) {
+  const innerText = lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)
+  // obj为鼠标移入时的事件对象
+  // currentwidth 为文本在页面中所占的宽度，创建标签，加入到页面，获取currentwidth,最后
+  let TemporaryTag = document.createElement('span');
+  TemporaryTag.innerText = innerText
+  TemporaryTag.className = 'getTextWidth'
+  document.querySelector('body').appendChild(TemporaryTag)
+  let currentWidth = document.querySelector('.getTextWidth').offsetWidth
+  document.querySelector(".getTextWidth").remove()
+  // cellwidth为表格容器的宽度
+  // 当文本宽度小于|等于容器宽度两倍时，代表文本显示未超过两行
+  // 当前宽度小于等于(两倍单元格宽度)时，显示提示信息为假;否则，显示提示信息为真。
+  const cellWidth = e.target.offsetWidth
+  if (currentWidth <= (2 * cellWidth)) {
+    config._labelShowTip = false
+    config._triggerRef = null
+  } else {
+    config._labelShowTip = true
+    config._triggerRef = e.target
+  }
+}