@hw-component/form 1.6.5 → 1.6.7

package/es/Form/FormItem/index.js

@@ -9,12 +9,23 @@ import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import { jsx } from 'react/jsx-runtime';
 import { useFormItemDomControl } from './hooks.js';
+import { useFormContext } from '../Context/index.js';
 
 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 Item = (function (props) {
+  var _useFormContext = useFormContext(),
+    formLabelWidth = _useFormContext.labelWidth,
+    formLabelAlign = _useFormContext.labelAlign;
+  var _props$labelWidth = props.labelWidth,
+    labelWidth = _props$labelWidth === void 0 ? formLabelWidth : _props$labelWidth,
+    _props$labelAlign = props.labelAlign,
+    labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign;
   var Component = useFormItemDomControl(props);
-  return jsx(Component, _objectSpread({}, props));
+  return jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
+    labelAlign: labelAlign,
+    labelWidth: labelWidth
+  }));
 });
 
 export { Item as default };

package/es/Form/index.js

@@ -94,7 +94,9 @@ var HForm = (function (_ref) {
       value: {
         loading: submitLoading || loading,
         form: hForm,
-        valueType: valueType
+        valueType: valueType,
+        labelAlign: formLabelAlign,
+        labelWidth: labelWidth
       },
       children: jsxs(Form, _objectSpread(_objectSpread({
         form: hForm,

package/es/Form/modal.d.ts

@@ -81,6 +81,8 @@ export interface FormContextProps {
     loading?: boolean;
     form: HFormInstance;
     valueType?: string;
+    labelAlign?: LabelAlignModal;
+    labelWidth?: number;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/es/Select/hooks/changeHooks.js

@@ -75,6 +75,9 @@ var useValueChange = function useValueChange(params) {
     if (labelInValue) {
       return val;
     }
+    if (val === undefined || mode === "tags") {
+      return val;
+    }
     if (!val) {
       return val;
     }

package/lib/Form/FormItem/index.js

@@ -12,12 +12,23 @@ require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var jsxRuntime = require('react/jsx-runtime');
 var hooks = require('./hooks.js');
+var index = require('../Context/index.js');
 
 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 Item = (function (props) {
+  var _useFormContext = index.useFormContext(),
+    formLabelWidth = _useFormContext.labelWidth,
+    formLabelAlign = _useFormContext.labelAlign;
+  var _props$labelWidth = props.labelWidth,
+    labelWidth = _props$labelWidth === void 0 ? formLabelWidth : _props$labelWidth,
+    _props$labelAlign = props.labelAlign,
+    labelAlign = _props$labelAlign === void 0 ? formLabelAlign : _props$labelAlign;
   var Component = hooks.useFormItemDomControl(props);
-  return jsxRuntime.jsx(Component, _objectSpread({}, props));
+  return jsxRuntime.jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
+    labelAlign: labelAlign,
+    labelWidth: labelWidth
+  }));
 });
 
 exports.default = Item;

package/lib/Form/index.js

@@ -97,7 +97,9 @@ var HForm = (function (_ref) {
       value: {
         loading: submitLoading || loading,
         form: hForm,
-        valueType: valueType
+        valueType: valueType,
+        labelAlign: formLabelAlign,
+        labelWidth: labelWidth
       },
       children: jsxRuntime.jsxs(antd.Form, _objectSpread(_objectSpread({
         form: hForm,

package/lib/Form/modal.d.ts

@@ -81,6 +81,8 @@ export interface FormContextProps {
     loading?: boolean;
     form: HFormInstance;
     valueType?: string;
+    labelAlign?: LabelAlignModal;
+    labelWidth?: number;
 }
 interface ConfigUploadProps {
     exFiles?: string[];

package/lib/Select/hooks/changeHooks.js

@@ -76,6 +76,9 @@ var useValueChange = function useValueChange(params) {
     if (labelInValue) {
       return val;
     }
+    if (val === undefined || mode === "tags") {
+      return val;
+    }
     if (!val) {
       return val;
     }

package/package.json

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

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

@@ -1,8 +1,11 @@
 import { useFormItemDomControl } from "./hooks";
 import React from "react";
 import type { HItemProps } from "../modal";
+import {useFormContext} from "../Context";
 
 export default (props: HItemProps) => {
+  const {labelWidth:formLabelWidth,labelAlign:formLabelAlign}=useFormContext();
+  const {labelWidth=formLabelWidth,labelAlign=formLabelAlign}=props;
   const Component = useFormItemDomControl(props);
-  return <Component {...props} />;
+  return <Component {...props} labelAlign={labelAlign} labelWidth={labelWidth}/>;
 };

package/src/components/Form/index.tsx

@@ -73,7 +73,12 @@ export default ({
       reload={infoRun}
     >
       <FormContext.Provider
-        value={{ loading: submitLoading || loading, form: hForm, valueType }}
+        value={{
+          loading: submitLoading || loading,
+          form: hForm, valueType ,
+          labelAlign:formLabelAlign,
+          labelWidth
+        }}
       >
         <Form
           form={hForm}

package/src/components/Form/modal.ts

@@ -130,6 +130,8 @@ export interface FormContextProps {
   loading?: boolean;
   form: HFormInstance;
   valueType?: string;
+  labelAlign?:LabelAlignModal;
+  labelWidth?:number
 }
 interface ConfigUploadProps {
   exFiles?: string[];

package/src/components/Select/hooks/changeHooks.tsx

@@ -67,6 +67,9 @@ export const useValueChange = (params: PartialHSelectProps) => {
     if (labelInValue) {
       return val;
     }
+    if (val===undefined||mode==="tags"){
+      return  val
+    }
     if (!val) {
       return val;
     }

package/src/pages/Select/index.tsx

@@ -18,8 +18,9 @@ export default () => {
           { name: "测试2", value: 20, userId: 112321 },
         ]}
         placeholder="多选"
-        value={[10, 20]}
+        value={null}
         onChange={(val, option) => {
+            console.log(val)
           setSelectVal(val);
         }}
         allSelect={true}
@@ -32,6 +33,7 @@ export default () => {
         placeholder="tags模式"
         showSearch={true}
         allowClear={true}
+        value={null}
         options={[
           { label: "测试1", value: 10 },
           { label: "测试2", value: 20 },
@@ -44,18 +46,18 @@ export default () => {
         labelInValue
         mode="multiple"
         value={["21321312"]}
-        request={(params) => {
+        request={async (params) => {
           const { page, size } = params;
           const op = [];
           for (let i = 0; i < size; i += 1) {
             op.push({ label: `第${page}页第${i}条`, value: i + page });
           }
-          return {
-            page,
-            size: 100,
-            total: 1000,
-            data: op,
-          };
+          return Promise.resolve({
+              page,
+              size: 100,
+              total: 1000,
+              data: op,
+          })
         }}
         isList
       />