@hw-component/form 0.0.9-beta-v10 → 0.0.9-beta-v12

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", "hideLabel"];
+var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan", "hideLabel", "style"];
 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) {
     itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
     props.itemSpan;
     props.hideLabel;
+    props.style;
     var componentProps = _objectWithoutProperties(props, _excluded);
   var mergeComponent = _objectSpread(_objectSpread({}, componentConfig), defaultComponents);
   var dom = mergeComponent[type];

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/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", "hideLabel"];
+var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan", "hideLabel", "style"];
 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) {
@@ -26,6 +26,7 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
     itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
     props.itemSpan;
     props.hideLabel;
+    props.style;
     var componentProps = _objectWithoutProperties(props, _excluded);
   var mergeComponent = _objectSpread(_objectSpread({}, config.default), defaultComponents);
   var dom = mergeComponent[type];

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-v10",
+  "version": "0.0.9-beta-v12",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

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

@@ -48,7 +48,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     labelAlign,
     ...oProps
   } = props;
-  const {labelAlign:align,...inProps}=props;
+  const { labelAlign: align, ...inProps } = props;
   const { form } = useFormContext();
   const defaultComponent = useDefaultComponents();
   const defaultRender = useDefaultRender(inProps, defaultComponent);

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

@@ -19,6 +19,7 @@ export const useDefaultRender = (
     itemProps = {},
     itemSpan,
     hideLabel,
+    style,
     ...componentProps
   } = props;
   const mergeComponent = { ...FormConfig, ...defaultComponents };

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

@@ -35,6 +35,9 @@ const formData = (options) => {
       label: "下拉框213",
       name: "select",
       type: "select",
+      style:{
+        marginBottom:8
+      },
       dispatch: {
         fnKey: "reload",
         dependencies: ["selectInput", "sz"],
@@ -42,6 +45,8 @@ const formData = (options) => {
       itemProps: {
         options: op,
         showSearch: true,
+        allowClear: true,
+        mode: "multiple",
       },
       rules: [{ required: true }],
     },
@@ -266,35 +271,13 @@ 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) => {
             console.log(value);
           }}
           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(() => {