fix:crud2中行记录内switch无法change问题 (baidu#9441)

lhtuling · Jan 17, 2024 · 04dfa35 · 04dfa35
1 parent fcf6300
commit 04dfa35
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/packages/amis-core/src/utils/helper.ts b/packages/amis-core/src/utils/helper.ts
@@ -1901,7 +1901,7 @@ export function isClickOnInput(e: React.MouseEvent<HTMLElement>) {
     !e.currentTarget.contains(target) ||
     ~['INPUT', 'TEXTAREA'].indexOf(target.tagName) ||
     ((formItem = target.closest(
-      `button, a, [data-role="form-item"], label[data-role="checkbox"]`
+      `button, a, [data-role="form-item"], label[data-role="checkbox"], label[data-role="switch"]`
     )) &&
       e.currentTarget.contains(formItem))
   );

diff --git a/packages/amis-ui/src/components/Switch.tsx b/packages/amis-ui/src/components/Switch.tsx
@@ -109,6 +109,7 @@ export class Switch extends React.PureComponent<SwitchProps, any> {
           'is-checked': isChecked,
           'is-disabled': isDisabled
         })}
+        data-role="switch"
       >
         <input
           type="checkbox"

diff --git a/packages/amis-ui/src/components/table/Row.tsx b/packages/amis-ui/src/components/table/Row.tsx
@@ -92,9 +92,6 @@ class BodyRow extends React.PureComponent<Props> {
       return;
     }
 
-    e.preventDefault();
-    e.stopPropagation();
-
     const {onClick} = this.props;
     onClick && onClick(e, record, rowIndex);
   }

diff --git a/packages/amis/__tests__/renderers/Form/__snapshots__/switch.test.tsx.snap b/packages/amis/__tests__/renderers/Form/__snapshots__/switch.test.tsx.snap
@@ -53,6 +53,7 @@ exports[`Renderer:Switch Switch basic props 1`] = `
           >
             <label
               class="cxd-Switch is-checked"
+              data-role="switch"
             >
               <input
                 checked=""
@@ -134,6 +135,7 @@ exports[`Renderer:Switch Switch size 1`] = `
           >
             <label
               class="cxd-Switch  cxd-Switch--sm"
+              data-role="switch"
             >
               <input
                 theme="cxd"

diff --git a/packages/amis/__tests__/renderers/Form/__snapshots__/valueFormula.test.tsx.snap b/packages/amis/__tests__/renderers/Form/__snapshots__/valueFormula.test.tsx.snap
@@ -215,6 +215,7 @@ exports[`Renderer:inputDate 1`] = `
           >
             <label
               class="cxd-Switch"
+              data-role="switch"
             >
               <input
                 checked=""

diff --git a/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Table.test.tsx.snap
@@ -7171,6 +7171,7 @@ exports[`Renderer:table list 1`] = `
                 >
                   <label
                     class="cxd-Switch is-checked"
+                    data-role="switch"
                   >
                     <input
                       checked=""
@@ -7413,6 +7414,7 @@ exports[`Renderer:table list 1`] = `
                 >
                   <label
                     class="cxd-Switch is-checked"
+                    data-role="switch"
                   >
                     <input
                       checked=""
@@ -7775,6 +7777,7 @@ exports[`Renderer:table list 1`] = `
                 >
                   <label
                     class="cxd-Switch"
+                    data-role="switch"
                   >
                     <input
                       theme="cxd"