resolver-egretimp-plus 0.0.169 → 0.0.171

package/package.json

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

package/src/components/childDialog/src/index.vue

@@ -4,6 +4,7 @@ import { ElDialog } from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import en from 'element-plus/es/locale/lang/en'
 import { hasOwn } from '../../../utils';
+import { watch } from 'vue';
 const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
 
 const props = defineProps({
@@ -57,7 +58,9 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
-  rootStoreChange: Function
+  rootStoreChange: Function,
+  // 获取formData数据
+  rootDataChange: Function,
 })
 const formData = ref({})
 const dialogVisible = ref(true)
@@ -93,6 +96,9 @@ function rootStoreChange(rootStore) {
 }
 
 
+watch(formData, (val) => {
+  props.rootDataChange && props.rootDataChange(val)
+})
 defineExpose({
   dialogVisible,
   clearData: () => {

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')
   }
@@ -213,21 +221,31 @@ export function openDailg({
   appContext,
   compConfig
 }) {
+  const dialogProps = parseExtendAttr({extendAttr: pagePopupMap.extendAttr})
+
   const busiIdentityId = pagePopupMap.popupBusiIdentityId
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   const reqData = getReqData(pagePopupMap.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
-  
+  // 是表格还是list
+  const isList = pagePopupMap?.objOrList == '1'
+
   let outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
     const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
+    const orignParam = item.orignParam ?
+      (
+        dialogProps?.bindFormData == '1' && !isList ? 
+          orignParamArr.join('.') :
+          orignParamArr[orignParamArr.length - 1]
+      )
+      : ''
     return {
       ...item,
-      orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
+      orignParam,
     }
   }) || []
   let mapList = {}
   let selectionsObj = {}
-  // 是表格还是list
-  const isList = pagePopupMap?.objOrList == '1'
+  
   if (isList ) {
     const primaryKeys = []
     mapList = outParamMappingList?.reduce((ret, item) => {
@@ -256,6 +274,7 @@ export function openDailg({
 
 
   let rootStore = {}
+  let rootFormData = {}
   let dialogClose = null
   const initPolyfillConfigs = {}
   if (pagePopupMap.outDisplayTrigger) {
@@ -276,6 +295,9 @@ export function openDailg({
               return retItem
             })
           }
+          if (dialogProps?.bindFormData == '1' && !isList) {
+            outResult = rootFormData
+          }
           // 定义打开弹框-中间钩子
           const configMiddleOpenDialog = compConfig?.middleOpenDialog
           const parmasMiddleOpenDialog = middleOpenDialog
@@ -335,7 +357,6 @@ export function openDailg({
       }
     }
   }
-  const dialogProps = parseExtendAttr({extendAttr: pagePopupMap.extendAttr})
 
   // 定义的弹框打开前钩子
   const configBeforeOpenDialog = compConfig?.beforeOpenDialog
@@ -430,7 +451,10 @@ export function openDailg({
       },
       rootStoreChange: (val) => {
         rootStore = val
-      }
+      },
+      rootDataChange: (val) => {
+        rootFormData = val
+      },
     }, appContext)
   }
 }

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

@@ -66,6 +66,15 @@
       width: 100% !important;
     }
   }
+  .vertical-start {
+    align-items: start;
+  }
+  .vertical-center {
+    align-items: center;
+  }
+  .vertical-end {
+    align-items: end;
+  }
   .el-form-item {
     margin-bottom: var(--prmary-marign);
     margin-right: var(--prmary-marign);

package/src/utils/render.jsx

@@ -30,6 +30,7 @@ import QuestionFilled from '../components/icons/question-filled.vue'
 import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/eventOrchestration.js'
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
+import { h } from 'vue'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -605,6 +606,14 @@ function generateFormItemPc (config, lang, compProps, params,) {
     }
   }
   return node => {
+    if (config.polyfillNode && typeof config.polyfillNode === 'function') {
+      node = (
+        <div style="width: 100%">
+          {node}
+          {config.polyfillNode(h, { config })}
+        </div>
+      )
+    }
     // 表格中中的列，是否需要转换为普通形式
     if (isPlainColumn(config, compProps.disabled)) {
       return node
@@ -674,9 +683,10 @@ function getFormItemExtendProps(config, lang, params) {
     prop,
     rules: getFormItemRule(config, lang, params),
     class: {
+      [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
       'hidden-label': config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1',
-      [`label-position-${config['label-position'] || 'right'}`]: true // label-position 支持三个值，right、left、top
+      [`label-position-${config['label-position'] || config['labelPosition'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
     style,
   }