resolver-egretimp-plus 0.0.65 → 0.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",
@@ -50,9 +50,8 @@
     "vue-style-loader": "^4.1.3",
     "vue3-quill": "^0.3.1",
     "webpack": "^5.90.0",
-    "webpack-cli": "^5.1.4"
-  },
-  "dependencies": {
+    "webpack-cli": "^5.1.4",
     "vue3-sfc-loader": "^0.9.5"
-  }
+  },
+  "dependencies": {}
 }

package/src/analysisComponent.jsx

@@ -117,9 +117,6 @@ export default {
     const componentProps = ref({})
     if (typeof props.component === 'function') {
       props.component()?.then(res => {
-        if (props.config.isCustomComp) {
-          debugger
-        }
         const obj = {}
         if (res?.default?.emits) {
           initVmodels(res?.default?.emits)

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

@@ -72,6 +72,19 @@ export default {
         return normalColumnConfig(config)
       })
     })
+    const isFrontPage = computed(() => {
+      return props.config?.frontPageFlag === '1'
+    })
+    const normalPageTotal = computed(() => {
+      return !isFrontPage.value ? page.total : ((props.refValue.value || [])?.length || 0)
+    })
+
+    const normalTableData = computed(() => {
+      return !isFrontPage.value ?
+        (props.refValue.value || []) :
+        (props.refValue.value || []).slice((page.pageNum - 1) * page.pageSize, page.pageNum * page.pageSize)
+    })
+
     /** 自定义排序逻辑 ===start==== */
     const sortObj = ref(null)
     // "ascending", "descending", null
@@ -96,11 +109,10 @@ export default {
     })
 
     const tableData = computed(() => {
-      return sortObj.value ? sortTable.value : (props.refValue.value || [])
+      return sortObj.value ? sortTable.value : normalTableData.value
     })
     /** 自定义排序逻辑 ===end==== */
 
-
     // 获取表格列的属性配置
     const getTableColumnProps = (config, idx) => {
       const nextList = tableColumnConfigs.value.slice(idx + 1)
@@ -457,7 +469,7 @@ export default {
           {
             pageable.value ? 
               <div class="pagination-wrap" style={{'justify-content': pageAlignEnmu[pageAlign.value || PAGE_RIGHT]}}>
-                <ElPagination { ...paginationProps.value } {...pagenationEvents} v-model:current-page={page.pageNum} v-model:page-size={page.pageSize} total={page.total}></ElPagination>
+                <ElPagination { ...paginationProps.value } {...pagenationEvents} v-model:current-page={page.pageNum} v-model:page-size={page.pageSize} total={normalPageTotal.value}></ElPagination>
               </div>
               : null
           }

package/src/hooks/mock.js

@@ -44,7 +44,7 @@ export default {
         {
           metaCode: 'testcomp',
           isCustomComp: true,
-          url: '/LabelCustomAttach.js'
+          url: '/Demo.js'
         },
         {
           "createUserId": "100000000000040800",

package/src/hooks/pageConfig.js

@@ -52,8 +52,8 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     }
     buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
       if (resultToast(ret.data, messageTipInstance, { noSuccessIip: true })) {
-        pageConfig.value = normalPageConfigs(mock)
-        // pageConfig.value = normalPageConfigs(ret.data.result)
+        // pageConfig.value = normalPageConfigs(mock)
+        pageConfig.value = normalPageConfigs(ret.data.result)
         cb(pageConfig.value)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return

package/src/utils/const.js

@@ -238,3 +238,7 @@ export const META_TYPE_MAP = {
   'cmi-table': 'CustomComponentTableH5',
   'cmi-datetime': 'CmiDatetimePicker',
 }
+
+export {
+  commonPropsType as componentPropsType
+}