resolver-egretimp-plus 0.0.168 → 0.0.170

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -116,7 +116,15 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
   // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
   initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
   if (tableConfig?.vm) {
-    const total = parseInt(getPathVal(ret.data?.result || {}, service.pageTotalCount || 'pageCount'))
+    let totalObj = ret.data?.result
+    let pageTotalCountKey = service.pageTotalCount
+    const deepMatch = /^_deep:(.+)$/
+    const matchs = service.pageTotalCount?.match(deepMatch)
+    if (matchs) {
+      totalObj = ret.data
+      pageTotalCountKey = matchs[1]
+    }
+    const total = parseInt(getPathVal(totalObj || {}, pageTotalCountKey || 'pageCount'))
     tableConfig.vm.page.total = total
     // tableConfig.vm?.changePage(total, 'total')
   }

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

@@ -16,6 +16,8 @@ const props = defineProps({
   }
 })
 
+const emptyValDisplay = props.config?.emptyValDisplay ?? "--"
+
 const normalVal = computed(() => {
   const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
   if (findItem) {
@@ -48,6 +50,9 @@ const calcProps = computed(() => {
     if (props.formatter && typeof props.formatter === "function") {
       desc = props.formatter(desc, props.config, props)
     }
+    if (desc === "" || desc === undefined || desc === null) {
+      desc = emptyValDisplay
+    }
     if (props.titleFormatter && typeof props.titleFormatter === "function") {
       title = props.titleFormatter(title, props.config, props)
     }

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

@@ -71,17 +71,15 @@
   }
 }
 
-.CustomComponentCollapse:first-child {
-  margin-bottom: 12px;
-}
-.CustomComponentCollapse + .CustomComponentCollapse {
+.CustomComponentCollapse:has(+ .CustomComponentCollapse) {
   margin-bottom: 12px;
 }
 
-.CustomComponentCollapse.is-card:first-child {
-  margin-bottom: 16px;
-}
-.CustomComponentCollapse.is-card + .CustomComponentCollapse.is-card {
+// 选择第一个
+// :not(.CustomComponentCollapse.is-card) + .CustomComponentCollapse.is-card {
+//   background: red;
+// }
+.CustomComponentCollapse.is-card:has(+ .CustomComponentCollapse.is-card) {
   margin-bottom: 16px;
 }
 

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

@@ -14,6 +14,20 @@
         display: none;
       }
     }
+    & > .el-form-item__label-wrap {
+      & > .el-form-item__label {
+        // 表单label中使用弹性居中
+        display: flex;
+        align-items: center;
+        box-sizing: content-box;
+  
+        // 不需要自带的必填*提示符合
+        &::before {
+          display: none;
+        }
+      }
+    }
+    
     .custom-label {
       display: inline-flex;
       align-items: center;

package/src/utils/render.jsx

@@ -851,7 +851,7 @@ function createFormLable(config, lang = 'zh') {
   }
   return (
     <div title={lang.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn} class="custom-label">
-      <span class="custom-label-content" style={config.labelStyle}>
+      <span 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.metaNameZh : config.metaNameEn}</span>
       </span>
@@ -866,6 +866,7 @@ function createFormLable(config, lang = 'zh') {
   )
 }
 
+
 export function getComponentPropsKeys(comp, config) {
   let propsKeys = []
   if (typeof comp === 'string') {