refractor：重构报表配置表单配置项

@@ -380,11 +380,11 @@ export const formSchema: QFormSchema[] = [
         },
         {
           label: '计数',
-          value: AggregateDataEnum.COUNTALL,
+          value: AggregateDataEnum.COUNT,
         },
         {
           label: '空',
-          value: AggregateDataEnum.EMPTY,
+          value: AggregateDataEnum.NONE,
         },
       ],
     },
@@ -437,7 +437,7 @@ export const formSchema: QFormSchema[] = [
       },
       placeholder: '请选择时间段',
     },
-    colProps: { span: 6 },
+    colProps: { span: 24 },
     ifShow: ({ values }) => isDefultWeek(values.defaultWeek),
   },
   {

@@ -78,13 +78,13 @@ export enum TypeEnum {
   IS_TIMING = 'TIMING',
   IS_WEEK = 'week',
   IS_MONTH = 'month',
-  IS_EMPTY = 'EMPTY',
+  IS_EMPTY = 'NONE',
   IS_DEFAULT_WEEK = 'defaultIsWeek',
   IS_MIN = 'MIN',
   IS_MAX = 'MAX',
   IS_AVG = 'AVG',
   IS_SUM = 'SUM',
-  COUNTALL = 'COUNTALL',
+  COUNT = 'COUNT',
 }
 
 export enum AggregateDataEnum {
@@ -92,8 +92,8 @@ export enum AggregateDataEnum {
   MAX = 'MAX',
   AVG = 'AVG',
   SUM = 'SUM',
-  COUNTALL = 'COUNTALL',
-  EMPTY = 'EMPTY',
+  COUNT = 'COUNT',
+  NONE = 'NONE',
 }
 
 export const isTiming = (type: string) => {
@@ -132,5 +132,5 @@ export const isSum = (type: string) => {
 };
 
 export const isCountAll = (type: string) => {
-  return type === TypeEnum.COUNTALL;
+  return type === TypeEnum.COUNT;
 };