@hw-component/form 0.0.4 → 0.0.5-beta-v1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/CheckboxGroup/CheckBox/index.d.ts +2 -5
- package/es/CheckboxGroup/CheckBox/index.js +15 -9
- package/es/CheckboxGroup/hooks.d.ts +1 -1
- package/es/CheckboxGroup/hooks.js +18 -19
- package/es/CheckboxGroup/index.d.ts +2 -3
- package/es/CheckboxGroup/index.js +70 -26
- package/es/CheckboxGroup/modal.d.ts +13 -0
- package/es/DialogForm/DrawerForm/Footer.d.ts +7 -0
- package/es/DialogForm/DrawerForm/Footer.js +27 -0
- package/es/DialogForm/DrawerForm/Title.d.ts +3 -0
- package/es/DialogForm/DrawerForm/Title.js +21 -0
- package/es/DialogForm/DrawerForm/index.d.ts +3 -0
- package/es/DialogForm/DrawerForm/index.js +138 -0
- package/es/DialogForm/ModalForm.d.ts +3 -0
- package/es/DialogForm/ModalForm.js +119 -0
- package/es/DialogForm/hooks.d.ts +16 -0
- package/es/DialogForm/hooks.js +150 -0
- package/es/DialogForm/modal.d.ts +33 -0
- package/es/Form/Context/FormConfigProvider.d.ts +5 -0
- package/es/Form/Context/FormConfigProvider.js +49 -0
- package/es/Form/Context/index.d.ts +5 -0
- package/es/Form/Context/index.js +11 -0
- package/es/Form/FormItem/BasicItem.d.ts +4 -0
- package/es/Form/FormItem/BasicItem.js +93 -0
- package/es/Form/FormItem/Helper.d.ts +7 -0
- package/es/Form/FormItem/Helper.js +26 -0
- package/es/Form/FormItem/RegularFormItem.d.ts +3 -0
- package/es/Form/FormItem/RegularFormItem.js +25 -0
- package/es/Form/FormItem/UpFormItem.d.ts +3 -0
- package/es/Form/FormItem/UpFormItem.js +43 -0
- package/es/Form/FormItem/hooks.d.ts +8 -0
- package/es/Form/FormItem/hooks.js +38 -0
- package/es/Form/FormItem/index.d.ts +3 -0
- package/es/Form/FormItem/index.js +22 -0
- package/es/Form/HFormConnect.d.ts +5 -0
- package/es/Form/HFormConnect.js +68 -0
- package/es/Form/InitSet.d.ts +2 -0
- package/es/Form/InitSet.js +16 -0
- package/es/Form/Label.d.ts +10 -0
- package/es/Form/Label.js +49 -0
- package/es/Form/config.d.ts +29 -0
- package/es/Form/config.js +45 -0
- package/es/Form/hooks/index.d.ts +16 -0
- package/es/Form/hooks/index.js +158 -0
- package/es/Form/hooks/useDefaultRender.d.ts +3 -0
- package/es/Form/hooks/useDefaultRender.js +49 -0
- package/es/Form/hooks/useHForm.d.ts +3 -0
- package/es/Form/hooks/useHForm.js +194 -0
- package/es/Form/hooks/useInitConfigData.d.ts +8 -0
- package/es/Form/hooks/useInitConfigData.js +172 -0
- package/es/Form/index.d.ts +3 -0
- package/es/Form/index.js +103 -0
- package/es/Form/modal.d.ts +123 -0
- package/es/Input/ButtonInput.d.ts +2 -2
- package/es/Input/ButtonInput.js +34 -19
- package/es/Input/ColorInput/Picker.d.ts +3 -0
- package/es/Input/ColorInput/Picker.js +22 -0
- package/es/Input/ColorInput/data.d.ts +1 -0
- package/es/Input/ColorInput/data.js +5 -0
- package/es/Input/ColorInput/index.d.ts +3 -0
- package/es/Input/ColorInput/index.js +87 -0
- package/es/Input/InputNumber.d.ts +0 -1
- package/es/Input/InputNumber.js +18 -8
- package/es/Input/SelectInput.d.ts +2 -1
- package/es/Input/SelectInput.js +43 -14
- package/es/Input/defaultConfig.js +2 -2
- package/es/Input/index.d.ts +0 -1
- package/es/Input/index.js +17 -6
- package/es/Input/modal.d.ts +30 -0
- package/es/PageHandler/ErrorComponent.d.ts +3 -0
- package/es/PageHandler/ErrorComponent.js +38 -0
- package/es/PageHandler/LoadingComponent.d.ts +2 -0
- package/es/PageHandler/LoadingComponent.js +19 -0
- package/es/PageHandler/index.d.ts +4 -0
- package/es/PageHandler/index.js +26 -0
- package/es/PageHandler/modal.d.ts +6 -0
- package/es/RadioGroup/index.d.ts +2 -3
- package/es/RadioGroup/index.js +25 -10
- package/es/Select/components/AllSelect.d.ts +3 -4
- package/es/Select/components/AllSelect.js +36 -18
- package/es/Select/components/CheckBoxOption.js +8 -6
- package/es/Select/components/DropdownComponent.js +18 -13
- package/es/Select/components/NoFindItem.d.ts +0 -1
- package/es/Select/components/NoFindItem.js +7 -6
- package/es/Select/components/NotFoundContent.d.ts +0 -1
- package/es/Select/components/NotFoundContent.js +25 -22
- package/es/Select/defaultConfig.d.ts +0 -1
- package/es/Select/defaultConfig.js +5 -5
- package/es/Select/hooks/changeHooks.js +7 -4
- package/es/Select/hooks/norHooks.d.ts +10 -3
- package/es/Select/hooks/norHooks.js +53 -17
- package/es/Select/index.d.ts +2 -3
- package/es/Select/index.js +65 -36
- package/es/Select/modal.d.ts +9 -1
- package/es/Select/utils.js +2 -2
- package/es/Submit/index.d.ts +9 -0
- package/es/Submit/index.js +55 -0
- package/es/Switch/index.d.ts +4 -3
- package/es/Switch/index.js +37 -18
- package/es/TDPicker/RangePicker.d.ts +8 -0
- package/es/TDPicker/RangePicker.js +126 -0
- package/es/TDPicker/TimePicker.d.ts +3 -0
- package/es/TDPicker/TimePicker.js +45 -0
- package/es/TDPicker/hooks.d.ts +33 -0
- package/es/TDPicker/hooks.js +132 -0
- package/es/TDPicker/index.d.ts +4 -0
- package/es/TDPicker/index.js +48 -0
- package/es/TDPicker/modal.d.ts +35 -0
- package/es/TextArea/index.d.ts +3 -0
- package/es/TextArea/index.js +31 -0
- package/es/Upload/Btn.d.ts +3 -0
- package/es/Upload/Btn.js +36 -0
- package/es/Upload/MediaTypeEle/TypeEle.d.ts +9 -0
- package/es/Upload/MediaTypeEle/TypeEle.js +42 -0
- package/es/Upload/MediaTypeEle/index.d.ts +3 -0
- package/es/Upload/MediaTypeEle/index.js +37 -0
- package/es/Upload/Preview/index.d.ts +5 -0
- package/es/Upload/Preview/index.js +22 -0
- package/es/Upload/UrlUpload/index.d.ts +3 -0
- package/es/Upload/UrlUpload/index.js +132 -0
- package/es/Upload/enums.d.ts +5 -0
- package/es/Upload/enums.js +10 -0
- package/es/Upload/hooks/change.d.ts +3 -0
- package/es/Upload/hooks/change.js +109 -0
- package/es/Upload/hooks/customRequest.d.ts +3 -0
- package/es/Upload/hooks/customRequest.js +132 -0
- package/es/Upload/hooks/propsMaker.d.ts +2 -0
- package/es/Upload/hooks/propsMaker.js +37 -0
- package/es/Upload/index.d.ts +3 -0
- package/es/Upload/index.js +144 -0
- package/es/Upload/modal.d.ts +30 -0
- package/es/Upload/util.d.ts +5 -0
- package/es/Upload/util.js +34 -0
- package/es/config.d.ts +2 -14
- package/es/config.js +57 -10
- package/{lib/hooks/useChangeOptions.d.ts → es/hooks/index.d.ts} +3 -0
- package/es/hooks/index.js +75 -0
- package/es/index.css +42 -1
- package/es/index.d.ts +26 -11
- package/es/index.js +33 -13
- package/es/modal.d.ts +16 -0
- package/lib/CheckboxGroup/CheckBox/index.d.ts +2 -5
- package/lib/CheckboxGroup/CheckBox/index.js +12 -6
- package/lib/CheckboxGroup/hooks.d.ts +1 -1
- package/lib/CheckboxGroup/hooks.js +16 -17
- package/lib/CheckboxGroup/index.d.ts +2 -3
- package/lib/CheckboxGroup/index.js +68 -24
- package/lib/CheckboxGroup/modal.d.ts +13 -0
- package/lib/DialogForm/DrawerForm/Footer.d.ts +7 -0
- package/lib/DialogForm/DrawerForm/Footer.js +30 -0
- package/lib/DialogForm/DrawerForm/Title.d.ts +3 -0
- package/lib/DialogForm/DrawerForm/Title.js +24 -0
- package/lib/DialogForm/DrawerForm/index.d.ts +3 -0
- package/lib/DialogForm/DrawerForm/index.js +141 -0
- package/lib/DialogForm/ModalForm.d.ts +3 -0
- package/lib/DialogForm/ModalForm.js +122 -0
- package/lib/DialogForm/hooks.d.ts +16 -0
- package/lib/DialogForm/hooks.js +154 -0
- package/lib/DialogForm/modal.d.ts +33 -0
- package/lib/Form/Context/FormConfigProvider.d.ts +5 -0
- package/lib/Form/Context/FormConfigProvider.js +53 -0
- package/lib/Form/Context/index.d.ts +5 -0
- package/lib/Form/Context/index.js +14 -0
- package/lib/Form/FormItem/BasicItem.d.ts +4 -0
- package/lib/Form/FormItem/BasicItem.js +96 -0
- package/lib/Form/FormItem/Helper.d.ts +7 -0
- package/lib/Form/FormItem/Helper.js +29 -0
- package/lib/Form/FormItem/RegularFormItem.d.ts +3 -0
- package/lib/Form/FormItem/RegularFormItem.js +28 -0
- package/lib/Form/FormItem/UpFormItem.d.ts +3 -0
- package/lib/Form/FormItem/UpFormItem.js +46 -0
- package/lib/Form/FormItem/hooks.d.ts +8 -0
- package/lib/Form/FormItem/hooks.js +41 -0
- package/lib/Form/FormItem/index.d.ts +3 -0
- package/lib/Form/FormItem/index.js +25 -0
- package/lib/Form/HFormConnect.d.ts +5 -0
- package/lib/Form/HFormConnect.js +71 -0
- package/lib/Form/InitSet.d.ts +2 -0
- package/lib/Form/InitSet.js +19 -0
- package/lib/Form/Label.d.ts +10 -0
- package/lib/Form/Label.js +52 -0
- package/lib/Form/config.d.ts +29 -0
- package/lib/Form/config.js +49 -0
- package/lib/Form/hooks/index.d.ts +16 -0
- package/lib/Form/hooks/index.js +162 -0
- package/lib/Form/hooks/useDefaultRender.d.ts +3 -0
- package/lib/Form/hooks/useDefaultRender.js +50 -0
- package/lib/Form/hooks/useHForm.d.ts +3 -0
- package/lib/Form/hooks/useHForm.js +197 -0
- package/lib/Form/hooks/useInitConfigData.d.ts +8 -0
- package/lib/Form/hooks/useInitConfigData.js +175 -0
- package/lib/Form/index.d.ts +3 -0
- package/lib/Form/index.js +106 -0
- package/lib/Form/modal.d.ts +123 -0
- package/lib/Input/ButtonInput.d.ts +2 -2
- package/lib/Input/ButtonInput.js +32 -17
- package/lib/Input/ColorInput/Picker.d.ts +3 -0
- package/lib/Input/ColorInput/Picker.js +25 -0
- package/lib/Input/ColorInput/data.d.ts +1 -0
- package/lib/Input/ColorInput/data.js +6 -0
- package/lib/Input/ColorInput/index.d.ts +3 -0
- package/lib/Input/ColorInput/index.js +90 -0
- package/lib/Input/InputNumber.d.ts +0 -1
- package/lib/Input/InputNumber.js +15 -5
- package/lib/Input/SelectInput.d.ts +2 -1
- package/lib/Input/SelectInput.js +42 -12
- package/lib/Input/index.d.ts +0 -1
- package/lib/Input/index.js +15 -4
- package/lib/Input/modal.d.ts +30 -0
- package/lib/PageHandler/ErrorComponent.d.ts +3 -0
- package/lib/PageHandler/ErrorComponent.js +41 -0
- package/lib/PageHandler/LoadingComponent.d.ts +2 -0
- package/lib/PageHandler/LoadingComponent.js +22 -0
- package/lib/PageHandler/index.d.ts +4 -0
- package/lib/PageHandler/index.js +29 -0
- package/lib/PageHandler/modal.d.ts +6 -0
- package/lib/RadioGroup/index.d.ts +2 -3
- package/lib/RadioGroup/index.js +23 -8
- package/lib/Select/components/AllSelect.d.ts +3 -4
- package/lib/Select/components/AllSelect.js +34 -16
- package/lib/Select/components/CheckBoxOption.js +6 -4
- package/lib/Select/components/DropdownComponent.js +16 -11
- package/lib/Select/components/NoFindItem.d.ts +0 -1
- package/lib/Select/components/NoFindItem.js +5 -4
- package/lib/Select/components/NotFoundContent.d.ts +0 -1
- package/lib/Select/components/NotFoundContent.js +23 -20
- package/lib/Select/defaultConfig.d.ts +0 -1
- package/lib/Select/defaultConfig.js +3 -3
- package/lib/Select/hooks/changeHooks.js +5 -2
- package/lib/Select/hooks/norHooks.d.ts +10 -3
- package/lib/Select/hooks/norHooks.js +50 -14
- package/lib/Select/index.d.ts +2 -3
- package/lib/Select/index.js +62 -33
- package/lib/Select/modal.d.ts +9 -1
- package/lib/Submit/index.d.ts +9 -0
- package/lib/Submit/index.js +58 -0
- package/lib/Switch/index.d.ts +4 -3
- package/lib/Switch/index.js +34 -15
- package/lib/TDPicker/RangePicker.d.ts +8 -0
- package/lib/TDPicker/RangePicker.js +129 -0
- package/lib/TDPicker/TimePicker.d.ts +3 -0
- package/lib/TDPicker/TimePicker.js +48 -0
- package/lib/TDPicker/hooks.d.ts +33 -0
- package/lib/TDPicker/hooks.js +139 -0
- package/lib/TDPicker/index.d.ts +4 -0
- package/lib/TDPicker/index.js +51 -0
- package/lib/TDPicker/modal.d.ts +35 -0
- package/lib/TextArea/index.d.ts +3 -0
- package/lib/TextArea/index.js +34 -0
- package/lib/Upload/Btn.d.ts +3 -0
- package/lib/Upload/Btn.js +39 -0
- package/lib/Upload/MediaTypeEle/TypeEle.d.ts +9 -0
- package/lib/Upload/MediaTypeEle/TypeEle.js +45 -0
- package/lib/Upload/MediaTypeEle/index.d.ts +3 -0
- package/lib/Upload/MediaTypeEle/index.js +40 -0
- package/lib/Upload/Preview/index.d.ts +5 -0
- package/lib/Upload/Preview/index.js +25 -0
- package/lib/Upload/UrlUpload/index.d.ts +3 -0
- package/lib/Upload/UrlUpload/index.js +135 -0
- package/lib/Upload/enums.d.ts +5 -0
- package/lib/Upload/enums.js +9 -0
- package/lib/Upload/hooks/change.d.ts +3 -0
- package/lib/Upload/hooks/change.js +110 -0
- package/lib/Upload/hooks/customRequest.d.ts +3 -0
- package/lib/Upload/hooks/customRequest.js +133 -0
- package/lib/Upload/hooks/propsMaker.d.ts +2 -0
- package/lib/Upload/hooks/propsMaker.js +38 -0
- package/lib/Upload/index.d.ts +3 -0
- package/lib/Upload/index.js +147 -0
- package/lib/Upload/modal.d.ts +30 -0
- package/lib/Upload/util.d.ts +5 -0
- package/lib/Upload/util.js +38 -0
- package/lib/config.d.ts +2 -14
- package/lib/config.js +55 -8
- package/{es/hooks/useChangeOptions.d.ts → lib/hooks/index.d.ts} +3 -0
- package/lib/hooks/index.js +78 -0
- package/lib/index.css +42 -1
- package/lib/index.d.ts +26 -11
- package/lib/index.js +52 -23
- package/lib/modal.d.ts +16 -0
- package/package.json +7 -4
- package/scripts/rollup.config.js +2 -4
- package/scripts/webpack.config.js +5 -8
- package/src/Layout.tsx +4 -4
- package/src/components/CheckboxGroup/CheckBox/index.tsx +7 -7
- package/src/components/CheckboxGroup/hooks.ts +12 -13
- package/src/components/CheckboxGroup/index.tsx +40 -7
- package/src/components/CheckboxGroup/{modal.d.ts → modal.ts} +4 -1
- package/src/components/DialogForm/DrawerForm/Footer.tsx +20 -0
- package/src/components/DialogForm/DrawerForm/Title.tsx +12 -0
- package/src/components/DialogForm/DrawerForm/index.tsx +95 -0
- package/src/components/DialogForm/ModalForm.tsx +77 -0
- package/src/components/DialogForm/hooks.ts +109 -0
- package/src/components/DialogForm/modal.ts +36 -0
- package/src/components/Form/Context/FormConfigProvider.tsx +38 -0
- package/src/components/Form/Context/index.tsx +14 -0
- package/src/components/Form/FormItem/BasicItem.tsx +76 -0
- package/src/components/Form/FormItem/Helper.tsx +25 -0
- package/src/components/Form/FormItem/RegularFormItem.tsx +7 -0
- package/src/components/Form/FormItem/UpFormItem.tsx +20 -0
- package/src/components/Form/FormItem/hooks.tsx +40 -0
- package/src/components/Form/FormItem/index.tsx +8 -0
- package/src/components/Form/HFormConnect.tsx +67 -0
- package/src/components/Form/InitSet.tsx +10 -0
- package/src/components/Form/Label.tsx +50 -0
- package/src/components/Form/config.ts +43 -0
- package/src/components/Form/hooks/index.ts +111 -0
- package/src/components/Form/hooks/useDefaultRender.tsx +42 -0
- package/src/components/Form/hooks/useHForm.ts +164 -0
- package/src/components/Form/hooks/useInitConfigData.tsx +194 -0
- package/src/components/Form/index.less +22 -0
- package/src/components/Form/index.tsx +85 -0
- package/src/components/Form/modal.ts +179 -0
- package/src/components/Input/ButtonInput.tsx +11 -5
- package/src/components/Input/ColorInput/Picker.tsx +18 -0
- package/src/components/Input/ColorInput/data.ts +102 -0
- package/src/components/Input/ColorInput/index.less +10 -0
- package/src/components/Input/ColorInput/index.tsx +48 -0
- package/src/components/Input/SelectInput.tsx +33 -3
- package/src/components/Input/modal.ts +36 -0
- package/src/components/PageHandler/ErrorComponent.tsx +20 -0
- package/src/components/PageHandler/LoadingComponent.tsx +9 -0
- package/src/components/PageHandler/index.tsx +14 -0
- package/src/components/PageHandler/modal.ts +6 -0
- package/src/components/RadioGroup/index.tsx +8 -4
- package/src/components/Select/components/AllSelect.tsx +28 -17
- package/src/components/Select/components/DropdownComponent.tsx +1 -0
- package/src/components/Select/components/NotFoundContent.tsx +1 -1
- package/src/components/Select/hooks/changeHooks.tsx +6 -2
- package/src/components/Select/hooks/norHooks.ts +33 -6
- package/src/components/Select/index.less +20 -4
- package/src/components/Select/index.tsx +25 -11
- package/src/components/Select/modal.ts +17 -8
- package/src/components/Submit/index.tsx +46 -0
- package/src/components/Switch/index.tsx +14 -9
- package/src/components/TDPicker/RangePicker.tsx +109 -0
- package/src/components/TDPicker/TimePicker.tsx +25 -0
- package/src/components/TDPicker/hooks.ts +150 -0
- package/src/components/TDPicker/index.tsx +28 -0
- package/src/components/TDPicker/modal.ts +46 -0
- package/src/components/TextArea/index.tsx +8 -0
- package/src/components/Upload/Btn.tsx +24 -0
- package/src/components/Upload/MediaTypeEle/TypeEle.tsx +26 -0
- package/src/components/Upload/MediaTypeEle/index.tsx +34 -0
- package/src/components/Upload/Preview/index.tsx +14 -0
- package/src/components/Upload/UrlUpload/index.tsx +91 -0
- package/src/components/Upload/enums.ts +5 -0
- package/src/components/Upload/hooks/change.ts +79 -0
- package/src/components/Upload/hooks/customRequest.ts +87 -0
- package/src/components/Upload/hooks/propsMaker.ts +20 -0
- package/src/components/Upload/index.tsx +119 -0
- package/src/components/Upload/modal.ts +33 -0
- package/src/components/Upload/util.ts +27 -0
- package/src/components/config.ts +35 -8
- package/src/components/hooks/index.ts +53 -0
- package/src/components/index.tsx +30 -11
- package/src/components/modal.ts +20 -0
- package/src/components/styles/index.less +3 -0
- package/src/components/styles/local.less +1 -1
- package/src/components/typings.d.ts +0 -5
- package/src/pages/Checkbox/index.tsx +4 -5
- package/src/pages/DatePicker/index.tsx +20 -2
- package/src/pages/DrawerForm/index.tsx +127 -0
- package/src/pages/Form/index.tsx +203 -0
- package/src/pages/Input/index.tsx +2 -0
- package/src/pages/ModalForm/index.tsx +147 -0
- package/src/pages/Select/index.tsx +6 -3
- package/src/pages/Switch/index.tsx +1 -1
- package/src/pages/Upload/index.tsx +14 -0
- package/src/routes.tsx +24 -0
- package/tsconfig.json +1 -1
- package/es/DatePicker/RangePicker.d.ts +0 -4
- package/es/DatePicker/RangePicker.js +0 -23
- package/es/DatePicker/index.d.ts +0 -4
- package/es/DatePicker/index.js +0 -39
- package/es/TimePicker/index.d.ts +0 -2
- package/es/hooks/useChangeOptions.js +0 -25
- package/es/hooks/useClassName.d.ts +0 -1
- package/es/hooks/useClassName.js +0 -15
- package/lib/DatePicker/RangePicker.d.ts +0 -4
- package/lib/DatePicker/RangePicker.js +0 -26
- package/lib/DatePicker/index.d.ts +0 -4
- package/lib/DatePicker/index.js +0 -42
- package/lib/TimePicker/index.d.ts +0 -2
- package/lib/hooks/useChangeOptions.js +0 -26
- package/lib/hooks/useClassName.d.ts +0 -1
- package/lib/hooks/useClassName.js +0 -16
- package/src/components/DatePicker/RangePicker.tsx +0 -19
- package/src/components/DatePicker/index.tsx +0 -38
- package/src/components/DatePicker/modal.d.ts +0 -17
- package/src/components/Input/modal.d.ts +0 -26
- package/src/components/TimePicker/index.tsx +0 -1
- package/src/components/hooks/useChangeOptions.ts +0 -22
- package/src/components/hooks/useClassName.ts +0 -9
package/src/components/config.ts
CHANGED
|
@@ -1,14 +1,41 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import moment from "moment";
|
|
2
|
+
import type { IFormConfigContextProps } from "./Form/modal";
|
|
3
|
+
import { fileToBase64 } from "./Upload/util";
|
|
4
|
+
export const baseConfig: IFormConfigContextProps = {
|
|
5
|
+
fieldNames: {
|
|
3
6
|
label: "label",
|
|
4
7
|
value: "value",
|
|
5
8
|
},
|
|
6
|
-
|
|
7
|
-
checked:
|
|
8
|
-
noChecked:
|
|
9
|
+
valueCheckMap: {
|
|
10
|
+
checked: 1,
|
|
11
|
+
noChecked: 0,
|
|
9
12
|
},
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
valueSwitchMap: {
|
|
14
|
+
open: 1,
|
|
15
|
+
close: 0,
|
|
13
16
|
},
|
|
17
|
+
valueRangePickerValueMap: {
|
|
18
|
+
start: (name) => {
|
|
19
|
+
return `${name}StartTime`;
|
|
20
|
+
},
|
|
21
|
+
end: (name) => {
|
|
22
|
+
return `${name}EndTime`;
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
dateRanges: {
|
|
26
|
+
最近三天: [moment().subtract(2, "days").startOf("days"), moment()],
|
|
27
|
+
最近七天: [moment().subtract(6, "days").startOf("days"), moment()],
|
|
28
|
+
最近三十天: [moment().subtract(29, "days").startOf("days"), moment()],
|
|
29
|
+
},
|
|
30
|
+
uploadProps: {
|
|
31
|
+
exFiles: ["JPG", "PNG", "JPEG", "GIF"],
|
|
32
|
+
request: async (file: any) => {
|
|
33
|
+
const url = await fileToBase64(file);
|
|
34
|
+
return {
|
|
35
|
+
url,
|
|
36
|
+
};
|
|
37
|
+
},
|
|
38
|
+
maxSize: 1024 * 1024 * 1.8,
|
|
39
|
+
},
|
|
40
|
+
defaultComponent: {},
|
|
14
41
|
};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { useContext, useMemo } from "react";
|
|
2
|
+
import type { SelectProps } from "antd";
|
|
3
|
+
import { ConfigContext } from "antd/es/config-provider";
|
|
4
|
+
import type { IFormConfigContextProps } from "../Form/modal";
|
|
5
|
+
import { useFormConfigContext } from "../Form/Context/FormConfigProvider";
|
|
6
|
+
|
|
7
|
+
interface UseChangeOptionsParams {
|
|
8
|
+
options?: Record<string, any>[];
|
|
9
|
+
fieldNames?: SelectProps["fieldNames"];
|
|
10
|
+
}
|
|
11
|
+
export const useChangeOptions = ({
|
|
12
|
+
options,
|
|
13
|
+
fieldNames = {},
|
|
14
|
+
}: UseChangeOptionsParams) => {
|
|
15
|
+
return useMemo(() => {
|
|
16
|
+
return options?.map((item) => {
|
|
17
|
+
const { label = "", value = "" } = fieldNames;
|
|
18
|
+
const { [label]: relLabel, [value]: relVal, ...oItem } = item;
|
|
19
|
+
return {
|
|
20
|
+
...oItem,
|
|
21
|
+
label: relLabel,
|
|
22
|
+
value: relVal,
|
|
23
|
+
};
|
|
24
|
+
});
|
|
25
|
+
}, [options]);
|
|
26
|
+
}; //options组装
|
|
27
|
+
|
|
28
|
+
export const useClassName = (className: string | string[]) => {
|
|
29
|
+
const config = useContext(ConfigContext);
|
|
30
|
+
return useMemo(() => {
|
|
31
|
+
if (Array.isArray(className)) {
|
|
32
|
+
const classNames = className.map((item) => {
|
|
33
|
+
return `${config.getPrefixCls()}-${item}`;
|
|
34
|
+
});
|
|
35
|
+
return classNames.join(" ");
|
|
36
|
+
}
|
|
37
|
+
return `${config.getPrefixCls()}-${className}`;
|
|
38
|
+
}, [className]);
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
export const useMatchConfigProps = (matchProps: IFormConfigContextProps) => {
|
|
42
|
+
const globalConfig = useFormConfigContext();
|
|
43
|
+
const keys = Object.keys(matchProps);
|
|
44
|
+
const resultMatchProps: IFormConfigContextProps = {};
|
|
45
|
+
keys.forEach((key) => {
|
|
46
|
+
if (!matchProps[key]) {
|
|
47
|
+
resultMatchProps[key] = globalConfig[key];
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
resultMatchProps[key] = matchProps[key];
|
|
51
|
+
});
|
|
52
|
+
return resultMatchProps;
|
|
53
|
+
}; //匹配全局配置
|
package/src/components/index.tsx
CHANGED
|
@@ -1,11 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
export { default as
|
|
5
|
-
export { default as
|
|
6
|
-
export {
|
|
7
|
-
export { default as
|
|
8
|
-
export { default as
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
import "./styles/index.less";
|
|
2
|
+
import FormConfig from "./Form/config";
|
|
3
|
+
import PageHandler from "./PageHandler";
|
|
4
|
+
export { default as HForm } from "./Form";
|
|
5
|
+
export { default as useHForm } from "./Form/hooks/useHForm";
|
|
6
|
+
export { useHDialogForm } from "./DialogForm/hooks";
|
|
7
|
+
export { default as HFormConnect } from "./Form/HFormConnect";
|
|
8
|
+
export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
|
|
9
|
+
|
|
10
|
+
import ModalForm from "./DialogForm/ModalForm";
|
|
11
|
+
import DrawerForm from "./DialogForm/DrawerForm";
|
|
12
|
+
export const HSelect = FormConfig.select;
|
|
13
|
+
export const HInput = FormConfig.input;
|
|
14
|
+
export const HSelectInput = FormConfig.selectInput;
|
|
15
|
+
export const HUpload = FormConfig.upload;
|
|
16
|
+
export const HUrlUpload = FormConfig.urlUpload;
|
|
17
|
+
export const HButtonInput = FormConfig.buttonInput;
|
|
18
|
+
export const HCheckBox = FormConfig.checkBox;
|
|
19
|
+
export const HSwitch = FormConfig.switch;
|
|
20
|
+
export const HCheckboxGroup = FormConfig.checkboxGroup;
|
|
21
|
+
export const HDatePicker = FormConfig.datePicker;
|
|
22
|
+
export const HRangePicker = FormConfig.rangePicker.Component;
|
|
23
|
+
export const HRadioGroup = FormConfig.radioGroup;
|
|
24
|
+
export const HTimePicker = FormConfig.timePicker;
|
|
25
|
+
export const HInputNumber = FormConfig.inputNumber;
|
|
26
|
+
export const HPageHandler = PageHandler;
|
|
27
|
+
export const HTextArea = FormConfig.textArea;
|
|
28
|
+
export const HColorInput = FormConfig.colorInput;
|
|
29
|
+
export const HModalForm = ModalForm;
|
|
30
|
+
export const HDrawerForm = DrawerForm;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export interface ValueCheckMapModal {
|
|
2
|
+
checked?: any;
|
|
3
|
+
noChecked?: any;
|
|
4
|
+
}
|
|
5
|
+
export type PromiseFnResult<T = any, R = any> = (
|
|
6
|
+
params: T,
|
|
7
|
+
formDataValues?: any
|
|
8
|
+
) => Promise<R>;
|
|
9
|
+
export interface ValueSwitchMapModal {
|
|
10
|
+
open?: any;
|
|
11
|
+
close?: any;
|
|
12
|
+
}
|
|
13
|
+
export interface DataFnProvider<P = any, R = any> {
|
|
14
|
+
(name: P): R;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export interface DateRangePickerValueMapModal {
|
|
18
|
+
start?: string | DataFnProvider<string, string>;
|
|
19
|
+
end?: string | DataFnProvider<string, string>;
|
|
20
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
@ant-prefix:ant;
|
|
1
|
+
@ant-prefix: ant;
|
|
@@ -4,12 +4,11 @@ export default () => {
|
|
|
4
4
|
return (
|
|
5
5
|
<Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
|
|
6
6
|
<HCheckboxGroup
|
|
7
|
-
options={[
|
|
7
|
+
options={[
|
|
8
|
+
{ label: "测试", value: "uu" },
|
|
9
|
+
{ label: "测试1", value: "uu1" },
|
|
10
|
+
]}
|
|
8
11
|
value={{ uu: 0 }}
|
|
9
|
-
onChange={(value) => {
|
|
10
|
-
console.log(value);
|
|
11
|
-
}}
|
|
12
|
-
valueCheckMap={{ checked: 1, noChecked: 0 }}
|
|
13
12
|
/>
|
|
14
13
|
</Space>
|
|
15
14
|
);
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Space } from "antd";
|
|
2
|
-
import { HDatePicker, HRangePicker } from "../../components";
|
|
2
|
+
import { HDatePicker, HRangePicker, HTimePicker } from "../../components";
|
|
3
|
+
import { useState } from "react";
|
|
3
4
|
export default () => {
|
|
5
|
+
const [timeVal, setTimeVal] = useState({
|
|
6
|
+
start: 1692070068,
|
|
7
|
+
end: 1692242868,
|
|
8
|
+
});
|
|
4
9
|
return (
|
|
5
10
|
<Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
|
|
6
11
|
<HDatePicker
|
|
@@ -9,7 +14,20 @@ export default () => {
|
|
|
9
14
|
console.log(val);
|
|
10
15
|
}}
|
|
11
16
|
/>
|
|
12
|
-
<HRangePicker
|
|
17
|
+
<HRangePicker
|
|
18
|
+
value={timeVal}
|
|
19
|
+
valueMap={{ start: "start", end: "end" }}
|
|
20
|
+
onChange={(val) => {
|
|
21
|
+
console.log(val);
|
|
22
|
+
setTimeVal(val);
|
|
23
|
+
}}
|
|
24
|
+
/>
|
|
25
|
+
<HTimePicker
|
|
26
|
+
value={55135}
|
|
27
|
+
onChange={(val) => {
|
|
28
|
+
console.log(val);
|
|
29
|
+
}}
|
|
30
|
+
/>
|
|
13
31
|
</Space>
|
|
14
32
|
);
|
|
15
33
|
};
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { Button } from "antd";
|
|
2
|
+
import { HDrawerForm, useHDialogForm } from "../../components";
|
|
3
|
+
const data = [
|
|
4
|
+
{
|
|
5
|
+
label: "输入框",
|
|
6
|
+
name: "name",
|
|
7
|
+
rules: [
|
|
8
|
+
() => {
|
|
9
|
+
return {
|
|
10
|
+
required: true,
|
|
11
|
+
};
|
|
12
|
+
},
|
|
13
|
+
],
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
label: "数字",
|
|
17
|
+
name: "sz",
|
|
18
|
+
type: "inputNumber",
|
|
19
|
+
rules: [{ required: true }],
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
label: "下拉输入框",
|
|
23
|
+
name: "selectInput",
|
|
24
|
+
type: "selectInput",
|
|
25
|
+
rules: [{ required: true }],
|
|
26
|
+
itemProps: {
|
|
27
|
+
valueName: {
|
|
28
|
+
select: "op",
|
|
29
|
+
input: "opInput",
|
|
30
|
+
},
|
|
31
|
+
selectProps: {
|
|
32
|
+
options: [{ label: "测试", value: 1 }],
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
label: "按钮输入框",
|
|
38
|
+
name: "buttonInput",
|
|
39
|
+
type: "buttonInput",
|
|
40
|
+
children: "点击",
|
|
41
|
+
rules: [{ required: true }],
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
label: "选择",
|
|
45
|
+
name: "checkboxGroup",
|
|
46
|
+
type: "checkboxGroup",
|
|
47
|
+
rules: [{ required: true }],
|
|
48
|
+
helper: "帮助我",
|
|
49
|
+
options: [
|
|
50
|
+
{ label: "选择1", value: "check1" },
|
|
51
|
+
{ label: "选择2", value: "check2" },
|
|
52
|
+
],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
label: "开关",
|
|
56
|
+
name: "switch",
|
|
57
|
+
type: "switch",
|
|
58
|
+
rules: [{ required: true }],
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
label: "时间",
|
|
62
|
+
name: "datePicker",
|
|
63
|
+
type: "datePicker",
|
|
64
|
+
hover: "时间选择",
|
|
65
|
+
helper: "帮助我",
|
|
66
|
+
rules: [{ required: true }],
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
label: "时间段",
|
|
70
|
+
name: "rangePicker",
|
|
71
|
+
type: "rangePicker",
|
|
72
|
+
helper: "帮助我",
|
|
73
|
+
rules: [{ required: true }],
|
|
74
|
+
itemProps: {
|
|
75
|
+
valueMap: {
|
|
76
|
+
start: "testStart",
|
|
77
|
+
end: "testEnd",
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
label: "时分秒",
|
|
83
|
+
name: "timePicker",
|
|
84
|
+
type: "timePicker",
|
|
85
|
+
rules: [{ required: true }],
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
label: "文件",
|
|
89
|
+
name: "upload",
|
|
90
|
+
type: "upload",
|
|
91
|
+
rules: [{ required: true }],
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
label: "地址文件",
|
|
95
|
+
name: "urlUpload",
|
|
96
|
+
type: "urlUpload",
|
|
97
|
+
rules: [{ required: true }],
|
|
98
|
+
},
|
|
99
|
+
];
|
|
100
|
+
export default () => {
|
|
101
|
+
const modalForm = useHDialogForm();
|
|
102
|
+
return (
|
|
103
|
+
<>
|
|
104
|
+
<Button
|
|
105
|
+
onClick={() => {
|
|
106
|
+
modalForm.show({
|
|
107
|
+
initialValues: {
|
|
108
|
+
check1: 1,
|
|
109
|
+
testStart: "1694747960",
|
|
110
|
+
testEnd: "1693538359",
|
|
111
|
+
op: 1,
|
|
112
|
+
opInput: "12121",
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
}}
|
|
116
|
+
>
|
|
117
|
+
打开
|
|
118
|
+
</Button>
|
|
119
|
+
<HDrawerForm
|
|
120
|
+
configData={data}
|
|
121
|
+
labelWidth={88}
|
|
122
|
+
modalForm={modalForm}
|
|
123
|
+
title="测试"
|
|
124
|
+
/>
|
|
125
|
+
</>
|
|
126
|
+
);
|
|
127
|
+
};
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
import { HForm, HFormConfigProvider, useHForm } from "../../components";
|
|
2
|
+
import { useState } from "react";
|
|
3
|
+
|
|
4
|
+
const formData = (options) => {
|
|
5
|
+
return [
|
|
6
|
+
{
|
|
7
|
+
label: "输入框",
|
|
8
|
+
name: "name",
|
|
9
|
+
rules: [
|
|
10
|
+
() => {
|
|
11
|
+
return {
|
|
12
|
+
required: true,
|
|
13
|
+
};
|
|
14
|
+
},
|
|
15
|
+
],
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
label: "数字",
|
|
19
|
+
name: "sz",
|
|
20
|
+
type: "inputNumber",
|
|
21
|
+
rules: [{ required: true }],
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
label: "下拉框",
|
|
25
|
+
name: "select",
|
|
26
|
+
type: "select",
|
|
27
|
+
dispatch: {
|
|
28
|
+
fnKey: "reload",
|
|
29
|
+
dependencies: ["selectInput", "sz"],
|
|
30
|
+
},
|
|
31
|
+
itemProps: {
|
|
32
|
+
request: (params = {}, values) => {
|
|
33
|
+
console.log(values, "paramsparamsparams");
|
|
34
|
+
const { label = "123", value = 1 } = params;
|
|
35
|
+
return Promise.resolve([{ label, value }]);
|
|
36
|
+
},
|
|
37
|
+
showSearch: true,
|
|
38
|
+
},
|
|
39
|
+
rules: [{ required: true }],
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
label: "下拉输入框",
|
|
43
|
+
name: "selectInput",
|
|
44
|
+
type: "selectInput",
|
|
45
|
+
rules: [{ required: true }],
|
|
46
|
+
itemProps: {
|
|
47
|
+
valueName: {
|
|
48
|
+
select: "op",
|
|
49
|
+
input: "opInput",
|
|
50
|
+
},
|
|
51
|
+
selectProps: {
|
|
52
|
+
options: [{ label: "测试", value: 1 }],
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
label: "按钮输入框",
|
|
58
|
+
name: "buttonInput",
|
|
59
|
+
type: "buttonInput",
|
|
60
|
+
children: "点击",
|
|
61
|
+
rules: [{ required: true }],
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
label: "选择",
|
|
65
|
+
name: "checkboxGroup",
|
|
66
|
+
type: "checkboxGroup",
|
|
67
|
+
rules: [{ required: true }],
|
|
68
|
+
helper: "帮助我",
|
|
69
|
+
options: [
|
|
70
|
+
{ label: "选择1", value: "check1" },
|
|
71
|
+
{ label: "选择2", value: "check2" },
|
|
72
|
+
],
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
label: "开关",
|
|
76
|
+
name: "switch",
|
|
77
|
+
type: "switch",
|
|
78
|
+
rules: [{ required: true }],
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
label: "时间",
|
|
82
|
+
name: "datePicker",
|
|
83
|
+
type: "datePicker",
|
|
84
|
+
hover: "时间选择",
|
|
85
|
+
helper: "帮助我",
|
|
86
|
+
rules: [{ required: true }],
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
label: "时间段",
|
|
90
|
+
name: "rangePicker",
|
|
91
|
+
type: "rangePicker",
|
|
92
|
+
helper: "帮助我",
|
|
93
|
+
rules: [{ required: true }],
|
|
94
|
+
itemProps: {
|
|
95
|
+
valueMap: {
|
|
96
|
+
start: "testStart",
|
|
97
|
+
end: "testEnd",
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
label: "时分秒",
|
|
103
|
+
name: "timePicker",
|
|
104
|
+
type: "timePicker",
|
|
105
|
+
rules: [{ required: true }],
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
label: "文件",
|
|
109
|
+
name: "upload",
|
|
110
|
+
type: "upload",
|
|
111
|
+
rules: [{ required: true }],
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
label: "地址文件",
|
|
115
|
+
name: "urlUpload",
|
|
116
|
+
type: "urlUpload",
|
|
117
|
+
rules: [{ required: true }],
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
label: "颜色",
|
|
121
|
+
name: "colorInput",
|
|
122
|
+
type: "colorInput",
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
label: "测试",
|
|
126
|
+
type: "test",
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
type: "submit",
|
|
130
|
+
},
|
|
131
|
+
];
|
|
132
|
+
};
|
|
133
|
+
const Test = (props) => {
|
|
134
|
+
return <div>ffff</div>;
|
|
135
|
+
};
|
|
136
|
+
export default () => {
|
|
137
|
+
const form = useHForm();
|
|
138
|
+
const [options, setOptions] = useState([{ label: "1", value: 1 }]);
|
|
139
|
+
|
|
140
|
+
return (
|
|
141
|
+
<div style={{ overflow: "auto", height: "90vh" }}>
|
|
142
|
+
<HFormConfigProvider
|
|
143
|
+
valueSwitchMap={{ open: 1, close: 2 }}
|
|
144
|
+
valueCheckMap={{ noChecked: 0, checked: 1 }}
|
|
145
|
+
defaultComponent={{
|
|
146
|
+
test: Test,
|
|
147
|
+
}}
|
|
148
|
+
>
|
|
149
|
+
<HForm
|
|
150
|
+
configData={formData(options)}
|
|
151
|
+
labelWidth={200}
|
|
152
|
+
form={form}
|
|
153
|
+
initialValues={{}}
|
|
154
|
+
onFinish={(value) => {
|
|
155
|
+
console.log(value);
|
|
156
|
+
}}
|
|
157
|
+
onValuesChange={(val) => {
|
|
158
|
+
console.log(val, "onValuesChange");
|
|
159
|
+
}}
|
|
160
|
+
infoRequest={() => {
|
|
161
|
+
return new Promise<any>((resolve) => {
|
|
162
|
+
setTimeout(() => {
|
|
163
|
+
resolve({
|
|
164
|
+
check1: 1,
|
|
165
|
+
op: 1,
|
|
166
|
+
opInput: "12121",
|
|
167
|
+
colorInput: "rgba(24, 144, 255,1)",
|
|
168
|
+
upload:
|
|
169
|
+
"https://img2.baidu.com/it/u=2048195462,703560066&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=333",
|
|
170
|
+
});
|
|
171
|
+
}, 3000);
|
|
172
|
+
});
|
|
173
|
+
}}
|
|
174
|
+
request={(params) => {
|
|
175
|
+
return new Promise<any>((resolve) => {
|
|
176
|
+
setTimeout(() => {
|
|
177
|
+
resolve(params);
|
|
178
|
+
}, 3000);
|
|
179
|
+
});
|
|
180
|
+
}}
|
|
181
|
+
/>
|
|
182
|
+
</HFormConfigProvider>
|
|
183
|
+
<div
|
|
184
|
+
onClick={() => {
|
|
185
|
+
form.dispatch(
|
|
186
|
+
{
|
|
187
|
+
name: "select",
|
|
188
|
+
key: "reload",
|
|
189
|
+
},
|
|
190
|
+
{
|
|
191
|
+
params: {
|
|
192
|
+
label: "更新",
|
|
193
|
+
value: 2,
|
|
194
|
+
},
|
|
195
|
+
}
|
|
196
|
+
);
|
|
197
|
+
}}
|
|
198
|
+
>
|
|
199
|
+
点我
|
|
200
|
+
</div>
|
|
201
|
+
</div>
|
|
202
|
+
);
|
|
203
|
+
};
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
HSelectInput,
|
|
4
4
|
HButtonInput,
|
|
5
5
|
HInputNumber,
|
|
6
|
+
HColorInput,
|
|
6
7
|
} from "../../components";
|
|
7
8
|
import { Space } from "antd";
|
|
8
9
|
export default () => {
|
|
@@ -17,6 +18,7 @@ export default () => {
|
|
|
17
18
|
/>
|
|
18
19
|
<HButtonInput>点我</HButtonInput>
|
|
19
20
|
<HInputNumber />
|
|
21
|
+
<HColorInput />
|
|
20
22
|
</Space>
|
|
21
23
|
);
|
|
22
24
|
};
|