Merge pull request #609 from JeromeLin/master

fix #607
ZhongAnTech · Apr 16, 2021 · 8ed0d0e · 8ed0d0e
2 parents 4e6fa4d + 5af7a37
commit 8ed0d0e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 25 deletions.
diff --git a/components/slider/__tests__/index.test.tsx b/components/slider/__tests__/index.test.tsx
@@ -299,7 +299,7 @@ describe('Slider', () => {
     expect(wrapper.instance()['offsetStart']).toEqual(140);
     expect(mOnChange).toBeCalledWith(70);
     expect(touchMoveEvent.stopPropagation).toBeCalledTimes(1);
-    expect(touchMoveEvent.preventDefault).toBeCalledTimes(1);
+    // expect(touchMoveEvent.preventDefault).toBeCalledTimes(1);
     expect(updateAllSpy).toBeCalledTimes(1);
   });
 
@@ -323,7 +323,7 @@ describe('Slider', () => {
     expect(wrapper.state('tooltip')).toBeFalsy();
     expect(mOnChange).toBeCalledWith(100);
     expect(touchMoveEvent.stopPropagation).toBeCalledTimes(1);
-    expect(touchMoveEvent.preventDefault).toBeCalledTimes(1);
+    // expect(touchMoveEvent.preventDefault).toBeCalledTimes(1);
     expect(updateAllSpy).toBeCalledTimes(1);
   });
 

diff --git a/components/stack-picker/PropsType.tsx b/components/stack-picker/PropsType.tsx
@@ -15,22 +15,21 @@ type TItemRender = (data: TDataSource) => string;
 type TDisplayRender = (data: TDataSource[]) => string;
 
 export default interface PropsType {
-  defaultValue: ReactNode[];
-  value: ReactNode[];
+  defaultValue?: ReactNode[];
+  value?: ReactNode[];
   displayMember?: string;
   valueMember?: string;
   dataSource: IDataSource[];
   title?: string;
   visible?: boolean;
-  disabled?: boolean;
   maskClosable?: boolean;
   cols?: number;
   labelAddon?: string;
   displayRender?: TDisplayRender;
   itemRender?: TItemRender;
   onChangeValidate?: (v: ReactNode) => ReactNode;
-  cancelText: string;
-  okText: string;
+  cancelText?: string;
+  okText?: string;
   onChange?: (selected: string[]) => void;
   onOk?: (value: string[]) => void;
   onCancel?: () => void;

diff --git a/components/stack-picker/StackPicker.tsx b/components/stack-picker/StackPicker.tsx
@@ -32,7 +32,6 @@ export default memo(
     valueMember = 'value',
     title = '请选择',
     visible = false,
-    disabled = false,
     cols = Infinity,
     labelAddon = ' > ',
     displayRender,
@@ -83,14 +82,6 @@ export default memo(
       setCurrentValue(initValue);
     }, [dataSource, handleObtainItem, value, defaultValue]);
 
-    const handleToggle = () => {
-      if (disabled) {
-        return;
-      }
-
-      setCurrentVisible(!currentVisible);
-    };
-
     /**
      * 点击遮罩
      */
@@ -112,8 +103,6 @@ export default memo(
      * 点击取消按钮
      */
     const handleCancel = () => {
-      handleToggle();
-
       if (onCancel) {
         if (typeof onCancel !== 'function') {
           console.error('onCancel need a function');
@@ -191,8 +180,6 @@ export default memo(
      * 点击确认按钮
      */
     const handleOk = () => {
-      handleToggle();
-
       if (onOk) {
         if (typeof onOk !== 'function') {
           console.error('onOk need a function');

diff --git a/components/stack-picker/demo.md b/components/stack-picker/demo.md
@@ -91,12 +91,18 @@ const Demo = () => {
         value={value}
         title="层叠选择器"
         dataSource={District}
-        onOk={(v) => {
-          console.log(v);
-          setValue(v);
+        onChange={(value) => {
+          console.log('onChange', value);
+        }}
+        onOk={(value) => {
+          console.log('onOk', value);
+          setValue(value);
+          setVisible(false);
+        }}
+        onCancel={() => {
+          console.log('onCancel');
           setVisible(false);
         }}
-        onCancel={() => setVisible(false)}
       />
     </>
   );
@@ -117,7 +123,6 @@ ReactDOM.render(<Demo />, mountNode);
 | valueMember   | string                                                                    | 'value'                                      | 值字段对应的 key                               |
 | displayRender | (selected?: object) => string                                             | selected => selected.map(item => item.label) | 所选值的展示                                   |
 | itemRender    | (data?: object) => data.label                                             | (data?: object) => data.label                | 单个选项的展示                                 |
-| disabled      | boolean                                                                   | false                                        | 是否禁用                                       |
 | title         | string                                                                    | '请选择'                                     | 选择器标题                                     |
 | okText        | string                                                                    | '确定'                                       | 确定栏文字                                     |
 | cancelText    | string                                                                    | '取消'                                       | 取消栏文字                                     |

diff --git a/components/swipe-action/__tests__/__snapshots__/index.test.jsx.snap b/components/swipe-action/__tests__/__snapshots__/index.test.jsx.snap
@@ -40,6 +40,7 @@ exports[`SwipeAction left only 1`] = `
 exports[`SwipeAction renders correctly 1`] = `
 <SwipeAction
   animationDuration={300}
+  autoClose={true}
   left={
     Array [
       <Button