@longhongguo/form-create-ant-design-vue 3.2.89 → 3.2.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@longhongguo/form-create-ant-design-vue",
-  "version": "3.2.89",
+  "version": "3.2.91",
   "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

@@ -97,14 +97,15 @@ export default {
     }
 
     // 处理分页配置
+    const paginationConfig = rule.props?.pagination
     console.log('[accTable] 开始处理分页配置:', {
       hasPaginationProp: hasProperty(props, 'pagination'),
-      paginationConfig: rule.props?.pagination,
-      paginationConfigType: typeof rule.props?.pagination
+      paginationConfig,
+      paginationConfigType: typeof paginationConfig
     })
 
+    // 处理分页 props（只有在 props 中没有 pagination 时才初始化）
     if (!hasProperty(props, 'pagination')) {
-      const paginationConfig = rule.props?.pagination
       console.log('[accTable] 分页配置检查:', {
         paginationConfig,
         isFalse: paginationConfig === false,
@@ -124,193 +125,204 @@ export default {
           ...paginationConfig
         }
 
-        console.log('[accTable] 检查是否需要添加分页请求参数:', {
-          hasFetch: !!rule.effect?.fetch,
-          fetchType: typeof rule.effect?.fetch,
-          fetchValue: rule.effect?.fetch,
-          paginationCurrent: paginationConfig.current,
-          currentDefined: paginationConfig.current !== undefined
-        })
+        props.pagination = pagination
+      } else {
+        // 默认不启用分页
+        props.pagination = false
+      }
+    }
 
-        // 如果启用了分页且有远程数据源（fetch effect），添加 onChange 事件处理和初始化分页参数
-        if (rule.effect?.fetch && paginationConfig.current !== undefined) {
-          console.log('[accTable] 进入分页请求参数处理逻辑')
-          // 获取分页参数配置
-          const pageParamName = rule.props?.paginationPageParam || 'page'
-          const pageSizeParamName =
-            rule.props?.paginationPageSizeParam || 'pageSize'
-          const paramType = rule.props?.paginationParamType || 'query' // 'query' 或 'data'
-          const responseDataPath =
-            rule.props?.paginationResponseDataPath || 'data'
-          const responseTotalPath =
-            rule.props?.paginationResponseTotalPath || 'total'
-
-          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') {
-            // 保存原始配置和分页参数配置到闭包中
-            const savedParamType = paramType
-            const savedPageParamName = pageParamName
-            const savedPageSizeParamName = pageSizeParamName
-            const savedOriginalBeforeFetch = originalFetch.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
-              })
+    // 无论 props.pagination 是否已存在，只要满足条件就添加/检查 beforeFetch 钩子
+    console.log('[accTable] 检查分页钩子添加条件:', {
+      hasFetch: !!rule.effect?.fetch,
+      hasPaginationConfig: !!paginationConfig,
+      paginationConfigType: typeof paginationConfig,
+      paginationConfigValue: paginationConfig,
+      paginationCurrent: paginationConfig?.current,
+      paginationCurrentDefined: paginationConfig?.current !== undefined
+    })
 
-              // 获取当前分页配置
-              const currentPagination = r.props?.pagination
-              console.log('[accTable] 当前分页配置:', {
-                currentPagination,
-                isObject: typeof currentPagination === 'object',
-                currentPage: currentPagination?.current,
-                currentPageSize: currentPagination?.pageSize
-              })
+    if (
+      rule.effect?.fetch &&
+      paginationConfig &&
+      typeof paginationConfig === 'object' &&
+      paginationConfig.current !== undefined
+    ) {
+      console.log('[accTable] ✅ 满足条件，进入分页请求参数处理逻辑')
+
+      console.log('[accTable] 进入分页请求参数处理逻辑')
+      // 获取分页参数配置
+      const pageParamName = rule.props?.paginationPageParam || 'page'
+      const pageSizeParamName =
+        rule.props?.paginationPageSizeParam || 'pageSize'
+      const paramType = rule.props?.paginationParamType || 'query' // 'query' 或 'data'
+      const responseDataPath = rule.props?.paginationResponseDataPath || 'data'
+      const responseTotalPath =
+        rule.props?.paginationResponseTotalPath || 'total'
+
+      // 获取当前分页对象（从 props 或 paginationConfig）
+      const currentPaginationObj = props.pagination || paginationConfig
+
+      console.log('[accTable] 分页配置初始化:', {
+        hasFetch: !!rule.effect?.fetch,
+        paginationConfig,
+        pageParamName,
+        pageSizeParamName,
+        paramType,
+        currentPage: currentPaginationObj?.current,
+        currentPageSize: currentPaginationObj?.pageSize
+      })
 
-              if (currentPagination && typeof currentPagination === 'object') {
-                const currentPage = currentPagination.current || 1
-                const currentPageSize = currentPagination.pageSize || 10
-
-                console.log('[accTable] 准备添加分页参数:', {
-                  savedParamType,
-                  savedPageParamName,
-                  savedPageSizeParamName,
-                  currentPage,
-                  currentPageSize,
-                  existingQuery: config.query,
-                  existingData: config.data
-                })
+      // 包装 fetch 配置，通过 beforeFetch 钩子动态注入分页参数
+      const originalFetch = rule.effect.fetch
+      console.log('[accTable] 原始 fetch 配置:', {
+        type: typeof originalFetch,
+        isObject: typeof originalFetch === 'object',
+        originalFetch,
+        hasBeforeFetch: typeof originalFetch?.beforeFetch === 'function'
+      })
 
-                // 添加分页参数（使用闭包中保存的参数名）
-                if (savedParamType === 'query') {
-                  // 合并已有的 query 参数，确保不覆盖用户自定义的参数
-                  config.query = {
-                    ...(config.query || {}),
-                    [savedPageParamName]: currentPage,
-                    [savedPageSizeParamName]: currentPageSize
-                  }
-                  console.log('[accTable] 添加 query 参数后:', {
-                    query: config.query
-                  })
-                } else {
-                  // 合并已有的 data 参数，确保不覆盖用户自定义的参数
-                  config.data = {
-                    ...(config.data || {}),
-                    [savedPageParamName]: currentPage,
-                    [savedPageSizeParamName]: currentPageSize
-                  }
-                  console.log('[accTable] 添加 data 参数后:', {
-                    data: config.data
-                  })
+      if (typeof originalFetch === 'object') {
+        // 保存原始配置和分页参数配置到闭包中
+        const savedParamType = paramType
+        const savedPageParamName = pageParamName
+        const savedPageSizeParamName = pageSizeParamName
+        const savedOriginalBeforeFetch = originalFetch.beforeFetch
+        // 在闭包中保存 rule 的引用，因为 beforeFetch 只接收 (config, {api}) 参数
+        const savedRule = rule
+
+        // 检查是否已经添加过我们的 beforeFetch 钩子（通过检查函数是否包含特定标记）
+        const isOurBeforeFetch =
+          savedOriginalBeforeFetch &&
+          savedOriginalBeforeFetch._accTablePaginationHook === true
+
+        if (!isOurBeforeFetch) {
+          // 添加 beforeFetch 钩子来注入分页参数
+          // 注意：form-create 的 beforeFetch 只接收 (config, {api}) 参数，没有 rule
+          originalFetch.beforeFetch = (config, { api }) => {
+            console.log('[accTable] beforeFetch 被调用:', {
+              configAction: config?.action,
+              hasApi: !!api,
+              ruleProps: savedRule?.props,
+              pagination: savedRule?.props?.pagination
+            })
+
+            // 从闭包中获取当前分页配置
+            const currentPagination = savedRule?.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
+
+              console.log('[accTable] 准备添加分页参数:', {
+                savedParamType,
+                savedPageParamName,
+                savedPageSizeParamName,
+                currentPage,
+                currentPageSize,
+                existingQuery: config.query,
+                existingData: config.data
+              })
+
+              // 添加分页参数（使用闭包中保存的参数名）
+              if (savedParamType === 'query') {
+                // 合并已有的 query 参数，确保不覆盖用户自定义的参数
+                config.query = {
+                  ...(config.query || {}),
+                  [savedPageParamName]: currentPage,
+                  [savedPageSizeParamName]: currentPageSize
                 }
+                console.log('[accTable] 添加 query 参数后:', {
+                  query: config.query
+                })
               } else {
-                console.warn('[accTable] 分页配置无效，无法添加分页参数:', {
-                  currentPagination,
-                  type: typeof currentPagination
+                // 合并已有的 data 参数，确保不覆盖用户自定义的参数
+                config.data = {
+                  ...(config.data || {}),
+                  [savedPageParamName]: currentPage,
+                  [savedPageSizeParamName]: currentPageSize
+                }
+                console.log('[accTable] 添加 data 参数后:', {
+                  data: config.data
                 })
               }
-
-              // 调用原始的 beforeFetch 钩子（如果存在）
-              if (
-                savedOriginalBeforeFetch &&
-                typeof savedOriginalBeforeFetch === 'function'
-              ) {
-                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
+            } else {
+              console.warn('[accTable] 分页配置无效，无法添加分页参数:', {
+                currentPagination,
+                type: typeof currentPagination
               })
             }
 
-            // 初始化时也添加分页参数到配置中
-            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)
+            // 调用原始的 beforeFetch 钩子（如果存在）
+            // 原始钩子可能也只接收 (config, {api}) 参数
+            if (
+              savedOriginalBeforeFetch &&
+              typeof savedOriginalBeforeFetch === 'function'
+            ) {
+              console.log('[accTable] 调用原始 beforeFetch 钩子')
+              return savedOriginalBeforeFetch(config, { api })
             }
 
-            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
+            console.log('[accTable] beforeFetch 完成，最终 config:', {
+              query: config.query,
+              data: config.data,
+              action: config.action
             })
           }
 
-          // 添加分页 onChange 事件处理
-          pagination.onChange = (page, size) => {
+          // 标记这是我们添加的钩子，避免重复添加
+          originalFetch.beforeFetch._accTablePaginationHook = true
+          console.log('[accTable] ✅ beforeFetch 钩子已添加并标记')
+        } else {
+          console.log('[accTable] ⚠️ beforeFetch 钩子已存在，跳过添加')
+        }
+        console.log('[accTable] beforeFetch 钩子处理完成')
+      } else {
+        console.warn('[accTable] fetch 配置不是对象类型:', {
+          type: typeof originalFetch,
+          originalFetch
+        })
+      }
+
+      // 添加分页 onChange 和 onShowSizeChange 事件处理（确保事件处理函数存在）
+      const paginationObj = props.pagination || paginationConfig
+      if (paginationObj && typeof paginationObj === 'object') {
+        if (!paginationObj.onChange) {
+          paginationObj.onChange = (page, size) => {
+            console.log('[accTable] pagination onChange 被调用:', {
+              page,
+              size
+            })
             // 更新分页配置
             if (rule.props?.pagination) {
               rule.props.pagination.current = page
               rule.props.pagination.pageSize = size
             }
-
-            // 分页参数已经通过包装的 fetch 函数自动添加，只需要触发重新加载
+            // 分页参数已经通过 beforeFetch 钩子自动添加，只需要触发重新加载
             ctx.api.sync(rule)
             setTimeout(() => {
               ctx.api.refresh()
             }, 0)
           }
+        }
 
-          // 添加 onShowSizeChange 事件处理（改变每页条数时）
-          pagination.onShowSizeChange = (current, size) => {
+        if (!paginationObj.onShowSizeChange) {
+          paginationObj.onShowSizeChange = (current, size) => {
+            console.log('[accTable] pagination onShowSizeChange 被调用:', {
+              current,
+              size
+            })
             if (rule.props?.pagination) {
               rule.props.pagination.current = 1 // 改变每页条数时重置到第一页
               rule.props.pagination.pageSize = size
             }
-
-            // 分页参数已经通过包装的 fetch 函数自动添加，只需要触发重新加载
+            // 分页参数已经通过 beforeFetch 钩子自动添加，只需要触发重新加载
             ctx.api.sync(rule)
             setTimeout(() => {
               ctx.api.refresh()
@@ -318,10 +330,10 @@ export default {
           }
         }
 
-        props.pagination = pagination
-      } else {
-        // 默认不启用分页
-        props.pagination = false
+        // 如果 props.pagination 不存在，将 paginationObj 赋值给 props.pagination
+        if (!props.pagination) {
+          props.pagination = paginationObj
+        }
       }
     }