@hw-component/form 0.0.9-beta-v6 → 0.0.9-beta-v8

package/es/Form/hooks/useDefaultRender.js

@@ -12,7 +12,7 @@ import { jsx } from 'react/jsx-runtime';
 import componentConfig from '../config.js';
 import React from 'react';
 
-var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan"];
+var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan", "hideLabel"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(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 source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useDefaultRender = function useDefaultRender(props, defaultComponents) {
@@ -24,6 +24,7 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
     _props$itemProps = props.itemProps,
     itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
     props.itemSpan;
+    props.hideLabel;
     var componentProps = _objectWithoutProperties(props, _excluded);
   var mergeComponent = _objectSpread(_objectSpread({}, componentConfig), defaultComponents);
   var dom = mergeComponent[type];

package/es/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/index.js

@@ -19,7 +19,7 @@ import Index from '../PageHandler/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
 import InitSet from './InitSet.js';
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(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 source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var HForm = (function (_ref) {
@@ -39,6 +39,7 @@ var HForm = (function (_ref) {
     _ref$hideLabel = _ref.hideLabel,
     formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
     gutter = _ref.gutter,
+    submitLoading = _ref.submitLoading,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = useCurrentForm(form);
   var _useInitConfigData = useInitConfigData({
@@ -81,7 +82,7 @@ var HForm = (function (_ref) {
     reload: infoRun,
     children: jsx(FormContext.Provider, {
       value: {
-        loading: loading,
+        loading: submitLoading || loading,
         form: hForm,
         valueType: valueType
       },

package/es/Form/modal.d.ts

@@ -15,7 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
-import { Gutter } from "antd/lib/grid/row";
+import type { Gutter } from "antd/lib/grid/row";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
@@ -58,6 +58,7 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     itemSpan?: ColProps;
     hideLabel?: boolean;
     gutter?: Gutter | [Gutter, Gutter];
+    submitLoading?: boolean;
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;

package/lib/Form/hooks/useDefaultRender.js

@@ -13,7 +13,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var config = require('../config.js');
 var React = require('react');
 
-var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan"];
+var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan", "hideLabel"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(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 source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useDefaultRender = function useDefaultRender(props, defaultComponents) {
@@ -25,6 +25,7 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
     _props$itemProps = props.itemProps,
     itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
     props.itemSpan;
+    props.hideLabel;
     var componentProps = _objectWithoutProperties(props, _excluded);
   var mergeComponent = _objectSpread(_objectSpread({}, config.default), defaultComponents);
   var dom = mergeComponent[type];

package/lib/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/index.js

@@ -22,7 +22,7 @@ var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
 var InitSet = require('./InitSet.js');
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(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 source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var HForm = (function (_ref) {
@@ -42,6 +42,7 @@ var HForm = (function (_ref) {
     _ref$hideLabel = _ref.hideLabel,
     formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
     gutter = _ref.gutter,
+    submitLoading = _ref.submitLoading,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
   var _useInitConfigData = useInitConfigData.default({
@@ -84,7 +85,7 @@ var HForm = (function (_ref) {
     reload: infoRun,
     children: jsxRuntime.jsx(index$2.FormContext.Provider, {
       value: {
-        loading: loading,
+        loading: submitLoading || loading,
         form: hForm,
         valueType: valueType
       },

package/lib/Form/modal.d.ts

@@ -15,7 +15,7 @@ import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRang
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
-import { Gutter } from "antd/lib/grid/row";
+import type { Gutter } from "antd/lib/grid/row";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
 export interface HoverModal {
@@ -58,6 +58,7 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     itemSpan?: ColProps;
     hideLabel?: boolean;
     gutter?: Gutter | [Gutter, Gutter];
+    submitLoading?: boolean;
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;

package/package.json

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

package/src/components/Form/hooks/useDefaultRender.tsx

@@ -18,6 +18,7 @@ export const useDefaultRender = (
     type = "input",
     itemProps = {},
     itemSpan,
+    hideLabel,
     ...componentProps
   } = props;
   const mergeComponent = { ...FormConfig, ...defaultComponents };

package/src/components/Form/index.tsx

@@ -22,6 +22,7 @@ export default ({
   itemSpan,
   hideLabel: formHideLabel = false,
   gutter,
+                  submitLoading,
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
@@ -63,7 +64,7 @@ export default ({
       data={infoData}
       reload={infoRun}
     >
-      <FormContext.Provider value={{ loading, form: hForm, valueType }}>
+      <FormContext.Provider value={{ loading:submitLoading||loading, form: hForm, valueType }}>
         <Form
           form={hForm}
           onFinish={run}

package/src/components/Form/modal.ts

@@ -33,7 +33,7 @@ import type {
 import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
-import {Gutter} from "antd/lib/grid/row";
+import type { Gutter } from "antd/lib/grid/row";
 
 type RenderFun = (
   props: HItemProps,
@@ -105,6 +105,7 @@ export interface HFormProps<T = any, R = any>
   itemSpan?: ColProps;
   hideLabel?: boolean;
   gutter?: Gutter | [Gutter, Gutter];
+  submitLoading?:boolean;
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;

package/src/pages/Form/index.tsx

@@ -271,6 +271,7 @@ export default () => {
             trimInput: "trimInput",
             trimTextArea: "trimTextArea",
           }}
+          submitLoading={true}
           itemSpan={{ span: 12, xs: 24, md: 12 }}
           onFinish={(value) => {
             console.log(value);