Browse Source

表格优化提交

main
likunming 11 months ago
parent
commit
b763579709
  1. 2
      io.sc.platform.core.frontend/package.json
  2. 13
      io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue
  3. 8
      io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue

2
io.sc.platform.core.frontend/package.json

@ -1,6 +1,6 @@
{
"name": "platform-core",
"version": "8.1.160",
"version": "8.1.161",
"description": "前端核心包,用于快速构建前端的脚手架",
"//main": "库的主文件",
"main": "dist/platform-core.js",

13
io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue

@ -37,7 +37,7 @@
</div>
</q-card-section>
<q-separator />
<q-card-section :style="generateDialogBodyStyle()" class="overflow-y-scroll">
<q-card-section :style="generateDialogBodyStyle()" class="overflow-y-auto">
<div ref="dialogContentDivRef" style="height: 100%">
<slot></slot>
</div>
@ -110,9 +110,14 @@ const generateDialogBodyStyle = () => {
if (dialog.maximized) {
result.height = quasar.screen.height - 60 + 'px';
} else {
if (props.height) {
result.height = 'calc(' + props.height + ' - 60px)';
}
// if (props.height) {
// if (props.height.indexOf('%') > 0) {
// result.height = 'calc(100% - 60px)';
// } else {
// result.height = 'calc(' + props.height + ' - 60px)';
// }
// }
result.height = 'calc(100% - 60px)';
}
return result;
};

8
io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue

@ -45,6 +45,14 @@
tickeds: tickedComputed,
grid: grid,
})
: button[0].enableIf
? !button[0].enableIf({
selected: firstSelectedComputed,
selecteds: selectedComputed,
ticked: firstTickedComputed,
tickeds: tickedComputed,
grid: grid,
})
: false
"
@click="buttonClick(childrenBtn)"

Loading…
Cancel
Save