resolver-egretimp-plus 0.0.63 → 0.0.64

package/package.json

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

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

@@ -1,6 +1,6 @@
 <script setup>
-import { commonPropsType } from '../../utils/index.js'
-import { computed, inject, ref, useAttrs, watch } from 'vue'
+import { commonPropsType, hasOwn } from '../../utils/index.js'
+import { computed, inject, reactive, ref, useAttrs, watch } from 'vue'
 
 const attrs = useAttrs()
 const lang = inject('lang')
@@ -10,15 +10,101 @@ const props = defineProps({
 })
 const tableData = ref([])
 const modelValue = defineModel()
+
+const isFrontPage = computed(() => {
+  return props.config?.frontPageFlag === '1'
+})
 const tableProps = computed(() => {
   return {
     stripe: props.config?.stripe === '1',
     card: props.config?.displayType === 'card',
     display: props.config?.display,
-    open: props.config?.open === '1',
+    open: props.config?.defaultOpenFlag === '1',
     showlandscape: props.config?.showLandscape === '1',
   }
 })
+const page = reactive({
+  pageNum: 1,
+  pageSize: 3,
+  total: 0,
+})
+
+const normalTableData = computed(() => {
+  return !isFrontPage.value ?
+    tableData.value :
+    tableData.value.slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
+})
+
+const normalPageTotal = computed(() => {
+  return !isFrontPage.value ? page.total : (tableData.value?.length || 0)
+})
+
+const paginationProps = computed(() => {
+  return {
+    pagesizes: props.config?.pagesizes || [3, 10, 20, 50],
+    showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : true,
+  }
+})
+const pagenationEvents = computed(() => {
+  const ret = {
+    onSizeChange: (e) => {
+      if (attrs.onSizeChange) {
+        attrs.onSizeChange?.(e)
+      }
+      page.pageSize = e?.detail?.value || 3
+    },
+    onCurrentChange: (e) => {
+      if (attrs.onCurrentChange) {
+        attrs.onCurrentChange?.(e)
+      }
+      page.pageNum = e?.detail?.value || 1
+    }
+  }
+  return ret
+})
+// 是否配置分页功能     ====== start======
+const pageable = computed(() => {
+  return props.config?.pageable === '1'
+})
+const pageAlign = computed(() => {
+  return props.config?.pageAlign
+})
+const PAGE_LEFT = 'left'
+const PAGE_CENTER = 'center'
+const PAGE_RIGHT = 'right'
+const pageAlignEnmu = {
+  [PAGE_LEFT]: 'flex-start',
+  [PAGE_RIGHT]: 'flex-end',
+  [PAGE_CENTER]: 'center'
+}
+// 页码变动
+watch(() => page.pageNum, (val) => {
+  const fn = props.config?.currentChange
+  const ret = fn && fn(val, props, page)
+  if (ret) {
+    if (isPromise(ret)) {
+      ret.then((res) => {
+        res && (modelValue.value = res)
+      })
+    } else {
+      modelValue.value = ret
+    }
+  }
+})
+// 页面大小变动
+watch(() => page.pageSize, (val) => {
+  const fn = props.config?.sizeChange
+  const ret = fn && fn(val, props, page)
+  if (ret) {
+    if (isPromise(ret)) {
+      ret.then((res) => {
+        res && (modelValue.value = res)
+      })
+    } else {
+      modelValue.value = ret
+    }
+  }
+})
 
 const pmPageMetaList = computed(() => {
   return (props.config.pmPageMetaList || [])
@@ -36,7 +122,7 @@ const getTableColumnProps = (config) => {
 
 watch(modelValue, (val) => {
   setTimeout(() => {
-    tableData.value = val || (tableProps.value.card ? [{}] : [])
+    tableData.value = val || (tableProps.value.card ? [] : [])
   }, 100);
   tableRef.value?.setTableData(val || [])
 }, {
@@ -44,7 +130,7 @@ watch(modelValue, (val) => {
 })
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}`" v-bind="tableProps" :data="tableData">
+  <cmi-table ref="tableRef" :key="`${tableProps.card}${tableProps.display}`" v-bind="tableProps" :data="normalTableData">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{
@@ -54,5 +140,16 @@ watch(modelValue, (val) => {
     >
     </cmi-table-column>
   </cmi-table>
+  <div v-if="pageable" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
+    <cmi-pagination
+      :key="normalPageTotal"
+      v-bind="{...paginationProps, ...pagenationEvents}"
+      @sizeChange="pagenationEvents.onSizeChange"
+      @currentChange="pagenationEvents.onCurrentChange"
+      :total="normalPageTotal"
+      :pagesize="page.pageSize"
+      :current="page.pageNum"
+    />
+  </div>
 </template>
 <style></style>

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

@@ -305,7 +305,7 @@ export default {
 
     // 是否配置分页功能     ====== start======
     const pageable = computed(() => {
-      return props.config?.pageable
+      return props.config?.pageable === '1'
     })
     const pageAlign = computed(() => {
       return props.config?.pageAlign

package/src/utils/render.jsx

@@ -222,16 +222,20 @@ export function normalConfig({
     cbs.push(() => {
       const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
       tabsServices.forEach((({tableConfig, service}) => {
+        const orginCurrentChange = tableConfig.currentChange
         tableConfig.currentChange = (val, props, page) => {
           // setTimeout(() => {
+            orginCurrentChange && orginCurrentChange(val, props, page)
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
             dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, messageCb, compConfig: pageConfig, axiosInstance, messageInstance })
           // }, 0);
         }
+        const orginSizeChange = tableConfig.sizeChange
         tableConfig.sizeChange = (val, props, page) => {
           // setTimeout(() => {
+            orginSizeChange && orginSizeChange(val, props, page)
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
@@ -392,6 +396,9 @@ export function getRenderComponentProps({ props, component, modelValue, selects,
     ...defprops,
     ...commonProps
   }
+  if (config.class) {
+    retObj.class = config.class
+  }
   return retObj
 }
 // 一些组件并且没有占居满格