@hw-component/form 1.9.42 → 1.9.43

package/es/Input/InputNumberGroup.js

@@ -26,7 +26,7 @@ var Addon = function Addon(_ref) {
   var children = _ref.children,
     value = _ref.value,
     onChange = _ref.onChange;
-  var addonClassname = useClassName(["hw-input-group-addon"]);
+  var addonClassname = useClassName(["hw-addon"]);
   if (!children) {
     return jsx(Fragment, {});
   }

package/es/Select/index.js

@@ -1,18 +1,18 @@
 // welcome to hoo hoo hoo
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import { jsx } from 'react/jsx-runtime';
 import { createElement } from 'react';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { Select } from 'antd';
 import { useFilterOption, useSelectReq } from './hooks/norHooks.js';
 import { useValueChange } from './hooks/changeHooks.js';
 import { defaultModeConfig, defaultSelectConfig } from './defaultConfig.js';
 import Index$1 from './components/DropdownComponent.js';
 import Index$2 from './components/AllSelect.js';
-import { useMatchConfigProps, useChangeOptions } from '../hooks/index.js';
+import { useMatchConfigProps, useChangeOptions, useClassName } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch", "isList", "onPopupScroll"],
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch", "isList", "onPopupScroll", "addonBefore", "addonAfter"],
   _excluded2 = ["value", "label"];
 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; }
@@ -49,6 +49,8 @@ var Index = function Index(_ref) {
     var dispatch = _ref.dispatch,
     isList = _ref.isList,
     propsOnPopupScroll = _ref.onPopupScroll,
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
@@ -84,6 +86,12 @@ var Index = function Index(_ref) {
     options: resultData,
     fieldNames: fieldNames
   });
+  var boxClassName = useClassName("hw-select-box");
+  var addonBeforeClassName = useClassName("hw-group-addon-before");
+  var addonBeforeBoxClassName = useClassName("hw-select-box-addon-before");
+  var addonAfterClassName = useClassName("hw-group-addon-after");
+  var addonAfterBoxClassName = useClassName("hw-select-box-addon-after");
+  var addonClassname = useClassName(["hw-addon"]);
   var _useValueChange = useValueChange({
       labelInValue: labelInValue,
       onChange: onChange,
@@ -96,53 +104,62 @@ var Index = function Index(_ref) {
     val = _useValueChange.val,
     change = _useValueChange.change;
   addDispatchListener === null || addDispatchListener === void 0 || addDispatchListener("reload", reload);
-  return jsx(Select, _objectSpread(_objectSpread({
+  return jsxs("div", {
+    className: "".concat(boxClassName, " ").concat(addonBefore ? addonBeforeBoxClassName : "", " ").concat(addonAfter ? addonAfterBoxClassName : ""),
     style: style,
-    mode: mode,
-    loading: loading,
-    value: val,
-    onSearch: onSearch,
-    onChange: change,
-    dropdownRender: function dropdownRender(node) {
-      return jsx(Index$1, {
-        loading: loading,
-        reload: run,
-        error: error,
-        options: data,
-        children: jsx(Index$2, {
-          allSelect: allSelect,
+    children: [addonBefore && jsx("div", {
+      className: "".concat(addonClassname, " ").concat(addonBeforeClassName),
+      children: addonBefore
+    }), jsx(Select, _objectSpread(_objectSpread({
+      mode: mode,
+      loading: loading,
+      value: val,
+      onSearch: onSearch,
+      onChange: change,
+      dropdownRender: function dropdownRender(node) {
+        return jsx(Index$1, {
+          loading: loading,
+          reload: run,
+          error: error,
           options: data,
-          mode: mode,
-          value: val,
-          onChange: change,
-          fieldNames: fieldNames,
-          children: node
-        })
-      });
-    },
-    optionLabelProp: optionLabelProp,
-    menuItemSelectedIcon: icon,
-    optionFilterProp: optionFilterProp,
-    filterOption: selfFilterOption,
-    showSearch: mathShowSearch,
-    labelInValue: true,
-    onPopupScroll: propsOnPopupScroll || onPopupScroll
-  }, props), {}, {
-    children: data === null || data === void 0 ? void 0 : data.map(function (item) {
-      var optionValue = item.value,
-        label = item.label,
-        oItem = _objectWithoutProperties(item, _excluded2);
-      var filterKey = filterProvider || "label";
-      var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
-      var filter = _defineProperty({}, optionFilterProp, result);
-      return /*#__PURE__*/createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
-        value: optionValue,
-        key: optionValue,
-        label: label,
-        mode: mode
-      }, filter), render ? render(item, val) : label);
-    })
-  }));
+          children: jsx(Index$2, {
+            allSelect: allSelect,
+            options: data,
+            mode: mode,
+            value: val,
+            onChange: change,
+            fieldNames: fieldNames,
+            children: node
+          })
+        });
+      },
+      optionLabelProp: optionLabelProp,
+      menuItemSelectedIcon: icon,
+      optionFilterProp: optionFilterProp,
+      filterOption: selfFilterOption,
+      showSearch: mathShowSearch,
+      labelInValue: true,
+      onPopupScroll: propsOnPopupScroll || onPopupScroll
+    }, props), {}, {
+      children: data === null || data === void 0 ? void 0 : data.map(function (item) {
+        var optionValue = item.value,
+          label = item.label,
+          oItem = _objectWithoutProperties(item, _excluded2);
+        var filterKey = filterProvider || "label";
+        var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
+        var filter = _defineProperty({}, optionFilterProp, result);
+        return /*#__PURE__*/createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
+          value: optionValue,
+          key: optionValue,
+          label: label,
+          mode: mode
+        }, filter), render ? render(item, val) : label);
+      })
+    })), addonAfter && jsx("div", {
+      className: "".concat(addonClassname, " ").concat(addonAfterClassName),
+      children: addonAfter
+    })]
+  });
 };
 var HSelect = HFormConnect(Index);
 

package/es/Select/modal.d.ts

@@ -36,6 +36,8 @@ export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder
     placeholder?: string;
     dispatch?: DispatchModal;
     isList?: boolean;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
 }
 export interface FilterDataModal {
     value: any;

package/es/index.css

@@ -7,6 +7,41 @@
 .ant-hw-all-check-box .ant-select-item-option:not( .ant-select-item-option-selected):hover {
   background-color: #f5f5f5;
 }
+.ant-hw-select-box {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+}
+.ant-hw-select-box .ant-hw-group-addon-before {
+  border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+  border-right: 0px;
+}
+.ant-hw-select-box .ant-select {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+.ant-hw-select-box .ant-hw-group-addon-after {
+  border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+  border-left: 0px;
+}
+.ant-hw-select-box-addon-before .ant-select .ant-select-selector {
+  border-bottom-left-radius: 0px !important;
+  border-top-left-radius: 0px !important;
+}
+.ant-hw-select-box-addon-after .ant-select .ant-select-selector {
+  border-bottom-right-radius: 0px !important;
+  border-top-right-radius: 0px !important;
+}
 .ant-hw-form-item-colon:after {
   position: relative;
   top: -0.5px;
@@ -125,17 +160,6 @@
 .ant-hw-form-form-item .ant-form-item-label {
   overflow: visible;
 }
-.ant-form-item-has-error .ant-hw-input-group-body {
-  border-color: #ff4d4f !important;
-}
-.ant-form-item-has-error .ant-hw-input-group-active {
-  border-color: #ff4d4f !important;
-  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
-}
-.ant-form-item-has-error .ant-hw-input-group-addon {
-  color: #ff4d4f;
-  border-color: #ff4d4f !important;
-}
 .ant-hw-input-group {
   display: -webkit-box !important;
   display: -webkit-flex !important;
@@ -201,19 +225,6 @@
   border-color: #40a9ff;
   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
 }
-.ant-hw-input-group .ant-hw-input-group-addon {
-  display: -webkit-box !important;
-  display: -webkit-flex !important;
-  display: -ms-flexbox !important;
-  display: flex !important;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  padding: 0 11px;
-  background-color: #fafafa;
-  border: 1px solid #d9d9d9;
-}
 .ant-hw-color-box {
   width: 22px;
   height: 22px;
@@ -223,6 +234,13 @@
 .ant-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
+.ant-form-item-has-error .ant-hw-input-group-body {
+  border-color: #ff4d4f !important;
+}
+.ant-form-item-has-error .ant-hw-input-group-active {
+  border-color: #ff4d4f !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
 .ant-hw-switch {
   display: -webkit-box;
   display: -webkit-flex;
@@ -244,3 +262,20 @@
 .ant-hw-switch .ant-hw-switch-after {
   margin-left: 4px;
 }
+.ant-hw-addon {
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  padding: 0 11px;
+  background-color: #fafafa;
+  border: 1px solid #d9d9d9;
+}
+.ant-form-item-has-error .ant-hw-addon {
+  color: #ff4d4f;
+  border-color: #ff4d4f !important;
+}

package/lib/Input/InputNumberGroup.js

@@ -29,7 +29,7 @@ var Addon = function Addon(_ref) {
   var children = _ref.children,
     value = _ref.value,
     onChange = _ref.onChange;
-  var addonClassname = index.useClassName(["hw-input-group-addon"]);
+  var addonClassname = index.useClassName(["hw-addon"]);
   if (!children) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {});
   }

package/lib/Select/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var norHooks = require('./hooks/norHooks.js');
 var changeHooks = require('./hooks/changeHooks.js');
@@ -15,7 +15,7 @@ var AllSelect = require('./components/AllSelect.js');
 var index = require('../hooks/index.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch", "isList", "onPopupScroll"],
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch", "isList", "onPopupScroll", "addonBefore", "addonAfter"],
   _excluded2 = ["value", "label"];
 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; }
@@ -52,6 +52,8 @@ var Index = function Index(_ref) {
     var dispatch = _ref.dispatch,
     isList = _ref.isList,
     propsOnPopupScroll = _ref.onPopupScroll,
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
@@ -87,6 +89,12 @@ var Index = function Index(_ref) {
     options: resultData,
     fieldNames: fieldNames
   });
+  var boxClassName = index.useClassName("hw-select-box");
+  var addonBeforeClassName = index.useClassName("hw-group-addon-before");
+  var addonBeforeBoxClassName = index.useClassName("hw-select-box-addon-before");
+  var addonAfterClassName = index.useClassName("hw-group-addon-after");
+  var addonAfterBoxClassName = index.useClassName("hw-select-box-addon-after");
+  var addonClassname = index.useClassName(["hw-addon"]);
   var _useValueChange = changeHooks.useValueChange({
       labelInValue: labelInValue,
       onChange: onChange,
@@ -99,53 +107,62 @@ var Index = function Index(_ref) {
     val = _useValueChange.val,
     change = _useValueChange.change;
   addDispatchListener === null || addDispatchListener === void 0 || addDispatchListener("reload", reload);
-  return jsxRuntime.jsx(antd.Select, _objectSpread(_objectSpread({
+  return jsxRuntime.jsxs("div", {
+    className: "".concat(boxClassName, " ").concat(addonBefore ? addonBeforeBoxClassName : "", " ").concat(addonAfter ? addonAfterBoxClassName : ""),
     style: style,
-    mode: mode,
-    loading: loading,
-    value: val,
-    onSearch: onSearch,
-    onChange: change,
-    dropdownRender: function dropdownRender(node) {
-      return jsxRuntime.jsx(DropdownComponent.default, {
-        loading: loading,
-        reload: run,
-        error: error,
-        options: data,
-        children: jsxRuntime.jsx(AllSelect.default, {
-          allSelect: allSelect,
+    children: [addonBefore && jsxRuntime.jsx("div", {
+      className: "".concat(addonClassname, " ").concat(addonBeforeClassName),
+      children: addonBefore
+    }), jsxRuntime.jsx(antd.Select, _objectSpread(_objectSpread({
+      mode: mode,
+      loading: loading,
+      value: val,
+      onSearch: onSearch,
+      onChange: change,
+      dropdownRender: function dropdownRender(node) {
+        return jsxRuntime.jsx(DropdownComponent.default, {
+          loading: loading,
+          reload: run,
+          error: error,
           options: data,
-          mode: mode,
-          value: val,
-          onChange: change,
-          fieldNames: fieldNames,
-          children: node
-        })
-      });
-    },
-    optionLabelProp: optionLabelProp,
-    menuItemSelectedIcon: icon,
-    optionFilterProp: optionFilterProp,
-    filterOption: selfFilterOption,
-    showSearch: mathShowSearch,
-    labelInValue: true,
-    onPopupScroll: propsOnPopupScroll || onPopupScroll
-  }, props), {}, {
-    children: data === null || data === void 0 ? void 0 : data.map(function (item) {
-      var optionValue = item.value,
-        label = item.label,
-        oItem = _objectWithoutProperties(item, _excluded2);
-      var filterKey = filterProvider || "label";
-      var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
-      var filter = _defineProperty({}, optionFilterProp, result);
-      return /*#__PURE__*/React.createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
-        value: optionValue,
-        key: optionValue,
-        label: label,
-        mode: mode
-      }, filter), render ? render(item, val) : label);
-    })
-  }));
+          children: jsxRuntime.jsx(AllSelect.default, {
+            allSelect: allSelect,
+            options: data,
+            mode: mode,
+            value: val,
+            onChange: change,
+            fieldNames: fieldNames,
+            children: node
+          })
+        });
+      },
+      optionLabelProp: optionLabelProp,
+      menuItemSelectedIcon: icon,
+      optionFilterProp: optionFilterProp,
+      filterOption: selfFilterOption,
+      showSearch: mathShowSearch,
+      labelInValue: true,
+      onPopupScroll: propsOnPopupScroll || onPopupScroll
+    }, props), {}, {
+      children: data === null || data === void 0 ? void 0 : data.map(function (item) {
+        var optionValue = item.value,
+          label = item.label,
+          oItem = _objectWithoutProperties(item, _excluded2);
+        var filterKey = filterProvider || "label";
+        var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
+        var filter = _defineProperty({}, optionFilterProp, result);
+        return /*#__PURE__*/React.createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
+          value: optionValue,
+          key: optionValue,
+          label: label,
+          mode: mode
+        }, filter), render ? render(item, val) : label);
+      })
+    })), addonAfter && jsxRuntime.jsx("div", {
+      className: "".concat(addonClassname, " ").concat(addonAfterClassName),
+      children: addonAfter
+    })]
+  });
 };
 var HSelect = HFormConnect.default(Index);
 

package/lib/Select/modal.d.ts

@@ -36,6 +36,8 @@ export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder
     placeholder?: string;
     dispatch?: DispatchModal;
     isList?: boolean;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
 }
 export interface FilterDataModal {
     value: any;

package/lib/index.css

@@ -7,6 +7,41 @@
 .ant-hw-all-check-box .ant-select-item-option:not( .ant-select-item-option-selected):hover {
   background-color: #f5f5f5;
 }
+.ant-hw-select-box {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+}
+.ant-hw-select-box .ant-hw-group-addon-before {
+  border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+  border-right: 0px;
+}
+.ant-hw-select-box .ant-select {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+.ant-hw-select-box .ant-hw-group-addon-after {
+  border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+  border-left: 0px;
+}
+.ant-hw-select-box-addon-before .ant-select .ant-select-selector {
+  border-bottom-left-radius: 0px !important;
+  border-top-left-radius: 0px !important;
+}
+.ant-hw-select-box-addon-after .ant-select .ant-select-selector {
+  border-bottom-right-radius: 0px !important;
+  border-top-right-radius: 0px !important;
+}
 .ant-hw-form-item-colon:after {
   position: relative;
   top: -0.5px;
@@ -125,17 +160,6 @@
 .ant-hw-form-form-item .ant-form-item-label {
   overflow: visible;
 }
-.ant-form-item-has-error .ant-hw-input-group-body {
-  border-color: #ff4d4f !important;
-}
-.ant-form-item-has-error .ant-hw-input-group-active {
-  border-color: #ff4d4f !important;
-  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
-}
-.ant-form-item-has-error .ant-hw-input-group-addon {
-  color: #ff4d4f;
-  border-color: #ff4d4f !important;
-}
 .ant-hw-input-group {
   display: -webkit-box !important;
   display: -webkit-flex !important;
@@ -201,19 +225,6 @@
   border-color: #40a9ff;
   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
 }
-.ant-hw-input-group .ant-hw-input-group-addon {
-  display: -webkit-box !important;
-  display: -webkit-flex !important;
-  display: -ms-flexbox !important;
-  display: flex !important;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  padding: 0 11px;
-  background-color: #fafafa;
-  border: 1px solid #d9d9d9;
-}
 .ant-hw-color-box {
   width: 22px;
   height: 22px;
@@ -223,6 +234,13 @@
 .ant-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
+.ant-form-item-has-error .ant-hw-input-group-body {
+  border-color: #ff4d4f !important;
+}
+.ant-form-item-has-error .ant-hw-input-group-active {
+  border-color: #ff4d4f !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
 .ant-hw-switch {
   display: -webkit-box;
   display: -webkit-flex;
@@ -244,3 +262,20 @@
 .ant-hw-switch .ant-hw-switch-after {
   margin-left: 4px;
 }
+.ant-hw-addon {
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  padding: 0 11px;
+  background-color: #fafafa;
+  border: 1px solid #d9d9d9;
+}
+.ant-form-item-has-error .ant-hw-addon {
+  color: #ff4d4f;
+  border-color: #ff4d4f !important;
+}

package/package.json

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

package/src/components/Input/InputNumberGroup.tsx

@@ -32,7 +32,7 @@ const useArrayProps = (props: any) => {
   }, [props]);
 };
 const Addon: React.FC<IProps> = ({ children, value, onChange }) => {
-  const addonClassname = useClassName(["hw-input-group-addon"]);
+  const addonClassname = useClassName(["hw-addon"]);
   if (!children) {
     return <></>;
   }

package/src/components/Input/index.less

@@ -1,18 +1,6 @@
 @import "../styles/local.less";
 @all-input-group: ~"@{ant-prefix}-hw-input-group";
-.@{ant-prefix}-form-item-has-error {
-  .@{all-input-group}-body {
-    border-color: #ff4d4f !important;
-  }
-  .@{all-input-group}-active {
-    border-color: #ff4d4f !important;
-    box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
-  }
-  .@{all-input-group}-addon {
-    color: #ff4d4f;
-    border-color: #ff4d4f !important;
-  }
-}
+
 .@{all-input-group} {
   display: flex !important;
   width: 100%;
@@ -63,13 +51,6 @@
     border-color: #40a9ff;
     box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
   }
-  .@{all-input-group}-addon {
-    display: flex !important;
-    align-items: center;
-    padding: 0 11px;
-    background-color: #fafafa;
-    border: 1px solid #d9d9d9;
-  }
 }
 
 .@{ant-prefix}-hw-color-box {
@@ -81,3 +62,12 @@
 .@{ant-prefix}-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
+.@{ant-prefix}-form-item-has-error {
+  .@{all-input-group}-body {
+    border-color: #ff4d4f !important;
+  }
+  .@{all-input-group}-active {
+    border-color: #ff4d4f !important;
+    box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+  }
+}

package/src/components/Select/index.less

@@ -20,3 +20,38 @@
     }
   }
 }
+.@{ant-prefix}-hw-select-box{
+  display: flex;
+  flex-direction: row;
+
+  .@{ant-prefix}-hw-group-addon-before{
+    border-bottom-left-radius: 2px;
+    border-top-left-radius: 2px;
+    border-right: 0px;
+  }
+  .@{ant-prefix}-select{
+    flex: 1;
+  }
+  .@{ant-prefix}-hw-group-addon-after{
+    border-bottom-right-radius: 2px;
+    border-top-right-radius: 2px;
+    border-left: 0px;
+  }
+}
+.@{ant-prefix}-hw-select-box-addon-before{
+  .@{ant-prefix}-select{
+    .@{ant-prefix}-select-selector{
+      border-bottom-left-radius: 0px !important;
+      border-top-left-radius: 0px !important;
+    }
+  }
+}
+
+.@{ant-prefix}-hw-select-box-addon-after{
+  .@{ant-prefix}-select{
+    .@{ant-prefix}-select-selector{
+      border-bottom-right-radius: 0px !important;
+      border-top-right-radius: 0px !important;
+    }
+  }
+}

package/src/components/Select/index.tsx

@@ -1,4 +1,4 @@
-import { Select } from "antd";
+import { Select} from "antd";
 import React from "react";
 import { useFilterOption, useSelectReq } from "./hooks/norHooks";
 import { useValueChange } from "./hooks/changeHooks";
@@ -6,7 +6,7 @@ import type { HSelectProps } from "./modal";
 import { defaultModeConfig, defaultSelectConfig } from "./defaultConfig";
 import DropdownComponent from "./components/DropdownComponent";
 import AllSelect from "./components/AllSelect";
-import { useChangeOptions, useMatchConfigProps } from "../hooks";
+import {useChangeOptions, useClassName, useMatchConfigProps} from "../hooks";
 import HFormConnect from "../Form/HFormConnect";
 const { Option } = Select;
 
@@ -35,7 +35,8 @@ const Index: React.FC<HSelectProps> = ({
   dispatch,
   isList,
   onPopupScroll: propsOnPopupScroll,
-
+    addonBefore,
+    addonAfter,
   ...props
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
@@ -63,6 +64,13 @@ const Index: React.FC<HSelectProps> = ({
   }); //options
 
   const data = useChangeOptions({ options: resultData, fieldNames });
+  const boxClassName=useClassName("hw-select-box");
+  const addonBeforeClassName=useClassName("hw-group-addon-before");
+  const addonBeforeBoxClassName=useClassName("hw-select-box-addon-before");
+  const addonAfterClassName=useClassName("hw-group-addon-after");
+  const addonAfterBoxClassName=useClassName("hw-select-box-addon-after");
+  const addonClassname = useClassName(["hw-addon"]);
+
   const { val, change } = useValueChange({
     labelInValue,
     onChange,
@@ -74,65 +82,72 @@ const Index: React.FC<HSelectProps> = ({
   });
   addDispatchListener?.("reload", reload);
   return (
-    <Select
-      style={style}
-      mode={mode}
-      loading={loading}
-      value={val}
-      onSearch={onSearch}
-      onChange={change}
-      dropdownRender={(node) => {
-        return (
-          <DropdownComponent
-            loading={loading}
-            reload={run}
-            error={error}
-            options={data}
-          >
-            <AllSelect
-              allSelect={allSelect}
-              options={data}
-              mode={mode}
-              value={val}
-              onChange={change}
-              fieldNames={fieldNames}
-            >
-              {node}
-            </AllSelect>
-          </DropdownComponent> //全选
-        );
-      }}
-      optionLabelProp={optionLabelProp}
-      menuItemSelectedIcon={icon}
-      optionFilterProp={optionFilterProp}
-      filterOption={selfFilterOption}
-      showSearch={mathShowSearch}
-      labelInValue={true}
-      onPopupScroll={propsOnPopupScroll || onPopupScroll}
-      {...props}
-    >
-      {data?.map((item) => {
-        const { value: optionValue, label, ...oItem } = item;
-        const filterKey = filterProvider || "label";
-        const result =
-          typeof filterProvider === "function"
-            ? filterProvider?.(item)
-            : item[filterKey as string];
-        const filter = { [optionFilterProp]: result };
-        return (
-          <Option
-            {...oItem}
-            value={optionValue}
-            key={optionValue}
-            label={label}
+      <div className={`${boxClassName} ${addonBefore?addonBeforeBoxClassName:""} ${addonAfter?addonAfterBoxClassName:""}`}  style={style}>
+        {addonBefore&& <div className={`${addonClassname} ${addonBeforeClassName}`}>
+          {addonBefore}
+        </div>}
+        <Select
             mode={mode}
-            {...filter}
-          >
-            {render ? render(item, val) : label}
-          </Option>
-        );
-      })}
-    </Select>
+            loading={loading}
+            value={val}
+            onSearch={onSearch}
+            onChange={change}
+            dropdownRender={(node) => {
+              return (
+                  <DropdownComponent
+                      loading={loading}
+                      reload={run}
+                      error={error}
+                      options={data}
+                  >
+                    <AllSelect
+                        allSelect={allSelect}
+                        options={data}
+                        mode={mode}
+                        value={val}
+                        onChange={change}
+                        fieldNames={fieldNames}
+                    >
+                      {node}
+                    </AllSelect>
+                  </DropdownComponent> //全选
+              );
+            }}
+            optionLabelProp={optionLabelProp}
+            menuItemSelectedIcon={icon}
+            optionFilterProp={optionFilterProp}
+            filterOption={selfFilterOption}
+            showSearch={mathShowSearch}
+            labelInValue={true}
+            onPopupScroll={propsOnPopupScroll || onPopupScroll}
+            {...props}
+        >
+          {data?.map((item) => {
+            const { value: optionValue, label, ...oItem } = item;
+            const filterKey = filterProvider || "label";
+            const result =
+                typeof filterProvider === "function"
+                    ? filterProvider?.(item)
+                    : item[filterKey as string];
+            const filter = { [optionFilterProp]: result };
+            return (
+                <Option
+                    {...oItem}
+                    value={optionValue}
+                    key={optionValue}
+                    label={label}
+                    mode={mode}
+                    {...filter}
+                >
+                  {render ? render(item, val) : label}
+                </Option>
+            );
+          })}
+        </Select>
+        {addonAfter&&<div className={`${addonClassname} ${addonAfterClassName}`}>
+          {addonAfter}
+        </div>}
+      </div>
   );
 };
 export default HFormConnect(Index);

package/src/components/Select/modal.ts

@@ -39,6 +39,8 @@ export interface HSelectProps
   placeholder?: string;
   dispatch?: DispatchModal;
   isList?: boolean;
+  addonBefore?:React.ReactNode;
+  addonAfter?:React.ReactNode;
 }
 export interface FilterDataModal {
   value: any;

package/src/components/styles/index.less

@@ -2,3 +2,17 @@
 @import "../Form/index.less";
 @import "../Input/index.less";
 @import "../Switch/index.less";
+
+.@{ant-prefix}-hw-addon{
+  display: flex !important;
+  align-items: center;
+  padding: 0 11px;
+  background-color: #fafafa;
+  border: 1px solid #d9d9d9;
+}
+.@{ant-prefix}-form-item-has-error {
+  .@{ant-prefix}-hw-addon {
+    color: #ff4d4f;
+    border-color: #ff4d4f !important;
+  }
+}

package/src/pages/Form/index.tsx

@@ -80,8 +80,25 @@ const formData = (options) => {
       itemProps: {
         addonBefore: "前面",
         addonAfter: "后面",
+          disabled:true
       },
     },
+      {
+          name: "inputNumberGroup",
+          label: "inputNumber",
+          type:"inputNumberGroup",
+          rules: [
+              {
+                  validator: () => {
+                      return Promise.reject(new Error("错误"));
+                  },
+              },
+          ],
+          itemProps: {
+              addonBefore: "前面",
+              addonAfter: "后面",
+          },
+      },
       {
           label:"时间",
           name:"time",
@@ -90,6 +107,22 @@ const formData = (options) => {
               picker: 'month',
               placeholder: '请选择月份',
           },
+      },
+      {
+          label:"下拉",
+          name:"select",
+          type:'select',
+          rules: [
+              {
+                  validator: () => {
+                      return Promise.reject(new Error("错误"));
+                  },
+              },
+          ],
+          itemProps: {
+              addonBefore: "前面",
+              addonAfter: "后面",
+          },
       }
   ];
 };
@@ -136,39 +169,41 @@ export default () => {
         }}>
           点我
         </div>
-        <HForm
-          configData={formData(options)}
-          dismissOnPressEnter={false}
-          labelWidth={88}
-          form={form}
-          infoRequest={{
-            request:async ()=>{
-              if (id===1){
-                return {
-                    name:"你好"
-                };
-              }
-              return  {
+       <div style={{width:1000}}>
+           <HForm
+               configData={formData(options)}
+               dismissOnPressEnter={false}
+               labelWidth={88}
+               form={form}
+               infoRequest={{
+                   request:async ()=>{
+                       if (id===1){
+                           return {
+                               name:"你好"
+                           };
+                       }
+                       return  {
 
-              }
-            },
-            refreshDeps:[id]
-          }}
-          labelAlign={"left"}
-          onFinish={(value) => {
-            console.log(value, "onFinish");
-          }}
-          onValuesChange={(val) => {
-            console.log(val, "onValuesChange");
-          }}
-          request={(params) => {
-            return new Promise<any>((resolve) => {
-              setTimeout(() => {
-                resolve(params);
-              }, 3000);
-            });
-          }}
-        />
+                       }
+                   },
+                   refreshDeps:[id]
+               }}
+               labelAlign={"left"}
+               onFinish={(value) => {
+                   console.log(value, "onFinish");
+               }}
+               onValuesChange={(val) => {
+                   console.log(val, "onValuesChange");
+               }}
+               request={(params) => {
+                   return new Promise<any>((resolve) => {
+                       setTimeout(() => {
+                           resolve(params);
+                       }, 3000);
+                   });
+               }}
+           />
+       </div>
       </HFormConfigProvider>
       <div
         onClick={async () => {

package/src/pages/Select/index.tsx

@@ -10,6 +10,7 @@ export default () => {
       <HSelect
         placeholder="分页"
         serviceSearch
+        addonBefore="你好"
         allowClear={true}
         labelInValue
         fieldNames={{