diff --git a/.turbo/cookies/29.cookie b/.turbo/cookies/29.cookie deleted file mode 100644 index e69de29bb..000000000 diff --git a/.turbo/cookies/30.cookie b/.turbo/cookies/30.cookie deleted file mode 100644 index e69de29bb..000000000 diff --git a/.turbo/cookies/31.cookie b/.turbo/cookies/31.cookie deleted file mode 100644 index e69de29bb..000000000 diff --git a/.turbo/cookies/32.cookie b/.turbo/cookies/32.cookie deleted file mode 100644 index e69de29bb..000000000 diff --git a/.turbo/daemon/ae401ef4dd981f33-turbo.log.2024-08-26 b/.turbo/daemon/ae401ef4dd981f33-turbo.log.2024-08-26 new file mode 100644 index 000000000..b307982d8 --- /dev/null +++ b/.turbo/daemon/ae401ef4dd981f33-turbo.log.2024-08-26 @@ -0,0 +1,6 @@ +2024-08-26T15:23:25.560565Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("packages/form-render/package.json")} +2024-08-26T15:23:25.560588Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("form-render"), path: AnchoredSystemPathBuf("packages/form-render") }})) +2024-08-26T15:24:27.958664Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("packages/form-render/CHANGELOG.md")} +2024-08-26T15:24:27.958679Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("form-render"), path: AnchoredSystemPathBuf("packages/form-render") }})) +2024-08-26T15:26:43.157922Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("packages/form-render/CHANGELOG.md")} +2024-08-26T15:26:43.157934Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("form-render"), path: AnchoredSystemPathBuf("packages/form-render") }})) diff --git a/package.json b/package.json index 89b0611b3..7eeca4617 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "babel-plugin-no-debugger": "^0.0.1", "babel-plugin-transform-remove-console": "^6.9.4", "cross-env": "^7.0.3", - "dumi": "^2.0.2", + "dumi": "2.2.16", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.6.2", diff --git a/packages/form-render/CHANGELOG.md b/packages/form-render/CHANGELOG.md index 39f0733a3..7d922a76b 100644 --- a/packages/form-render/CHANGELOG.md +++ b/packages/form-render/CHANGELOG.md @@ -1,4 +1,13 @@ # 更新日志 +### 2.4.8 +- [!] 修复 drawerList 组件,编辑时打开弹窗,表单数据一直是最后一条 + +### 2.4.7 +- [+] 兼容 safari 浏览器 ?. 正则表达式不全逻辑 + +### 2.4.6 +- [1!] 函数表达式为了兼容性考虑会替换成 ?. 但是需要剔除数字场景 + ### 2.4.5 - [+] 函数表达式兼容,formData.x['y'] 语法 - [+] 适配,formData.x.y, formData.x undefined 时,表达式解析异常 diff --git a/packages/form-render/package.json b/packages/form-render/package.json index 13b2475e3..b869d0f43 100644 --- a/packages/form-render/package.json +++ b/packages/form-render/package.json @@ -1,6 +1,6 @@ { "name": "form-render", - "version": "2.4.7", + "version": "2.4.8", "description": "通过 JSON Schema 生成标准 Form,常用于自定义搭建配置界面生成", "keywords": [ "Form", diff --git a/packages/form-render/src/widgets/listDrawer/drawerForm.tsx b/packages/form-render/src/widgets/listDrawer/drawerForm.tsx index 4cc97d871..e8775fc4c 100644 --- a/packages/form-render/src/widgets/listDrawer/drawerForm.tsx +++ b/packages/form-render/src/widgets/listDrawer/drawerForm.tsx @@ -3,21 +3,21 @@ import { Button, Drawer, Space, ConfigProvider } from 'antd'; import { translation } from '../utils'; const DrawerForm = (props: any) => { - const { children, onConfirm, onClose, DrawerProps } = props; + const { children, onConfirm, onClose, ...ret } = props; const configCtx = useContext(ConfigProvider.ConfigContext); const t = translation(configCtx); - let drawerProps: any = { ...DrawerProps, open: true }; + let extraProps: any = { ...ret, open: true }; if ((window as any).antdVersion === 'v4') { - drawerProps = { ...DrawerProps, visible: true }; + extraProps = { ...ret, visible: true }; } return ( diff --git a/packages/form-render/src/widgets/listDrawer/index.tsx b/packages/form-render/src/widgets/listDrawer/index.tsx index be6faeac2..d475abb20 100644 --- a/packages/form-render/src/widgets/listDrawer/index.tsx +++ b/packages/form-render/src/widgets/listDrawer/index.tsx @@ -238,6 +238,8 @@ const TableList: React.FC = (props: any) => { }); } + const drawerIndex = indexRef.current ?? (fields.length - 1); + return (
= (props: any) => { )} {visible && ( - {renderCore({ schema: schema.items, parentPath: [fields.length - 1], rootPath: [...rootPath, fields.length - 1] })} + {renderCore({ schema: schema.items, parentPath: [drawerIndex], rootPath: [...rootPath, drawerIndex] })} )}