diff --git a/docs/zh/front/component/ma-pro-table.md b/docs/zh/front/component/ma-pro-table.md index 8d56adf..5412dbd 100644 --- a/docs/zh/front/component/ma-pro-table.md +++ b/docs/zh/front/component/ma-pro-table.md @@ -242,8 +242,8 @@ add({ |`type`| `el-table` 原生基础上，增加 `operation`, `sort`，第一个为操作栏，可通过 `API 扩展`，第二个为`行拖动排序` | `string` | - | 1.0.0 | |`cellRenderTo`| 渲染单元格为表格注册的插件 | [查看下方类型](#cellrenderto-使用渲染插件) | - | 1.0.0 | |`isRender`| 是否渲染列，跟 `hide` 不同的是，不会在表格设置里显示此列 | `boolean & () => boolean` | - | 1.0.55 | -|`cellRenderPro`| `cellRender` 加强型，增加了第二个参数 `proxy: MaProTableExpose` | `(data, proxy) => VNode | string` | - | 1.0.55 | -|`headerRenderPro`| `headerRenderPro` 加强型，增加了第二个参数 `proxy: MaProTableExpose` | `(data, proxy) => VNode | string` | - | 1.0.55 | +|`cellRenderPro`| `cellRender` 加强型，增加了第二个参数 `proxy: MaProTableExpose` | `(data, proxy) => VNode & string` | - | 1.0.55 | +|`headerRenderPro`| `headerRender` 加强型，增加了第二个参数 `proxy: MaProTableExpose` | `(data, proxy) => VNode & string` | - | 1.0.55 | |`operationConfigure`| 操作栏配置，只有 `type` 为 `operation` 生效 | [查看下方类型](#operationconfigure-操作栏) | - | 1.0.0 | ##### cellRenderTo 使用渲染插件 diff --git a/docs/zh/front/component/ma-search.md b/docs/zh/front/component/ma-search.md index ef9795c..83b7301 100644 --- a/docs/zh/front/component/ma-search.md +++ b/docs/zh/front/component/ma-search.md @@ -50,11 +50,12 @@ ### SearchItems -| 参数 | 说明 | 类型 | 默认值 | 版本 | -|----------|------------------------|----------|-----|-------| -| `span` | 合并跨列数 | `number` | 1 | 1.0.0 | -| `offset` | 间隔大小 | `number` | 0 | 1.0.0 | -| ... | 其余都是 `ma-form-item` 参数 | - | - | 1.0.0 | +| 参数 | 说明 | 类型 | 默认值 | 版本 | +|----------|------------------------|---------------------------|---|-------| +| `span` | 合并跨列数 | `number` | 1 | 1.0.0 | +| `offset` | 间隔大小 | `number` | 0 | 1.0.0 | +| `hide` | 是否隐藏 | `boolean & () => boolean` | false | 1.0.0 | +| ... | 其余都是 `ma-form-item` 参数 | - | - | 1.0.0 | ## Event diff --git a/package.json b/package.json index a19d2da..ea3f8ec 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,10 @@ }, "dependencies": { "@imengyu/vue3-context-menu": "^1.4.2", - "@mineadmin/echarts": "^1.0.5", + "@mineadmin/echarts": "^1.0.1", "@mineadmin/form": "^1.0.21", - "@mineadmin/pro-table": "^1.0.53", - "@mineadmin/search": "^1.0.25", + "@mineadmin/pro-table": "^1.0.55", + "@mineadmin/search": "^1.0.27", "@mineadmin/table": "^1.0.29", "@vueuse/core": "^11.1.0", "@vueuse/integrations": "^11.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bbb4b9d..831bcd3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,17 +12,17 @@ importers: specifier: ^1.4.2 version: 1.4.2 '@mineadmin/echarts': - specifier: ^1.0.5 + specifier: ^1.0.1 version: 1.0.7(element-plus@2.8.3(vue@3.5.12)) '@mineadmin/form': specifier: ^1.0.21 version: 1.0.21(element-plus@2.8.3(vue@3.5.12)) '@mineadmin/pro-table': - specifier: ^1.0.53 - version: 1.0.53(element-plus@2.8.3(vue@3.5.12)) + specifier: ^1.0.55 + version: 1.0.55(element-plus@2.8.3(vue@3.5.12)) '@mineadmin/search': - specifier: ^1.0.25 - version: 1.0.25(element-plus@2.8.3(vue@3.5.12)) + specifier: ^1.0.27 + version: 1.0.27(element-plus@2.8.3(vue@3.5.12)) '@mineadmin/table': specifier: ^1.0.29 version: 1.0.29(element-plus@2.8.3(vue@3.5.12)) @@ -683,13 +683,13 @@ packages: peerDependencies: element-plus: ^2.0.0 - '@mineadmin/pro-table@1.0.53': - resolution: {integrity: sha512-sz6MzDCILTJh8Nb0QIsDYbBcCgHQCy67dalqypH9+vRuXgDd/DqdrwQ0zp3S4nuAocmP9DXzo/H2/DsXzr5iNA==} + '@mineadmin/pro-table@1.0.55': + resolution: {integrity: sha512-6whDcfx3pcvd09/xQuH1qBJzW8/B7k3i9X7svm9jMLEHPyU4UwACzY/0hLISnmCTWKJJLHdmjUG0/SM74Jrndw==} peerDependencies: element-plus: ^2.0.0 - '@mineadmin/search@1.0.25': - resolution: {integrity: sha512-zHvTKWXCJoTMLHfHp1Ksl+FKU9qwoTuLwJ8HNDTvmRipzKBukmsb9oZLK+f8Dj05Bz3uErHAkfkRNnsiS/UOdA==} + '@mineadmin/search@1.0.27': + resolution: {integrity: sha512-T6KunXWkiv0zhhB8UkZc673qExON77ocBehklOZxD7sV2apLXOAZRudy8hD5TKiC1m9Fjfrx4TpHoEU8mfUl3A==} peerDependencies: element-plus: ^2.0.0 @@ -2316,14 +2316,14 @@ snapshots: transitivePeerDependencies: - typescript - '@mineadmin/pro-table@1.0.53(element-plus@2.8.3(vue@3.5.12))': + '@mineadmin/pro-table@1.0.55(element-plus@2.8.3(vue@3.5.12))': dependencies: element-plus: 2.8.3(vue@3.5.12) vue: 3.5.12 transitivePeerDependencies: - typescript - '@mineadmin/search@1.0.25(element-plus@2.8.3(vue@3.5.12))': + '@mineadmin/search@1.0.27(element-plus@2.8.3(vue@3.5.12))': dependencies: element-plus: 2.8.3(vue@3.5.12) vue: 3.5.12