@hw-component/form 0.0.3-beta-v7 → 0.0.3-beta-v9

package/lib/Upload/Btn.js

@@ -2,8 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var icons = require('@ant-design/icons');
+var React = require('react');
 var antd = require('antd');
 
 var Btn = (function (_ref) {
@@ -19,15 +20,19 @@ var Btn = (function (_ref) {
     return "上传";
   }, [len, maxCount]);
   if (listType === "picture-card") {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(icons.PlusOutlined, null), /*#__PURE__*/React.createElement("div", {
-      style: {
-        marginTop: 8
-      }
-    }, text));
+    return jsxRuntime.jsxs("div", {
+      children: [jsxRuntime.jsx(icons.PlusOutlined, {}), jsxRuntime.jsx("div", {
+        style: {
+          marginTop: 8
+        },
+        children: text
+      })]
+    });
   }
-  return /*#__PURE__*/React.createElement(antd.Button, {
-    icon: /*#__PURE__*/React.createElement(icons.UploadOutlined, null)
-  }, text);
+  return jsxRuntime.jsx(antd.Button, {
+    icon: jsxRuntime.jsx(icons.UploadOutlined, {}),
+    children: text
+  });
 });
 
 exports.default = Btn;

package/lib/Upload/MediaTypeEle/TypeEle.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var enums = require('../enums.js');
 
 var TypeEle = (function (_ref) {
@@ -11,27 +11,29 @@ var TypeEle = (function (_ref) {
     onReady = _ref.onReady,
     onError = _ref.onError;
   if (mediaType === enums.MediaTypeEnum.video) {
-    return /*#__PURE__*/React.createElement("video", {
+    return jsxRuntime.jsx("video", {
       autoPlay: true,
       width: "100%",
       controls: true,
       onPlay: onReady,
-      onError: onError
-    }, /*#__PURE__*/React.createElement("source", {
-      src: url
-    }));
+      onError: onError,
+      children: jsxRuntime.jsx("source", {
+        src: url
+      })
+    });
   }
   if (mediaType === enums.MediaTypeEnum.audio) {
-    return /*#__PURE__*/React.createElement("audio", {
+    return jsxRuntime.jsx("audio", {
       autoPlay: true,
       controls: true,
       onPlay: onReady,
-      onError: onError
-    }, /*#__PURE__*/React.createElement("source", {
-      src: url
-    }));
+      onError: onError,
+      children: jsxRuntime.jsx("source", {
+        src: url
+      })
+    });
   }
-  return /*#__PURE__*/React.createElement("img", {
+  return jsxRuntime.jsx("img", {
     src: url,
     width: "100%",
     onLoad: onReady,

package/lib/Upload/MediaTypeEle/index.js

@@ -2,10 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
+var jsxRuntime = require('react/jsx-runtime');
 var util = require('../util.js');
 var TypeEle = require('./TypeEle.js');
+var React = require('react');
 var enums = require('../enums.js');
 
 var videoType = ["MP4"];
@@ -27,7 +28,7 @@ var MediaTypeEle = (function (_ref) {
     }
     return enums.MediaTypeEnum.img;
   }, [name]);
-  return /*#__PURE__*/React.createElement(TypeEle.default, {
+  return jsxRuntime.jsx(TypeEle.default, {
     onError: onError,
     onReady: onReady,
     mediaType: mediaType,

package/lib/Upload/Preview/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var index = require('../MediaTypeEle/index.js');
 
@@ -10,14 +10,15 @@ var Preview = (function (_ref) {
   var visible = _ref.visible,
     file = _ref.file,
     onCancel = _ref.onCancel;
-  return /*#__PURE__*/React.createElement(antd.Modal, {
+  return jsxRuntime.jsx(antd.Modal, {
     footer: null,
     visible: visible,
     title: "\u9884\u89C8",
-    onCancel: onCancel
-  }, /*#__PURE__*/React.createElement(index.default, {
-    file: file
-  }));
+    onCancel: onCancel,
+    children: jsxRuntime.jsx(index.default, {
+      file: file
+    })
+  });
 });
 
 exports.default = Preview;

package/lib/Upload/UrlUpload/index.js

@@ -2,20 +2,31 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
-var _extends = require('@babel/runtime-corejs3/helpers/extends');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/trim');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _Array$from = require('@babel/runtime-corejs3/core-js/array/from');
+var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
+var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
+var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
+var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
+var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
+var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var Input = require('antd/es/input/Input');
 var index = require('../index.js');
 var TypeEle = require('../MediaTypeEle/TypeEle.js');
+var React = require('react');
 
 var _excluded = ["placeholder", "value", "onChange", "mediaType"];
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
   var _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
@@ -88,34 +99,36 @@ var Index = function Index(_ref) {
     setUrl("");
     setLoad(false);
   };
-  return /*#__PURE__*/React.createElement(antd.Space, {
+  return jsxRuntime.jsxs(antd.Space, {
     direction: "vertical",
     style: {
       width: "100%"
     },
-    size: "middle"
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: placeholder,
-    onBlur: onBlur,
-    value: url,
-    onPaste: onPaste,
-    onChange: function onChange(e) {
-      setUrl(e.target.value);
-    }
-  }), /*#__PURE__*/React.createElement(index.default, _extends({}, props, {
-    ref: ref,
-    value: value,
-    onChange: onChange
-  })), load && /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "none"
-    }
-  }, /*#__PURE__*/React.createElement(TypeEle.default, {
-    url: url,
-    mediaType: mediaType,
-    onReady: onReady,
-    onError: onError
-  })));
+    size: "middle",
+    children: [jsxRuntime.jsx(Input, {
+      placeholder: placeholder,
+      onBlur: onBlur,
+      value: url,
+      onPaste: onPaste,
+      onChange: function onChange(e) {
+        setUrl(e.target.value);
+      }
+    }), jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({}, props), {}, {
+      ref: ref,
+      value: value,
+      onChange: onChange
+    })), load && jsxRuntime.jsx("div", {
+      style: {
+        display: "none"
+      },
+      children: jsxRuntime.jsx(TypeEle.default, {
+        url: url,
+        mediaType: mediaType,
+        onReady: onReady,
+        onError: onError
+      })
+    })]
+  });
 };
 
 exports.default = Index;

package/lib/Upload/index.js

@@ -10,11 +10,11 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
-var _extends = require('@babel/runtime-corejs3/helpers/extends');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
+var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var propsMaker = require('./hooks/propsMaker.js');
 var index = require('./Preview/index.js');
@@ -115,28 +115,31 @@ var Index = function Index(_ref, ref) {
       }
     }
   });
-  return /*#__PURE__*/React.createElement("div", {
-    style: contentStyle
-  }, /*#__PURE__*/React.createElement(antd.Upload, _extends({
-    listType: listType,
-    maxCount: maxNum,
-    fileList: value,
-    onPreview: preview,
-    onChange: change$1,
-    beforeUpload: function beforeUpload() {
-      return false;
-    }
-  }, props), /*#__PURE__*/React.createElement(Btn.default, {
-    value: value,
-    maxCount: maxCount,
-    listType: listType
-  })), /*#__PURE__*/React.createElement(index.default, {
-    visible: visible,
-    file: previewFile,
-    onCancel: function onCancel() {
-      setPreviewModal({});
-    }
-  }));
+  return jsxRuntime.jsxs("div", {
+    style: contentStyle,
+    children: [jsxRuntime.jsx(antd.Upload, _objectSpread(_objectSpread({
+      listType: listType,
+      maxCount: maxNum,
+      fileList: value,
+      onPreview: preview,
+      onChange: change$1,
+      beforeUpload: function beforeUpload() {
+        return false;
+      }
+    }, props), {}, {
+      children: jsxRuntime.jsx(Btn.default, {
+        value: value,
+        maxCount: maxCount,
+        listType: listType
+      })
+    })), jsxRuntime.jsx(index.default, {
+      visible: visible,
+      file: previewFile,
+      onCancel: function onCancel() {
+        setPreviewModal({});
+      }
+    })]
+  });
 };
 var HUpload = HFormConnect.default( /*#__PURE__*/React.forwardRef(Index));
 

package/lib/index.d.ts

@@ -14,7 +14,7 @@ export declare const HButtonInput: import("react").FC<import("./Input/modal").HB
 export declare const HCheckBox: import("react").FC<import("./CheckboxGroup/modal").HCheckboxProps>;
 export declare const HSwitch: import("react").FC<import("./Switch").HSwitchProps>;
 export declare const HCheckboxGroup: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
-export declare const HDatePicker: ({ value, onChange, showTime, format, ...props }: import("./TDPicker/modal").HDatePickerProps) => JSX.Element;
+export declare const HDatePicker: import("react").FC<import("./TDPicker/modal").HDatePickerProps>;
 export declare const HRangePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HRadioGroup: ({ value, options, onChange, fieldNames: propsFieldNames, ...props }: import("./RadioGroup").HRadioGroupProps) => JSX.Element;
 export declare const HTimePicker: ({ value, format, onChange, ...props }: import("./TDPicker/modal").HTimePickerProps) => JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.3-beta-v7",
+  "version": "0.0.3-beta-v9",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
     "ahooks": "2.10.9",
     "antd": "4.20.7",
     "react": "17.0.0",
-    "react-dom": "17.0.2",
     "react-color": "^2.19.3",
+    "react-dom": "17.0.2",
     "react-router-dom": "^6.11.2"
   },
   "devDependencies": {

package/src/components/Submit/index.tsx

@@ -1,4 +1,4 @@
-import {Button, Row} from "antd";
+import { Button, Row, Space } from "antd";
 import React from "react";
 import { useFormContext } from "../Form/Context";
 import type { ButtonProps, FormInstance } from "antd/es";
@@ -6,37 +6,41 @@ import type { ButtonProps, FormInstance } from "antd/es";
 export interface ISubmitProps extends Omit<ButtonProps, "form"> {
   text?: string;
   form: FormInstance;
-  reset?:boolean;
-  position?:"start"|"end"
+  reset?: boolean;
+  position?: "start" | "end";
 }
 export default ({
   text = "提交",
   type = "primary",
   form,
   loading,
-                  position="start",
-    reset,
+  position = "start",
+  reset,
   ...props
 }: ISubmitProps) => {
   const { loading: formSubLoading = loading } = useFormContext();
   return (
-     <Row justify={position} style={{width:"100%"}}>
-       {reset&&<Button
-           {...props}
-           onClick={()=>{
-             form.resetFields();
-           }}
-       >
-         重制
-       </Button>}
-       <Button
-           {...props}
-           type={type}
-           onClick={form.submit}
-           loading={formSubLoading}
-       >
-         {text}
-       </Button>
-     </Row>
+    <Row justify={position} style={{ width: "100%" }}>
+      <Space>
+        {reset && (
+          <Button
+            {...props}
+            onClick={() => {
+              form.resetFields();
+            }}
+          >
+            重制
+          </Button>
+        )}
+        <Button
+          {...props}
+          type={type}
+          onClick={form.submit}
+          loading={formSubLoading}
+        >
+          {text}
+        </Button>
+      </Space>
+    </Row>
   );
 };

package/src/components/TDPicker/RangePicker.tsx

@@ -22,6 +22,7 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
   ranges = true,
   name,
   addFormat,
+  disabledDate,
   ...props
 }) => {
   const { valueRangePickerValueMap = {}, dateRanges } = useMatchConfigProps({
@@ -89,6 +90,9 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
       onChange={change}
       showTime={showTime}
       ranges={defaultRanges as RangePickerProps["ranges"]}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
       {...props}
     />
   );

package/src/components/TDPicker/TimePicker.tsx

@@ -6,10 +6,20 @@ export default ({
   value,
   format = "X",
   onChange,
+  disabledDate,
   ...props
 }: HTimePickerProps) => {
   const timeVal = useTimePickerValue({ value, format });
   const change = useTimePickerChange({ value, format, onChange });
 
-  return <TimePicker value={timeVal} onChange={change} {...props} />;
+  return (
+    <TimePicker
+      value={timeVal}
+      onChange={change}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
+      {...props}
+    />
+  );
 };

package/src/components/TDPicker/index.tsx

@@ -8,12 +8,21 @@ const Index: React.FC<HDatePickerProps> = ({
   onChange,
   showTime = true,
   format = "X",
+  disabledDate,
   ...props
 }) => {
   const timeVal = useTimeVal({ value, format });
   const change = useTimeChange({ format, onChange });
   return (
-    <Picker value={timeVal} onChange={change} showTime={showTime} {...props} />
+    <Picker
+      value={timeVal}
+      onChange={change}
+      showTime={showTime}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
+      {...props}
+    />
   );
 };
 export default Index;

package/src/components/TDPicker/modal.ts

@@ -6,14 +6,25 @@ import type { TimePickerProps } from "antd";
 import type { DurationInputArg2 } from "moment";
 import type { DateRangePickerValueMapModal } from "../modal";
 import type { addFormatItemModal } from "@/components/Form/modal";
+interface DisabledDateFnModal<T = Moment | undefined> {
+  (currentDate: Moment, value: T): boolean;
+}
+
 export interface HDatePickerProps
-  extends Omit<DatePickerProps, "onChange" | "format" | "ranges"> {
+  extends Omit<
+    DatePickerProps,
+    "onChange" | "format" | "ranges" | "disabledDate"
+  > {
   onChange?: (time?: Moment | string | number) => void;
   format?: string;
   showTime?: boolean | SharedTimeProps<Moment>;
+  disabledDate?: DisabledDateFnModal;
 }
 export interface HRangePickerProps
-  extends Omit<RangePickerProps, "onChange" | "format" | "ranges" | "value"> {
+  extends Omit<
+    RangePickerProps,
+    "onChange" | "format" | "ranges" | "value" | "disabledDate"
+  > {
   value?: [any, any] | Record<string, any>;
   onChange?: (val: any) => void;
   showTime?: boolean | { defaultValue?: Moment[] };
@@ -21,10 +32,15 @@ export interface HRangePickerProps
   valueMap?: DateRangePickerValueMapModal;
   ranges?: RangePickerProps["ranges"] | boolean;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
+  disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
 }
 
 export interface HTimePickerProps
-  extends Omit<TimePickerProps, "onChange" | "format" | "ranges"> {
+  extends Omit<
+    TimePickerProps,
+    "onChange" | "format" | "ranges" | "disabledDate"
+  > {
   onChange?: (time?: Moment | string | number) => void;
   format?: DurationInputArg2 | string;
+  disabledDate?: DisabledDateFnModal;
 }

package/tsconfig.json

@@ -5,7 +5,7 @@
     "alwaysStrict": false,
     "baseUrl": ".",
     "experimentalDecorators": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "sourceMap": true,
     "module": "ESNext",
     "noImplicitAny": false,