@ecoding/components.antd 0.2.31 → 0.2.33

package/lib/core/date.picker/index.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+import { RangePickerProps } from "antd/es/date-picker";
+declare type IProps = RangePickerProps & {
+    value?: string | number;
+    disabledDate?: (current: any) => RangePickerProps['disabledDate'];
+    onChange?: any;
+    showTime?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
+    disabled?: boolean;
+    format?: string;
+};
+declare const Picker: React.FC<IProps>;
+export default Picker;

package/lib/core/date.picker/index.js

@@ -0,0 +1,40 @@
+import React, { useEffect, useState } from "react";
+import dayjs from "dayjs";
+import { DatePicker } from "antd";
+const Picker = (props) => {
+    const [date, setDates] = useState();
+    // const disabledDate: RangePickerProps['disabledDate'] = (current) => {
+    //     // Can not select days before today and today
+    //     return current && current < dayjs().endOf('day');
+    // };
+    const change = (v) => {
+        let value;
+        setDates(v);
+        if (props.format) {
+            value = dayjs(v).format(props.format || "YYYY-MM-DD HH:mm:ss");
+        }
+        else {
+            value = dayjs(v).valueOf();
+        }
+        props.onChange && props.onChange(value);
+    };
+    useEffect(() => {
+        if (!props.value) {
+            return;
+        }
+        let v;
+        if (typeof props.value === "string") {
+            v = /^[0-9]*$/.test(props.value) ? dayjs(Number(props.value)) : dayjs(props.value);
+        }
+        if (typeof props.value === "number") {
+            v = dayjs(props.value);
+        }
+        if (typeof props.value === "object") {
+            v = props.value;
+        }
+        setDates(v);
+    }, [props.value]);
+    return (React.createElement(DatePicker, { value: date, className: props.className || undefined, style: props.style || undefined, showTime: props.showTime ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : undefined, disabledDate: props.disabledDate || undefined, disabled: props.disabled || undefined, onChange: change }));
+};
+Picker.defaultProps = {};
+export default Picker;

package/lib/core/multiple-upload/index.d.ts

@@ -12,6 +12,7 @@ interface IProps {
     maxCount?: number;
     name?: string;
     data?: any;
+    extraData?: any;
     value?: IRes[];
     headers?: any;
     uploadRef?: any;

package/lib/core/multiple-upload/index.js

@@ -51,16 +51,21 @@ const SingleFileUpload = (props) => {
         return props.action();
     }, [props.actionParams]);
     const handleChange = (info, type) => {
+        var _a, _b;
         switch (info.file.status) {
             case 'uploading':
                 Loading.show();
                 break;
             case 'done':
                 Loading.hide();
-                const response = info.file.response;
+                const response = info.file.response || {};
                 const file = info.file;
-                if ((response && response.code === 200) || response.success) {
-                    const tempObj = Object.assign({ name: file.name, url: response.data.url }, props.data);
+                const data = response.data || response.model;
+                if (response.code === 200 ||
+                    response.code === 0 ||
+                    response.success ||
+                    response.successed) {
+                    const tempObj = Object.assign({ name: file.name, url: data.url }, props.extraData);
                     const tempRes = infos.concat([]);
                     tempRes.push(tempObj);
                     setInfos(tempRes);
@@ -84,7 +89,7 @@ const SingleFileUpload = (props) => {
                 Toast.error({
                     mask: true,
                     title: info.file.response
-                        ? `${info.file.name}-${info.file.response.msg}` || `${info.file.name}-${info.file.response.message}`
+                        ? `${info.file.name}-${(_a = info.file.response) === null || _a === void 0 ? void 0 : _a.msg}` || `${info.file.name}-${(_b = info.file.response) === null || _b === void 0 ? void 0 : _b.message}`
                         : `${info.file.name}-服务出错，文件上传失败`
                 });
                 props.onError && props.onError(info.file);
@@ -128,6 +133,7 @@ SingleFileUpload.defaultProps = {
     openFileDialogOnClick: true,
     icon: true,
     data: {},
+    extraData: {},
     maxCount: 10,
     headers: undefined,
     buttonText: '点击上传',

package/lib/core/range-picker/index.d.ts

@@ -1,14 +1,15 @@
 import React from "react";
-import { RangePickerProps } from "antd/es/date-picker";
 import type { Dayjs } from "dayjs";
 declare type RangeValue = [Dayjs | null, Dayjs | null] | null;
-declare type IProps = RangePickerProps & {
+interface IProps {
     value?: RangeValue;
+    showTime?: boolean;
     rangeDay?: number;
     onChange?: any;
     className?: string;
     style?: React.CSSProperties;
     disabled?: boolean;
-};
+    format?: string;
+}
 declare const Picker: React.FC<IProps>;
 export default Picker;

package/lib/core/range-picker/index.js

@@ -1,9 +1,10 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import dayjs from "dayjs";
 import { DatePicker } from "antd";
+;
 const { RangePicker } = DatePicker;
 const Picker = (props) => {
-    const [dates, setDates] = useState(props.value || null);
+    const [dates, setDates] = useState();
     const disabledDate = (current) => {
         if (!dates) {
             return false;
@@ -12,11 +13,48 @@ const Picker = (props) => {
         const tooEarly = dates[1] && dates[1].diff(current, "days") > props.rangeDay;
         return !!tooEarly || !!tooLate;
     };
-    return (React.createElement(RangePicker, { showTime: {
+    const change = (v) => {
+        if (!v) {
+            return;
+        }
+        let value;
+        setDates(v);
+        if (props.format) { // "YYYY-MM-DD HH:mm:ss"
+            value = [dayjs(v[0]).format(props.format), dayjs(v[1]).format(props.format)];
+        }
+        else {
+            value = [dayjs(v[0]).valueOf(), dayjs(v[1]).valueOf()];
+        }
+        props.onChange && props.onChange(value);
+    };
+    useEffect(() => {
+        if (!props.value || !Array.isArray(props.value) || props.value.length < 2) {
+            return;
+        }
+        const v = [];
+        props.value.forEach((item) => {
+            if (typeof item === "string") {
+                if (/^[0-9]*$/.test(item)) {
+                    v.push(dayjs(Number(item)));
+                }
+                else {
+                    v.push(dayjs(item));
+                }
+            }
+            if (typeof item === "number") {
+                v.push(dayjs(item));
+            }
+            if (typeof item === "object") {
+                v.push(item);
+            }
+        });
+        setDates(v);
+    }, [props.value]);
+    return (React.createElement(RangePicker, { value: dates, className: props.className || undefined, style: props.style || undefined, showTime: props.showTime ? {
             defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")]
-        }, onCalendarChange: (val) => setDates(val), disabledDate: disabledDate, onChange: (v) => props.onChange(v) }));
+        } : undefined, onCalendarChange: (val) => setDates(val), disabledDate: props.rangeDay ? disabledDate : undefined, disabled: props.disabled || undefined, onChange: change }));
 };
 Picker.defaultProps = {
-    rangeDay: 30
+    rangeDay: undefined
 };
 export default Picker;

package/lib/core/single-file-upload/index.js

@@ -30,12 +30,16 @@ const SingleFileUpload = (props) => {
             case "uploading":
                 break;
             case "done":
-                const response = info.file.response;
-                if ((response && response.code === 200) || response.success) {
-                    const url = response.data && response.data.url;
+                const response = info.file.response || {};
+                const data = response.data || response.model;
+                if (response.code === 200 ||
+                    response.code === 0 ||
+                    response.success ||
+                    response.successed) {
+                    const url = data && data.url;
                     setFileUrl(url);
                     props.onChange && props.onChange(url);
-                    props.onDone && props.onDone(info.file, info.file.response.data);
+                    props.onDone && props.onDone(info.file, data);
                 }
                 else {
                     Toast.error({

package/lib/core/single-img-upload/index.js

@@ -53,9 +53,13 @@ const ImgUpload = (props) => {
                 break;
             case "done":
                 setLoading(false);
-                const response = info.file.response;
-                if ((response && response.code === 200) || response.success) {
-                    const url = response.data && response.data.url;
+                const response = info.file.response || {};
+                const data = response.data || response.model;
+                if (response.code === 200 ||
+                    response.code === 0 ||
+                    response.success ||
+                    response.successed) {
+                    const url = data && data.url;
                     setImageUrl(url);
                     // Form.item 值注入关键
                     props.onChange && props.onChange(url);

package/lib/index.d.ts

@@ -8,6 +8,7 @@ export { default as AsyncCascader } from "./core/async-cascader";
 export { default as LengthInput } from "./core/length-input";
 export { default as PhoneInput } from "./core/phone-input";
 export { default as RangePicker } from "./core/range-picker";
+export { default as DatePicker } from "./core/date.picker";
 export { default as SingleImgUpload } from "./core/single-img-upload";
 export { default as SingleFileUpload } from "./core/single-file-upload";
 export { default as MultipleUpload } from "./core/multiple-upload";

package/lib/index.js

@@ -8,6 +8,7 @@ export { default as AsyncCascader } from "./core/async-cascader";
 export { default as LengthInput } from "./core/length-input";
 export { default as PhoneInput } from "./core/phone-input";
 export { default as RangePicker } from "./core/range-picker";
+export { default as DatePicker } from "./core/date.picker";
 export { default as SingleImgUpload } from "./core/single-img-upload";
 export { default as SingleFileUpload } from "./core/single-file-upload";
 export { default as MultipleUpload } from "./core/multiple-upload";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.2.31",
+    "version": "0.2.33",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -44,5 +44,5 @@
     "dependencies": {
         "react-quill": "^2.0.0"
     },
-    "gitHead": "bd97cd7929a841cc580a8b1399d177f8cb33893d"
+    "gitHead": "d73e8530a38213c98888a7ed09f1225c0cecbc73"
 }