diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 67ca6540..c9afb1a0 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,11 @@ # @wakeadmin/components +## 1.9.11 + +### Patch Changes + +- fix: 修复 fatTableModal `width` 未生效的问题 + ## 1.9.10 ### Patch Changes diff --git a/packages/components/package.json b/packages/components/package.json index 7581926c..6bbca0d4 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@wakeadmin/components", - "version": "1.9.10", + "version": "1.9.11", "description": "wakeadmin 组件库", "module": "./dist/index.js", "main": "./dist/common/index.js", diff --git a/packages/components/src/fat-table-layout/fat-table-modal.tsx b/packages/components/src/fat-table-layout/fat-table-modal.tsx index 13fa2d68..b670e788 100644 --- a/packages/components/src/fat-table-layout/fat-table-modal.tsx +++ b/packages/components/src/fat-table-layout/fat-table-modal.tsx @@ -205,6 +205,7 @@ const FatTableModalInner = declareComponent({ // dialog title: null, top: String, + width: null, modal: { type: Boolean, default: true }, modalAppendToBody: { type: Boolean, default: false }, lockScroll: { type: Boolean, default: true }, diff --git a/packages/doc/package.json b/packages/doc/package.json index 68f648be..12c0e973 100644 --- a/packages/doc/package.json +++ b/packages/doc/package.json @@ -18,7 +18,7 @@ "author": "", "license": "MIT", "devDependencies": { - "@wakeadmin/components": "workspace:1.9.10", + "@wakeadmin/components": "workspace:1.9.11", "@wakeadmin/icons": "^0.1.5", "element-plus": "^2.3.6", "imagemin-cli": "^7.0.0", diff --git a/packages/playground-vite/CHANGELOG.md b/packages/playground-vite/CHANGELOG.md index 9dd1296a..cea51f2e 100644 --- a/packages/playground-vite/CHANGELOG.md +++ b/packages/playground-vite/CHANGELOG.md @@ -1,5 +1,12 @@ # playground-vite +## 0.0.32 + +### Patch Changes + +- Updated dependencies + - @wakeadmin/components@1.9.11 + ## 0.0.31 ### Patch Changes diff --git a/packages/playground-vite/package.json b/packages/playground-vite/package.json index e9c88cb8..a510cb58 100644 --- a/packages/playground-vite/package.json +++ b/packages/playground-vite/package.json @@ -1,7 +1,7 @@ { "name": "playground-vite", "private": true, - "version": "0.0.31", + "version": "0.0.32", "type": "module", "scripts": { "dev": "wk-demi-switch 3 && wakeadmin-adapter-switch 3 && vite", diff --git a/packages/playground-vue2/CHANGELOG.md b/packages/playground-vue2/CHANGELOG.md index 4579d5bc..6b67fc90 100644 --- a/packages/playground-vue2/CHANGELOG.md +++ b/packages/playground-vue2/CHANGELOG.md @@ -1,5 +1,12 @@ # playground-vue2 +## 0.1.109 + +### Patch Changes + +- Updated dependencies + - @wakeadmin/components@1.9.11 + ## 0.1.108 ### Patch Changes diff --git a/packages/playground-vue2/package.json b/packages/playground-vue2/package.json index d4840712..ef3938bd 100644 --- a/packages/playground-vue2/package.json +++ b/packages/playground-vue2/package.json @@ -1,5 +1,5 @@ { - "version": "0.1.108", + "version": "0.1.109", "name": "playground-vue2", "imageName": "wkfe/playground-vue2", "workload": "wakeadmin-playground-vue2", @@ -22,7 +22,7 @@ "typescript": false }, "dependencies": { - "@wakeadmin/components": "workspace:1.9.10", + "@wakeadmin/components": "workspace:1.9.11", "@wakeadmin/framework": "^0.1.6", "@wakeadmin/h": "^0.3.0", "@wakeadmin/i18n-legacy": "^0.1.7", diff --git a/packages/playground-vue3/CHANGELOG.md b/packages/playground-vue3/CHANGELOG.md index b9fbc78a..b5f3a18c 100644 --- a/packages/playground-vue3/CHANGELOG.md +++ b/packages/playground-vue3/CHANGELOG.md @@ -1,5 +1,13 @@ # playground-vue3 +## 0.1.109 + +### Patch Changes + +- feat: 新增 fatTableModal +- Updated dependencies + - @wakeadmin/components@1.9.11 + ## 0.1.108 ### Patch Changes diff --git a/packages/playground-vue3/package.json b/packages/playground-vue3/package.json index a6c18571..5ef803ee 100644 --- a/packages/playground-vue3/package.json +++ b/packages/playground-vue3/package.json @@ -1,5 +1,5 @@ { - "version": "0.1.108", + "version": "0.1.109", "name": "playground-vue3", "imageName": "wkfe/playground-vue3", "workload": "wakeadmin-playground-vue3", @@ -18,7 +18,7 @@ "publish:docker": "node ./scripts/docker-publish.js" }, "dependencies": { - "@wakeadmin/components": "workspace:1.9.10", + "@wakeadmin/components": "workspace:1.9.11", "@wakeadmin/framework": "^0.1.6", "@wakeadmin/h": "^0.3.0", "core-js": "^3.30.2", diff --git a/packages/playground-vue3/src/router/index.ts b/packages/playground-vue3/src/router/index.ts index 2da98511..eb43b5f0 100644 --- a/packages/playground-vue3/src/router/index.ts +++ b/packages/playground-vue3/src/router/index.ts @@ -41,6 +41,11 @@ export const routes: RouteRecordRaw[] = [ name: 'drag', component: () => import('../views/drag.vue'), }, + { + path: '/fat-table-modal', + name: 'FatTableModalPage', + component: () => import('../views/fatTableModal.tsx'), + }, { path: '/about', name: 'about', diff --git a/packages/playground-vue3/src/views/fatTableModal.tsx b/packages/playground-vue3/src/views/fatTableModal.tsx new file mode 100644 index 00000000..b716b0c6 --- /dev/null +++ b/packages/playground-vue3/src/views/fatTableModal.tsx @@ -0,0 +1,51 @@ +import { defineFatTableModal, useFatTableModalRef } from '@wakeadmin/components'; +import { ElButton } from 'element-plus'; +import { defineComponent } from 'vue'; + +const TableModal = defineFatTableModal(({ column, props, modelRef }) => { + return () => { + return { + // FIXME 未生效 + width: '1400px', + renderToolbar() { + return Toolbar; + }, + async request(params) { + return { list: [], total: 0 }; + }, + columns: [ + column({ + label: '任务名称', + prop: 'name', + }), + column({ + label: '创建时间', + prop: 'createTime', + valueType: 'date', + valueProps: { + type: 'datetime', + valueFormat: 'YYYY-MM-dd HH:mm:ss', + }, + }), + column({ + label: '操作人', + prop: 'createBy', + width: 140, + }), + ], + }; + }; +}); + + +export default defineComponent({ + name: "FatTableModalPage", + setup(){ + const modal = useFatTableModalRef(); + + return () =>
+ modal.value.open()}>open + +
+ } +}) \ No newline at end of file diff --git a/packages/playground-vue3/vue.config.js b/packages/playground-vue3/vue.config.js index 551603e4..72f39c29 100644 --- a/packages/playground-vue3/vue.config.js +++ b/packages/playground-vue3/vue.config.js @@ -10,7 +10,7 @@ module.exports = defineConfig({ pluginOptions: { ...defineMappChild({ mapp: { - activeRule: '/dsp.html', + activeRule: '/dsp-vue3.html', }, }), }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88a5a639..8fd34e03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -189,7 +189,7 @@ importers: version: 1.0.3 devDependencies: '@wakeadmin/components': - specifier: workspace:1.9.10 + specifier: workspace:1.9.11 version: link:../components '@wakeadmin/icons': specifier: ^0.1.5 @@ -247,7 +247,7 @@ importers: packages/playground-vue2: dependencies: '@wakeadmin/components': - specifier: workspace:1.9.10 + specifier: workspace:1.9.11 version: link:../components '@wakeadmin/framework': specifier: ^0.1.6 @@ -317,7 +317,7 @@ importers: packages/playground-vue3: dependencies: '@wakeadmin/components': - specifier: workspace:1.9.10 + specifier: workspace:1.9.11 version: link:../components '@wakeadmin/framework': specifier: ^0.1.6