@hw-component/form 1.9.41 → 1.9.43

package/lib/Text/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+var antd = require('antd');
+
+var HText = (function (_ref) {
+  var value = _ref.value;
+  return jsxRuntime.jsx(antd.Typography.Text, {
+    children: value
+  });
+});
+
+exports.default = HText;
+// powered by h

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.41",
+  "version": "1.9.43",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/CheckboxGroup/index.tsx

@@ -43,15 +43,15 @@ const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [name]: resultObj,
+          [(name as string)]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal = {} } = outputValue;
+        const { [(name as string)]: itemVal = {} } = outputValue;
         if (Array.isArray(itemVal)) {
           return {
-            [name]: itemVal,
+            [(name as string)]: itemVal,
           };
         }
         return {

package/src/components/Form/HFormConnect.tsx

@@ -44,27 +44,26 @@ export default (
     ref
   ) => {
     const { form, valueType = "float" } = useFormContext();
-
+    const { name } = props;
+    const relName=Array.isArray(name)?name.join("."):name;
     useEffect(() => {
-      const { name } = props;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form?.addFormat(name, formatMaker(props, format[valueType]));
+      form?.addFormat(relName, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     const addFormat = (aFormat: Record<string, addFormatItemModal>) => {
-      const { name } = props;
-      if (!name) {
+      if (!relName) {
         return;
       }
-      form?.addFormat(name, formatMaker(props, aFormat[valueType]));
+      form?.addFormat(relName, formatMaker(props, aFormat[valueType]));
     };
     const addDispatchListener = (key: string, fn: argsFn) => {
-      const { name, dispatch } = props;
-      if (!name) {
+      const {dispatch } = props;
+      if (!relName) {
         return;
       }
-      form?.addDispatchListener({ key, name, dispatch }, fn);
+      form?.addDispatchListener({ key, name:relName, dispatch }, fn);
     };
     const Component = component as React.ForwardRefRenderFunction<
       any,

package/src/components/Form/config.ts

@@ -21,6 +21,7 @@ import VerificationCodeInput from "../Input/VerificationCodeInput";
 import TrimInput from "../Input/TrimInput";
 import TrimTextArea from "../TextArea/TrimTextArea";
 import HInputNumberGroup from "../Input/InputNumberGroup";
+import HText from '../Text'
 export const placeholderConfig = {
   inputType: [
     "input",
@@ -64,6 +65,7 @@ const componentConfig = {
   trimTextArea: TrimTextArea,
   inputNumberGroup: HInputNumberGroup,
   treeSelect: HTreeSelect,
+  text: HText,
 };
 
 export default componentConfig;

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 <></>;
   }
@@ -80,11 +80,11 @@ const InputNumberGroup = ({
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         const { min: minKey, max: maxKey } = valueMap;
-        const cuValue = initValue[valueName];
+        const cuValue = initValue[(valueName as string)];
         const minInitVal = initValue[minKey];
         const maxInitVal = initValue[maxKey];
         return {
-          [valueName]: {
+          [(valueName as string)]: {
             [min]: minInitVal,
             [max]: maxInitVal,
             ...cuValue,
@@ -93,7 +93,7 @@ const InputNumberGroup = ({
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = {} } = outputValue;
+        const { [(valueName as string)]: itemVal = {} } = outputValue;
         const { min: minKey, max: maxKey } = valueMap;
         const {
           [minKey]: minSubVal,
@@ -103,7 +103,7 @@ const InputNumberGroup = ({
         return {
           [maxKey]: maxSubVal,
           [minKey]: minSubVal,
-          [valueName]: oItemVal,
+          [(valueName as string)]: oItemVal,
         };
       },
     },

package/src/components/Input/SelectInput.tsx

@@ -38,12 +38,12 @@ export const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [name]: resultObj,
+          [(name as string)]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal = {} } = outputValue;
+        const { [(name as string)]: itemVal = {} } = outputValue;
         const newItemVal = { [itemVal[select]]: itemVal[input] };
         return {
           ...newItemVal,

package/src/components/Input/TrimInput.tsx

@@ -8,14 +8,14 @@ const Index = ({ addFormat, ...props }: HInputProps) => {
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         return {
-          [valueName]: initValue[valueName],
+          [(valueName as string)]: initValue[(valueName as string)],
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal } = outputValue;
+        const { [(name as string)]: itemVal } = outputValue;
         return {
-          [name]: itemVal?.trim(),
+          [(name as string)]: itemVal?.trim(),
         };
       },
     },

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/TreeSelect.tsx

@@ -2,7 +2,7 @@ import { TreeSelect } from "antd";
 import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
 import { useRequest } from "ahooks";
-interface IProps extends TreeSelectProps {
+export interface HTreeSelectProps extends TreeSelectProps {
   request?: PromiseFnResult;
   onlyCheckChild?:boolean;
 }
@@ -29,7 +29,7 @@ const opMk=({options,onlyCheckChild=false,fieldNames}:OpMkParamsModal)=>{
         }
    })
 }
-export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: IProps) => {
+export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: HTreeSelectProps) => {
   const { loading, data } = useRequest(async () => {
     let options=treeData;
     if (request) {

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/Switch/index.tsx

@@ -56,18 +56,18 @@ const Index: React.FC<HSwitchProps> = ({
       inputValue: (item, initValue) => {
         const { close } = valueSwitchMap;
         const { name: valueName = "" } = item;
-        let val = initValue[valueName];
+        let val = initValue[(valueName as string)];
         if (typeof val === "undefined" || val === null) {
           val = close;
         }
         return {
-          [valueName]: val,
+          [(valueName as string)]: val,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
         return {
-          [name]: outputValue[name],
+          [(name as string)]: outputValue[(name as string)],
         };
       },
     },

package/src/components/TDPicker/RangePicker.tsx

@@ -62,12 +62,12 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
         });
         const hasKeys = Object.keys(resultObj).length !== 0;
         return {
-          [valueName]: hasKeys ? resultObj : null,
+          [(valueName as string)]: hasKeys ? resultObj : null,
         };
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = {} } = outputValue;
+        const { [(valueName as string)]: itemVal = {} } = outputValue;
         return {
           ...itemVal,
         };

package/src/components/Text/index.tsx

@@ -0,0 +1,6 @@
+import {Typography} from "antd";
+import {HFormItemProps} from "../Form/modal";
+
+export default ({value}:HFormItemProps)=>{
+    return <Typography.Text>{value}</Typography.Text>
+}

package/src/components/TextArea/TrimTextArea.tsx

@@ -12,14 +12,14 @@ const Index = ({ addFormat, ...props }: TrimTextAreaProps) => {
       inputValue: (item, initValue) => {
         const { name: valueName = "" } = item;
         return {
-          [valueName]: initValue[valueName],
+          [(valueName as string)]: initValue[(valueName as string)],
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [name]: itemVal } = outputValue;
+        const { [(name as string)]: itemVal } = outputValue;
         return {
-          [name]: itemVal?.trim(),
+          [(name as string)]: itemVal?.trim(),
         };
       },
     },

package/src/components/Upload/index.tsx

@@ -63,7 +63,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     float: {
       inputValue: (item, initValue) => {
         const { name = "" } = item;
-        const initFileList = initValue[name] || [];
+        const initFileList = initValue[(name as string)] || [];
         const relInitFileList =
           typeof initFileList === "string" ? [initFileList] : initFileList;
         const fileList = relInitFileList.map((itemData, index) => {
@@ -81,17 +81,17 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
           return { ...itemData };
         });
         return {
-          [name]: fileList,
+          [(name as string)]: fileList,
         };
       },
       outputValue: (item, outputValue) => {
         const { name: valueName = "" } = item;
-        const { [valueName]: itemVal = [] } = outputValue;
+        const { [(valueName as string)]: itemVal = [] } = outputValue;
         const urls = itemVal.map((fileItem) => {
           return fileItem.response.url;
         });
         return {
-          [valueName]: maxCount === 1 ? urls[0] : urls,
+          [(valueName as string)]: maxCount === 1 ? urls[0] : urls,
         };
       },
     },