@hw-component/form 1.9.65 → 1.9.67

package/es/Form/Basic.js

@@ -6,6 +6,7 @@ import Item from './FormItem/index.js';
 import { Row } from 'antd';
 import { useFormContext } from './Context/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
+import { useClassName } from '../hooks/index.js';
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -29,6 +30,7 @@ var Basic = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  var rowClassname = useClassName("hw-form-item-row");
   useEffect(function () {
     setData === null || setData === void 0 || setData(dispatchSourceData);
   }, []);
@@ -41,6 +43,7 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
+    className: rowClassname,
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,

package/es/Upload/hooks/change.js

@@ -58,6 +58,13 @@ var useChange = function useChange(_ref) {
     onChange: onChange,
     value: value
   });
+  var checkGo = function checkGo(errList) {
+    var len = errList.length;
+    if (len) {
+      message.error(errList[0].message);
+    }
+    return !(maxCount === 1 && len > 0);
+  };
   var _useRequest = useRequest(/*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
         var fileList, _matchFile, addFile, newFileList, errList, changeFile;
@@ -73,9 +80,12 @@ var useChange = function useChange(_ref) {
               return _context.abrupt("return");
             case 4:
               _matchFile = matchFile(fileList, value, exFiles, maxSize), addFile = _matchFile.addFile, newFileList = _matchFile.fileList, errList = _matchFile.errList;
-              if (errList.length) {
-                message.error(errList[0].message);
+              if (checkGo(errList)) {
+                _context.next = 7;
+                break;
               }
+              return _context.abrupt("return");
+            case 7:
               changeFile = newFileList === null || newFileList === void 0 ? void 0 : newFileList.map(function (item) {
                 return _objectSpread({
                   thumbUrl: thumbUrl
@@ -83,7 +93,7 @@ var useChange = function useChange(_ref) {
               });
               onChange === null || onChange === void 0 || onChange(changeFile);
               customRequest(addFile);
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }

package/es/index.css

@@ -160,6 +160,12 @@
 .ant-hw-form-form-item .ant-form-item-label {
   overflow: visible;
 }
+.ant-hw-form-item-row .ant-form-item-control-input-content > .ant-space-vertical {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
 .ant-hw-input-group .ant-hw-input-group-disabled {
   background-color: #f5f5f5;
 }

package/lib/Form/Basic.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var index$1 = require('./FormItem/index.js');
+var index$2 = require('./FormItem/index.js');
 var antd = require('antd');
 var index = require('./Context/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
+var index$1 = require('../hooks/index.js');
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -32,6 +33,7 @@ var Basic = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
+  var rowClassname = index$1.useClassName("hw-form-item-row");
   React.useEffect(function () {
     setData === null || setData === void 0 || setData(dispatchSourceData);
   }, []);
@@ -44,6 +46,7 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
+    className: rowClassname,
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,
@@ -62,7 +65,7 @@ var Basic = (function (_ref) {
       var arrayName = Array.isArray(name) ? name.join(".") : name;
       var key = arrayName || nameKey;
       var itemStyle = style || formItemStyle;
-      return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
+      return /*#__PURE__*/React.createElement(index$2.default, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,
         style: itemStyle,

package/lib/Upload/hooks/change.js

@@ -59,6 +59,13 @@ var useChange = function useChange(_ref) {
     onChange: onChange,
     value: value
   });
+  var checkGo = function checkGo(errList) {
+    var len = errList.length;
+    if (len) {
+      antd.message.error(errList[0].message);
+    }
+    return !(maxCount === 1 && len > 0);
+  };
   var _useRequest = ahooks.useRequest(/*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
         var fileList, _matchFile, addFile, newFileList, errList, changeFile;
@@ -74,9 +81,12 @@ var useChange = function useChange(_ref) {
               return _context.abrupt("return");
             case 4:
               _matchFile = matchFile(fileList, value, exFiles, maxSize), addFile = _matchFile.addFile, newFileList = _matchFile.fileList, errList = _matchFile.errList;
-              if (errList.length) {
-                antd.message.error(errList[0].message);
+              if (checkGo(errList)) {
+                _context.next = 7;
+                break;
               }
+              return _context.abrupt("return");
+            case 7:
               changeFile = newFileList === null || newFileList === void 0 ? void 0 : newFileList.map(function (item) {
                 return _objectSpread({
                   thumbUrl: thumbUrl
@@ -84,7 +94,7 @@ var useChange = function useChange(_ref) {
               });
               onChange === null || onChange === void 0 || onChange(changeFile);
               customRequest$1(addFile);
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }

package/lib/index.css

@@ -160,6 +160,12 @@
 .ant-hw-form-form-item .ant-form-item-label {
   overflow: visible;
 }
+.ant-hw-form-item-row .ant-form-item-control-input-content > .ant-space-vertical {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
 .ant-hw-input-group .ant-hw-input-group-disabled {
   background-color: #f5f5f5;
 }

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -8,6 +8,7 @@ import { Row } from "antd";
 import { useFormContext } from "./Context";
 import useInitConfigData from "./hooks/useInitConfigData";
 import { useEffect } from "react";
+import {useClassName} from "../hooks";
 
 export default ({
   configData,
@@ -28,6 +29,7 @@ export default ({
     configData,
     form,
   });
+  const rowClassname=useClassName("hw-form-item-row");
   useEffect(() => {
     setData?.(dispatchSourceData);
   }, []);
@@ -36,7 +38,7 @@ export default ({
   };
   const globalItemSpan = itemSpan || formItemSpan;
   return (
-    <Row gutter={gutter} style={{ width: "100%" }}>
+    <Row gutter={gutter} style={{ width: "100%" }} className={rowClassname}>
       {newConfigData.map((itemData: HItemProps, index) => {
         const {
           labelWidth: itemLabelWidth = labelWidth,

package/src/components/Form/index.less

@@ -95,3 +95,8 @@
     overflow: visible;
   }
 }
+.@{ant-prefix}-hw-form-item-row{
+  .@{ant-prefix}-form-item-control-input-content>.@{ant-prefix}-space-vertical{
+      display: flex;
+  }
+}

package/src/components/Upload/hooks/change.ts

@@ -10,7 +10,6 @@ const checkFile = (item: UploadFile, oldFile: UploadFile[] = []) => {
     return item.uid !== oldItem.uid;
   });
 };
-
 const matchFile = (
   newFile: UploadFile[],
   oldFile: UploadFile[] = [],
@@ -53,7 +52,14 @@ export const useChange = ({
   thumbUrl,
 }: IUpLoadProps) => {
   const customRequest = useCustomRequest({ request, onChange, value });
+  const checkGo=(errList:Error[])=>{
+    const len=errList.length;
+    if (len) {
+      message.error(errList[0].message);
+    }
+    return !(maxCount === 1 && len > 0);//为1时存在错误不调用onChange
 
+  }
   const { run } = useRequest(
     async ({ fileList }: UploadChangeParam<UploadFile>) => {
       if (fileList.length > maxCount) {
@@ -65,8 +71,8 @@ export const useChange = ({
         fileList: newFileList,
         errList,
       } = matchFile(fileList, value, exFiles, maxSize);
-      if (errList.length) {
-        message.error(errList[0].message);
+      if (!checkGo(errList)) {
+        return;
       }
       const changeFile = newFileList?.map((item) => {
         return {

package/src/pages/Select/index.tsx

@@ -1,10 +1,11 @@
 import { HSelect } from "../../components";
-import { Space } from "antd";
-import { useState } from "react";
+import {Form, Space} from "antd";
+import {useEffect, useState} from "react";
 export default () => {
   const [selectVal, setSelectVal] = useState([{ name: "11", id: -100 }]);
   const [op, setOp] = useState([{ label: "1", value: 1 }]);
   const [val, setVal] = useState([2, 3]);
+
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HSelect

package/src/pages/Upload/index.tsx

@@ -9,7 +9,6 @@ export default () => {
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HUpload
-        exFiles={null}
         value={files}
         request={() => {
           return {