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

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"];
+var _excluded = ["render", "labelWidth", "colon", "type", "itemProps", "itemSpan"];
 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) {
@@ -22,8 +22,9 @@ var useDefaultRender = function useDefaultRender(props, defaultComponents) {
     var _props$type = props.type,
     type = _props$type === void 0 ? "input" : _props$type,
     _props$itemProps = props.itemProps,
-    itemProps = _props$itemProps === void 0 ? {} : _props$itemProps,
-    componentProps = _objectWithoutProperties(props, _excluded);
+    itemProps = _props$itemProps === void 0 ? {} : _props$itemProps;
+    props.itemSpan;
+    var componentProps = _objectWithoutProperties(props, _excluded);
   var mergeComponent = _objectSpread(_objectSpread({}, componentConfig), defaultComponents);
   var dom = mergeComponent[type];
   return function (form) {

package/es/Select/hooks/changeHooks.js

@@ -11,6 +11,7 @@ import 'core-js/modules/es.array.find-index.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.array.map.js';
+import 'core-js/modules/es.regexp.to-string.js';
 import { useState, useEffect } from 'react';
 import { itemOpProvider } from '../utils.js';
 
@@ -180,7 +181,7 @@ var useValueChange = function useValueChange(params) {
       setVal(value);
       return;
     }
-    if (options && value) {
+    if (options && value !== null && value !== void 0 && value.toString()) {
       setVal(function (oldVale) {
         return matchNotFind(params, oldVale);
       });

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

package/lib/Select/hooks/changeHooks.js

@@ -12,6 +12,7 @@ require('core-js/modules/es.array.find-index.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.array.map.js');
+require('core-js/modules/es.regexp.to-string.js');
 var React = require('react');
 var utils = require('../utils.js');
 
@@ -181,7 +182,7 @@ var useValueChange = function useValueChange(params) {
       setVal(value);
       return;
     }
-    if (options && value) {
+    if (options && value !== null && value !== void 0 && value.toString()) {
       setVal(function (oldVale) {
         return matchNotFind(params, oldVale);
       });

package/package.json

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

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

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

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

@@ -143,7 +143,7 @@ export const useValueChange = (params: PartialHSelectProps) => {
       return;
     }
 
-    if (options && value) {
+    if (options && value?.toString()) {
       setVal((oldVale) => {
         return matchNotFind(params, oldVale);
       });

package/src/pages/Form/index.tsx

@@ -2,6 +2,16 @@ import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { useState } from "react";
 
 const formData = (options) => {
+  const op = [
+    {
+      key: 1,
+      value: '是',
+    },
+    {
+      key: 0,
+      value: '否',
+    },
+  ];
   return [
     {
       label: "输入框",
@@ -21,7 +31,7 @@ const formData = (options) => {
       rules: [{ required: true }],
     },
     {
-      label: "下拉框",
+      label: "下拉框213",
       name: "select",
       type: "select",
       dispatch: {
@@ -29,11 +39,7 @@ const formData = (options) => {
         dependencies: ["selectInput", "sz"],
       },
       itemProps: {
-        request: (params = {}, values) => {
-          console.log(values, "paramsparamsparams");
-          const { label = "123", value = 1 } = params;
-          return Promise.resolve([{ label, value }]);
-        },
+        options:op,
         showSearch: true,
       },
       rules: [{ required: true }],
@@ -161,6 +167,10 @@ export default () => {
         defaultComponent={{
           test: Test,
         }}
+        fieldNames={{
+          label: 'value',
+          value: 'key',
+        }}
       >
         <HForm
           configData={formData(options)}