resolver-egretimp-plus 0.0.75 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "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/helper/eventOrchestration.js

@@ -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/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

@@ -107,7 +107,15 @@ export default {
       }
       const sortList = [sortObj.value]
       const ret = sortList.reduce((ret, item) => {
-        ret = ret.sort((a, b) => (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? 1 : -1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? -1 : 1)))
+        ret = ret.sort((a, b) => {
+          if (a[item.prop] === '' || a[item.prop] === undefined || a[item.prop] === null) {
+            return item.order === 'descending' ? -1 : 1
+          }
+          if (b[item.prop] === '' || b[item.prop] === undefined || b[item.prop] === null) {
+            return item.order === 'descending' ? 1 : -1
+          }
+          return (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? 1 : -1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? -1 : 1))
+        })
         return ret
       }, [...(normalTableData.value || [])])
       return ret
@@ -306,7 +314,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/index.jsx

@@ -242,7 +242,10 @@ export default {
       dynamicMapComp,
       validate,
       pageConfig: pageConfigRef,
-      rootForm
+      rootForm,
+      getRequestTraceId: () => {
+        return props.requestTraceId
+      }
     })
 
     const modelValue = computed({