resolver-egretimp-plus 0.0.169 → 0.0.170

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.169",
+  "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/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;
 }