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

package/es/Form/FormItem/BasicItem.js

@@ -19,7 +19,7 @@ import { useFormContext } from '../Context/index.js';
 import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign"];
 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 Content = function Content(_ref) {
@@ -64,6 +64,7 @@ var Index = function Index(props) {
     } : _props$itemSpan,
     _props$hideLabel = props.hideLabel,
     hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
+    labelAlign = props.labelAlign,
     oProps = _objectWithoutProperties(props, _excluded);
   var _useFormContext = useFormContext(),
     form = _useFormContext.form;
@@ -83,6 +84,7 @@ var Index = function Index(props) {
         labelWidth: labelWidth,
         required: required,
         colon: colon,
+        align: labelAlign,
         children: label
       })
     }, oProps), {}, {

package/es/Form/Label.d.ts

@@ -5,6 +5,7 @@ interface IProps {
     hover?: string | HoverModal;
     colon?: boolean;
     required?: boolean;
+    align?: "left" | "right";
 }
 declare const Index: React.FC<IProps>;
 export default Index;

package/es/Form/Label.js

@@ -19,7 +19,9 @@ var Index = function Index(_ref2) {
     children = _ref2.children,
     colon = _ref2.colon,
     required = _ref2.required,
-    hover = _ref2.hover;
+    hover = _ref2.hover,
+    _ref2$align = _ref2.align,
+    align = _ref2$align === void 0 ? "right" : _ref2$align;
   var _useHover = useHover({
       hover: hover
     }),
@@ -29,7 +31,8 @@ var Index = function Index(_ref2) {
   var className = useClassName(array);
   return jsxs("div", {
     style: {
-      width: labelWidth
+      width: labelWidth,
+      textAlign: align
     },
     className: className,
     children: [children, text && jsx("span", {

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, labelAlign: formLabelAlign, ...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", "labelAlign"];
 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,8 @@ var HForm = (function (_ref) {
     _ref$hideLabel = _ref.hideLabel,
     formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
     gutter = _ref.gutter,
+    submitLoading = _ref.submitLoading,
+    formLabelAlign = _ref.labelAlign,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = useCurrentForm(form);
   var _useInitConfigData = useInitConfigData({
@@ -81,7 +83,7 @@ var HForm = (function (_ref) {
     reload: infoRun,
     children: jsx(FormContext.Provider, {
       value: {
-        loading: loading,
+        loading: submitLoading || loading,
         form: hForm,
         valueType: valueType
       },
@@ -95,12 +97,15 @@ var HForm = (function (_ref) {
           children: newConfigData.map(function (itemData, index) {
             var itemLabelWidth = itemData.labelWidth,
               _itemData$hideLabel = itemData.hideLabel,
-              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel;
+              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel,
+              _itemData$labelAlign = itemData.labelAlign,
+              labelAlign = _itemData$labelAlign === void 0 ? formLabelAlign : _itemData$labelAlign;
             return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
               key: index,
               hideLabel: hideLabel,
               itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth
+              labelWidth: itemLabelWidth || labelWidth,
+              labelAlign: labelAlign
             }));
           })
         }), jsx(InitSet, {})]

package/es/Form/modal.d.ts

@@ -58,6 +58,8 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     itemSpan?: ColProps;
     hideLabel?: boolean;
     gutter?: Gutter | [Gutter, Gutter];
+    submitLoading?: boolean;
+    labelAlign?: "left" | "right";
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;
@@ -66,6 +68,7 @@ export interface HFormItemProps extends HItemProps {
     itemSpan?: ColProps;
     initValueProvider?: AddValueFormat;
     subProvider?: AddValueFormat;
+    labelAlign?: "left" | "right";
 }
 export type argsFn = (...args: any[]) => void;
 export interface FormContextProps {

package/lib/Form/FormItem/BasicItem.js

@@ -22,7 +22,7 @@ var index = require('../Context/index.js');
 var useDefaultRender = require('../hooks/useDefaultRender.js');
 var index$1 = require('../hooks/index.js');
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign"];
 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 Content = function Content(_ref) {
@@ -67,6 +67,7 @@ var Index = function Index(props) {
     } : _props$itemSpan,
     _props$hideLabel = props.hideLabel,
     hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
+    labelAlign = props.labelAlign,
     oProps = _objectWithoutProperties(props, _excluded);
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form;
@@ -86,6 +87,7 @@ var Index = function Index(props) {
         labelWidth: labelWidth,
         required: required,
         colon: colon,
+        align: labelAlign,
         children: label
       })
     }, oProps), {}, {

package/lib/Form/Label.d.ts

@@ -5,6 +5,7 @@ interface IProps {
     hover?: string | HoverModal;
     colon?: boolean;
     required?: boolean;
+    align?: "left" | "right";
 }
 declare const Index: React.FC<IProps>;
 export default Index;

package/lib/Form/Label.js

@@ -22,7 +22,9 @@ var Index = function Index(_ref2) {
     children = _ref2.children,
     colon = _ref2.colon,
     required = _ref2.required,
-    hover = _ref2.hover;
+    hover = _ref2.hover,
+    _ref2$align = _ref2.align,
+    align = _ref2$align === void 0 ? "right" : _ref2$align;
   var _useHover = useHover({
       hover: hover
     }),
@@ -32,7 +34,8 @@ var Index = function Index(_ref2) {
   var className = index.useClassName(array);
   return jsxRuntime.jsxs("div", {
     style: {
-      width: labelWidth
+      width: labelWidth,
+      textAlign: align
     },
     className: className,
     children: [children, text && jsxRuntime.jsx("span", {

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, labelAlign: formLabelAlign, ...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", "labelAlign"];
 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,8 @@ var HForm = (function (_ref) {
     _ref$hideLabel = _ref.hideLabel,
     formHideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
     gutter = _ref.gutter,
+    submitLoading = _ref.submitLoading,
+    formLabelAlign = _ref.labelAlign,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
   var _useInitConfigData = useInitConfigData.default({
@@ -84,7 +86,7 @@ var HForm = (function (_ref) {
     reload: infoRun,
     children: jsxRuntime.jsx(index$2.FormContext.Provider, {
       value: {
-        loading: loading,
+        loading: submitLoading || loading,
         form: hForm,
         valueType: valueType
       },
@@ -98,12 +100,15 @@ var HForm = (function (_ref) {
           children: newConfigData.map(function (itemData, index) {
             var itemLabelWidth = itemData.labelWidth,
               _itemData$hideLabel = itemData.hideLabel,
-              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel;
+              hideLabel = _itemData$hideLabel === void 0 ? formHideLabel : _itemData$hideLabel,
+              _itemData$labelAlign = itemData.labelAlign,
+              labelAlign = _itemData$labelAlign === void 0 ? formLabelAlign : _itemData$labelAlign;
             return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
               key: index,
               hideLabel: hideLabel,
               itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth
+              labelWidth: itemLabelWidth || labelWidth,
+              labelAlign: labelAlign
             }));
           })
         }), jsxRuntime.jsx(InitSet.default, {})]

package/lib/Form/modal.d.ts

@@ -58,6 +58,8 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
     itemSpan?: ColProps;
     hideLabel?: boolean;
     gutter?: Gutter | [Gutter, Gutter];
+    submitLoading?: boolean;
+    labelAlign?: "left" | "right";
 }
 export interface HFormItemProps extends HItemProps {
     required?: boolean;
@@ -66,6 +68,7 @@ export interface HFormItemProps extends HItemProps {
     itemSpan?: ColProps;
     initValueProvider?: AddValueFormat;
     subProvider?: AddValueFormat;
+    labelAlign?: "left" | "right";
 }
 export type argsFn = (...args: any[]) => void;
 export interface FormContextProps {

package/package.json

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

package/src/components/Form/FormItem/BasicItem.tsx

@@ -45,6 +45,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     render,
     itemSpan = { span: 24 },
     hideLabel = false,
+    labelAlign,
     ...oProps
   } = props;
   const { form } = useFormContext();
@@ -64,6 +65,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
               labelWidth={labelWidth}
               required={required}
               colon={colon}
+              align={labelAlign}
             >
               {label}
             </Label>

package/src/components/Form/Label.tsx

@@ -9,6 +9,7 @@ interface IProps {
   hover?: string | HoverModal;
   colon?: boolean;
   required?: boolean;
+  align?: "left" | "right";
 }
 const useHover = ({ hover }: IProps) => {
   if (!hover || typeof hover === "string") {
@@ -25,6 +26,7 @@ const Index: React.FC<IProps> = ({
   colon,
   required,
   hover,
+  align = "right",
 }) => {
   const { text, icon } = useHover({ hover });
   const array = [
@@ -34,7 +36,7 @@ const Index: React.FC<IProps> = ({
 
   const className = useClassName(array);
   return (
-    <div style={{ width: labelWidth }} className={className}>
+    <div style={{ width: labelWidth, textAlign: align }} className={className}>
       {children}
       {text && (
         <span style={{ marginLeft: 4 }}>

package/src/components/Form/index.tsx

@@ -22,6 +22,8 @@ export default ({
   itemSpan,
   hideLabel: formHideLabel = false,
   gutter,
+  submitLoading,
+  labelAlign: formLabelAlign,
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
@@ -63,7 +65,9 @@ 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}
@@ -72,8 +76,11 @@ export default ({
         >
           <Row gutter={gutter}>
             {newConfigData.map((itemData: HItemProps, index) => {
-              const { labelWidth: itemLabelWidth, hideLabel = formHideLabel } =
-                itemData;
+              const {
+                labelWidth: itemLabelWidth,
+                hideLabel = formHideLabel,
+                labelAlign = formLabelAlign,
+              } = itemData;
               return (
                 <Item
                   {...itemData}
@@ -81,6 +88,7 @@ export default ({
                   hideLabel={hideLabel}
                   itemSpan={itemSpan}
                   labelWidth={itemLabelWidth || labelWidth}
+                  labelAlign={labelAlign}
                 />
               );
             })}

package/src/components/Form/modal.ts

@@ -105,6 +105,8 @@ export interface HFormProps<T = any, R = any>
   itemSpan?: ColProps;
   hideLabel?: boolean;
   gutter?: Gutter | [Gutter, Gutter];
+  submitLoading?: boolean;
+  labelAlign?: "left" | "right";
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;
@@ -113,6 +115,7 @@ export interface HFormItemProps extends HItemProps {
   itemSpan?: ColProps;
   initValueProvider?: AddValueFormat;
   subProvider?: AddValueFormat;
+  labelAlign?: "left" | "right";
 }
 export type argsFn = (...args: any[]) => void;
 export interface FormContextProps {

package/src/pages/Form/index.tsx

@@ -265,12 +265,13 @@ export default () => {
           configData={formData(options)}
           labelWidth={200}
           form={form}
-          hideLabel={true}
+          labelAlign={"left"}
           initialValues={{
             name: "fff",
             trimInput: "trimInput",
             trimTextArea: "trimTextArea",
           }}
+          submitLoading={true}
           itemSpan={{ span: 12, xs: 24, md: 12 }}
           onFinish={(value) => {
             console.log(value);