@longhongguo/form-create-ant-design-vue 3.2.85 → 3.2.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@longhongguo/form-create-ant-design-vue",
-  "version": "3.2.85",
+  "version": "3.2.87",
   "description": "AntDesignVue版本低代码表单|FormCreate 是一个可以通过 JSON 生成具有动态渲染、数据收集、验证和提交功能的低代码表单生成组件。支持6个UI框架，适配移动端，并且支持生成任何 Vue 组件。内置20种常用表单组件和自定义组件，再复杂的表单都可以轻松搞定。",
   "main": "./dist/form-create.min.js",
   "module": "./dist/form-create.esm.js",

package/src/parsers/accTable.js

@@ -1,4 +1,5 @@
 import { hasProperty } from '@form-create/utils/lib/type'
+import { deepCopy } from '@form-create/utils/lib/deepextend'
 
 // 简单的 getValue 函数，根据路径字符串获取嵌套对象的值
 function getValue(obj, path) {
@@ -105,67 +106,147 @@ export default {
           const responseTotalPath =
             rule.props?.paginationResponseTotalPath || 'total'
 
-          // 包装 fetch 配置，添加 beforeFetch 钩子来动态注入分页参数
+          console.log('[accTable] 分页配置初始化:', {
+            hasFetch: !!rule.effect?.fetch,
+            paginationConfig,
+            pageParamName,
+            pageSizeParamName,
+            paramType,
+            currentPage: pagination.current,
+            currentPageSize: pagination.pageSize
+          })
+
+          // 包装 fetch 配置，通过 beforeFetch 钩子动态注入分页参数
           const originalFetch = rule.effect.fetch
+          console.log('[accTable] 原始 fetch 配置:', {
+            type: typeof originalFetch,
+            isObject: typeof originalFetch === 'object',
+            originalFetch
+          })
+
           if (typeof originalFetch === 'object') {
-            // 保存原始 beforeFetch 钩子和分页参数配置到闭包中
-            const originalBeforeFetch = originalFetch.beforeFetch
+            // 保存原始配置和分页参数配置到闭包中
             const savedParamType = paramType
             const savedPageParamName = pageParamName
             const savedPageSizeParamName = pageSizeParamName
+            const savedOriginalBeforeFetch = originalFetch.beforeFetch
 
-            // 先将初始分页参数添加到配置中（用于首次加载）
-            const currentPage = pagination.current || 1
-            const currentPageSize = pagination.pageSize || 10
-
-            if (savedParamType === 'query') {
-              if (!originalFetch.query) {
-                originalFetch.query = {}
-              }
-              originalFetch.query[savedPageParamName] = currentPage
-              originalFetch.query[savedPageSizeParamName] = currentPageSize
-            } else {
-              if (!originalFetch.data) {
-                originalFetch.data = {}
-              }
-              originalFetch.data[savedPageParamName] = currentPage
-              originalFetch.data[savedPageSizeParamName] = currentPageSize
-            }
-
-            // 添加 beforeFetch 钩子来动态更新分页参数（确保每次请求都使用最新值）
+            // 添加 beforeFetch 钩子来注入分页参数
             originalFetch.beforeFetch = (config, { rule: r, api: a }) => {
+              console.log('[accTable] beforeFetch 被调用:', {
+                configBefore: JSON.parse(JSON.stringify(config)),
+                ruleProps: r.props,
+                pagination: r.props?.pagination
+              })
+
               // 获取当前分页配置
               const currentPagination = r.props?.pagination
+              console.log('[accTable] 当前分页配置:', {
+                currentPagination,
+                isObject: typeof currentPagination === 'object',
+                currentPage: currentPagination?.current,
+                currentPageSize: currentPagination?.pageSize
+              })
+
               if (currentPagination && typeof currentPagination === 'object') {
                 const currentPage = currentPagination.current || 1
                 const currentPageSize = currentPagination.pageSize || 10
 
-                // 确保 config 存在 query 和 data
-                if (!config.query) {
-                  config.query = {}
-                }
-                if (!config.data) {
-                  config.data = {}
-                }
+                console.log('[accTable] 准备添加分页参数:', {
+                  savedParamType,
+                  savedPageParamName,
+                  savedPageSizeParamName,
+                  currentPage,
+                  currentPageSize,
+                  existingQuery: config.query,
+                  existingData: config.data
+                })
 
                 // 添加分页参数（使用闭包中保存的参数名）
                 if (savedParamType === 'query') {
-                  config.query[savedPageParamName] = currentPage
-                  config.query[savedPageSizeParamName] = currentPageSize
+                  // 合并已有的 query 参数，确保不覆盖用户自定义的参数
+                  config.query = {
+                    ...(config.query || {}),
+                    [savedPageParamName]: currentPage,
+                    [savedPageSizeParamName]: currentPageSize
+                  }
+                  console.log('[accTable] 添加 query 参数后:', {
+                    query: config.query
+                  })
                 } else {
-                  config.data[savedPageParamName] = currentPage
-                  config.data[savedPageSizeParamName] = currentPageSize
+                  // 合并已有的 data 参数，确保不覆盖用户自定义的参数
+                  config.data = {
+                    ...(config.data || {}),
+                    [savedPageParamName]: currentPage,
+                    [savedPageSizeParamName]: currentPageSize
+                  }
+                  console.log('[accTable] 添加 data 参数后:', {
+                    data: config.data
+                  })
                 }
+              } else {
+                console.warn('[accTable] 分页配置无效，无法添加分页参数:', {
+                  currentPagination,
+                  type: typeof currentPagination
+                })
               }
 
               // 调用原始的 beforeFetch 钩子（如果存在）
               if (
-                originalBeforeFetch &&
-                typeof originalBeforeFetch === 'function'
+                savedOriginalBeforeFetch &&
+                typeof savedOriginalBeforeFetch === 'function'
               ) {
-                return originalBeforeFetch(config, { rule: r, api: a })
+                console.log('[accTable] 调用原始 beforeFetch 钩子')
+                return savedOriginalBeforeFetch(config, { rule: r, api: a })
+              }
+
+              console.log('[accTable] beforeFetch 完成，最终 config:', {
+                query: config.query,
+                data: config.data,
+                action: config.action
+              })
+            }
+
+            // 初始化时也添加分页参数到配置中
+            const currentPage = pagination.current || 1
+            const currentPageSize = pagination.pageSize || 10
+
+            console.log('[accTable] 初始化分页参数到 fetch 配置:', {
+              paramType,
+              pageParamName,
+              pageSizeParamName,
+              currentPage,
+              currentPageSize
+            })
+
+            if (paramType === 'query') {
+              if (!originalFetch.query) {
+                originalFetch.query = {}
+              }
+              originalFetch.query[pageParamName] = currentPage
+              originalFetch.query[pageSizeParamName] = currentPageSize
+              console.log('[accTable] 初始化后的 query:', originalFetch.query)
+            } else {
+              if (!originalFetch.data) {
+                originalFetch.data = {}
               }
+              originalFetch.data[pageParamName] = currentPage
+              originalFetch.data[pageSizeParamName] = currentPageSize
+              console.log('[accTable] 初始化后的 data:', originalFetch.data)
             }
+
+            console.log('[accTable] 最终 fetch 配置:', {
+              action: originalFetch.action,
+              method: originalFetch.method,
+              query: originalFetch.query,
+              data: originalFetch.data,
+              hasBeforeFetch: typeof originalFetch.beforeFetch === 'function'
+            })
+          } else {
+            console.warn('[accTable] fetch 配置不是对象类型:', {
+              type: typeof originalFetch,
+              originalFetch
+            })
           }
 
           // 添加分页 onChange 事件处理