Merge branch 'main' of http://gitlab.sc.io:9000/wangshaoping/platform

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}

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;

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();