@ray-js/components 1.2.1 → 1.2.2

package/lib/DatePicker/DatePicker.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { DatePickerProps } from './props';
+declare const DatePicker: React.FC<DatePickerProps>;
+export default DatePicker;

package/lib/DatePicker/DatePicker.js

@@ -0,0 +1,61 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import * as React from 'react';
+import { useTouch } from '@ray-js/framework-shared';
+import { useEventListener } from 'ahooks';
+import handleProps from '../utils/handleProps';
+
+var DatePicker = function (props) {
+  var children = props.children,
+      onLongClick = props.onLongClick,
+      onTouchStart = props.onTouchStart,
+      onTouchMove = props.onTouchMove,
+      onTouchEnd = props.onTouchEnd,
+      onTouchCancel = props.onTouchCancel,
+      onClick = props.onClick;
+  var currentNode = React.useRef(null);
+  useEventListener('change', function (e) {
+    var _props$onChange;
+
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, {
+      type: e.type,
+      value: e.detail.value,
+      origin: e
+    });
+  }, {
+    target: currentNode
+  });
+  useEventListener('cancel', function (e) {
+    var _props$onCancel;
+
+    (_props$onCancel = props.onCancel) === null || _props$onCancel === void 0 ? void 0 : _props$onCancel.call(props, {
+      type: e.type,
+      origin: e
+    });
+  }, {
+    target: currentNode
+  });
+
+  var _useTouch = useTouch({
+    onLongClick: onLongClick,
+    onTouchStart: onTouchStart,
+    onTouchMove: onTouchMove,
+    onTouchEnd: onTouchEnd,
+    onTouchCancel: onTouchCancel,
+    onClick: onClick
+  }),
+      _useTouch2 = _slicedToArray(_useTouch, 2),
+      handlers = _useTouch2[1];
+
+  return (
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement("v-picker", _extends({}, handleProps(props), handlers, {
+      ref: currentNode,
+      mode: "date"
+    }), children)
+  );
+};
+
+DatePicker.displayName = 'DatePicker';
+export default DatePicker;

package/lib/DatePicker/DatePicker.thing.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { DatePickerProps } from './props';
+declare const DatePicker: React.FC<DatePickerProps>;
+export default DatePicker;

package/lib/DatePicker/DatePicker.thing.js

@@ -0,0 +1,56 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["className", "style", "id", "onLongClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onChange", "onCancel"];
+import clsx from 'clsx';
+import * as React from 'react';
+import { inlineStyle, useTouch } from '@ray-js/framework-shared';
+import { Picker as RemaxPicker } from '@ray-js/adapter';
+
+var DatePicker = function (props) {
+  var className = props.className,
+      style = props.style,
+      id = props.id,
+      onLongClick = props.onLongClick,
+      onTouchStart = props.onTouchStart,
+      onTouchMove = props.onTouchMove,
+      onTouchEnd = props.onTouchEnd,
+      onTouchCancel = props.onTouchCancel,
+      onClick = props.onClick,
+      onChange = props.onChange,
+      onCancel = props.onCancel,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useTouch = useTouch({
+    onLongClick: onLongClick,
+    onTouchStart: onTouchStart,
+    onTouchMove: onTouchMove,
+    onTouchEnd: onTouchEnd,
+    onTouchCancel: onTouchCancel,
+    onClick: onClick
+  }),
+      _useTouch2 = _slicedToArray(_useTouch, 2),
+      touching = _useTouch2[0],
+      handlers = _useTouch2[1];
+
+  return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
+    mode: "date",
+    onChange: function handleChange(e) {
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        type: e.type,
+        value: e.detail.value,
+        origin: e
+      });
+    },
+    onCancel: function handleCancel(e) {
+      onCancel === null || onCancel === void 0 ? void 0 : onCancel({
+        type: e.type,
+        origin: e
+      });
+    },
+    style: inlineStyle(style),
+    className: clsx(className)
+  }, restProps, handlers), props.children);
+};
+
+export default DatePicker;

package/lib/DatePicker/DatePicker.wechat.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { DatePickerProps } from './props';
+declare const DatePicker: React.FC<DatePickerProps>;
+export default DatePicker;

package/lib/DatePicker/DatePicker.wechat.js

@@ -0,0 +1,56 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["className", "style", "id", "onLongClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onChange", "onCancel"];
+import clsx from 'clsx';
+import * as React from 'react';
+import { inlineStyle, useTouch } from '@ray-js/framework-shared';
+import { Picker as RemaxPicker } from '@ray-core/wechat';
+
+var DatePicker = function (props) {
+  var className = props.className,
+      style = props.style,
+      id = props.id,
+      onLongClick = props.onLongClick,
+      onTouchStart = props.onTouchStart,
+      onTouchMove = props.onTouchMove,
+      onTouchEnd = props.onTouchEnd,
+      onTouchCancel = props.onTouchCancel,
+      onClick = props.onClick,
+      onChange = props.onChange,
+      onCancel = props.onCancel,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useTouch = useTouch({
+    onLongClick: onLongClick,
+    onTouchStart: onTouchStart,
+    onTouchMove: onTouchMove,
+    onTouchEnd: onTouchEnd,
+    onTouchCancel: onTouchCancel,
+    onClick: onClick
+  }),
+      _useTouch2 = _slicedToArray(_useTouch, 2),
+      touching = _useTouch2[0],
+      handlers = _useTouch2[1];
+
+  return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
+    mode: "date",
+    onChange: function handleChange(e) {
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        type: e.type,
+        value: e.detail.value,
+        origin: e
+      });
+    },
+    onCancel: function handleCancel(e) {
+      onCancel === null || onCancel === void 0 ? void 0 : onCancel({
+        type: e.type,
+        origin: e
+      });
+    },
+    style: inlineStyle(style),
+    className: clsx(className)
+  }, restProps, handlers), props.children);
+};
+
+export default DatePicker;

package/lib/DatePicker/index.d.ts

@@ -0,0 +1,3 @@
+import DatePicker from './DatePicker';
+export * from './props';
+export default DatePicker;

package/lib/DatePicker/index.js

@@ -0,0 +1,3 @@
+import DatePicker from './DatePicker';
+export * from './props';
+export default DatePicker;

package/lib/DatePicker/props.d.ts

@@ -0,0 +1,100 @@
+import { BaseProps } from '../types';
+declare type changeValue = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: string;
+    /**
+     * @description.en value
+     * @description.zh value
+     * @default undefined
+     */
+    value: string;
+    origin?: any;
+}) => void;
+declare type CancelEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: string;
+    origin: any;
+}) => void;
+export interface DatePickerProps extends BaseProps {
+    /**
+     * @description.en disabled
+     * @description.zh 是否禁用
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * @description.en The currently selected date
+     * @description.zh 当前选择的日期
+     * @default undefined
+     */
+    value?: string;
+    /**
+     * @description.en Indicates the beginning of the valid date range in the format of "YYYY-MM-DD"
+     * @description.zh 表示有效日期范围的开始，字符串格式为"YYYY-MM-DD"
+     * @default undefined
+     */
+    start?: string;
+    /**
+     * @description.en Indicates the end of the valid date range in the format of "YYYY-MM-DD"
+     * @description.zh 表示有效日期范围的结束，字符串格式为"YYYY-MM-DD"
+     * @default undefined
+     */
+    end?: string;
+    /**
+     * @description.en Valid values year,month,day indicate the granularity of the selector
+     * @description.zh 有效值 year,month,day，表示选择器的粒度
+     * @default undefined
+     */
+    fields?: 'year' | 'month' | 'day';
+    /**
+     * @description.en onChange
+     * @description.zh 选择时触发
+     * @default undefined
+     */
+    onChange?: changeValue;
+    /**
+     * @description.en onCancel
+     * @description.zh 取消选择时触发
+     * @default undefined
+     */
+    onCancel?: CancelEvent;
+    /**
+     * @description.en confirmText
+     * @description.zh 确认文本
+     * @default undefined
+     */
+    confirmText?: string;
+    /**
+     * @description.en cancelText
+     * @description.zh 取消文本
+     * @default undefined
+     */
+    cancelText?: string;
+}
+export declare const defaultProps: DatePickerProps;
+export interface IState {
+    visible: boolean;
+    /**
+     * @description.en value
+     * @description.zh value
+     * @default undefined
+     */
+    value: number | number[];
+    changeValue: number | number[];
+    /**
+     * @description.en range
+     * @description.zh 范围
+     * @default undefined
+     */
+    range: any[];
+    dateListArr: any[];
+}
+export {};

package/lib/DatePicker/props.js

@@ -0,0 +1,7 @@
+export var defaultProps = {
+  confirmText: '确定',
+  cancelText: '取消',
+  fields: 'day',
+  start: '2000-01-01',
+  end: '2000-12-31'
+};

package/lib/Picker/Picker.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerProps } from '@ray-js/adapter';
+import { PickerProps } from './props';
 declare const Picker: React.FC<PickerProps>;
 export default Picker;

package/lib/Picker/Picker.js

@@ -7,7 +7,8 @@ import handleProps from '../utils/handleProps';
 var countArr = 1;
 
 var Picker = function (props) {
-  var onTouchStart = props.onTouchStart,
+  var onLongClick = props.onLongClick,
+      onTouchStart = props.onTouchStart,
       onTouchMove = props.onTouchMove,
       onTouchEnd = props.onTouchEnd,
       onTouchCancel = props.onTouchCancel,
@@ -37,6 +38,7 @@ var Picker = function (props) {
   });
 
   var _useTouch = useTouch({
+    onLongClick: onLongClick,
     onTouchStart: onTouchStart,
     onTouchMove: onTouchMove,
     onTouchEnd: onTouchEnd,

package/lib/Picker/Picker.thing.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerProps } from '@ray-js/adapter';
+import { PickerProps } from './props';
 declare const Picker: React.FC<PickerProps>;
 export default Picker;

package/lib/Picker/Picker.thing.js

@@ -1,17 +1,19 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "style", "id", "onChange", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onCancel"];
+var _excluded = ["className", "style", "id", "onChange", "onLongClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onCancel"];
 import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle, useTouch } from '@ray-js/framework-shared';
 import { Picker as RemaxPicker } from '@ray-js/adapter';
+var countArr = 1;
 
 var Picker = function (props) {
   var className = props.className,
       style = props.style,
       id = props.id,
       onChange = props.onChange,
+      onLongClick = props.onLongClick,
       onTouchStart = props.onTouchStart,
       onTouchMove = props.onTouchMove,
       onTouchEnd = props.onTouchEnd,
@@ -21,6 +23,7 @@ var Picker = function (props) {
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useTouch = useTouch({
+    onLongClick: onLongClick,
     onTouchStart: onTouchStart,
     onTouchMove: onTouchMove,
     onTouchEnd: onTouchEnd,
@@ -31,6 +34,18 @@ var Picker = function (props) {
       touching = _useTouch2[0],
       handlers = _useTouch2[1];
 
+  var multiarr = function (arr) {
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i] instanceof Array) {
+        countArr++;
+        arr = arr[i];
+        multiarr(arr);
+      }
+    }
+
+    return countArr;
+  };
+
   return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
     onChange: function handleChange(e) {
       onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -45,15 +60,9 @@ var Picker = function (props) {
         origin: e
       });
     },
-    onColumnChange: function handleColumnChange(e) {
-      onCancel === null || onCancel === void 0 ? void 0 : onCancel({
-        type: e.type,
-        value: e.detail.value,
-        origin: e
-      });
-    },
     style: inlineStyle(style),
-    className: clsx(className)
+    className: clsx(className),
+    mode: multiarr(props.range) > 1 ? 'multiSelector' : 'selector'
   }, restProps, handlers), props.children);
 };
 

package/lib/Picker/Picker.wechat.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerProps } from '@ray-js/adapter';
+import { PickerProps } from './props';
 declare const Picker: React.FC<PickerProps>;
 export default Picker;

package/lib/Picker/Picker.wechat.js

@@ -1,17 +1,19 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "style", "id", "onChange", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onCancel"];
+var _excluded = ["className", "style", "id", "onChange", "onLongClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onCancel"];
 import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle, useTouch } from '@ray-js/framework-shared';
-import { Picker as RemaxPicker } from '@ray-js/adapter';
+import { Picker as RemaxPicker } from '@ray-core/wechat';
+var countArr = 1;
 
 var Picker = function (props) {
   var className = props.className,
       style = props.style,
       id = props.id,
       onChange = props.onChange,
+      onLongClick = props.onLongClick,
       onTouchStart = props.onTouchStart,
       onTouchMove = props.onTouchMove,
       onTouchEnd = props.onTouchEnd,
@@ -21,6 +23,7 @@ var Picker = function (props) {
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useTouch = useTouch({
+    onLongClick: onLongClick,
     onTouchStart: onTouchStart,
     onTouchMove: onTouchMove,
     onTouchEnd: onTouchEnd,
@@ -31,6 +34,18 @@ var Picker = function (props) {
       touching = _useTouch2[0],
       handlers = _useTouch2[1];
 
+  var multiarr = function (arr) {
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i] instanceof Array) {
+        countArr++;
+        arr = arr[i];
+        multiarr(arr);
+      }
+    }
+
+    return countArr;
+  };
+
   return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
     onChange: function handleChange(e) {
       onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -45,16 +60,11 @@ var Picker = function (props) {
         origin: e
       });
     },
-    onColumnChange: function handleColumnChange(e) {
-      onCancel === null || onCancel === void 0 ? void 0 : onCancel({
-        type: e.type,
-        value: e.detail.value,
-        origin: e
-      });
-    },
     style: inlineStyle(style),
     className: clsx(className)
-  }, restProps, handlers), props.children);
+  }, restProps, handlers, {
+    mode: multiarr(props.range) > 1 ? 'multiSelector' : 'selector'
+  }), props.children);
 };
 
 export default Picker;

package/lib/Picker/index.d.ts

@@ -1,3 +1,3 @@
 import Picker from './Picker';
-export type { PickerProps } from '@ray-js/adapter';
+export * from './props';
 export default Picker;

package/lib/Picker/index.js

@@ -1,2 +1,3 @@
 import Picker from './Picker';
+export * from './props';
 export default Picker;

package/lib/Picker/props.d.ts

@@ -0,0 +1,96 @@
+import { BaseProps } from '../types';
+declare type ChangeEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: 'change';
+    /**
+     * @description.en value
+     * @description.zh value
+     * @default undefined
+     */
+    value: number | number[];
+    origin?: any;
+}) => void;
+declare type CancelEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: 'cancel';
+    origin: any;
+}) => void;
+declare type ColumnChangeEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: 'columnchange';
+    /**
+     * @description.en value
+     * @description.zh value
+     * @default undefined
+     */
+    value: number;
+    column: number;
+    origin: any;
+}) => void;
+export interface PickerProps extends BaseProps {
+    /**
+     * @description.en disabled
+     * @description.zh 是否禁用
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * @description.en Option data source
+     * @description.zh 选择项数据源
+     * @default undefined
+     */
+    range: string[] | string[][];
+    /**
+     * @description.en Indicates the number in the range selected (subscripts start at 0)
+     * @description.zh 表示选择了 range 中的第几个（下标从 0 开始）
+     * @default 0
+     */
+    value?: number[] | number;
+    /**
+     * @description.en onChange
+     * @description.zh 点击触发
+     * @default undefined
+     */
+    onChange?: ChangeEvent;
+    /**
+     * @description.en onCancel
+     * @description.zh 取消选择时触发
+     * @default undefined
+     */
+    onCancel?: CancelEvent;
+    /**
+     * @description.en onColumnChange
+     * @description.zh 列改变时触发
+     * @default undefined
+     */
+    onColumnChange?: ColumnChangeEvent;
+    /**
+     * @description.en confirmText
+     * @description.zh 确认文本
+     * @default 确认
+     */
+    confirmText?: string;
+    /**
+     * @description.en cancelText
+     * @description.zh 取消文本
+     * @default 取消
+     */
+    cancelText?: string;
+}
+export declare const IDefaultPickerProps: {
+    cancelText: string;
+    confirmText: string;
+};
+export {};

package/lib/Picker/props.js

@@ -0,0 +1,4 @@
+export var IDefaultPickerProps = {
+  cancelText: '取消',
+  confirmText: '确定'
+};

package/lib/PickerView/PickerView.thing.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerViewProps } from '@ray-js/adapter';
+import { PickerViewProps } from './props';
 declare const Picker: React.FC<PickerViewProps>;
 export default Picker;

package/lib/PickerView/PickerView.thing.js

@@ -1,10 +1,12 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "style", "id", "onChange", "onPickstart", "onPickend", "children"];
+var _excluded = ["className", "style", "id", "onChange", "range", "children"];
+import "core-js/modules/es.array.map.js";
 import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle } from '@ray-js/framework-shared';
-import { PickerView as RemaxPickerView } from '@ray-js/adapter';
+import { PickerView as RemaxPickerView, PickerViewColumn as RemaxPickerViewColumn } from '@ray-js/adapter';
+import { View } from '@ray-js/components';
 import styles from './index.module.less';
 
 var Picker = function (props) {
@@ -12,11 +14,28 @@ var Picker = function (props) {
       style = props.style,
       id = props.id,
       onChange = props.onChange,
-      onPickstart = props.onPickstart,
-      onPickend = props.onPickend,
+      range = props.range,
       children = props.children,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var countArray = function (array) {
+    var countArr = 1;
+
+    var multiarr = function (arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] instanceof Array) {
+          countArr++;
+          arr = arr[i];
+          multiarr(arr);
+        }
+      }
+
+      return countArr;
+    };
+
+    return multiarr(array);
+  };
+
   return /*#__PURE__*/React.createElement(RemaxPickerView, _extends({
     onChange: function handleChange(e) {
       onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -25,24 +44,30 @@ var Picker = function (props) {
         origin: e
       });
     },
-    onPickstart: function handlePickstart(e) {
-      onPickstart === null || onPickstart === void 0 ? void 0 : onPickstart({
-        type: 'pickstart',
-        value: e.detail.value,
-        origin: e
-      });
-    },
-    onPickend: function handlePickend(e) {
-      onPickend === null || onPickend === void 0 ? void 0 : onPickend({
-        type: 'pickend',
-        value: e.detail.value,
-        origin: e
-      });
-    },
     style: inlineStyle(style),
     className: clsx(styles.pickerViewWrp, className)
   }, restProps), function renderChildren() {
     return children;
+  }() || function renderPickerColumn() {
+    if (countArray(props.range) > 1) {
+      return props.range.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, {
+          key: index
+        }, item.map(function (i, id) {
+          return /*#__PURE__*/React.createElement(View, {
+            key: id,
+            className: styles.pcWrp
+          }, i);
+        }));
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, null, range.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(View, {
+          key: index,
+          className: styles.pcWrp
+        }, item);
+      }));
+    }
   }());
 };
 

package/lib/PickerView/PickerView.wechat.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerViewProps } from '@ray-js/adapter';
+import { PickerViewProps } from './props';
 declare const Picker: React.FC<PickerViewProps>;
 export default Picker;

package/lib/PickerView/PickerView.wechat.js

@@ -1,10 +1,12 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "style", "id", "onChange", "onPickstart", "onPickend", "children"];
+var _excluded = ["className", "style", "id", "onChange", "range", "children"];
+import "core-js/modules/es.array.map.js";
 import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle } from '@ray-js/framework-shared';
-import { PickerView as RemaxPickerView } from '@ray-js/adapter';
+import { View } from '@ray-js/components';
+import { PickerView as RemaxPickerView, PickerViewColumn as RemaxPickerViewColumn } from '@ray-core/wechat';
 import styles from './index.module.less';
 
 var Picker = function (props) {
@@ -12,11 +14,28 @@ var Picker = function (props) {
       style = props.style,
       id = props.id,
       onChange = props.onChange,
-      onPickstart = props.onPickstart,
-      onPickend = props.onPickend,
+      range = props.range,
       children = props.children,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var countArray = function (array) {
+    var countArr = 1;
+
+    var multiarr = function (arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] instanceof Array) {
+          countArr++;
+          arr = arr[i];
+          multiarr(arr);
+        }
+      }
+
+      return countArr;
+    };
+
+    return multiarr(array);
+  };
+
   return /*#__PURE__*/React.createElement(RemaxPickerView, _extends({
     onChange: function handleChange(e) {
       onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -25,24 +44,30 @@ var Picker = function (props) {
         origin: e
       });
     },
-    onPickstart: function handlePickstart(e) {
-      onPickstart === null || onPickstart === void 0 ? void 0 : onPickstart({
-        type: 'pickstart',
-        value: e.detail.value,
-        origin: e
-      });
-    },
-    onPickend: function handlePickend(e) {
-      onPickend === null || onPickend === void 0 ? void 0 : onPickend({
-        type: 'pickend',
-        value: e.detail.value,
-        origin: e
-      });
-    },
     style: inlineStyle(style),
     className: clsx(styles.pickerViewWrp, className)
   }, restProps), function renderChildren() {
     return children;
+  }() || function renderPickerColumn() {
+    if (countArray(props.range) > 1) {
+      return props.range.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, {
+          key: index
+        }, item.map(function (i, id) {
+          return /*#__PURE__*/React.createElement(View, {
+            key: id,
+            className: styles.pcWrp
+          }, i);
+        }));
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, null, range.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(View, {
+          key: index,
+          className: styles.pcWrp
+        }, item);
+      }));
+    }
   }());
 };
 

package/lib/PickerView/index.d.ts

@@ -1,3 +1,3 @@
 import PickerView from './PickerView';
-export type { PickerViewProps } from '@ray-js/adapter';
+export * from './props';
 export default PickerView;

package/lib/PickerView/index.js

@@ -1,2 +1,3 @@
 import PickerView from './PickerView';
+export * from './props';
 export default PickerView;

package/lib/PickerViewColumn/PickerViewColumn.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import { PickerViewColumnProps } from '@ray-js/adapter';
+import { PickerViewColumnProps } from './props';
 declare const PickerViewColumn: React.FC<PickerViewColumnProps>;
 export default PickerViewColumn;

package/lib/PickerViewColumn/PickerViewColumn.thing.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import type { PickerViewColumnProps } from '@ray-js/adapter';
+import { PickerViewColumnProps } from './props';
 declare const PickerViewColumn: React.FC<PickerViewColumnProps>;
 export default PickerViewColumn;

package/lib/PickerViewColumn/PickerViewColumn.thing.js

@@ -1,16 +1,21 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["style"];
+var _excluded = ["className", "style", "id"];
+import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle } from '@ray-js/framework-shared';
-import { PickerViewColumn as RemaxViewColumnPicker } from '@ray-js/adapter';
+import { PickerViewColumn as RemaxPickerViewColumn } from '@ray-js/adapter';
 
 var PickerViewColumn = function (props) {
-  var style = props.style,
+  var className = props.className,
+      style = props.style,
+      id = props.id,
       restProps = _objectWithoutProperties(props, _excluded);
 
-  return /*#__PURE__*/React.createElement(RemaxViewColumnPicker, _extends({
-    style: inlineStyle(style)
+  return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, _extends({
+    id: id,
+    style: inlineStyle(style),
+    className: clsx('ray-picker-view-column', className)
   }, restProps));
 };
 

package/lib/PickerViewColumn/PickerViewColumn.wechat.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-import type { PickerViewColumnProps } from '@ray-js/adapter';
+import { PickerViewColumnProps } from './props';
 declare const PickerViewColumn: React.FC<PickerViewColumnProps>;
 export default PickerViewColumn;

package/lib/PickerViewColumn/PickerViewColumn.wechat.js

@@ -1,16 +1,21 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["style"];
+var _excluded = ["className", "style", "id"];
+import clsx from 'clsx';
 import * as React from 'react';
 import { inlineStyle } from '@ray-js/framework-shared';
-import { PickerViewColumn as RemaxViewColumnPicker } from '@ray-js/adapter';
+import { PickerViewColumn as RemaxPickerViewColumn } from '@ray-js/adapter';
 
 var PickerViewColumn = function (props) {
-  var style = props.style,
+  var className = props.className,
+      style = props.style,
+      id = props.id,
       restProps = _objectWithoutProperties(props, _excluded);
 
-  return /*#__PURE__*/React.createElement(RemaxViewColumnPicker, _extends({
-    style: inlineStyle(style)
+  return /*#__PURE__*/React.createElement(RemaxPickerViewColumn, _extends({
+    id: id,
+    style: inlineStyle(style),
+    className: clsx('ray-picker-view-column', className)
   }, restProps));
 };
 

package/lib/PickerViewColumn/index.d.ts

@@ -1,3 +1,3 @@
 import PickerViewColumn from './PickerViewColumn';
-export type { PickerViewColumnProps } from '@ray-js/adapter';
+export * from './props';
 export default PickerViewColumn;

package/lib/PickerViewColumn/index.js

@@ -1,2 +1,3 @@
 import PickerViewColumn from './PickerViewColumn';
+export * from './props';
 export default PickerViewColumn;

package/lib/PickerViewColumn/props.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { BaseProps } from '../types';
+export interface PickerViewColumnProps extends BaseProps {
+    children?: React.ReactNode | string;
+}

package/lib/PickerViewColumn/props.js

@@ -0,0 +1 @@
+export {};

package/lib/TimePicker/TimePicker.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { TimePickerProps } from './props';
+declare const TimePicker: React.FC<TimePickerProps>;
+export default TimePicker;

package/lib/TimePicker/TimePicker.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { useEventListener } from 'ahooks';
+import handleProps from '../utils/handleProps';
+
+var TimePicker = function (props) {
+  var children = props.children;
+  var currentNode = React.useRef(null);
+  useEventListener('change', function (e) {
+    var _props$onChange;
+
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, {
+      type: e.type,
+      value: e.detail.value,
+      origin: e
+    });
+  }, {
+    target: currentNode
+  });
+  useEventListener('cancel', function (e) {
+    var _props$onCancel;
+
+    (_props$onCancel = props.onCancel) === null || _props$onCancel === void 0 ? void 0 : _props$onCancel.call(props, {
+      type: e.type,
+      origin: e
+    });
+  }, {
+    target: currentNode
+  });
+  return (
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement("v-picker", _extends({}, handleProps(props), {
+      ref: currentNode,
+      mode: "time"
+    }), children)
+  );
+};
+
+TimePicker.displayName = 'TimePicker';
+export default TimePicker;

package/lib/TimePicker/TimePicker.thing.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { TimePickerProps } from './props';
+declare const TimePicker: React.FC<TimePickerProps>;
+export default TimePicker;

package/lib/TimePicker/TimePicker.thing.js

@@ -0,0 +1,26 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["className", "style", "id", "onChange"];
+import clsx from 'clsx';
+import * as React from 'react';
+import { inlineStyle } from '@ray-js/framework-shared';
+import { Picker as RemaxPicker } from '@ray-js/adapter';
+
+var TimePicker = function (props) {
+  var className = props.className,
+      style = props.style,
+      id = props.id,
+      onChange = props.onChange,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
+    mode: "time",
+    onChange: function handleChange(e) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(e);
+    },
+    style: inlineStyle(style),
+    className: clsx(className)
+  }, restProps), props.children);
+};
+
+export default TimePicker;

package/lib/TimePicker/TimePicker.wechat.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { TimePickerProps } from './props';
+declare const TimePicker: React.FC<TimePickerProps>;
+export default TimePicker;

package/lib/TimePicker/TimePicker.wechat.js

@@ -0,0 +1,56 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["className", "style", "id", "onLongClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel", "onClick", "onChange", "onCancel"];
+import clsx from 'clsx';
+import * as React from 'react';
+import { inlineStyle, useTouch } from '@ray-js/framework-shared';
+import { Picker as RemaxPicker } from '@ray-core/wechat';
+
+var TimePicker = function (props) {
+  var className = props.className,
+      style = props.style,
+      id = props.id,
+      onLongClick = props.onLongClick,
+      onTouchStart = props.onTouchStart,
+      onTouchMove = props.onTouchMove,
+      onTouchEnd = props.onTouchEnd,
+      onTouchCancel = props.onTouchCancel,
+      onClick = props.onClick,
+      onChange = props.onChange,
+      onCancel = props.onCancel,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useTouch = useTouch({
+    onLongClick: onLongClick,
+    onTouchStart: onTouchStart,
+    onTouchMove: onTouchMove,
+    onTouchEnd: onTouchEnd,
+    onTouchCancel: onTouchCancel,
+    onClick: onClick
+  }),
+      _useTouch2 = _slicedToArray(_useTouch, 2),
+      touching = _useTouch2[0],
+      handlers = _useTouch2[1];
+
+  return /*#__PURE__*/React.createElement(RemaxPicker, _extends({
+    mode: "time",
+    onChange: function handleChange(e) {
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        type: e.type,
+        value: e.detail.value,
+        origin: e
+      });
+    },
+    onCancel: function handleCancel(e) {
+      onCancel === null || onCancel === void 0 ? void 0 : onCancel({
+        type: e.type,
+        origin: e
+      });
+    },
+    style: inlineStyle(style),
+    className: clsx(className)
+  }, restProps, handlers), props.children);
+};
+
+export default TimePicker;

package/lib/TimePicker/index.d.ts

@@ -0,0 +1,3 @@
+import TimePicker from './TimePicker';
+export * from './props';
+export default TimePicker;

package/lib/TimePicker/index.js

@@ -0,0 +1,3 @@
+import TimePicker from './TimePicker';
+export * from './props';
+export default TimePicker;

package/lib/TimePicker/props.d.ts

@@ -0,0 +1,82 @@
+import { BaseProps } from '../types';
+declare type ChangeEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: string;
+    /**
+     * @description.en value
+     * @description.zh 价值
+     * @default undefined
+     */
+    value: string;
+    origin?: any;
+}) => void;
+declare type CancelEvent = (e: {
+    /**
+     * @description.en type
+     * @description.zh 类型
+     * @default undefined
+     */
+    type: string;
+    origin: any;
+}) => void;
+export interface TimePickerProps extends BaseProps {
+    /**
+     * @description.en disabled
+     * @description.zh 是否禁用
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * @description.en value
+     * @description.zh 当前选择的时间
+     * @default undefined
+     */
+    value?: string;
+    /**
+     * @description.en start
+     * @description.zh 表示有效时间范围的开始，字符串格式为"hh:mm"
+     * @default undefined
+     */
+    start?: string;
+    /**
+     * @description.en end
+     * @description.zh 表示有效时间范围的结束，字符串格式为"hh:mm"
+     * @default undefined
+     */
+    end?: string;
+    /**
+     * @description.en onCancel
+     * @description.zh 取消选择时触发
+     * @default undefined
+     */
+    onCancel?: CancelEvent;
+    /**
+     * @description.en onChange
+     * @description.zh 选择时触发
+     * @default undefined
+     */
+    onChange?: ChangeEvent;
+    /**
+     * @description.en confirmText
+     * @description.zh 确认文本
+     * @default 确认
+     */
+    confirmText?: string;
+    /**
+     * @description.en cancelText
+     * @description.zh 取消文本
+     * @default 取消
+     */
+    cancelText?: string;
+}
+export declare const IDefaultTimePickerProps: {
+    cancelText: string;
+    confirmText: string;
+    start: string;
+    end: string;
+};
+export {};

package/lib/TimePicker/props.js

@@ -0,0 +1,6 @@
+export var IDefaultTimePickerProps = {
+  cancelText: '取消',
+  confirmText: '确定',
+  start: '00:00',
+  end: '23:59'
+};

package/lib/index.d.ts

@@ -19,6 +19,8 @@ export { default as SwiperItem } from './SwiperItem';
 export { default as Switch } from './Switch';
 export { default as Slider } from './Slider';
 export { default as Picker } from './Picker';
+export { default as DatePicker } from './DatePicker';
+export { default as TimePicker } from './TimePicker';
 export { default as Icon } from './Icon';
 export { default as PickerView } from './PickerView';
 export { default as PickerViewColumn } from './PickerViewColumn';
@@ -30,4 +32,3 @@ export { default as WebView } from './WebView';
 export { default as Map } from './Map';
 export { default as Camera } from './Camera';
 export { default as Progress } from './Progress';
-export { default as Iframe } from './Iframe';

package/lib/index.js

@@ -19,6 +19,8 @@ export { default as SwiperItem } from './SwiperItem';
 export { default as Switch } from './Switch';
 export { default as Slider } from './Slider';
 export { default as Picker } from './Picker';
+export { default as DatePicker } from './DatePicker';
+export { default as TimePicker } from './TimePicker';
 export { default as Icon } from './Icon';
 export { default as PickerView } from './PickerView';
 export { default as PickerViewColumn } from './PickerViewColumn';
@@ -29,5 +31,4 @@ export { default as NativeVideo } from './NativeVideo';
 export { default as WebView } from './WebView';
 export { default as Map } from './Map';
 export { default as Camera } from './Camera';
-export { default as Progress } from './Progress';
-export { default as Iframe } from './Iframe';
+export { default as Progress } from './Progress';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/components",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Ray basic components",
   "keywords": [
     "ray"
@@ -24,10 +24,10 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-core/macro": "^0.2.1",
-    "@ray-core/wechat": "^0.2.1",
-    "@ray-js/adapter": "^1.2.1",
-    "@ray-js/framework-shared": "^1.2.1",
+    "@ray-core/macro": "^0.2.3",
+    "@ray-core/wechat": "^0.2.3",
+    "@ray-js/adapter": "^1.2.2",
+    "@ray-js/framework-shared": "^1.2.2",
     "ahooks": "^3.7.1",
     "clsx": "^1.1.1",
     "core-js": "^3.19.1",
@@ -37,7 +37,7 @@
     "style-to-object": "^0.3.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.2.1"
+    "@ray-js/cli": "^1.2.2"
   },
   "maintainers": [
     {
@@ -45,6 +45,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "2bfdb0b62fdd4fa36e82f661712fc57eccb51f4c",
+  "gitHead": "e517fe5da418e0caa4c69c9331499d510472dc5e",
   "repository": {}
 }

package/lib/Iframe/Iframe.d.ts

@@ -1,2 +0,0 @@
-declare const Iframe: () => JSX.Element;
-export default Iframe;

package/lib/Iframe/Iframe.thing.d.ts

@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IframeProps } from '@ray-js/adapter';
-declare const Iframe: React.FC<IframeProps>;
-export default Iframe;

package/lib/Iframe/Iframe.wechat.d.ts

@@ -1,2 +0,0 @@
-declare const Iframe: () => JSX.Element;
-export default Iframe;

package/lib/Iframe/index.d.ts

@@ -1,3 +0,0 @@
-import Iframe from './Iframe';
-export type { IframeProps } from '@ray-js/adapter';
-export default Iframe;