@hw-component/form 1.9.89 → 1.9.91

package/es/Form/hooks/useHForm.js

@@ -177,6 +177,9 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setSourceFieldsValue: function setSourceFieldsValue(values) {
+        form.setFieldsValue(values);
+      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/es/Form/modal.d.ts

@@ -153,6 +153,7 @@ export interface HFormInstance extends FormInstance {
     clearFormat: (name: string) => void;
     inited: boolean;
     resetFormStatus: VoidFunction;
+    setSourceFieldsValue: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/es/InputGroup/index.js

@@ -2,7 +2,7 @@
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useClassName } from '../hooks/index.js';
 import { Input } from 'antd';
 
@@ -42,6 +42,21 @@ var Index = function Index(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded);
   var contentClassname = useClassName(["hw-input-group"]);
   var bodyClassname = useClassName(["hw-input-group-body"]);
+  var beforeBodyClassname = useClassName(["hw-input-group-before-body"]);
+  var beforeAfterClassname = useClassName(["hw-input-group-after-body"]);
+  var noAddonClassname = useClassName(["hw-input-group-no-addon"]);
+  var cuBodyClassName = useMemo(function () {
+    if (addonBefore && !addonAfter) {
+      return beforeBodyClassname;
+    }
+    if (addonAfter && !addonBefore) {
+      return beforeAfterClassname;
+    }
+    if (!addonBefore && !addonAfter) {
+      return noAddonClassname;
+    }
+    return "";
+  }, [addonAfter, addonBefore]);
   return jsxs(Input.Group, {
     compact: true,
     className: "".concat(contentClassname, " ").concat(className),
@@ -50,7 +65,7 @@ var Index = function Index(_ref2) {
       onChange: onChange,
       children: addonBefore
     }), jsx("div", {
-      className: bodyClassname,
+      className: "".concat(bodyClassname, " ").concat(cuBodyClassName),
       children: /*#__PURE__*/React.cloneElement(children, _objectSpread({
         value: value,
         onChange: onChange

package/es/index.css

@@ -302,6 +302,17 @@
 .ant-form-item-has-error .ant-hw-input-group-body {
   border-color: #ff4d4f !important;
 }
+.ant-hw-input-group-before-body .ant-hw-input-group-number-body {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.ant-hw-input-group-after-body .ant-hw-input-group-number-body {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.ant-hw-input-group-no-addon .ant-hw-input-group-number-body {
+  border-radius: 4px;
+}
 .ant-hw-rich-editor {
   box-sizing: border-box;
   width: 100%;

package/lib/Form/hooks/useHForm.js

@@ -180,6 +180,9 @@ var useHForm = (function () {
         var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setSourceFieldsValue: function setSourceFieldsValue(values) {
+        form.setFieldsValue(values);
+      },
       validateFields: function validateFields(nameList) {
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {

package/lib/Form/modal.d.ts

@@ -153,6 +153,7 @@ export interface HFormInstance extends FormInstance {
     clearFormat: (name: string) => void;
     inited: boolean;
     resetFormStatus: VoidFunction;
+    setSourceFieldsValue: (values: Record<string, any>) => void;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/InputGroup/index.js

@@ -45,6 +45,21 @@ var Index = function Index(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded);
   var contentClassname = index.useClassName(["hw-input-group"]);
   var bodyClassname = index.useClassName(["hw-input-group-body"]);
+  var beforeBodyClassname = index.useClassName(["hw-input-group-before-body"]);
+  var beforeAfterClassname = index.useClassName(["hw-input-group-after-body"]);
+  var noAddonClassname = index.useClassName(["hw-input-group-no-addon"]);
+  var cuBodyClassName = React.useMemo(function () {
+    if (addonBefore && !addonAfter) {
+      return beforeBodyClassname;
+    }
+    if (addonAfter && !addonBefore) {
+      return beforeAfterClassname;
+    }
+    if (!addonBefore && !addonAfter) {
+      return noAddonClassname;
+    }
+    return "";
+  }, [addonAfter, addonBefore]);
   return jsxRuntime.jsxs(antd.Input.Group, {
     compact: true,
     className: "".concat(contentClassname, " ").concat(className),
@@ -53,7 +68,7 @@ var Index = function Index(_ref2) {
       onChange: onChange,
       children: addonBefore
     }), jsxRuntime.jsx("div", {
-      className: bodyClassname,
+      className: "".concat(bodyClassname, " ").concat(cuBodyClassName),
       children: /*#__PURE__*/React.cloneElement(children, _objectSpread({
         value: value,
         onChange: onChange

package/lib/index.css

@@ -302,6 +302,17 @@
 .ant-form-item-has-error .ant-hw-input-group-body {
   border-color: #ff4d4f !important;
 }
+.ant-hw-input-group-before-body .ant-hw-input-group-number-body {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.ant-hw-input-group-after-body .ant-hw-input-group-number-body {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.ant-hw-input-group-no-addon .ant-hw-input-group-number-body {
+  border-radius: 4px;
+}
 .ant-hw-rich-editor {
   box-sizing: border-box;
   width: 100%;

package/package.json

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

package/src/components/Form/hooks/useHForm.ts

@@ -160,6 +160,9 @@ export default () => {
         const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
+      setSourceFieldsValue(values){
+      form.setFieldsValue(values);
+    },
       validateFields(nameList) {
         return new Promise((resolve, reject) => {
           form

package/src/components/Form/modal.ts

@@ -212,6 +212,7 @@ export interface HFormInstance extends FormInstance {
   clearFormat: (name: string) => void;
   inited: boolean;
   resetFormStatus: VoidFunction;
+  setSourceFieldsValue:( values: Record<string, any>)=>void;
 }
 
 export interface ConnectConfigModal {

package/src/components/Input/index.less

@@ -1,5 +1,4 @@
 @import "../InputGroup/index";
-
 .@{all-input-group} {
   .@{all-input-group}-disabled {
     background-color: #f5f5f5;

package/src/components/InputGroup/index.less

@@ -1,4 +1,5 @@
 @import "../styles/local.less";
+
 @all-input-group: ~"@{ant-prefix}-hw-input-group";
 
 .@{all-input-group} {
@@ -24,3 +25,21 @@
     border-color: #ff4d4f !important;
   }
 }
+.@{all-input-group}-before-body{
+  .@{all-input-group}-number-body{
+    border-top-right-radius:@border-radius-base;
+    border-bottom-right-radius:@border-radius-base;
+  }
+}
+.@{all-input-group}-after-body{
+  .@{all-input-group}-number-body{
+    border-top-left-radius:@border-radius-base;
+    border-bottom-left-radius:@border-radius-base;
+  }
+}
+
+.@{all-input-group}-no-addon{
+  .@{all-input-group}-number-body{
+    border-radius: @border-radius-base;
+  }
+}

package/src/components/InputGroup/index.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, {useMemo} from "react";
 import { useClassName } from "../hooks";
 import { Input } from "antd";
 interface HInputGroupProps<T = any> {
@@ -34,13 +34,28 @@ const Index: React.FC<HInputGroupProps> = ({
 }) => {
   const contentClassname = useClassName(["hw-input-group"]);
   const bodyClassname = useClassName(["hw-input-group-body"]);
+  const beforeBodyClassname = useClassName(["hw-input-group-before-body"]);
+  const beforeAfterClassname = useClassName(["hw-input-group-after-body"]);
+  const noAddonClassname = useClassName(["hw-input-group-no-addon"]);
 
+  const cuBodyClassName=useMemo(()=>{
+        if (addonBefore&&!addonAfter){
+          return beforeBodyClassname;
+        }
+        if (addonAfter&&!addonBefore){
+          return beforeAfterClassname;
+        }
+        if (!addonBefore&&!addonAfter){
+          return  noAddonClassname;
+        }
+        return  ""
+  },[addonAfter,addonBefore]);
   return (
     <Input.Group compact className={`${contentClassname} ${className}`}>
       <Addon value={value} onChange={onChange}>
         {addonBefore}
       </Addon>
-      <div className={bodyClassname}>
+      <div className={`${bodyClassname} ${cuBodyClassName}`}>
         {React.cloneElement(children as any, { value, onChange, ...props })}
       </div>
       <Addon value={value} onChange={onChange}>

package/src/components/styles/local.less

@@ -1 +1,2 @@
 @ant-prefix: ant;
+@border-radius-base: 4px;

package/src/pages/InputNumberGroup/index.tsx

@@ -20,6 +20,7 @@ export default () => {
       <Col span={10}>
         <HInputNumberGroup
           addonBefore={<Test />}
+          addonAfter={<Test />}
           value={val}
           onChange={setVal}
         />