resolver-egretimp-plus 0.0.76 → 0.0.78

package/package.json

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

package/src/analysisComponent.jsx

@@ -99,6 +99,9 @@ export default {
         })
         penddingRules[hireRelat] = null
       }
+      if (props.config?.immediateClickEvent) {
+        executeClickEvents()
+      }
     }
     const onVnodeUnmounted = () => {
       props.config.vmIsBind = false
@@ -183,6 +186,9 @@ export default {
         appContext
       }
       attrs?.onClick?.call(context, e) // 如果配置中有点击事件
+      executeClickEvents()
+    }
+    function executeClickEvents() {
       executeEventOrchestration({
         props,
         requestTraceId: requestTraceId?.value,

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

@@ -122,5 +122,8 @@ defineExpose({
       width: 100%;
     }
   }
+  .el-dialog__header {
+    min-height: 40px;
+  }
 }
 </style>

package/src/components/helper/eventOrchestration.js

@@ -46,7 +46,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     delete reqConfig.data
   }
   const ret = await (axiosInstance && axiosInstance(reqConfig))
-  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig})) {
+  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip: httpMethod.toLocaleLowerCase() === 'get'})) {
     await Promise.reject()
     return
   }
@@ -195,17 +195,20 @@ export function openDailg({
     initPolyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
       return {
         onClick() {
-          const outResult = rootStore.tableSelectedInfo?.map(item => {
-            const retItem = {
-              ...item
-            }
-            Object.keys(mapList).forEach(key => {
-              if (mapList[key]) {
-                retItem[key] = item[mapList[key]]
+          let outResult = rootStore.tableSelectedInfo
+          if (isList) {
+            outResult = rootStore.tableSelectedInfo?.map(item => {
+              const retItem = {
+                ...item
               }
+              Object.keys(mapList).forEach(key => {
+                if (mapList[key]) {
+                  retItem[key] = item[mapList[key]]
+                }
+              })
+              return retItem
             })
-            return retItem
-          })
+          }
           initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult})
           dialogClose?.()
         }

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

@@ -28,10 +28,10 @@ const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
 })
 const showCollapseBtn = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN)?.length > collapseLimt
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')?.length > collapseLimt
 })
 const showPageMeteList = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN).slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1').slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
 })
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1

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

@@ -12,8 +12,9 @@ const props = defineProps({
 const tableData = ref([])
 const modelValue = defineModel()
 
+// 移动端默认前端分页
 const isFrontPage = computed(() => {
-  return props.config?.frontPageFlag == '1'
+  return hasOwn(props.config, 'frontPageFlag') ? props.config?.frontPageFlag == '1' : true
 })
 const tableProps = computed(() => {
   return {
@@ -123,7 +124,7 @@ watch(() => page.pageSize, (val) => {
 })
 
 const pmPageMetaList = computed(() => {
-  return (props.config.pmPageMetaList || [])
+  return (props.config.pmPageMetaList || []).filter(config => config.hidden != '1')
 })
 
 const getTableColumnProps = (config) => {
@@ -188,7 +189,7 @@ function normalTableRowValue(row) {
     >
     </cmi-table-column>
   </cmi-table>
-  <div v-if="pageable" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
+  <div v-if="pageable && normalPageTotal > page.pageSize" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
     <cmi-pagination
       :key="normalPageTotal"
       v-bind="{...paginationProps, ...pagenationEvents}"

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

@@ -129,7 +129,7 @@ export default {
     // 获取表格列的属性配置
     const getTableColumnProps = (config, idx) => {
       const nextList = tableColumnConfigs.value.slice(idx + 1)
-      const nextConfig = nextList.find(config => config.displayType === DISPLAY_SHOW)
+      const nextConfig = nextList.find(config => config.displayType != DISPLAY_HIDDEN)
       const props =  Object.keys(ElTableColumn.props).reduce((ret, key) => {
         if (hasOwn(config, key)) {
           ret[key] = config[key]
@@ -146,7 +146,7 @@ export default {
         props.className = 'hidden-column'
         props.width = '1px'
       }
-      if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px')) {
+      if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px' || nextConfig.hidden == '1')) {
         props.className = `${props.className || ''} next-hidden-column`
       }
       if (isPlainColumn({...config, isColumn: true}, calcDisable(config, props.mode))) {
@@ -216,6 +216,9 @@ export default {
     watch(() => {
       return tableData?.value?.length
     }, (length) => {
+      // if (props.config.metaCode == 'solutionSupports') {
+      //   debugger
+      // }
       let list = []
       if (length) {
         const newVal = tableData?.value
@@ -314,7 +317,7 @@ export default {
 
     // 表格是否开启啦可选择配置
     const selectable = computed(() => {
-      return props.config?.selectable
+      return props.config?.selectable == '1' || props.config?.canSelect
     })
     const selectedRow = ref(null)
     const currentChange = (row) => {

package/src/components/styles/CustomComponenTable.scss

@@ -114,12 +114,13 @@
     margin-top: 16px;
   }
   .hidden-column {
-    display: none;
+    border: none;
+    // display: none;
   }
   .hidden-column + .el-table__cell {
-    border: none;
+    // border: none;
   }
   .next-hidden-column {
-    border: none;
+    // border: none;
   }
 }

package/src/index.jsx

@@ -6,6 +6,7 @@ import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices } from "./components/helper/resolver.js"
+import { deepMerge } from "./utils/index.js"
 export default {
   name: 'Resolver',
   props: {
@@ -197,7 +198,7 @@ export default {
           reqData: props.loadEvnetsReq,
           respCb: (result) => {
             nativeDataLoad.value = true
-            emit('update:modelValue', result)
+            emit('update:modelValue', deepMerge(props.modelValue, result, 'replace') )
             emit('loadEvnetsCompleted', result)
           }
         }
@@ -242,7 +243,10 @@ export default {
       dynamicMapComp,
       validate,
       pageConfig: pageConfigRef,
-      rootForm
+      rootForm,
+      getRequestTraceId: () => {
+        return props.requestTraceId
+      }
     })
 
     const modelValue = computed({

package/src/utils/valid.js

@@ -1,11 +1,13 @@
 export function toValidate(formRef, cb, dynamicMapComp) {
   if (!cb) {
     return formRef.value && formRef.value.validate().catch(err => {
+      debugger
       validFailAction(err, dynamicMapComp)
       return Promise.reject(err)
     })
   }
   return formRef.value && formRef.value.validate((valid, errInfo) => {
+    debugger
     errInfo && validFailAction(errInfo, dynamicMapComp)
     cb && cb(valid, errInfo)
   })
@@ -40,7 +42,7 @@ function validFailAction(errInfo, dynamicMapComp) {
 // 标签组件，需要进行聚焦当前页面
 // component组件，需要打开折叠
 function validFail(config, nextConfig) {
-  const type = config.metaType
+  const type = config.renderby || config.metaType
   switch (type) {
     case 'CustomComponentTabPane':
     case 'CustomComponentCycleTabPane':