diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index b6d5f824..253278b0 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.1.160", + "version": "8.1.161", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue b/io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue index 558d4024..fa04e72b 100644 --- a/io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/components/dialog/WDialog.vue @@ -37,7 +37,7 @@ - +
@@ -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; }; diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue index 4d8a573d..0c6c4277 100644 --- a/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue +++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/ChildrenBtn.vue @@ -45,7 +45,15 @@ tickeds: tickedComputed, grid: grid, }) - : false + : button[0].enableIf + ? !button[0].enableIf({ + selected: firstSelectedComputed, + selecteds: selectedComputed, + ticked: firstTickedComputed, + tickeds: tickedComputed, + grid: grid, + }) + : false " @click="buttonClick(childrenBtn)" >