列表重置优化

src/components/Form/src/hooks/useFormEvents.ts

@@ -46,7 +46,9 @@ export function useFormEvents({
       const isInput = schema?.component && defaultValueComponents.includes(schema.component);
       const isSubForm = schema?.component && arrayValueComponents.includes(schema.component);
 
-      if (isSubForm) {
+      if (schema?.clearOnReset) {
+        formModel[key] = undefined;
+      } else if (isSubForm) {
         formModel[key] = [];
       } else if (isInput) {
         formModel[key] = defaultValueRef.value[key] || '';

src/components/Form/src/types/index.ts

@@ -171,6 +171,7 @@ export interface SubFormColumn extends ColumnProps {
   componentType?: ComponentType;
   rules?: Rule[];
   defaultValue?: any;
+  clearOnReset?: boolean;
   fieldMapToTime?: FieldMapToTime; //RangerPick组件特有
   // Render the content in the form-item tag
   render?: (renderCallbackParams: RenderCallbackParams) => VNode | VNode[] | string;

src/components/common/contractSalesPngPurPointModal.vue

@@ -128,7 +128,7 @@
       loadData()
     }
     const onReset = () => {
-      dateArr.value = [dayjs(props.defaultDate[0]), dayjs(props.defaultDate[1])]
+      dateArr.value = []
       pagination.current = 1
       loadData()
     }

src/components/common/contractSalesPngPurPointTcModal.vue

@@ -128,7 +128,7 @@
       loadData()
     }
     const onReset = () => {
-      dateArr.value = [dayjs(props.defaultDate[0]), dayjs(props.defaultDate[1])]
+      dateArr.value = []
       pagination.current = 1
       loadData()
     }

src/views/approve/Appro/index.vue

@@ -130,7 +130,8 @@
           field: 'dateAppro',
           label: '拟稿日期',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/contract/ContractFact/index.vue

@@ -134,7 +134,8 @@
           field: 'dateFrom',
           label: '有效期',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/contract/ContractPurLng/index.vue

@@ -124,7 +124,7 @@
       },
       schemas: customSearchFormSchema,
       fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']],
-      showResetButton: false,
+      showResetButton: true,
     },
     beforeFetch: (params) => {
       return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit};
@@ -527,4 +527,7 @@
   :deep(.ant-col-8:nth-child(5) .ant-select-selector) {
     width: 172px !important;
   }
+  :deep(.ant-col-8:nth-child(3) .ant-form-item-label) {
+    width: 80px !important;
+  }
 </style>

src/views/contract/ContractSalesPngPur/index.vue

@@ -29,9 +29,7 @@
   const logId = ref('')
   const logPath = ref('/contract/contractSalesPngPur/datalog');
   import { DataLog } from '/@/components/pcitc';
-  import { ref, computed, onMounted, onUnmounted,  
+  import { ref, computed, onMounted, onUnmounted } from 'vue';
-
-} from 'vue';
   
   import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
   import { getLngContractSalesPngPointPage, deleteLngContractSalesPngPoint} from '/@/api/contract/ContractSalesPngPur';
@@ -106,6 +104,7 @@
           label: '销售合同有效期',
           component: 'RangePicker',
           defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/dayPlan/Demand/index.vue

@@ -148,7 +148,8 @@
           field: 'datePlan',
           label: '计划日期',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/dayPlan/PngApproJsz/index.vue

@@ -121,7 +121,8 @@
           field: 'datePlan',
           label: '计划日期',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/ship/MeaPurInt/index.vue

@@ -105,7 +105,8 @@
           field: 'dateMea',
           label: '计量日期',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/ship/OpsPurInt/index.vue

@@ -107,7 +107,8 @@
           field: 'dateEta',
           label: '卸港ETA',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/ship/OpsSalesInt/index.vue

@@ -104,7 +104,8 @@
           field: 'dateEta',
           label: '卸港ETA',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },

src/views/ship/ShipSchedule/index.vue

@@ -115,7 +115,8 @@
           field: 'dateEta',
           label: '卸港ETA',
           component: 'RangePicker',
-          defaultValue: defaultDate.value, 
+          defaultValue: defaultDate.value,
+          clearOnReset: true,
           componentProps: {
             format: 'YYYY-MM-DD',
             style: { width: '100%' },