Merge pull request #190 from kne-union/release

Release
kne-union · Apr 18, 2024 · f2c2422 · f2c2422
2 parents 1a052b2 + 230ee7e
commit f2c2422
Show file tree

Hide file tree

Showing 13 changed files with 525 additions and 325 deletions.
diff --git a/README.md b/README.md
@@ -957,7 +957,7 @@ const BaseExample = () => {
                             <Calendar.Item name="time2" label="时间"/>, <TimeStep.Item name="timeStep" label="时间2"/>,
                             <CalendarRange.Item name="time3" label="时间段"/>,
                             <CalendarTimeRange.Item name="time2" label="面试时间2" rule="REQ" durationHidden/>,
-                            <UserListSelect.Item name="user" label="用户" rule="REQ"/>,
+                            <UserListSelect.Item name="user" label="用户" rule="REQ" disabledValues={[1, 2, 3]}/>,
                             <Upload.Item name="attachment" label="附件" rule="REQ"/>,
                             <AutoComplete.Item name="school" label="学校" rule="REQ" api={{
                                 loader: ({data}) => {
@@ -976,8 +976,8 @@ const BaseExample = () => {
             <Space direction={"vertical"}>
                 <View>列表</View>
                 <Form onSubmit={(data) => {
-                          console.log(data);
-                      }}
+                    console.log(data);
+                }}
                 >
                     <CommonListTitle
                         subtitle="(填写工作经历)"

diff --git a/doc/form.js b/doc/form.js
@@ -128,7 +128,7 @@ const BaseExample = () => {
                             <Calendar.Item name="time2" label="时间"/>, <TimeStep.Item name="timeStep" label="时间2"/>,
                             <CalendarRange.Item name="time3" label="时间段"/>,
                             <CalendarTimeRange.Item name="time2" label="面试时间2" rule="REQ" durationHidden/>,
-                            <UserListSelect.Item name="user" label="用户" rule="REQ"/>,
+                            <UserListSelect.Item name="user" label="用户" rule="REQ" disabledValues={[1, 2, 3]}/>,
                             <Upload.Item name="attachment" label="附件" rule="REQ"/>,
                             <AutoComplete.Item name="school" label="学校" rule="REQ" api={{
                                 loader: ({data}) => {
@@ -147,8 +147,8 @@ const BaseExample = () => {
             <Space direction={"vertical"}>
                 <View>列表</View>
                 <Form onSubmit={(data) => {
-                          console.log(data);
-                      }}
+                    console.log(data);
+                }}
                 >
                     <CommonListTitle
                         subtitle="(填写工作经历)"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kne/mini-core",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "dependencies": {
     "@kne/antd-taro": "^1.0.35",
     "@kne/compose": "^0.1.0",

diff --git a/src/Calendar/CalendarPopup.js b/src/Calendar/CalendarPopup.js
@@ -1,56 +1,81 @@
-import React, {useState} from 'react';
-import {Popup, SafeArea} from '@kne/antd-taro';
+import React, { useState } from 'react';
+import { Popup, SafeArea } from '@kne/antd-taro';
 import style from './style.module.scss';
-import useControlValue from "@kne/use-control-value";
+import useControlValue from '@kne/use-control-value';
 import CalendarView from './CalendarView';
 import classnames from 'classnames';
-import {View} from '@tarojs/components';
+import { View } from '@tarojs/components';
+import computedIsDisabled from './computedIsDisabled';
 
-const CalendarPopup = ({className, onClose, onCancel, isRootPortal, value, onChange, placeholder, ...props}) => {
-    const [active, setActive] = useControlValue(props, {
-        defaultValue: 'defaultOpen', value: 'open', onChange: 'onOpenChange'
-    });
-    const [current, setCurrent] = useState(value);
-    return <Popup className={classnames(style['popup'], 'adm-picker-popup')} isRootPortal={isRootPortal} hasSafeArea={false}
-                  position="bottom" open={active}
-                  onOpenChange={(open) => {
-                      if (open) {
-                          return;
-                      }
-                      setActive(false);
-                      onClose?.();
-                      setCurrent(value);
-                  }}>
-
-        {active && <><View className={`adm-picker-header`}>
+const CalendarPopup = ({ className, onClose, onCancel, isRootPortal, value, onChange, placeholder, ...props }) => {
+  const [active, setActive] = useControlValue(props, {
+    defaultValue: 'defaultOpen',
+    value: 'open',
+    onChange: 'onOpenChange'
+  });
+  const [current, setCurrent] = useState(value);
+  return (
+    <Popup
+      className={classnames(style['popup'], 'adm-picker-popup')}
+      isRootPortal={isRootPortal}
+      hasSafeArea={false}
+      position="bottom"
+      open={active}
+      onOpenChange={open => {
+        if (open) {
+          return;
+        }
+        setActive(false);
+        onClose?.();
+        setCurrent(value);
+      }}
+    >
+      {active && (
+        <>
+          <View className={`adm-picker-header`}>
             <View
-                className={`adm-picker-header-button`}
-                onClick={() => {
-                    onCancel?.();
-                    setActive(false);
-                    onClose?.();
-                }}
+              className={`adm-picker-header-button`}
+              onClick={() => {
+                onCancel?.();
+                setActive(false);
+                onClose?.();
+              }}
             >
-                取消
+              取消
             </View>
             <View className={`adm-picker-header-title`}>{placeholder}</View>
             <View
-                className={classnames(`adm-picker-header-button`)}
-                onClick={() => {
-                    setActive(false);
-                    onClose?.();
-                    onChange?.(current);
-                }}
+              className={classnames(`adm-picker-header-button`)}
+              onClick={() => {
+                setActive(false);
+                onClose?.();
+                if (
+                  computedIsDisabled(current, {
+                    minDate: props.minDate,
+                    maxDate: props.maxDate,
+                    disabledDate: props.disabledDate
+                  })
+                ) {
+                  return;
+                }
+                onChange?.(current);
+              }}
             >
-                确定
+              确定
             </View>
-        </View><CalendarView {...props} value={current} onChange={setCurrent}/></>}
-        <SafeArea position="bottom"/>
+          </View>
+          <CalendarView {...props} value={current} onChange={setCurrent} />
+        </>
+      )}
+      <SafeArea position="bottom" />
     </Popup>
+  );
 };
 
 CalendarPopup.defaultProps = {
-    value: new Date(), placeholder: '请选择日期', isRootPortal: false
+  value: new Date(),
+  placeholder: '请选择日期',
+  isRootPortal: false
 };
 
 export default CalendarPopup;
diff --git a/src/Calendar/CalendarRangePopup.js b/src/Calendar/CalendarRangePopup.js
@@ -1,39 +1,65 @@
-import React, {useState} from 'react';
-import {Popup, SafeArea} from '@kne/antd-taro';
+import React, { useState } from 'react';
+import { Popup, SafeArea } from '@kne/antd-taro';
 import style from './style.module.scss';
-import useControlValue from "@kne/use-control-value";
+import useControlValue from '@kne/use-control-value';
 import CalendarRangeView from './CalendarRangeView';
 import classnames from 'classnames';
-import {View} from '@tarojs/components';
+import { View } from '@tarojs/components';
+import computedIsDisabled from './computedIsDisabled';
 
-const CalendarRangePopup = ({className, onClose, onCancel, isRootPortal, value, onChange, placeholder, ...props}) => {
-    const [active, setActive] = useControlValue(props, {
-        defaultValue: 'defaultOpen', value: 'open', onChange: 'onOpenChange'
-    });
-    const [current, setCurrent] = useState(value);
-    return <Popup className={classnames(style['popup'], 'adm-picker-popup')} isRootPortal={false} hasSafeArea={false}
-                  position="bottom" open={active}
-                  onOpenChange={(open) => {
-                      if (open) {
-                          return;
-                      }
-                      setActive(false);
-                      onClose?.();
-                      setCurrent(value);
-                  }}>
-
-        {active && <CalendarRangeView {...props} value={current} onChange={setCurrent}/>}
-        <View className={classnames(`adm-picker-header-button`, style['confirm-btn'])} onClick={() => {
-            setActive(false);
-            onClose?.();
-            onChange?.(current);
-        }}>确定</View>
-        <SafeArea position="bottom"/>
+const CalendarRangePopup = ({ className, onClose, onCancel, isRootPortal, value, onChange, placeholder, ...props }) => {
+  const [active, setActive] = useControlValue(props, {
+    defaultValue: 'defaultOpen',
+    value: 'open',
+    onChange: 'onOpenChange'
+  });
+  const [current, setCurrent] = useState(value);
+  return (
+    <Popup
+      className={classnames(style['popup'], 'adm-picker-popup')}
+      isRootPortal={false}
+      hasSafeArea={false}
+      position="bottom"
+      open={active}
+      onOpenChange={open => {
+        if (open) {
+          return;
+        }
+        setActive(false);
+        onClose?.();
+        setCurrent(value);
+      }}
+    >
+      {active && <CalendarRangeView {...props} value={current} onChange={setCurrent} />}
+      <View
+        className={classnames(`adm-picker-header-button`, style['confirm-btn'])}
+        onClick={() => {
+          setActive(false);
+          onClose?.();
+          if (
+            current.some(target =>
+              computedIsDisabled(target, {
+                minDate: props.minDate,
+                maxDate: props.maxDate,
+                disabledDate: props.disabledDate
+              })
+            )
+          ) {
+            return;
+          }
+          onChange?.(current);
+        }}
+      >
+        确定
+      </View>
+      <SafeArea position="bottom" />
     </Popup>
+  );
 };
 
 CalendarRangePopup.defaultProps = {
-    value: [], placeholder: '请选择日期'
+  value: [],
+  placeholder: '请选择日期'
 };
 
 export default CalendarRangePopup;
diff --git a/src/Calendar/TimeRangePopup.js b/src/Calendar/TimeRangePopup.js
@@ -1,40 +1,66 @@
-import React, {useState} from 'react';
-import {Popup, SafeArea} from '@kne/antd-taro';
+import React, { useState } from 'react';
+import { Popup, SafeArea } from '@kne/antd-taro';
 import style from './style.module.scss';
-import useControlValue from "@kne/use-control-value";
+import useControlValue from '@kne/use-control-value';
 import TimeRangeView from './TimeRangeView';
 import classnames from 'classnames';
-import {View} from '@tarojs/components';
+import { View } from '@tarojs/components';
 import dayjs from 'dayjs';
+import computedIsDisabled from './computedIsDisabled';
 
-const TimeRangePopup = ({className, onClose, isRootPortal, value, onChange, ...props}) => {
-    const [active, setActive] = useControlValue(props, {
-        defaultValue: 'defaultOpen', value: 'open', onChange: 'onOpenChange'
-    });
-    const [current, setCurrent] = useState(value);
-    return <Popup className={classnames(style['popup'], 'adm-picker-popup')} isRootPortal={isRootPortal}
-                  hasSafeArea={false}
-                  position="bottom" open={active}
-                  onOpenChange={(open) => {
-                      if (open) {
-                          return;
-                      }
-                      setActive(false);
-                      onClose?.();
-                      setCurrent(value);
-                  }}>
-        {active && <TimeRangeView {...props} value={current} onChange={setCurrent}/>}
-        <View className={classnames(`adm-picker-header-button`, style['confirm-btn'])} onClick={() => {
-            setActive(false);
-            onClose?.();
-            onChange?.(current);
-        }}>确定</View>
-        <SafeArea position="bottom"/>
+const TimeRangePopup = ({ className, onClose, isRootPortal, value, onChange, ...props }) => {
+  const [active, setActive] = useControlValue(props, {
+    defaultValue: 'defaultOpen',
+    value: 'open',
+    onChange: 'onOpenChange'
+  });
+  const [current, setCurrent] = useState(value);
+  return (
+    <Popup
+      className={classnames(style['popup'], 'adm-picker-popup')}
+      isRootPortal={isRootPortal}
+      hasSafeArea={false}
+      position="bottom"
+      open={active}
+      onOpenChange={open => {
+        if (open) {
+          return;
+        }
+        setActive(false);
+        onClose?.();
+        setCurrent(value);
+      }}
+    >
+      {active && <TimeRangeView {...props} value={current} onChange={setCurrent} />}
+      <View
+        className={classnames(`adm-picker-header-button`, style['confirm-btn'])}
+        onClick={() => {
+          setActive(false);
+          onClose?.();
+          if (
+            current.some(target =>
+              computedIsDisabled(target, {
+                minDate: props.minDate,
+                maxDate: props.maxDate,
+                disabledDate: props.disabledDate
+              })
+            )
+          ) {
+            return;
+          }
+          onChange?.(current);
+        }}
+      >
+        确定
+      </View>
+      <SafeArea position="bottom" />
     </Popup>
+  );
 };
 
 TimeRangePopup.defaultProps = {
-    value: [dayjs(new Date()).startOf('hour'), dayjs(new Date()).startOf('hour').add(1, 'hour')], isRootPortal: false
+  value: [dayjs(new Date()).startOf('hour'), dayjs(new Date()).startOf('hour').add(1, 'hour')],
+  isRootPortal: false
 };
 
 export default TimeRangePopup;