@hw-component/form 0.0.2-bate → 0.0.2-beta-v1

package/lib/Form/modal.d.ts

@@ -12,6 +12,7 @@ import type { IUpLoadProps } from "@/components/Upload/modal";
 import type { SelectProps } from "antd";
 import type { RangePickerProps } from "antd/es/date-picker";
 import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
+import type { ForwardedRef } from "react";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => void;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps;
 export interface HoverModal {
@@ -20,17 +21,17 @@ export interface HoverModal {
 }
 type HelperModal = (form: HFormInstance) => React.ReactNode | string;
 export type HideModal = (form: HFormInstance) => boolean;
+export type AddDispatchListenerFn = (action: ActionModal, fn: argsFn) => void;
 export interface HItemProps extends Omit<FormItemProps, "name"> {
     type?: string;
     itemProps?: ItemPropsType;
     render?: RenderFun;
-    helper?: HelperModal;
+    helper?: HelperModal | string;
     hover?: string | HoverModal;
     labelWidth?: number;
     hide?: boolean | HideModal;
     placeholder?: string | string[];
-    formatKeys?: string[];
-    name: string;
+    name?: string;
 }
 export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form"> {
     configData: HItemProps[];
@@ -42,10 +43,13 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form"> {
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;
+    value?: any;
+    onChange?: (val: any, item: any) => void;
 }
 export interface FormItemWithRender extends Omit<HFormItemProps, "render"> {
     render: (form: HFormInstance) => React.ReactNode;
 }
+export type argsFn = (...args: any[]) => void;
 export interface FormContextProps {
     loading?: boolean;
     form: HFormInstance;
@@ -64,14 +68,18 @@ export interface IFormConfigContextProps {
     dateRanges?: RangePickerProps["ranges"];
     uploadProps?: ConfigUploadProps;
 }
+interface ActionModal {
+    key: string;
+    name?: string;
+}
 export interface HFormInstance extends FormInstance {
     addFormat: (name: string, formats?: FormatItemModal) => void;
-    initValues: (values?: Record<string, any>) => void;
+    initValues: VoidFunction;
     formatValues: (values?: Record<string, any>, formatKey?: string) => Record<string, any>;
-    dispatch: (key: string) => void;
+    dispatch: (action: ActionModal, ...args: any[]) => void;
     outputValues: (values?: Record<string, any>) => Record<string, any>;
-    addDispatchListener: (key: string, fn: VoidFunction) => void;
-    removeDispatchListener: (key?: string) => void;
+    addDispatchListener: AddDispatchListenerFn;
+    removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;
@@ -86,7 +94,11 @@ export interface addFormatItemModal {
     inputValue: addValueFormat;
     outputValue: addValueFormat;
 }
-export interface ConnectResultProps {
+export interface ConnectResultProps extends HFormItemProps {
     addFormat?: (format: Record<string, addFormatItemModal>) => void;
+    addDispatchListener?: (key: string, fn: argsFn) => void;
+    ref?: ForwardedRef<any>;
+    value?: any;
+    onChange?: (value: any, item?: any) => void;
 }
 export {};

package/lib/Input/SelectInput.d.ts

@@ -4,6 +4,6 @@ export declare enum SelectInputType {
     input = 0,
     select = 1
 }
-export declare const Index: ({ selectProps, value, onChange, valueName, addFormat, ...props }: HSelectInputProps) => JSX.Element;
-declare const _default: (props: import("../Form/modal").HFormItemProps) => import("react").ReactElement<import("../Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
+export declare const Index: ({ selectProps, value, onChange, valueName, addFormat, addDispatchListener, ...props }: HSelectInputProps) => JSX.Element;
+declare const _default: import("react").ForwardRefExoticComponent<import("@/components/Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export default _default;

package/lib/Input/SelectInput.js

@@ -20,7 +20,7 @@ var index = require('../Select/index.js');
 var defaultConfig = require('./defaultConfig.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["selectProps", "value", "onChange", "valueName", "addFormat"],
+var _excluded = ["selectProps", "value", "onChange", "valueName", "addFormat", "addDispatchListener"],
   _excluded2 = ["style", "placeholder"];
 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -37,8 +37,9 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     _ref$valueName = _ref.valueName,
     valueName = _ref$valueName === void 0 ? defaultConfig.defaultValueName : _ref$valueName,
-    addFormat = _ref.addFormat,
-    props = _objectWithoutProperties(_ref, _excluded);
+    addFormat = _ref.addFormat;
+    _ref.addDispatchListener;
+    var props = _objectWithoutProperties(_ref, _excluded);
   var _valueName$input = valueName.input,
     input = _valueName$input === void 0 ? "" : _valueName$input,
     _valueName$select = valueName.select,
@@ -60,7 +61,8 @@ var Index = function Index(_ref) {
     "float": {
       inputValue: function inputValue(item, initValue) {
         var _context;
-        var name = item.name;
+        var _item$name = item.name,
+          name = _item$name === void 0 ? "" : _item$name;
         var resultObj = {};
         _forEachInstanceProperty(_context = _Object$values(valueName)).call(_context, function (key) {
           resultObj[key] = initValue[key];
@@ -68,7 +70,8 @@ var Index = function Index(_ref) {
         return _defineProperty({}, name, resultObj);
       },
       outputValue: function outputValue(item, _outputValue) {
-        var name = item.name;
+        var _item$name2 = item.name,
+          name = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$name = _outputValue[name],
           itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
         var newItemVal = _defineProperty({}, itemVal[select], itemVal[input]);

package/lib/Input/modal.d.ts

@@ -3,6 +3,7 @@ import type { HSelectProps } from "../Select/modal";
 import type { SelectInputType } from "./SelectInput";
 import type { PromiseFnResult } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
+import type { AddDispatchListenerFn } from "../Form/modal";
 export type HInputProps = InputProps;
 interface ValueNameModal {
     input?: string;
@@ -14,6 +15,7 @@ export interface HSelectInputProps extends Omit<HInputProps, "value" | "onChange
     onChange?: (value: Record<string, any>, type: SelectInputType) => void;
     valueName?: ValueNameModal;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
+    addDispatchListener?: AddDispatchListenerFn;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
     onClick: (value: string | readonly string[] | number | undefined, e: HTMLElement) => void;

package/lib/Select/hooks/norHooks.d.ts

@@ -1,6 +1,6 @@
 import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
 export declare const useOptionReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, }: PartialHSelectProps) => {
-    run: (params?: any, type?: any) => Promise<any>;
+    run: (params?: any, type?: any) => Promise<OptionType[] | undefined>;
     loading: boolean;
     error: Error | undefined;
     data: OptionType[] | undefined;

package/lib/TDPicker/RangePicker.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import type { HItemProps } from "../Form/modal";
 declare const _default: {
-    Component: (props: import("../Form/modal").HFormItemProps) => React.ReactElement<import("../Form/modal").ConnectResultProps, string | React.JSXElementConstructor<any>>;
+    Component: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
     placeholder: ({ label }: HItemProps) => string[];
     requiredErrMsg: ({ label }: HItemProps) => string;
 };

package/lib/TDPicker/RangePicker.js

@@ -70,7 +70,8 @@ var HRangePicker = function HRangePicker(_ref) {
     "float": {
       inputValue: function inputValue(item, initValue) {
         var _context;
-        var valueName = item.name;
+        var _item$name = item.name,
+          valueName = _item$name === void 0 ? "" : _item$name;
         var resultObj = {};
         _forEachInstanceProperty(_context = _Object$values(dateMapKeys)).call(_context, function (key) {
           if (initValue[key]) {
@@ -81,7 +82,8 @@ var HRangePicker = function HRangePicker(_ref) {
         return _defineProperty({}, valueName, hasKeys ? resultObj : null);
       },
       outputValue: function outputValue(item, _outputValue) {
-        var valueName = item.name;
+        var _item$name2 = item.name,
+          valueName = _item$name2 === void 0 ? "" : _item$name2;
         var _outputValue$valueNam = _outputValue[valueName],
           itemVal = _outputValue$valueNam === void 0 ? {} : _outputValue$valueNam;
         return _objectSpread({}, itemVal);

package/lib/TextArea/index.js

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var _extends = require('@babel/runtime-corejs3/helpers/extends');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var antd = require('antd');
+
+var _excluded = ["autoSize"];
+var TextArea = (function (_ref) {
+  var _ref$autoSize = _ref.autoSize,
+    autoSize = _ref$autoSize === void 0 ? {
+      minRows: 4,
+      maxRows: 4
+    } : _ref$autoSize,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(antd.Input.TextArea, _extends({
+    autoSize: autoSize
+  }, props));
+});
+
+exports.default = TextArea;
+// powered by h

package/lib/Upload/UrlUpload/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { IUrlUploadProps } from "../modal";
-declare const _default: ({ placeholder, value, onChange, mediaType, ...props }: IUrlUploadProps) => JSX.Element;
-export default _default;
+declare const Index: ({ placeholder, value, onChange, mediaType, ...props }: IUrlUploadProps) => JSX.Element;
+export default Index;

package/lib/Upload/UrlUpload/index.js

@@ -16,7 +16,7 @@ var index = require('../index.js');
 var TypeEle = require('../MediaTypeEle/TypeEle.js');
 
 var _excluded = ["placeholder", "value", "onChange", "mediaType"];
-var HUrlUpload = (function (_ref) {
+var Index = function Index(_ref) {
   var _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
     _ref$value = _ref.value,
@@ -116,7 +116,7 @@ var HUrlUpload = (function (_ref) {
     onReady: onReady,
     onError: onError
   })));
-});
+};
 
-exports.default = HUrlUpload;
+exports.default = Index;
 // powered by h

package/lib/Upload/hooks/customRequest.js

@@ -1,15 +1,91 @@
 'use strict';
 
+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 _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
+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 _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
-var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var React = require('react');
+var antd = require('antd');
 
-var useCustomRequest = function useCustomRequest(_ref) {
-  var value = _ref.value,
-    request = _ref.request,
-    onChange = _ref.onChange;
+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 subReq = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+    var request, file, _yield$request, url;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          request = _ref.request, file = _ref.file;
+          if (request) {
+            _context.next = 3;
+            break;
+          }
+          return _context.abrupt("return", {
+            url: "",
+            status: "done"
+          });
+        case 3:
+          _context.prev = 3;
+          _context.next = 6;
+          return request(file);
+        case 6:
+          _yield$request = _context.sent;
+          url = _yield$request.url;
+          return _context.abrupt("return", {
+            url: url,
+            status: "done"
+          });
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](3);
+          antd.message.error(_context.t0.message);
+          return _context.abrupt("return", {
+            url: "",
+            status: "error"
+          });
+        case 15:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[3, 11]]);
+  }));
+  return function subReq(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var fileListProvider = function fileListProvider(changeFile, files) {
+  var status = changeFile.status,
+    url = changeFile.url,
+    uid = changeFile.uid;
+  if (status === "error") {
+    return files === null || files === void 0 ? void 0 : _filterInstanceProperty(files).call(files, function (item) {
+      return item.uid !== uid;
+    });
+  }
+  return files === null || files === void 0 ? void 0 : _mapInstanceProperty(files).call(files, function (item) {
+    var resultUrl = url || item.thumbUrl;
+    if (item.uid === uid) {
+      item.status = status;
+      item.response = {
+        url: resultUrl
+      };
+      return item;
+    }
+    return item;
+  });
+};
+var useCustomRequest = function useCustomRequest(_ref3) {
+  var value = _ref3.value,
+    request = _ref3.request,
+    onChange = _ref3.onChange;
   var valObj = React.useMemo(function () {
     return {
       value: value
@@ -19,44 +95,31 @@ var useCustomRequest = function useCustomRequest(_ref) {
     valObj.value = value;
   }, [value]);
   var sendFile = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file) {
-      var _valObj$value;
-      var uid, url, result, fileList;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(file) {
+      var uid, result, fileList;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             uid = file.uid;
-            url = "";
-            if (!request) {
-              _context.next = 7;
-              break;
-            }
-            _context.next = 5;
-            return request(file);
-          case 5:
-            result = _context.sent;
-            url = result.url;
-          case 7:
-            fileList = valObj === null || valObj === void 0 ? void 0 : (_valObj$value = valObj.value) === null || _valObj$value === void 0 ? void 0 : _mapInstanceProperty(_valObj$value).call(_valObj$value, function (item) {
-              var resultUrl = url || item.thumbUrl;
-              if (item.uid === uid) {
-                item.status = "done";
-                item.response = {
-                  url: resultUrl
-                };
-                return item;
-              }
-              return item;
+            _context2.next = 3;
+            return subReq({
+              request: request,
+              file: file
             });
+          case 3:
+            result = _context2.sent;
+            fileList = fileListProvider(_objectSpread(_objectSpread({}, result), {}, {
+              uid: uid
+            }), valObj.value);
             onChange === null || onChange === void 0 ? void 0 : onChange(fileList || []);
-          case 9:
+          case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function sendFile(_x) {
-      return _ref2.apply(this, arguments);
+    return function sendFile(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
   return function (fileList) {

package/lib/Upload/index.d.ts

@@ -1,4 +1,3 @@
 import React from "react";
-import type { IUpLoadProps, IUploadRefModal } from "./modal";
-declare const _default: React.ForwardRefExoticComponent<IUpLoadProps & React.RefAttributes<IUploadRefModal>>;
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/lib/Upload/index.js

@@ -14,14 +14,16 @@ 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 antd = require('antd');
-var Btn = require('./Btn.js');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var React = require('react');
+var propsMaker = require('./hooks/propsMaker.js');
 var index = require('./Preview/index.js');
 var change = require('./hooks/change.js');
-var propsMaker = require('./hooks/propsMaker.js');
+var antd = require('antd');
+var Btn = require('./Btn.js');
+var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat"];
 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref, ref) {
@@ -38,6 +40,7 @@ var Index = function Index(_ref, ref) {
     onPreview = _ref.onPreview,
     request = _ref.request,
     maxSize = _ref.maxSize,
+    addFormat = _ref.addFormat,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = propsMaker.useProps({
     request: request,
@@ -80,6 +83,37 @@ var Index = function Index(_ref, ref) {
   var maxNum = maxCount === 1 ? maxCount : Number.MAX_VALUE;
   var visible = previewModal.visible,
     previewFile = previewModal.file;
+  addFormat === null || addFormat === void 0 ? void 0 : addFormat({
+    "float": {
+      inputValue: function inputValue(item, initValue) {
+        var _item$name = item.name,
+          name = _item$name === void 0 ? "" : _item$name;
+        var initFileList = initValue[name] || [];
+        var fileList = _mapInstanceProperty(initFileList).call(initFileList, function (url, index) {
+          return {
+            name: url,
+            response: {
+              url: url
+            },
+            status: "done",
+            uid: "init-".concat(index),
+            thumbUrl: url
+          };
+        });
+        return _defineProperty({}, name, fileList);
+      },
+      outputValue: function outputValue(item, _outputValue) {
+        var _item$name2 = item.name,
+          valueName = _item$name2 === void 0 ? "" : _item$name2;
+        var _outputValue$valueNam = _outputValue[valueName],
+          itemVal = _outputValue$valueNam === void 0 ? [] : _outputValue$valueNam;
+        var urls = _mapInstanceProperty(itemVal).call(itemVal, function (fileItem) {
+          return fileItem.response.url;
+        });
+        return _defineProperty({}, valueName, urls);
+      }
+    }
+  });
   return /*#__PURE__*/React.createElement("div", {
     style: contentStyle
   }, /*#__PURE__*/React.createElement(antd.Upload, _extends({
@@ -103,7 +137,7 @@ var Index = function Index(_ref, ref) {
     }
   }));
 };
-var HUpload = /*#__PURE__*/React.forwardRef(Index);
+var HUpload = HFormConnect.default( /*#__PURE__*/React.forwardRef(Index));
 
 exports.default = HUpload;
 // powered by h

package/lib/Upload/modal.d.ts

@@ -3,6 +3,7 @@ import type { UploadFile } from "antd/es/upload/interface";
 import type { BeforeUploadFileType, RcFile } from "rc-upload/lib/interface";
 import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
+import type { addFormatItemModal } from "@/components/Form/modal";
 export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     exFiles?: string[];
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
@@ -13,6 +14,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     value?: UploadFile[];
     maxRowNum?: number;
     maxSize?: number;
+    addFormat?: (config: Record<string, addFormatItemModal>) => void;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/lib/config.js

@@ -11,12 +11,12 @@ var baseConfig = {
     value: "value"
   },
   valueCheckMap: {
-    checked: true,
-    noChecked: false
+    checked: 1,
+    noChecked: 0
   },
   valueSwitchMap: {
-    open: true,
-    close: false
+    open: 1,
+    close: 0
   },
   valueRangePickerValueMap: {
     start: function start(name) {

package/lib/index.css

@@ -10,7 +10,7 @@
 .ant-hw-form-item-colon:after {
   position: relative;
   top: -0.5px;
-  margin: 0 8px 0 2px;
+  margin: 0 0 0 2px;
   content: ":";
 }
 .ant-hw-form-item-required:before {

package/lib/index.d.ts

@@ -2,19 +2,23 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
+export { useHDialogForm } from "./DialogForm/hooks";
 export declare const HSelect: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: import("./Select/modal").HSelectProps) => JSX.Element;
 export declare const HInput: ({ ...props }: import("antd").InputProps) => JSX.Element;
-export declare const HSelectInput: ({ selectProps, value, onChange, valueName, ...props }: import("./Input/modal").HSelectInputProps) => JSX.Element;
-export declare const HUpload: import("react").ForwardRefExoticComponent<import("./Upload/modal").IUpLoadProps & import("react").RefAttributes<import("./Upload/modal").IUploadRefModal>>;
+export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+export declare const HUpload: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HUrlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("./Upload/modal").IUrlUploadProps) => JSX.Element;
 export declare const HButtonInput: import("react").FC<import("./Input/modal").HButtonInputProps>;
 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: (props: import("./Form/modal").HFormItemProps) => import("react").ReactElement<import("./Form/modal").ConnectResultProps, string | import("react").JSXElementConstructor<any>>;
+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 HRangePicker: ({ value, onChange, showTime, format, valueMap, ranges, name, ...props }: import("./TDPicker/modal").HRangePickerProps) => JSX.Element;
+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;
 export declare const HInputNumber: ({ style, ...props }: import("antd").InputNumberProps<string | number>) => JSX.Element;
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
 export declare const HFormConfigProvider: import("react").FC<import("./Form/modal").IFormConfigContextProps>;
+export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, ...props }: import("./DialogForm/modal").DialogFormProps) => JSX.Element;

package/lib/index.js

@@ -4,6 +4,9 @@ var config = require('./Form/config.js');
 var index$1 = require('./PageHandler/index.js');
 var index = require('./Form/index.js');
 var useHForm = require('./Form/hooks/useHForm.js');
+var hooks = require('./DialogForm/hooks.js');
+var ModalForm = require('./DialogForm/ModalForm.js');
+var index$2 = require('./DialogForm/DrawerForm/index.js');
 
 var HSelect = config.default.select;
 var HInput = config.default.input;
@@ -21,22 +24,29 @@ var HTimePicker = config.default.timePicker;
 var HInputNumber = config.default.inputNumber;
 var HPageHandler = index$1.default;
 var HFormConfigProvider = config.default.formConfigProvider;
+var HTextArea = config.default.textArea;
+var HModalForm = ModalForm.default;
+var HDrawerForm = index$2.default;
 
 exports.HForm = index.default;
 exports.useHForm = useHForm.default;
+exports.useHDialogForm = hooks.useHDialogForm;
 exports.HButtonInput = HButtonInput;
 exports.HCheckBox = HCheckBox;
 exports.HCheckboxGroup = HCheckboxGroup;
 exports.HDatePicker = HDatePicker;
+exports.HDrawerForm = HDrawerForm;
 exports.HFormConfigProvider = HFormConfigProvider;
 exports.HInput = HInput;
 exports.HInputNumber = HInputNumber;
+exports.HModalForm = HModalForm;
 exports.HPageHandler = HPageHandler;
 exports.HRadioGroup = HRadioGroup;
 exports.HRangePicker = HRangePicker;
 exports.HSelect = HSelect;
 exports.HSelectInput = HSelectInput;
 exports.HSwitch = HSwitch;
+exports.HTextArea = HTextArea;
 exports.HTimePicker = HTimePicker;
 exports.HUpload = HUpload;
 exports.HUrlUpload = HUrlUpload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.2-bate",
+  "version": "0.0.2-beta-v1",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/CheckboxGroup/index.tsx

@@ -32,7 +32,7 @@ const Index = ({
   addFormat?.({
     float: {
       inputValue: (item, initValue) => {
-        const { name } = item;
+        const { name = "" } = item;
         const keys = checkOptions?.map((optItem) => {
           return optItem.value;
         });
@@ -45,7 +45,7 @@ const Index = ({
         };
       },
       outputValue: (item, outputValue) => {
-        const { name } = item;
+        const { name = "" } = item;
         const { [name]: itemVal = {} } = outputValue;
         return {
           ...itemVal,

package/src/components/DialogForm/DrawerForm/Footer.tsx

@@ -0,0 +1,19 @@
+import { Row, Space, Button } from "antd";
+import type { DialogFormProps } from "../modal";
+
+export default ({
+  onCancel,
+  onOk,
+  confirmLoading,
+}: Omit<DialogFormProps, "configData">) => {
+  return (
+    <Row justify={"end"}>
+      <Space size={"middle"}>
+        <Button onClick={onCancel}>关闭</Button>
+        <Button type={"primary"} onClick={onOk} loading={confirmLoading}>
+          确定
+        </Button>
+      </Space>
+    </Row>
+  );
+};