diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 7c8f156f..87b52d4c 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.2.50", + "version": "8.2.52", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts index 7d0008ec..55b2ad8b 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts +++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts @@ -140,9 +140,15 @@ export class ComputedManager extends Base { availableHeight -= otherHeight + otherHeight2; availableHeight -= 2; //无数据增加的title行,下边框所占边框 - style = { - height: this.props.height > 0 ? this.props.height - otherHeight2 - 1 + 'px' : availableHeight > 0 ? availableHeight + 'px' : '0px', - }; + if (this.props.height > 0) { + style = { + height: this.props.height - otherHeight2 - 2 + 'px', + }; + } else { + style = { + height: availableHeight > 0 ? availableHeight + 'px' : '0px', + }; + } } if (this.table?.store.resizeFlag) { return style; diff --git a/io.sc.platform.core.frontend/src/platform/components/index.ts b/io.sc.platform.core.frontend/src/platform/components/index.ts index 5581ee9a..8df869e8 100644 --- a/io.sc.platform.core.frontend/src/platform/components/index.ts +++ b/io.sc.platform.core.frontend/src/platform/components/index.ts @@ -31,6 +31,7 @@ import WPassword from './password/WPassword.vue'; import WFile from './file/WFile.vue'; import WLabel from './label/WLabel.vue'; import WRadio from './radio/WRadio.vue'; +import WExtRadio from './radio/WExtRadio.vue'; import WTextEditor from './text-editor/WTextEditor.vue'; import WQueryBuilder from './query-builder/WQueryBuilder.vue'; @@ -97,6 +98,7 @@ export default { app.component('WFile', WFile); app.component('WLabel', WLabel); app.component('WRadio', WRadio); + app.component('WExtRadio', WExtRadio); app.component('WTextEditor', WTextEditor); app.component('WQueryBuilder', WQueryBuilder); @@ -152,6 +154,8 @@ export { WOrgSelect, WRoleSelect, WLabel, + WRadio, + WExtRadio, WDate, WCheckbox, WPassword, diff --git a/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue b/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue index 3e542743..84e9c06b 100644 --- a/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue +++ b/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue @@ -1,7 +1,10 @@ - + diff --git a/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue new file mode 100644 index 00000000..82c6e254 --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue @@ -0,0 +1,105 @@ + + + + diff --git a/io.sc.platform.core.frontend/src/platform/index.ts b/io.sc.platform.core.frontend/src/platform/index.ts index c7762451..2f56c87d 100644 --- a/io.sc.platform.core.frontend/src/platform/index.ts +++ b/io.sc.platform.core.frontend/src/platform/index.ts @@ -151,6 +151,8 @@ export { WUserSelect, WRoleSelect, WLabel, + WRadio, + WExtRadio, WDate, WCheckbox, WPassword,