Browse Source

chore: 统一测试使用的testid

xyh 2 years atrás
parent
commit
ebda9aef9e

+ 5 - 7
packages/app/src/components/filter-button-group/index.tsx

@@ -7,10 +7,8 @@ type Props = {
   offset?: number;
   onSearch: () => void;
   onExport?: () => void;
-  searchTestId?: string;
   isSearching?: boolean;
   isExporting?: boolean;
-  exportTestId?: string;
   onRefresh?: () => void;
   onFilter?: () => void;
   onReset?: () => void;
@@ -22,10 +20,8 @@ const FiterButtonGroup: FC<Props> = function ({
   onRefresh,
   onFilter,
   onReset,
-  searchTestId,
   isSearching,
   isExporting,
-  exportTestId,
 }) {
   return (
     <>
@@ -34,7 +30,7 @@ const FiterButtonGroup: FC<Props> = function ({
           loading={isSearching}
           type='primary'
           onClick={onSearch}
-          data-testid={searchTestId ?? 'search_btn'}
+          data-testid={'search_btn'}
           icon={<Search theme='outline' className='anticon' />}
           htmlType='submit'
         >
@@ -44,7 +40,7 @@ const FiterButtonGroup: FC<Props> = function ({
           <Button
             loading={isSearching}
             onClick={onRefresh}
-            data-testid={searchTestId ?? 'refresh_btn'}
+            data-testid='refresh_btn'
             className='ant-btn-color-green'
             icon={<Refresh theme='outline' className='anticon' />}
             htmlType='button'
@@ -54,7 +50,7 @@ const FiterButtonGroup: FC<Props> = function ({
         )}
         {onExport && (
           <Button
-            data-testid={exportTestId ?? 'export_btn'}
+            data-testid='export_btn'
             loading={isExporting}
             type='default'
             onClick={onExport}
@@ -71,6 +67,7 @@ const FiterButtonGroup: FC<Props> = function ({
             onClick={onReset}
             icon={<Clear theme='outline' className='anticon' />}
             htmlType='button'
+            data-testid='reset_btn'
           >
             重置
           </Button>
@@ -81,6 +78,7 @@ const FiterButtonGroup: FC<Props> = function ({
             onClick={onFilter}
             icon={<Filter theme='outline' className='anticon' />}
             htmlType='button'
+            data-testid='filter_btn'
           >
             筛选
           </Button>

+ 1 - 1
packages/app/src/components/filter-field/Date.tsx

@@ -23,7 +23,7 @@ const FilterTime: FC<Props> = function ({label, name, value, onChange}) {
       </label>
       <div className={css.fieldWrapper}>
         <DatePicker.RangePicker
-          data-testid={`date_filter_${name}`}
+          data-testid={`filter_${name}`}
           name={name}
           value={value}
           onChange={onChange}

+ 1 - 0
packages/app/src/components/filter-field/Field.tsx

@@ -29,6 +29,7 @@ const FilterField: FC<Props> = function ({
       <div className={css.fieldWrapper}>
         <Input
           id={`filter_${name}`}
+          data-testid={`filter_${name}`}
           name={name}
           placeholder={placeholder ?? '请输入'}
           value={value}

+ 3 - 1
packages/app/src/components/filter-field/Tool.tsx

@@ -48,6 +48,7 @@ type Props<S extends Record<string, string>> = {
   onFilter?: () => void;
   onChange?: (key: any) => (value: string | number) => void;
   onDatesChange?: (dates: RangeValue<Dayjs>) => void;
+  testId?: string;
 };
 
 function FilterTool<S extends Record<string, string>>({
@@ -62,6 +63,7 @@ function FilterTool<S extends Record<string, string>>({
   onFilter,
   onReset,
   isSearching,
+  testId,
 }: Props<S>): ReactElement {
   const prevEls = useRef<MapValue<S>[]>([]);
 
@@ -128,7 +130,7 @@ function FilterTool<S extends Record<string, string>>({
 
   return (
     <Card>
-      <FilterFieldWrapper onSearch={onSearch}>
+      <FilterFieldWrapper onSearch={onSearch} testId={testId}>
         {list.map(function (state) {
           switch (state.type) {
             default:

+ 7 - 2
packages/app/src/components/filter-field/Wrapper.tsx

@@ -5,16 +5,21 @@ import {FormEvent} from 'react';
 
 type Props = {
   onSearch: () => void;
+  testId?: string;
 };
 
-const FilterFieldWrapper: ChildrenFC<Props> = function ({children, onSearch}) {
+const FilterFieldWrapper: ChildrenFC<Props> = function ({
+  children,
+  onSearch,
+  testId: testid,
+}) {
   function onSubmit(e: FormEvent) {
     e.preventDefault();
     onSearch();
   }
 
   return (
-    <form onSubmit={onSubmit}>
+    <form data-testid={testid} onSubmit={onSubmit}>
       <Space wrap className={css.fieldGroup} size='middle'>
         {children}
       </Space>

+ 1 - 0
packages/app/src/components/filter-selector-modal/index.tsx

@@ -37,6 +37,7 @@ const FilterSelectorModal: FC<Props> = function ({
       width='580px'
       onSubmit={onSubmit}
       icon={icon}
+      testId='filter_select_modal'
     >
       <div className='flex-center'>
         <Transfer

+ 2 - 1
packages/app/src/components/modal-field/Area.tsx

@@ -47,7 +47,8 @@ const OperationField: FC<Props> = function ({
                 <Input.TextArea
                   name={name}
                   placeholder={placeholder ?? `请输入${label}`}
-                  id={`operation_${name}`}
+                  data-testid={`field_${name}`}
+                  id={`field_${name}`}
                   value={value}
                   onChange={onChange}
                   ref={ref}

+ 1 - 0
packages/app/src/components/modal-field/Date.tsx

@@ -36,6 +36,7 @@ const Date: FC<Props> = function ({control, name, label, required}) {
             return (
               <>
                 <DatePicker
+                  data-testid={`field_${name}`}
                   allowClear={false}
                   ref={ref}
                   value={value}

+ 2 - 2
packages/app/src/components/modal-field/Select.tsx

@@ -67,10 +67,10 @@ const ModalSelect: FC<Props> = function ({
                     {[css.multipleSelect]: multiple},
                   ])}
                   filterOption={false}
-                  data-testid={`select_${name}`}
+                  data-testid={`field_${name}`}
                   defaultActiveFirstOption={false}
                   placeholder={placeholder ?? '请选择'}
-                  id={`operation_${name}`}
+                  id={`field_${name}`}
                   // 处理placeholder不显示问题
                   value={value?.length ? value : void 0}
                   onChange={onChange}

+ 2 - 0
packages/app/src/components/table-tools/index.tsx

@@ -63,6 +63,7 @@ const TableTools: ChildrenFC<Props> = function ({
         {onRefresh && (
           <Button
             className='ant-btn-color-green'
+            data-testid='refresh_btn'
             onClick={onRefresh}
             loading={isRefreshing}
             icon={<Refresh theme='outline' className='anticon' />}
@@ -90,6 +91,7 @@ const TableTools: ChildrenFC<Props> = function ({
         )}
         {onExport && (
           <Button
+            data-testid='export_btn'
             onClick={onExport}
             loading={isExporting}
             icon={<FileExcel theme='outline' className='anticon' />}