From 935ccc8d787037605b6e84373bfa7fcf28a07514 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 30 Apr 2024 14:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/form/elements/WIcon.vue        |  4 +++
 .../src/platform/components/grid/WGrid.vue    | 29 +++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/form/elements/WIcon.vue b/io.sc.platform.core.frontend/src/platform/components/form/elements/WIcon.vue
index 30325b52..8ae31f66 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/elements/WIcon.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/elements/WIcon.vue
@@ -161,6 +161,9 @@ const selectedTab = ref('bootstrap');
 const isShow = ref(false);
 const searchRef = ref('');
 const valueRef = ref(props.modelValue || 'bi-arrow-up-left-square');
+if (Tools.isEmpty(props.modelValue)) {
+  emit('update:modelValue', valueRef.value, props.form);
+}
 watch(
   () => props.modelValue,
   (newVal, oldVal) => {
@@ -236,6 +239,7 @@ const iconItemClick = (icon: string) => {
   valueRef.value = icon;
   isShow.value = false;
 
+  updateModelValue(icon);
   changeValue(icon);
 };
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index 5dbbb725..5172b2b7 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -241,7 +241,7 @@
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted, nextTick, toRaw, useAttrs, getCurrentInstance, provide, watchEffect, watch, onUpdated } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { axios, Environment, NotifyManager, TreeBuilder, VueTools, Tools, eventBus } from '@/platform';
+import { axios, Environment, NotifyManager, TreeBuilder, VueTools, Tools, eventBus, noErrorAxios } from '@/platform';
 import { useQuasar, getCssVar, exportFile } from 'quasar';
 import { IconEnum } from '@/platform/enums';
 import { arrayToMap, OperatorTypeEnum, isEmpty, PageStatusEnum } from '@/platform/components/utils';
@@ -735,7 +735,8 @@ const buttonObj = reactive({
         $q.dialog({
           title: t('confirm'),
           message: t('action.remove.tip'),
-          cancel: true,
+          cancel: { noCaps: true },
+          ok: { noCaps: true },
           persistent: true,
         }).onOk(() => {
           remove();
@@ -844,7 +845,8 @@ const buttonObj = reactive({
         $q.dialog({
           title: t('confirm'),
           message: t('action.resetDefaultValues.tip'),
-          cancel: true,
+          cancel: { noCaps: true },
+          ok: { noCaps: true },
           persistent: true,
         }).onOk(() => {
           resetDefaultValues();
@@ -1566,7 +1568,7 @@ const save = async () => {
             : (url.editDataUrl ? url.editDataUrl : url.dataUrl) + '/' + getSelectedRowsComputed.value[0][props.primaryKey],
       };
       dialog.dialogButtons[0].loading = false;
-      axios(requestParams)
+      noErrorAxios(requestParams)
         .then((resp) => {
           dialog.dialogButtons[0].loading = false;
           emit('afterEditorDataSubmit', resp.data);
@@ -1575,7 +1577,22 @@ const save = async () => {
           onRequest({ pagination: state.pagination });
         })
         .catch((error) => {
-          console.info('error====', error);
+          const response = error?.response;
+          const status = response?.status;
+          const data = response?.data;
+          if (data?.code === 1001) {
+            // 验证错误
+            if (error.response.data.data) {
+              dialogFormRef.value.setValidationErrors(error.response.data.data);
+            }
+          } else {
+            //其他错误
+            if (status === 500) {
+              NotifyManager.error(t(data?.errorMessageI18nKey));
+            } else {
+              NotifyManager.error(t(status));
+            }
+          }
           dialog.dialogButtons[0].loading = false;
         });
     } else {
@@ -2477,7 +2494,7 @@ VueTools.expose2Instance(instance);
   border-bottom-width: 1px;
 }
 
-.sticky-header-column-table thead tr {
+.sticky-header-column-table thead tr:not(.noDataTr) {
   height: var(--tableColumnTitleHeight) !important;
 }