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

package/es/Form/FormItem/BasicItem.js

@@ -19,7 +19,8 @@ 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", "labelAlign"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign"],
+  _excluded2 = ["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) {
@@ -66,10 +67,12 @@ var Index = function Index(props) {
     hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
     labelAlign = props.labelAlign,
     oProps = _objectWithoutProperties(props, _excluded);
+  props.labelAlign;
+    var inProps = _objectWithoutProperties(props, _excluded2);
   var _useFormContext = useFormContext(),
     form = _useFormContext.form;
   var defaultComponent = useDefaultComponents();
-  var defaultRender = useDefaultRender(props, defaultComponent);
+  var defaultRender = useDefaultRender(inProps, defaultComponent);
   var hideItem = useHide({
     hide: hide,
     form: form

package/es/Select/hooks/changeHooks.js

@@ -163,6 +163,10 @@ var useValueChange = function useValueChange(params) {
       setVal(changeVal);
       return;
     }
+    if (!changeVal) {
+      onChange(changeVal, itemOps);
+      return;
+    }
     var newChangeVal = changeVal.value;
     if (labelInValue) {
       newChangeVal = changeVal;

package/lib/Form/FormItem/BasicItem.js

@@ -22,7 +22,8 @@ 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", "labelAlign"];
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign"],
+  _excluded2 = ["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) {
@@ -69,10 +70,12 @@ var Index = function Index(props) {
     hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
     labelAlign = props.labelAlign,
     oProps = _objectWithoutProperties(props, _excluded);
+  props.labelAlign;
+    var inProps = _objectWithoutProperties(props, _excluded2);
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form;
   var defaultComponent = index$1.useDefaultComponents();
-  var defaultRender = useDefaultRender.useDefaultRender(props, defaultComponent);
+  var defaultRender = useDefaultRender.useDefaultRender(inProps, defaultComponent);
   var hideItem = hooks.useHide({
     hide: hide,
     form: form

package/lib/Select/hooks/changeHooks.js

@@ -164,6 +164,10 @@ var useValueChange = function useValueChange(params) {
       setVal(changeVal);
       return;
     }
+    if (!changeVal) {
+      onChange(changeVal, itemOps);
+      return;
+    }
     var newChangeVal = changeVal.value;
     if (labelInValue) {
       newChangeVal = changeVal;

package/package.json

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

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

@@ -48,9 +48,10 @@ const Index: React.FC<HFormItemProps> = (props) => {
     labelAlign,
     ...oProps
   } = props;
+  const {labelAlign:align,...inProps}=props;
   const { form } = useFormContext();
   const defaultComponent = useDefaultComponents();
-  const defaultRender = useDefaultRender(props, defaultComponent);
+  const defaultRender = useDefaultRender(inProps, defaultComponent);
   const hideItem = useHide({ hide, form });
   if (hideItem) {
     return null;

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

@@ -125,6 +125,10 @@ export const useValueChange = (params: PartialHSelectProps) => {
       setVal(changeVal);
       return;
     }
+    if (!changeVal){
+      onChange(changeVal, itemOps);
+      return;
+    }
     let newChangeVal = changeVal.value;
     if (labelInValue) {
       newChangeVal = changeVal;

package/src/pages/Form/index.tsx

@@ -42,6 +42,8 @@ const formData = (options) => {
       itemProps: {
         options: op,
         showSearch: true,
+        allowClear:true,
+        mode:"multiple"
       },
       rules: [{ required: true }],
     },
@@ -266,11 +268,6 @@ export default () => {
           labelWidth={200}
           form={form}
           labelAlign={"left"}
-          initialValues={{
-            name: "fff",
-            trimInput: "trimInput",
-            trimTextArea: "trimTextArea",
-          }}
           submitLoading={true}
           itemSpan={{ span: 12, xs: 24, md: 12 }}
           onFinish={(value) => {
@@ -279,22 +276,6 @@ export default () => {
           onValuesChange={(val) => {
             console.log(val, "onValuesChange");
           }}
-          infoRequest={() => {
-            return new Promise<any>((resolve) => {
-              setTimeout(() => {
-                resolve({
-                  check1: 1,
-                  op: 1,
-                  opInput: "12121",
-                  colorInput: "rgba(24, 144, 255,1)",
-                  upload:
-                    "https://img2.baidu.com/it/u=2048195462,703560066&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=333",
-                  trimInput: "trimInput",
-                  trimTextArea: "trimTextArea",
-                });
-              }, 3000);
-            });
-          }}
           request={(params) => {
             return new Promise<any>((resolve) => {
               setTimeout(() => {