From 14eb744f1c224434b273a99e4179ea13293375b8 Mon Sep 17 00:00:00 2001 From: likunming Date: Wed, 23 Oct 2024 14:36:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81Form=E8=A1=A8=E5=8D=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=85=8D=E7=BD=AE=E5=B1=9E=E6=80=A7colFirst=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAfirstCol=E3=80=82=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DForm=E8=A1=A8=E5=8D=95=E5=85=83=E7=B4=A0=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=80=E5=88=97=E6=97=B6colSpan=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/platform/components/form/WForm.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue index 16dee6dc..e8ae7d2f 100644 --- a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue @@ -164,9 +164,13 @@ const formLayoutStyleComputed = computed(() => { const fieldStyleComputed = (field) => { const style = {}; if (field) { - if (field.colFirst) { - // col-start-1 + if (field.firstCol) { style['grid-column-start'] = 1; + if (field.colSpan === 'full' || (typeof field.colSpan === 'number' && screenColsNumComputed.value < field.colSpan)) { + style['grid-column-end'] = `${screenColsNumComputed.value + 1}`; + } else if (typeof field.colSpan === 'number' && field.colSpan > 0) { + style['grid-column-end'] = `${field.colSpan + 1}`; + } } else { if (field.colSpan === 'full') { // col-span-${screenColsNumComputed.value} From 260e90f4b658bb68f110a9900e97830a48fbd7d8 Mon Sep 17 00:00:00 2001 From: likunming Date: Wed, 23 Oct 2024 14:49:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/platform/components/grid/CellEditor.vue | 4 ++-- .../src/platform/components/grid/GridEditor.vue | 4 ++-- io.sc.platform.core.frontend/src/platform/i18n/messages.json | 1 - .../src/platform/i18n/messages_tw_CN.json | 1 - .../src/platform/i18n/messages_zh_CN.json | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue index 7b05083f..38eade6d 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/CellEditor.vue @@ -47,8 +47,8 @@ const dialog = { buttons: [ { icon: 'beenhere', - labelI18nKey: props.grid.props.localMode ? 'action.confirm' : 'action.submit', - label: t(props.grid.props.localMode ? 'action.confirm' : 'action.submit'), + labelI18nKey: props.grid.props.localMode ? 'confirm' : 'action.submit', + label: t(props.grid.props.localMode ? 'confirm' : 'action.submit'), loading: false, click: async () => { dialog.buttons[0].loading = true; diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue index 491a0c62..76696122 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue @@ -153,8 +153,8 @@ const dialog = reactive({ dialogButtons: [ { icon: 'beenhere', - labelI18nKey: props.grid.props.localMode ? 'action.confirm' : 'action.submit', - label: t(props.grid.props.localMode ? 'action.confirm' : 'action.submit'), + labelI18nKey: props.grid.props.localMode ? 'confirm' : 'action.submit', + label: t(props.grid.props.localMode ? 'confirm' : 'action.submit'), loading: false, click: () => { save(); diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages.json b/io.sc.platform.core.frontend/src/platform/i18n/messages.json index b77270c7..1e09da16 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages.json @@ -142,7 +142,6 @@ "action.export": "Export", "action.export.failed": "Export Failed", "action.submit": "Submit", - "action.confirm": "Confirm", "action.expandAll": "Expand All", "action.collapseAll": "Collapse All", diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json index 98666918..0e83daa2 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json @@ -142,7 +142,6 @@ "action.export": "導出", "action.export.failed": "導出失敗", "action.submit": "提交", - "action.confirm": "确定", "action.expandAll": "全部展开", "action.collapseAll": "全部收起", diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json index a1574405..cc881858 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json @@ -142,7 +142,6 @@ "action.export": "导出", "action.export.failed": "导出失败", "action.submit": "提交", - "action.confirm": "确定", "action.expandAll": "全部展开", "action.collapseAll": "全部收起",