From de5f89a5de454c2154f39b04c76407a0fdf6b24d Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Sun, 29 Sep 2024 14:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/date/WDate.vue        | 15 +++++++++++++--
 .../src/platform/components/file/WFile.vue        |  5 ++++-
 .../src/platform/components/grid/GridEditor.vue   |  6 +-----
 .../src/platform/components/grid/WGrid.vue        |  7 +++++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/date/WDate.vue b/io.sc.platform.core.frontend/src/platform/components/date/WDate.vue
index c98a9598..cbcf3843 100644
--- a/io.sc.platform.core.frontend/src/platform/components/date/WDate.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/date/WDate.vue
@@ -8,6 +8,7 @@
       :outlined="true"
       :dense="true"
       v-bind="attrs"
+      mask="date"
       :rules="fieldMethodsClass.getRules(props, modelValue, dateRef, undefined)"
       :readonly="fieldMethodsClass.getReadOnly(props, modelValue)"
       :disable="fieldMethodsClass.getDisable(props, modelValue)"
@@ -23,7 +24,7 @@
       </template>
       <template v-if="!fieldMethodsClass.getReadOnly(props, modelValue)" #append>
         <q-icon name="event" class="cursor-pointer">
-          <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+          <q-popup-proxy cover transition-show="scale" transition-hide="scale" auto-close>
             <q-date v-model="modelValue" today-btn mask="YYYY-MM-DD" @update:model-value="fieldMethodsClass.updateValue"> </q-date>
           </q-popup-proxy>
         </q-icon>
@@ -33,7 +34,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, useAttrs } from 'vue';
+import { ref, useAttrs, watch } from 'vue';
+import { Tools } from '@/platform';
 import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
 
@@ -69,6 +71,15 @@ class FieldMethods extends FormFieldMethods {
 }
 const fieldMethodsClass = new FieldMethods();
 
+watch(
+  () => modelValue.value,
+  (newVal, oldVal) => {
+    if (!Tools.isEmpty(newVal) && newVal !== oldVal && newVal.length > 10) {
+      modelValue.value = newVal?.substring(0, 10);
+    }
+  },
+);
+
 defineExpose({
   validate: fieldMethodsClass.validate,
   setValue: fieldMethodsClass.setValue,
diff --git a/io.sc.platform.core.frontend/src/platform/components/file/WFile.vue b/io.sc.platform.core.frontend/src/platform/components/file/WFile.vue
index 12ed0931..01453397 100644
--- a/io.sc.platform.core.frontend/src/platform/components/file/WFile.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/file/WFile.vue
@@ -33,9 +33,12 @@ const fileRef = ref();
 const attrs = useAttrs();
 const modelValue = defineModel<File | Array<File>>();
 
-interface FieldProps extends FormFieldProps {}
+interface FieldProps extends FormFieldProps {
+  type?: string;
+}
 const props = withDefaults(defineProps<FieldProps>(), {
   showIf: true,
+  type: 'file',
 });
 class FieldMethods extends FormFieldMethods {
   updateValue = (value_) => {
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 d6315920..1adce5ba 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
@@ -74,11 +74,7 @@ const save = async () => {
     if (submitFlag) {
       if (formStatus === 'addTop') {
         dialogFormData[props.grid.props.foreignKey] = null;
-      } else if (formStatus === 'addChild') {
-        dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.primaryKey];
-      } else if (formStatus === 'edit' && selected[props.grid.props.primaryKey]) {
-        dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.primaryKey];
-      } else if (formStatus === 'clone' && selected[props.grid.props.primaryKey]) {
+      } else if ((formStatus === 'addChild' || formStatus === 'edit' || formStatus === 'clone') && selected[props.grid.props.foreignKey]) {
         dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.foreignKey];
       }
       if (formStatus === 'edit') {
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 7f01a265..ce369d5e 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
@@ -633,7 +633,7 @@ const buildCriteria = (value, fieldName) => {
       operator: queryOperator,
       value: value,
     };
-  } else if (typeof value === 'boolean' || typeof value === 'number') {
+  } else if (typeof value === 'boolean' || typeof value === 'number' || (typeof value === 'string' && queryFormFieldsMap.get(fieldName)['type'] === 'w-date')) {
     return {
       fieldName: fieldName,
       operator: OperatorTypeEnum.equals,
@@ -673,7 +673,10 @@ const buildQueryCriterias = (reqParams) => {
     nextTick(() => {
       const queryFormData = queryForm.getData();
       Object.keys(queryFormData).forEach((item) => {
-        if ((!Tools.isEmpty(queryFormData[item]) && !Array.isArray(queryFormData[item]) || (!Tools.isEmpty(queryFormData[item]) && Array.isArray(queryFormData[item]) && queryFormData[item].length > 0))) {
+        if (
+          (!Tools.isEmpty(queryFormData[item]) && !Array.isArray(queryFormData[item])) ||
+          (!Tools.isEmpty(queryFormData[item]) && Array.isArray(queryFormData[item]) && queryFormData[item].length > 0)
+        ) {
           // 根据数据进行operator处理
           const criteria = buildCriteria(queryFormData[item], item);
           urlSearchParams.append('criteria', JSON.stringify(criteria));