@hi-ui/form 4.0.0-alpha.9 → 4.0.0-beta.10

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.
Files changed (47) hide show
  1. package/README.md +23 -24
  2. package/lib/cjs/Form.js +8 -4
  3. package/lib/cjs/Form.js.map +1 -1
  4. package/lib/cjs/FormField.js +6 -0
  5. package/lib/cjs/FormField.js.map +1 -1
  6. package/lib/cjs/FormItem.js +10 -8
  7. package/lib/cjs/FormItem.js.map +1 -1
  8. package/lib/cjs/FormLabel.js +10 -8
  9. package/lib/cjs/FormLabel.js.map +1 -1
  10. package/lib/cjs/FormList.js +7 -7
  11. package/lib/cjs/FormList.js.map +1 -1
  12. package/lib/cjs/context.js.map +1 -1
  13. package/lib/cjs/index.js +10 -4
  14. package/lib/cjs/index.js.map +1 -1
  15. package/lib/cjs/styles/index.scss.js +1 -1
  16. package/lib/cjs/use-form-field.js +4 -3
  17. package/lib/cjs/use-form-field.js.map +1 -1
  18. package/lib/cjs/use-form.js +28 -30
  19. package/lib/cjs/use-form.js.map +1 -1
  20. package/lib/esm/Form.js +8 -4
  21. package/lib/esm/Form.js.map +1 -1
  22. package/lib/esm/FormField.js +5 -0
  23. package/lib/esm/FormField.js.map +1 -1
  24. package/lib/esm/FormItem.js +10 -8
  25. package/lib/esm/FormItem.js.map +1 -1
  26. package/lib/esm/FormLabel.js +9 -8
  27. package/lib/esm/FormLabel.js.map +1 -1
  28. package/lib/esm/FormList.js +1 -1
  29. package/lib/esm/context.js.map +1 -1
  30. package/lib/esm/index.js +13 -1
  31. package/lib/esm/index.js.map +1 -1
  32. package/lib/esm/styles/index.scss.js +1 -1
  33. package/lib/esm/use-form-field.js +4 -3
  34. package/lib/esm/use-form-field.js.map +1 -1
  35. package/lib/esm/use-form.js +17 -20
  36. package/lib/esm/use-form.js.map +1 -1
  37. package/lib/types/Form.d.ts +3 -3
  38. package/lib/types/FormField.d.ts +4 -0
  39. package/lib/types/FormItem.d.ts +4 -0
  40. package/lib/types/FormLabel.d.ts +5 -1
  41. package/lib/types/FormSubmit.d.ts +2 -2
  42. package/lib/types/context.d.ts +10 -69
  43. package/lib/types/index.d.ts +8 -1
  44. package/lib/types/types.d.ts +7 -7
  45. package/lib/types/use-form-field.d.ts +8 -13
  46. package/lib/types/use-form.d.ts +5 -14
  47. package/package.json +15 -14
package/README.md CHANGED
@@ -137,33 +137,32 @@
137
137
 
138
138
  ### Form
139
139
 
140
- | 参数 | 变更类型 | 变更内容 | 解决的问题 |
141
- | -------------------- | ------------------------------- | --------------------------------------------------- | ----------------------------------------------------------------- |
142
- | propName | feature \| deprecated \| update | 变更了什么 | 之前是什么样子,解决什么问题 |
143
- | ---- | ---- | ---- | ---- |
144
- | colon | feature | 字段:showColon -> colon 类型:boolean -> ReactText | 强化支持自定义 colon |
145
- | innerRef | update | ref -> innerRef | 解决名字占用,ref 功能作为 dom 引用获取,回调方法写法支持 Promise |
146
- | initialErrors | feature | - | 强化功能 |
147
- | initialTouched | feature | - | 强化功能 |
148
- | validateTrigger | feature | - | 强化功能 |
149
- | validateAfterTouched | feature | - | 强化功能 |
150
- | lazyValidate | feature | - | 强化功能 |
151
- | onSubmit | feature | - | 强化功能 |
152
- | onReset | feature | - | 强化功能 |
140
+ | 参数 | 变更类型 | 变更内容 | 解决的问题 |
141
+ | -------------------- | ------------------------------- | --------------- | ----------------------------------------------------------------- |
142
+ | propName | feature \| deprecated \| update | 变更了什么 | 之前是什么样子,解决什么问题 |
143
+ | ---- | ---- | ---- | ---- |
144
+ | innerRef | update | ref -> innerRef | 解决名字占用,ref 功能作为 dom 引用获取,回调方法写法支持 Promise |
145
+ | initialErrors | feature | - | 强化功能 |
146
+ | initialTouched | feature | - | 强化功能 |
147
+ | validateTrigger | feature | - | 强化功能 |
148
+ | validateAfterTouched | feature | - | 强化功能 |
149
+ | lazyValidate | feature | - | 强化功能 |
150
+ | onSubmit | feature | - | 强化功能 |
151
+ | onReset | feature | - | 强化功能 |
153
152
 
154
153
  ### FormItem
155
154
 
156
- | 参数 | 变更类型 | 变更内容 | 解决的问题 |
157
- | -------------------- | ------------------------------- | --------------------------------------------------- | ---------------------------- |
158
- | propName | feature \| deprecated \| update | 变更了什么 | 之前是什么样子,解决什么问题 |
159
- | ---- | ---- | ---- | ---- |
160
- | colon | feature | 字段:showColon -> colon 类型:boolean -> ReactText | 强化支持自定义 colon |
161
- | required | update | 定义:只做展示,不做校验 | 优化功能 |
162
- | valueType | feature | - | 强化功能 |
163
- | valueCollectPropName | feature | - | 强化功能 |
164
- | valueCollectPipe | feature | - | 强化功能 |
165
- | valueSyncPipe | feature | - | 强化功能 |
166
- | validateTrigger | feature | - | 强化功能 |
155
+ | 参数 | 变更类型 | 变更内容 | 解决的问题 |
156
+ | ----------------------- | ------------------------------- | -------------------------- | ---------------------------- |
157
+ | propName | feature \| deprecated \| update | 变更了什么 | 之前是什么样子,解决什么问题 |
158
+ | ---- | ---- | ---- | ---- |
159
+ | required | update | 定义:只做展示,不做校验 | 优化功能 |
160
+ | valueType | feature | - | 强化功能 |
161
+ | valueChangeFuncPropName | feature | - | 强化功能 |
162
+ | valueDispatchTransform | feature | - | 强化功能 |
163
+ | valueConnectTransform | feature | - | 强化功能 |
164
+ | validateTrigger | feature | - | 强化功能 |
165
+ | render | feature | 支持函数自定义渲染表单控件 | 强化功能 |
167
166
 
168
167
  ### FormList
169
168
 
package/lib/cjs/Form.js CHANGED
@@ -58,8 +58,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (_a, ref) {
58
58
  labelPlacement = _a$labelPlacement === void 0 ? 'right' : _a$labelPlacement,
59
59
  _a$placement = _a.placement,
60
60
  placement = _a$placement === void 0 ? 'vertical' : _a$placement,
61
- colon = _a.colon,
62
- rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "innerRef", "labelWidth", "labelPlacement", "placement", "verticalAlign", "colon"]);
61
+ _a$contentPosition = _a.contentPosition,
62
+ contentPosition = _a$contentPosition === void 0 ? 'center' : _a$contentPosition,
63
+ _a$showColon = _a.showColon,
64
+ showColon = _a$showColon === void 0 ? true : _a$showColon,
65
+ rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "innerRef", "labelWidth", "labelPlacement", "placement", "contentPosition", "showColon"]);
63
66
 
64
67
  var formContext = useForm.useForm(rest);
65
68
  var getRootProps = formContext.getRootProps; // @ts-ignore
@@ -83,11 +86,12 @@ var Form = /*#__PURE__*/React.forwardRef(function (_a, ref) {
83
86
  return Object.assign(Object.assign({
84
87
  labelWidth: labelWidth,
85
88
  labelPlacement: labelPlacement,
86
- colon: colon
89
+ showColon: showColon,
90
+ contentPosition: contentPosition
87
91
  }, formContext), {
88
92
  prefixCls: prefixCls
89
93
  });
90
- }, [labelWidth, formContext, labelPlacement, colon, prefixCls]);
94
+ }, [labelWidth, formContext, labelPlacement, showColon, prefixCls, contentPosition]);
91
95
  var cls = classname.cx(prefixCls, className, placement && prefixCls + "--placement-" + placement);
92
96
  return (
93
97
  /*#__PURE__*/
@@ -1 +1 @@
1
- {"version":3,"file":"Form.js","sources":["../../src/Form.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","FORM_REGISTER_TABLE","Form","forwardRef","_a","ref","prefixCls","role","className","children","innerRef","labelWidth","labelPlacement","placement","colon","rest","formContext","useForm","getRootProps","useImperativeHandle","validate","submitForm","reset","resetForm","validateField","validateFieldState","setFieldValue","setFieldsValue","getFieldValue","getFieldsValue","getFieldError","getFieldsError","clearValidates","resetErrors","providedValue","useMemo","cls","cx","React","FormProvider","value","__DEV__","displayName","formExtends","model","name","invariant","Object","assign","extends"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,IAAMA,KAAK,GAAG,MAAd;;AACA,IAAMC,OAAO,GAAGC,sBAAAA,CAAaF,KAAbE,CAAhB;;;IAGaC,mBAAmB,GAAkC;AAElE;;;;IAGaC,IAAI,gBAAGC,gBAAAA,CAClB,UACEC,EADF,EAcEC,GAdF;wBAEIC;MAAAA,sCAAYP;mBACZQ;MAAAA,4BAAOT;MACPU,eAAAA;MACAC,cAAAA;MACAC,cAAAA;MACAC,gBAAAA;6BACAC;MAAAA,gDAAiB;wBACjBC;MAAAA,sCAAY;MAEZC,WAAAA;MACGC,wBAXL,YAAA,QAAA,aAAA,YAAA,YAAA,cAAA,kBAAA,aAAA,iBAAA,SAAA;;MAeMC,WAAW,GAAGC,eAAAA,CAAQF,IAARE;MAEZC,YAAR,GAAyBF,WAAzB,CAAQE;;AAGRC,EAAAA,yBAAAA,CAAoBT,QAApBS,EAA8B;WACrB;AACLC,MAAAA,QAAQ,EAAEJ,WAAW,CAACK,UADjB;AAELC,MAAAA,KAAK,EAAEN,WAAW,CAACO,SAFd;AAGLC,MAAAA,aAAa,EAAER,WAAW,CAACS,kBAHtB;;AAKLC,MAAAA,aAAa,EAAEV,WAAW,CAACU,aALtB;AAMLC,MAAAA,cAAc,EAAEX,WAAW,CAACW,cANvB;AAOLC,MAAAA,aAAa,EAAEZ,WAAW,CAACY,aAPtB;AAQLC,MAAAA,cAAc,EAAEb,WAAW,CAACa,cARvB;AASLC,MAAAA,aAAa,EAAEd,WAAW,CAACc,aATtB;AAULC,MAAAA,cAAc,EAAEf,WAAW,CAACe,cAVvB;AAWLC,MAAAA,cAAc,EAAEhB,WAAW,CAACiB;AAXvB;AADU,GAAnBd;MAgBMe,aAAa,GAAGC,aAAAA,CAAQ;;AAE1BxB,MAAAA,UAAU,EAAVA;AACAC,MAAAA,cAAc,EAAdA;AACAE,MAAAA,KAAK,EAALA;OACGE;AACHV,MAAAA,SAAS,EAATA;;AANyB,GAAP6B,EAQnB,CAACxB,UAAD,EAAaK,WAAb,EAA0BJ,cAA1B,EAA0CE,KAA1C,EAAiDR,SAAjD,CARmB6B;MAUhBC,GAAG,GAAGC,YAAAA,CAAG/B,SAAH+B,EAAc7B,SAAd6B,EAAyBxB,SAAS,IAAOP,SAAP,iBAAOA,GAAwBO,SAAjEwB;;;;AAIVC,IAAAA,yBAAAA,cAAAA,CAACC,oBAADD;AAAcE,MAAAA,KAAK,EAAEN;KAArBI,eACEA,yBAAAA,cAAAA,OAAAA;AAAMjC,MAAAA,GAAG,EAAEA;AAAKE,MAAAA,IAAI,EAAEA;AAAMC,MAAAA,SAAS,EAAE4B;OAASlB,YAAY,GAA5DoB,EACG7B,QADH6B,CADFA;;AApDwB,CAAVnC;;AA0FpB,IAAIsC,WAAJ,EAAa;AACXvC,EAAAA,IAAI,CAACwC,WAALxC,GAAmB,MAAnBA;;;AAGF,IAAMyC,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD;;MAEd,OAAOA,KAAK,CAACC,IAAb,KAAsB,UAAU;;AAElC5C,IAAAA,mBAAmB,CAAC2C,KAAK,CAACC,IAAP,CAAnB5C,GAAkC2C,KAAlC3C;AAFF,SAGO;AACL6C,IAAAA,aAAAA,CAAU,IAAVA,EAAgB,iDAAhBA;;AANJ,CAAA;;AAUAC,MAAM,CAACC,MAAPD,CAAc7C,IAAd6C,EAAoB;AAAEE,aAASN;AAAX,CAApBI;;"}
1
+ {"version":3,"file":"Form.js","sources":["../../src/Form.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","FORM_REGISTER_TABLE","Form","forwardRef","_a","ref","prefixCls","role","className","children","innerRef","labelWidth","labelPlacement","placement","contentPosition","showColon","rest","formContext","useForm","getRootProps","useImperativeHandle","validate","submitForm","reset","resetForm","validateField","validateFieldState","setFieldValue","setFieldsValue","getFieldValue","getFieldsValue","getFieldError","getFieldsError","clearValidates","resetErrors","providedValue","useMemo","cls","cx","React","FormProvider","value","__DEV__","displayName","formExtends","model","name","invariant","Object","assign","extends"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,IAAMA,KAAK,GAAG,MAAd;;AACA,IAAMC,OAAO,GAAGC,sBAAAA,CAAaF,KAAbE,CAAhB;;;IAGaC,mBAAmB,GAAkC;AAElE;;;;IAGaC,IAAI,gBAAGC,gBAAAA,CAClB,UACEC,EADF,EAcEC,GAdF;wBAEIC;MAAAA,sCAAYP;mBACZQ;MAAAA,4BAAOT;MACPU,eAAAA;MACAC,cAAAA;MACAC,cAAAA;MACAC,gBAAAA;6BACAC;MAAAA,gDAAiB;wBACjBC;MAAAA,sCAAY;8BACZC;MAAAA,kDAAkB;wBAClBC;MAAAA,sCAAY;MACTC,wBAXL,YAAA,QAAA,aAAA,YAAA,YAAA,cAAA,kBAAA,aAAA,mBAAA,aAAA;;MAeMC,WAAW,GAAGC,eAAAA,CAAQF,IAARE;MAEZC,YAAR,GAAyBF,WAAzB,CAAQE;;AAGRC,EAAAA,yBAAAA,CAAoBV,QAApBU,EAA8B;WACrB;AACLC,MAAAA,QAAQ,EAAEJ,WAAW,CAACK,UADjB;AAELC,MAAAA,KAAK,EAAEN,WAAW,CAACO,SAFd;AAGLC,MAAAA,aAAa,EAAER,WAAW,CAACS,kBAHtB;;AAKLC,MAAAA,aAAa,EAAEV,WAAW,CAACU,aALtB;AAMLC,MAAAA,cAAc,EAAEX,WAAW,CAACW,cANvB;AAOLC,MAAAA,aAAa,EAAEZ,WAAW,CAACY,aAPtB;AAQLC,MAAAA,cAAc,EAAEb,WAAW,CAACa,cARvB;AASLC,MAAAA,aAAa,EAAEd,WAAW,CAACc,aATtB;AAULC,MAAAA,cAAc,EAAEf,WAAW,CAACe,cAVvB;AAWLC,MAAAA,cAAc,EAAEhB,WAAW,CAACiB;AAXvB;AADU,GAAnBd;MAgBMe,aAAa,GAAGC,aAAAA,CAAQ;;AAE1BzB,MAAAA,UAAU,EAAVA;AACAC,MAAAA,cAAc,EAAdA;AACAG,MAAAA,SAAS,EAATA;AACAD,MAAAA,eAAe,EAAfA;OACGG;AACHX,MAAAA,SAAS,EAATA;;AAPyB,GAAP8B,EASnB,CAACzB,UAAD,EAAaM,WAAb,EAA0BL,cAA1B,EAA0CG,SAA1C,EAAqDT,SAArD,EAAgEQ,eAAhE,CATmBsB;MAWhBC,GAAG,GAAGC,YAAAA,CAAGhC,SAAHgC,EAAc9B,SAAd8B,EAAyBzB,SAAS,IAAOP,SAAP,iBAAOA,GAAwBO,SAAjEyB;;;;AAIVC,IAAAA,yBAAAA,cAAAA,CAACC,oBAADD;AAAcE,MAAAA,KAAK,EAAEN;KAArBI,eACEA,yBAAAA,cAAAA,OAAAA;AAAMlC,MAAAA,GAAG,EAAEA;AAAKE,MAAAA,IAAI,EAAEA;AAAMC,MAAAA,SAAS,EAAE6B;OAASlB,YAAY,GAA5DoB,EACG9B,QADH8B,CADFA;;AArDwB,CAAVpC;;AA2FpB,IAAIuC,WAAJ,EAAa;AACXxC,EAAAA,IAAI,CAACyC,WAALzC,GAAmB,MAAnBA;;;AAGF,IAAM0C,WAAW,GAAG,SAAdA,WAAc,CAACC,KAAD;;MAEd,OAAOA,KAAK,CAACC,IAAb,KAAsB,UAAU;;AAElC7C,IAAAA,mBAAmB,CAAC4C,KAAK,CAACC,IAAP,CAAnB7C,GAAkC4C,KAAlC5C;AAFF,SAGO;AACL8C,IAAAA,aAAAA,CAAU,IAAVA,EAAgB,iDAAhBA;;AANJ,CAAA;;AAUAC,MAAM,CAACC,MAAPD,CAAc9C,IAAd8C,EAAoB;AAAEE,aAASN;AAAX,CAApBI;;"}
@@ -18,6 +18,8 @@ var React = require('react');
18
18
  var env = require('@hi-ui/env');
19
19
 
20
20
  var useFormField = require('./use-form-field.js');
21
+
22
+ var typeAssertion = require('@hi-ui/type-assertion');
21
23
  /**
22
24
  * TODO: What is FormField
23
25
  */
@@ -28,6 +30,10 @@ var FormField = function FormField(props) {
28
30
 
29
31
  var fieldProps = useFormField.useFormField(props);
30
32
 
33
+ if (typeAssertion.isFunction(props.render)) {
34
+ return props.render(fieldProps);
35
+ }
36
+
31
37
  if (! /*#__PURE__*/React.isValidElement(props.children)) {
32
38
  console.warn('FormField must pass a valid element as children.');
33
39
  return (_a = props.children) !== null && _a !== void 0 ? _a : null;
@@ -1 +1 @@
1
- {"version":3,"file":"FormField.js","sources":["../../src/FormField.tsx"],"sourcesContent":[null],"names":["FormField","props","fieldProps","useFormField","isValidElement","children","console","warn","cloneElement","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;AAIA;;;;;IAGaA,SAAS,GAA6B,SAAtCA,SAAsC,CAACC,KAAD;;;MAC3CC,UAAU,GAAGC,yBAAAA,CAAaF,KAAbE;;MAEf,eAACC,oBAAAA,CAAeH,KAAK,CAACI,QAArBD,GAAgC;AACnCE,IAAAA,OAAO,CAACC,IAARD,CAAa,kDAAbA;WACO,MAAAL,KAAK,CAACI,QAAN,UAAA,iBAAA,KAAA,GAAkB;;;sBAGpBG,kBAAAA,CAAaP,KAAK,CAACI,QAAnBG,oBAAkCN,WAAlCM;;;AAUT,IAAIC,WAAJ,EAAa;AACXT,EAAAA,SAAS,CAACU,WAAVV,GAAwB,WAAxBA;;;"}
1
+ {"version":3,"file":"FormField.js","sources":["../../src/FormField.tsx"],"sourcesContent":[null],"names":["FormField","props","fieldProps","useFormField","isFunction","render","isValidElement","children","console","warn","cloneElement","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAKA;;;;;IAGaA,SAAS,GAA6B,SAAtCA,SAAsC,CAACC,KAAD;;;MAC3CC,UAAU,GAAGC,yBAAAA,CAAaF,KAAbE;;MAEfC,wBAAAA,CAAWH,KAAK,CAACI,MAAjBD,GAA0B;WACrBH,KAAK,CAACI,MAANJ,CAAaC,UAAbD;;;MAGL,eAACK,oBAAAA,CAAeL,KAAK,CAACM,QAArBD,GAAgC;AACnCE,IAAAA,OAAO,CAACC,IAARD,CAAa,kDAAbA;WACO,MAAAP,KAAK,CAACM,QAAN,UAAA,iBAAA,KAAA,GAAkB;;;sBAGpBG,kBAAAA,CAAaT,KAAK,CAACM,QAAnBG,oBAAkCR,WAAlCQ;;;AAcT,IAAIC,WAAJ,EAAa;AACXX,EAAAA,SAAS,CAACY,WAAVZ,GAAwB,WAAxBA;;;"}
@@ -50,11 +50,12 @@ var FormItem = function FormItem(_a) {
50
50
  valueType = _a.valueType,
51
51
  rules = _a.rules,
52
52
  valuePropName = _a.valuePropName,
53
- valueCollectPropName = _a.valueCollectPropName,
54
- valueCollectPipe = _a.valueCollectPipe,
55
- valueSyncPipe = _a.valueSyncPipe,
53
+ valueChangeFuncPropName = _a.valueChangeFuncPropName,
54
+ valueDispatchTransform = _a.valueDispatchTransform,
55
+ valueConnectTransform = _a.valueConnectTransform,
56
56
  validateTrigger = _a.validateTrigger,
57
- rest = tslib.__rest(_a, ["className", "children", "field", "valueType", "rules", "valuePropName", "valueCollectPropName", "valueCollectPipe", "valueSyncPipe", "validateTrigger"]); // @ts-ignore
57
+ render = _a.render,
58
+ rest = tslib.__rest(_a, ["className", "children", "field", "valueType", "rules", "valuePropName", "valueChangeFuncPropName", "valueDispatchTransform", "valueConnectTransform", "validateTrigger", "render"]); // @ts-ignore
58
59
 
59
60
 
60
61
  var _useFormContext = context.useFormContext(),
@@ -67,10 +68,11 @@ var FormItem = function FormItem(_a) {
67
68
  valueType: valueType,
68
69
  rules: rules,
69
70
  valuePropName: valuePropName,
70
- valueCollectPropName: valueCollectPropName,
71
- valueCollectPipe: valueCollectPipe,
72
- valueSyncPipe: valueSyncPipe,
73
- validateTrigger: validateTrigger
71
+ valueChangeFuncPropName: valueChangeFuncPropName,
72
+ valueDispatchTransform: valueDispatchTransform,
73
+ valueConnectTransform: valueConnectTransform,
74
+ validateTrigger: validateTrigger,
75
+ render: render
74
76
  }, children), /*#__PURE__*/React__default['default'].createElement(FormMessage.FormMessage, {
75
77
  field: field,
76
78
  className: prefixCls + "-item__message"
@@ -1 +1 @@
1
- {"version":3,"file":"FormItem.js","sources":["../../src/FormItem.tsx"],"sourcesContent":[null],"names":["FormItem","_a","className","children","field","valueType","rules","valuePropName","valueCollectPropName","valueCollectPipe","valueSyncPipe","validateTrigger","rest","useFormContext","prefixCls","React","FormLabel","cx","FormField","FormMessage","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA;;;;;IAGaA,QAAQ,GAA4B,SAApCA,QAAoC,CAACC,EAAD;MAC/CC,eAAAA;MACAC,cAAAA;MACAC,WAAAA;MACAC,eAAAA;MACAC,WAAAA;MACAC,mBAAAA;MACAC,0BAAAA;MACAC,sBAAAA;MACAC,mBAAAA;MACAC,qBAAAA;MACGC,wBAX6C,YAAA,YAAA,SAAA,aAAA,SAAA,iBAAA,wBAAA,oBAAA,iBAAA,mBAAA;;;wBAc1BC,sBAAAA;MAAdC,SAAR,mBAAQA;;sBAGNC,yBAAAA,cAAAA,CAACC,mBAADD,oBAAeH;AAAMV,IAAAA,SAAS,EAAEe,YAAAA,CAAMH,SAAJ,UAAFG,EAAwBf,SAAxBe;IAAhCF,eACEA,yBAAAA,cAAAA,CAACG,mBAADH;AACEX,IAAAA,KAAK,EAAEA;AACPC,IAAAA,SAAS,EAAEA;AACXC,IAAAA,KAAK,EAAEA;AACPC,IAAAA,aAAa,EAAEA;AACfC,IAAAA,oBAAoB,EAAEA;AACtBC,IAAAA,gBAAgB,EAAEA;AAClBC,IAAAA,aAAa,EAAEA;AACfC,IAAAA,eAAe,EAAEA;GARnBI,EAUGZ,QAVHY,CADFA,eAcEA,yBAAAA,cAAAA,CAACI,uBAADJ;AAAaX,IAAAA,KAAK,EAAEA;AAAOF,IAAAA,SAAS,EAAKY,SAAL;GAApCC,CAdFA;;;AA0BJ,IAAIK,WAAJ,EAAa;AACXpB,EAAAA,QAAQ,CAACqB,WAATrB,GAAuB,UAAvBA;;;"}
1
+ {"version":3,"file":"FormItem.js","sources":["../../src/FormItem.tsx"],"sourcesContent":[null],"names":["FormItem","_a","className","children","field","valueType","rules","valuePropName","valueChangeFuncPropName","valueDispatchTransform","valueConnectTransform","validateTrigger","render","rest","useFormContext","prefixCls","React","FormLabel","cx","FormField","FormMessage","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA;;;;;IAGaA,QAAQ,GAA4B,SAApCA,QAAoC,CAACC,EAAD;MAC/CC,eAAAA;MACAC,cAAAA;MACAC,WAAAA;MACAC,eAAAA;MACAC,WAAAA;MACAC,mBAAAA;MACAC,6BAAAA;MACAC,4BAAAA;MACAC,2BAAAA;MACAC,qBAAAA;MACAC,YAAAA;MACGC,wBAZ6C,YAAA,YAAA,SAAA,aAAA,SAAA,iBAAA,2BAAA,0BAAA,yBAAA,mBAAA,UAAA;;;wBAe1BC,sBAAAA;MAAdC,SAAR,mBAAQA;;sBAGNC,yBAAAA,cAAAA,CAACC,mBAADD,oBAAeH;AAAMX,IAAAA,SAAS,EAAEgB,YAAAA,CAAMH,SAAJ,UAAFG,EAAwBhB,SAAxBgB;IAAhCF,eACEA,yBAAAA,cAAAA,CAACG,mBAADH;AACEZ,IAAAA,KAAK,EAAEA;AACPC,IAAAA,SAAS,EAAEA;AACXC,IAAAA,KAAK,EAAEA;AACPC,IAAAA,aAAa,EAAEA;AACfC,IAAAA,uBAAuB,EAAEA;AACzBC,IAAAA,sBAAsB,EAAEA;AACxBC,IAAAA,qBAAqB,EAAEA;AACvBC,IAAAA,eAAe,EAAEA;AACjBC,IAAAA,MAAM,EAAEA;GATVI,EAWGb,QAXHa,CADFA,eAeEA,yBAAAA,cAAAA,CAACI,uBAADJ;AAAaZ,IAAAA,KAAK,EAAEA;AAAOF,IAAAA,SAAS,EAAKa,SAAL;GAApCC,CAfFA;;;AA+BJ,IAAIK,WAAJ,EAAa;AACXrB,EAAAA,QAAQ,CAACsB,WAATtB,GAAuB,UAAvBA;;;"}
@@ -27,6 +27,8 @@ var context = require('./context.js');
27
27
 
28
28
  var typeAssertion = require('@hi-ui/type-assertion');
29
29
 
30
+ var localeContext = require('@hi-ui/locale-context');
31
+
30
32
  function _interopDefaultLegacy(e) {
31
33
  return e && _typeof(e) === 'object' && 'default' in e ? e : {
32
34
  'default': e
@@ -44,10 +46,12 @@ var _prefix = classname.getPrefixCls(_role);
44
46
 
45
47
 
46
48
  var FormLabel = /*#__PURE__*/React.forwardRef(function (props, ref) {
49
+ var i18n = localeContext.useLocaleContext();
50
+
47
51
  var _useFormContext = context.useFormContext(),
48
52
  labelWidthContext = _useFormContext.labelWidth,
49
53
  labelPlacement = _useFormContext.labelPlacement,
50
- colonContext = _useFormContext.colon,
54
+ showColonContext = _useFormContext.showColon,
51
55
  contentPositionContext = _useFormContext.contentPosition;
52
56
 
53
57
  var _props$prefixCls = props.prefixCls,
@@ -62,11 +66,11 @@ var FormLabel = /*#__PURE__*/React.forwardRef(function (props, ref) {
62
66
  required = _props$required === void 0 ? false : _props$required,
63
67
  _props$labelWidth = props.labelWidth,
64
68
  labelWidthProp = _props$labelWidth === void 0 ? labelWidthContext : _props$labelWidth,
65
- _props$colon = props.colon,
66
- colon = _props$colon === void 0 ? colonContext : _props$colon,
69
+ _props$showColon = props.showColon,
70
+ showColon = _props$showColon === void 0 ? showColonContext : _props$showColon,
67
71
  _props$contentPositio = props.contentPosition,
68
72
  contentPosition = _props$contentPositio === void 0 ? contentPositionContext : _props$contentPositio,
69
- rest = tslib.__rest(props, ["prefixCls", "role", "className", "style", "children", "label", "field", "required", "labelWidth", "colon", "contentPosition"]);
73
+ rest = tslib.__rest(props, ["prefixCls", "role", "className", "style", "children", "label", "required", "labelWidth", "showColon", "contentPosition"]);
70
74
 
71
75
  var _useMemo = React.useMemo(function () {
72
76
  if (labelPlacement === 'top') return {
@@ -95,9 +99,7 @@ var FormLabel = /*#__PURE__*/React.forwardRef(function (props, ref) {
95
99
  return 'center';
96
100
  }
97
101
  }, [contentPosition]);
98
- var colonMemo = React.useMemo(function () {
99
- return colon || ':';
100
- }, [colon]);
102
+ var colon = showColon ? i18n.get('form.colon') : null;
101
103
  var cls = classname.cx(prefixCls, className, required && prefixCls + "--required", labelPlacement && prefixCls + "--placement-" + labelPlacement // error && `${prefixCls}--error`,
102
104
  // validating && `${prefixCls}--validating`
103
105
  );
@@ -114,7 +116,7 @@ var FormLabel = /*#__PURE__*/React.forwardRef(function (props, ref) {
114
116
  style: {
115
117
  width: labelWidth
116
118
  }
117
- }, label, colonMemo) : /*#__PURE__*/React__default['default'].createElement("span", {
119
+ }, label, colon) : /*#__PURE__*/React__default['default'].createElement("span", {
118
120
  className: prefixCls + "__indent",
119
121
  style: {
120
122
  width: labelWidth
@@ -1 +1 @@
1
- {"version":3,"file":"FormLabel.js","sources":["../../src/FormLabel.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","FormLabel","forwardRef","props","ref","useFormContext","labelWidthContext","labelWidth","labelPlacement","colonContext","colon","contentPositionContext","contentPosition","prefixCls","role","className","styleProp","style","children","label","required","labelWidthProp","rest","useMemo","controlWidth","isNumeric","Number","contentPositionMemo","colonMemo","cls","cx","alignItems","React","width","__DEV__","displayName"],"mappings":"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"}
1
+ {"version":3,"file":"FormLabel.js","sources":["../../src/FormLabel.tsx"],"sourcesContent":[null],"names":["_role","_prefix","getPrefixCls","FormLabel","forwardRef","props","ref","i18n","useLocaleContext","useFormContext","labelWidthContext","labelWidth","labelPlacement","showColonContext","showColon","contentPositionContext","contentPosition","prefixCls","role","className","styleProp","style","children","label","required","labelWidthProp","rest","useMemo","controlWidth","isNumeric","Number","contentPositionMemo","colon","get","cls","cx","alignItems","React","width","__DEV__","displayName"],"mappings":"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"}
@@ -21,7 +21,7 @@ var env = require('@hi-ui/env');
21
21
 
22
22
  var context = require('./context.js');
23
23
 
24
- var funcUtils = require('@hi-ui/func-utils');
24
+ var objectUtils = require('@hi-ui/object-utils');
25
25
 
26
26
  var typeAssertion = require('@hi-ui/type-assertion');
27
27
 
@@ -56,12 +56,12 @@ var FormList = function FormList(_ref) {
56
56
 
57
57
  var updateFormList = React__default['default'].useCallback(function (stateFunc, alterTouched, alterErrors) {
58
58
  setFormState(function (prev) {
59
- var values = funcUtils.setNested(prev.values, name, stateFunc(funcUtils.getNested(prev.values, name))); // console.log(values, stateFunc(getNested(prev.values, name)))
59
+ var values = objectUtils.setNested(prev.values, name, stateFunc(objectUtils.getNested(prev.values, name))); // console.log(values, stateFunc(getNested(prev.values, name)))
60
60
 
61
61
  var updateErrors = typeof alterErrors === 'function' ? alterErrors : stateFunc;
62
62
  var updateTouched = typeof alterTouched === 'function' ? alterTouched : stateFunc;
63
- var fieldError = alterErrors ? updateErrors(funcUtils.getNested(prev.errors, name)) : undefined;
64
- var fieldTouched = alterTouched ? updateTouched(funcUtils.getNested(prev.touched, name)) : undefined;
63
+ var fieldError = alterErrors ? updateErrors(objectUtils.getNested(prev.errors, name)) : undefined;
64
+ var fieldTouched = alterTouched ? updateTouched(objectUtils.getNested(prev.touched, name)) : undefined;
65
65
 
66
66
  if (!typeAssertion.isArrayNonEmpty(fieldError)) {
67
67
  fieldError = undefined;
@@ -73,8 +73,8 @@ var FormList = function FormList(_ref) {
73
73
 
74
74
  return {
75
75
  values: values,
76
- errors: alterErrors ? funcUtils.setNested(prev.errors, name, fieldError) : prev.errors,
77
- touched: alterTouched ? funcUtils.setNested(prev.touched, name, fieldTouched) : prev.touched
76
+ errors: alterErrors ? objectUtils.setNested(prev.errors, name, fieldError) : prev.errors,
77
+ touched: alterTouched ? objectUtils.setNested(prev.touched, name, fieldTouched) : prev.touched
78
78
  };
79
79
  });
80
80
  }, [name, setFormState]);
@@ -119,7 +119,7 @@ var FormList = function FormList(_ref) {
119
119
  }, true, true);
120
120
  }, [updateFormList]);
121
121
  var listFields = React__default['default'].useMemo(function () {
122
- var list = funcUtils.getNested(values, name) || []; // @ts-ignore
122
+ var list = objectUtils.getNested(values, name) || []; // @ts-ignore
123
123
 
124
124
  return list.map(function (value, index) {
125
125
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"FormList.js","sources":["../../src/FormList.tsx"],"sourcesContent":[null],"names":["fieldListSymbol","Symbol","FormList","children","nameProp","name","useFormContext","values","setFormState","isArray","updateFormList","React","useCallback","stateFunc","alterTouched","alterErrors","prev","setNested","getNested","updateErrors","updateTouched","fieldError","errors","undefined","fieldTouched","touched","isArrayNonEmpty","add","value","asArray","remove","index","filter","_","idx","insertBefore","insert","swap","aIndex","bIndex","copy","temp","move","fromIndex","toIndex","splice","listFields","useMemo","list","map","symbol","__DEV__","console","warn","displayName","arr"],"mappings":"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"}
1
+ {"version":3,"file":"FormList.js","sources":["../../src/FormList.tsx"],"sourcesContent":[null],"names":["fieldListSymbol","Symbol","FormList","children","nameProp","name","useFormContext","values","setFormState","isArray","updateFormList","React","useCallback","stateFunc","alterTouched","alterErrors","prev","setNested","getNested","updateErrors","updateTouched","fieldError","errors","undefined","fieldTouched","touched","isArrayNonEmpty","add","value","asArray","remove","index","filter","_","idx","insertBefore","insert","swap","aIndex","bIndex","copy","temp","move","fromIndex","toIndex","splice","listFields","useMemo","list","map","symbol","__DEV__","console","warn","displayName","arr"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sources":["../../src/context.ts"],"sourcesContent":[null],"names":["formContext","createContext","FormProvider","Provider","useFormContext","context","useContext","Error"],"mappings":";;;;;;;;;;;;;;;;;AAIA,IAAMA,WAAW,gBAAGC,mBAAAA,CAAuD,IAAvDA,CAApB;IAEaC,YAAY,GAAGF,WAAW,CAACG;;IAE3BC,cAAc,GAAG,SAAjBA,cAAiB;MACtBC,OAAO,GAAGC,gBAAAA,CAAWN,WAAXM;;MAEZ,CAACD,SAAS;UACN,IAAIE,KAAJ,CAAU,uCAAV;;;SAGDF;;;;"}
1
+ {"version":3,"file":"context.js","sources":["../../src/context.ts"],"sourcesContent":[null],"names":["formContext","createContext","FormProvider","Provider","useFormContext","context","useContext","Error"],"mappings":";;;;;;;;;;;;;;;;;AAWA,IAAMA,WAAW,gBAAGC,mBAAAA,CAA0D,IAA1DA,CAApB;IAEaC,YAAY,GAAGF,WAAW,CAACG;;IAE3BC,cAAc,GAAG,SAAjBA,cAAiB;MACtBC,OAAO,GAAGC,gBAAAA,CAAWN,WAAXM;;MAEZ,CAACD,SAAS;UACN,IAAIE,KAAJ,CAAU,uCAAV;;;SAGDF;;;;"}
package/lib/cjs/index.js CHANGED
@@ -15,7 +15,7 @@ Object.defineProperty(exports, '__esModule', {
15
15
 
16
16
  require('./styles/index.scss.js');
17
17
 
18
- var Form = require('./Form.js');
18
+ var Form$1 = require('./Form.js');
19
19
 
20
20
  var FormItem = require('./FormItem.js');
21
21
 
@@ -25,11 +25,17 @@ var FormSubmit = require('./FormSubmit.js');
25
25
 
26
26
  var FormReset = require('./FormReset.js');
27
27
 
28
- exports.FORM_REGISTER_TABLE = Form.FORM_REGISTER_TABLE;
29
- exports.Form = Form.Form;
30
- exports["default"] = Form.Form;
28
+ var Form = Object.assign(Form$1.Form, {
29
+ Item: FormItem.FormItem,
30
+ List: FormList.FormList,
31
+ Submit: FormSubmit.FormSubmit,
32
+ Reset: FormReset.FormReset
33
+ });
34
+ exports.FORM_REGISTER_TABLE = Form$1.FORM_REGISTER_TABLE;
35
+ exports.Form = Form$1.Form;
31
36
  exports.FormItem = FormItem.FormItem;
32
37
  exports.FormList = FormList.FormList;
33
38
  exports.FormSubmit = FormSubmit.FormSubmit;
34
39
  exports.FormReset = FormReset.FormReset;
40
+ exports["default"] = Form;
35
41
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"index.js","sources":["../../src/index.ts"],"sourcesContent":[null],"names":["Form","Object","assign","_Form","Item","List","Submit","Reset"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;IAQMA,IAAI,GAAGC,MAAM,CAACC,MAAPD,CAAcE,WAAdF,EAAqB;AAChCG,EAAAA,IAAI,EAAJA,iBADgC;AAEhCC,EAAAA,IAAI,EAAJA,iBAFgC;AAGhCC,EAAAA,MAAM,EAANA,qBAHgC;AAIhCC,EAAAA,KAAK,EAALA;AAJgC,CAArBN;;;;;;;"}
@@ -12,7 +12,7 @@
12
12
  Object.defineProperty(exports, '__esModule', {
13
13
  value: true
14
14
  });
15
- var css_248z = "@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n.hi-v4-form {\n max-width: 100%;\n position: relative; }\n.hi-v4-form fieldset {\n margin: 0;\n padding: 0;\n border: 0; }\n.hi-v4-form fieldset + fieldset {\n margin-top: 16px; }\n.hi-v4-form legend {\n margin: 0 0 16px;\n color: #1f2937;\n color: var(--hi-v4-color-gray-800, #1f2937); }\n.hi-v4-form--placement-horizontal {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-wrap: wrap;\n flex-wrap: wrap; }\n.hi-v4-form--placement-horizontal .hi-v4-form-label__indent {\n min-height: 32px; }\n.hi-v4-form-label {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n font-size: 0.875rem;\n font-size: var(--hi-v4-text-size-normal, 0.875rem);\n margin-right: 8px;\n margin-right: var(--hi-v4-spacing-4, 8px);\n margin-bottom: 24px; }\n.hi-v4-form-label__text, .hi-v4-form-label__indent {\n -ms-flex-negative: 0;\n flex-shrink: 0;\n -webkit-box-sizing: border-box;\n box-sizing: border-box;\n vertical-align: top;\n color: #1f2937;\n color: var(--hi-v4-color-gray-800, #1f2937);\n overflow-wrap: break-word; }\n.hi-v4-form-label__text {\n padding-right: 8px;\n padding-right: var(--hi-v4-spacing-4, 8px);\n min-height: 22px;\n line-height: 22px; }\n.hi-v4-form-label--placement-left .hi-v4-form-label__text {\n text-align: left; }\n.hi-v4-form-label--placement-right .hi-v4-form-label__text {\n text-align: right; }\n.hi-v4-form-label--placement-top .hi-v4-form-label__text {\n height: 22px;\n padding-right: 8px;\n margin-bottom: 8px; }\n.hi-v4-form-label--required .hi-v4-form-label__text::before {\n margin-right: 4px;\n margin-right: var(--hi-v4-spacing-2, 4px);\n content: '*';\n color: #ff5959;\n color: var(--hi-v4-color-red-500, #ff5959); }\n.hi-v4-form-label--placement-top {\n text-align: left;\n -webkit-box-orient: vertical;\n -webkit-box-direction: normal;\n -ms-flex-direction: column;\n flex-direction: column;\n margin-bottom: 20px;\n margin-bottom: var(--hi-v4-spacing-10, 20px);\n padding-right: 0; }\n.hi-v4-form-label__content {\n -webkit-box-flex: 1;\n -ms-flex: 1 1;\n flex: 1 1;\n position: relative;\n vertical-align: top;\n min-height: 32px;\n -ms-flex-negative: 0;\n flex-shrink: 0; }\n.hi-v4-form-message {\n display: block;\n font-size: 0.875rem;\n font-size: var(--hi-v4-text-size-normal, 0.875rem);\n min-height: 24px;\n padding: 2px 0;\n -webkit-box-sizing: border-box;\n box-sizing: border-box;\n line-height: 20px;\n -webkit-transform: translateY(-10%);\n transform: translateY(-10%);\n opacity: 0;\n color: #ff5959;\n color: var(--hi-v4-color-red-500, #ff5959);\n -webkit-transition: all 0.3s;\n transition: all 0.3s; }\n.hi-v4-form-message--show {\n opacity: 1;\n -webkit-transform: translateY(0);\n transform: translateY(0); }\n.hi-v4-form-item {\n position: relative; }\n.hi-v4-form-item__message {\n position: absolute; }\n";
15
+ var css_248z = "@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n.hi-v4-form {\n max-width: 100%;\n position: relative; }\n.hi-v4-form fieldset {\n margin: 0;\n padding: 0;\n border: 0; }\n.hi-v4-form fieldset + fieldset {\n margin-top: 16px; }\n.hi-v4-form legend {\n margin: 0 0 16px;\n color: var(--hi-v4-color-gray-800, #1f2937); }\n.hi-v4-form--placement-horizontal {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-wrap: wrap;\n flex-wrap: wrap; }\n.hi-v4-form--placement-horizontal .hi-v4-form-label__indent {\n min-height: 32px; }\n.hi-v4-form-label {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n font-size: var(--hi-v4-text-size-normal, 0.875rem);\n margin-right: var(--hi-v4-spacing-4, 8px);\n margin-bottom: 24px; }\n.hi-v4-form-label__text, .hi-v4-form-label__indent {\n -ms-flex-negative: 0;\n flex-shrink: 0;\n -webkit-box-sizing: border-box;\n box-sizing: border-box;\n vertical-align: top;\n color: var(--hi-v4-color-gray-800, #1f2937);\n overflow-wrap: break-word; }\n.hi-v4-form-label__text {\n padding-right: var(--hi-v4-spacing-6, 12px);\n min-height: 32px;\n line-height: 32px; }\n.hi-v4-form-label--placement-left .hi-v4-form-label__text {\n text-align: left; }\n.hi-v4-form-label--placement-right .hi-v4-form-label__text {\n text-align: right; }\n.hi-v4-form-label--placement-top .hi-v4-form-label__text {\n height: 22px;\n padding-right: 8px;\n margin-bottom: 8px; }\n.hi-v4-form-label--required .hi-v4-form-label__text::before {\n margin-right: var(--hi-v4-spacing-2, 4px);\n content: '*';\n color: var(--hi-v4-color-danger-500, var(--hi-v4-color-red-500, #ff5959)); }\n.hi-v4-form-label--placement-top {\n text-align: left;\n -webkit-box-orient: vertical;\n -webkit-box-direction: normal;\n -ms-flex-direction: column;\n flex-direction: column;\n margin-bottom: var(--hi-v4-spacing-10, 20px);\n padding-right: 0; }\n.hi-v4-form-label__content {\n -webkit-box-flex: 1;\n -ms-flex: 1 1;\n flex: 1 1;\n position: relative;\n vertical-align: top;\n min-height: 32px;\n -ms-flex-negative: 0;\n flex-shrink: 0; }\n.hi-v4-form-message {\n display: block;\n font-size: var(--hi-v4-text-size-normal, 0.875rem);\n min-height: 24px;\n padding: 2px 0;\n -webkit-box-sizing: border-box;\n box-sizing: border-box;\n line-height: 20px;\n -webkit-transform: translateY(-10%);\n transform: translateY(-10%);\n opacity: 0;\n color: var(--hi-v4-color-danger-500, var(--hi-v4-color-red-500, #ff5959));\n -webkit-transition: all 0.3s;\n transition: all 0.3s; }\n.hi-v4-form-message--show {\n opacity: 1;\n -webkit-transform: translateY(0);\n transform: translateY(0); }\n.hi-v4-form-item {\n position: relative; }\n.hi-v4-form-item__message {\n position: absolute; }\n";
16
16
 
17
17
  var __styleInject__ = require('style-inject/dist/style-inject.es.js')["default"];
18
18
 
@@ -23,7 +23,7 @@ var typeAssertion = require('@hi-ui/type-assertion');
23
23
 
24
24
  var Validater = require('async-validator');
25
25
 
26
- var funcUtils = require('@hi-ui/func-utils');
26
+ var arrayUtils = require('@hi-ui/array-utils');
27
27
 
28
28
  var index = require('./utils/index.js');
29
29
 
@@ -38,7 +38,8 @@ var Validater__default = /*#__PURE__*/_interopDefaultLegacy(Validater);
38
38
  var useFormField = function useFormField(props) {
39
39
  var field = props.field,
40
40
  rulesProp = props.rules,
41
- valueType = props.valueType;
41
+ _props$valueType = props.valueType,
42
+ valueType = _props$valueType === void 0 ? 'any' : _props$valueType;
42
43
 
43
44
  var _useFormContext = context.useFormContext(),
44
45
  getFieldRules = _useFormContext.getFieldRules,
@@ -52,7 +53,7 @@ var useFormField = function useFormField(props) {
52
53
 
53
54
  var fieldRules = React.useMemo(function () {
54
55
  // @ts-ignore
55
- var rules = funcUtils.toArray(rulesProp !== null && rulesProp !== void 0 ? rulesProp : getFieldRules(field));
56
+ var rules = arrayUtils.normalizeArray(rulesProp !== null && rulesProp !== void 0 ? rulesProp : getFieldRules(field));
56
57
  return rules.map(function (rule) {
57
58
  return Object.assign({
58
59
  type: valueType
@@ -1 +1 @@
1
- {"version":3,"file":"use-form-field.js","sources":["../../src/use-form-field.ts"],"sourcesContent":[null],"names":["useFormField","props","field","rulesProp","rules","valueType","useFormContext","getFieldRules","getFieldProps","registerField","unregisterField","fieldRules","useMemo","toArray","map","rule","type","fieldValidate","useCallback","value","isArrayNonEmpty","Promise","resolve","fieldMD5","stringify","validater","Validater","validate","firstFields","useEffect","isNullish","isArray","every","item"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IASaA,YAAY,GAAG,SAAfA,YAAe,CAAeC,KAAf;MAClBC,KAAR,GAA+CD,KAA/C,CAAQC;MAAcC,SAAtB,GAA+CF,KAA/C,CAAeG;MAAkBC,SAAjC,GAA+CJ,KAA/C,CAAiCI;;wBAEwCC,sBAAAA;MAAjEC,aAAR,mBAAQA;MAAeC,aAAvB,mBAAuBA;MAAeC,aAAtC,mBAAsCA;MAAeC,eAArD,mBAAqDA;;;;;;MAK/CC,UAAU,GAAYC,aAAAA,CAAQ;;QAE5BR,KAAK,GAAGS,iBAAAA,CAAQV,SAAS,SAATA,IAAAA,SAAS,WAATA,GAAAA,SAAAA,GAAaI,aAAa,CAACL,KAAD,CAAlCW;WACPT,KAAK,CAACU,GAANV,CAAU,UAACW,IAAD;;AAAkBC,QAAAA,IAAI,EAAEX;SAAcU;AAAhD,KAAAX;AAH0B,GAAPQ,EAIzB,CAACT,SAAD,EAAYD,KAAZ,EAAmBK,aAAnB,EAAkCF,SAAlC,CAJyBO;;MAOtBK,aAAa,GAAGC,iBAAAA,CACpB,UAACC,KAAD;;;QACM,CAACC,6BAAAA,CAAgBT,UAAhBS,GAA6B;aACzBC,OAAO,CAACC,OAARD,CAAgB,IAAhBA;;;;QAIHE,QAAQ,GAAGC,eAAAA,CAAUtB,KAAVsB;QAEXC,SAAS,GAAG,IAAIC,6BAAJ,8BAAiBH,YAAWZ,sBAA5B;WACXc,SAAS,CAACE,QAAVF,gDAAsBF,YAAWJ,0BAAjCM,GAA0C;AAAEG,MAAAA,WAAW,EAAE;AAAf,KAA1CH;AAVsB,GAAXP,EAYpB,CAACP,UAAD,EAAaT,KAAb,CAZoBgB;;AAgBtBW,EAAAA,eAAAA,CAAU;QACJC,uBAAAA,CAAU5B,KAAV4B,KAAoB5B,KAAK,KAAK,IAAI;QAClC6B,qBAAAA,CAAQ7B,KAAR6B,KAAkB7B,KAAK,CAAC8B,KAAN9B,CAAY,UAAC+B,IAAD;aAAUH,uBAAAA,CAAUG,IAAVH,KAAmBG,IAAI,KAAK;AAAlD,KAAA/B,GAAuD;AAE7EO,IAAAA,aAAa,CAACP,KAAD,EAAQ;AACnByB,MAAAA,QAAQ,EAAEV;AADS,KAAR,CAAbR;WAIO;UACDqB,uBAAAA,CAAU5B,KAAV4B,KAAoB5B,KAAK,KAAK,IAAI;UAClC6B,qBAAAA,CAAQ7B,KAAR6B,KAAkB7B,KAAK,CAAC8B,KAAN9B,CAAY,UAAC+B,IAAD;eAAUH,uBAAAA,CAAUG,IAAVH,KAAmBG,IAAI,KAAK;AAAlD,OAAA/B,GAAuD;AAE7EQ,MAAAA,eAAe,CAACR,KAAD,CAAfQ;AAJF;AARO,GAATmB,EAcG,CAACpB,aAAD,EAAgBC,eAAhB,EAAiCR,KAAjC,EAAwCe,aAAxC,CAdHY;SAgBOrB,aAAa,CAACP,KAAD;;;"}
1
+ {"version":3,"file":"use-form-field.js","sources":["../../src/use-form-field.ts"],"sourcesContent":[null],"names":["useFormField","props","field","rulesProp","rules","valueType","useFormContext","getFieldRules","getFieldProps","registerField","unregisterField","fieldRules","useMemo","normalizeArray","map","rule","type","fieldValidate","useCallback","value","isArrayNonEmpty","Promise","resolve","fieldMD5","stringify","validater","Validater","validate","firstFields","useEffect","isNullish","isArray","every","item"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQaA,YAAY,GAAG,SAAfA,YAAe,CAAeC,KAAf;MAClBC,KAAR,GAAuDD,KAAvD,CAAQC;MAAcC,SAAtB,GAAuDF,KAAvD,CAAeG;yBAAwCH,KAAvD,CAAiCI;MAAAA,SAAjC,iCAA6C;;wBAE4BC,sBAAAA;MAAjEC,aAAR,mBAAQA;MAAeC,aAAvB,mBAAuBA;MAAeC,aAAtC,mBAAsCA;MAAeC,eAArD,mBAAqDA;;;;;;MAK/CC,UAAU,GAAYC,aAAAA,CAAQ;;QAE5BR,KAAK,GAAGS,yBAAAA,CAAeV,SAAS,SAATA,IAAAA,SAAS,WAATA,GAAAA,SAAAA,GAAaI,aAAa,CAACL,KAAD,CAAzCW;WACPT,KAAK,CAACU,GAANV,CAAU,UAACW,IAAD;;AAAkBC,QAAAA,IAAI,EAAEX;SAAcU;AAAhD,KAAAX;AAH0B,GAAPQ,EAIzB,CAACT,SAAD,EAAYD,KAAZ,EAAmBK,aAAnB,EAAkCF,SAAlC,CAJyBO;;MAOtBK,aAAa,GAAGC,iBAAAA,CACpB,UAACC,KAAD;;;QACM,CAACC,6BAAAA,CAAgBT,UAAhBS,GAA6B;aACzBC,OAAO,CAACC,OAARD,CAAgB,IAAhBA;;;;QAIHE,QAAQ,GAAGC,eAAAA,CAAUtB,KAAVsB;QAEXC,SAAS,GAAG,IAAIC,6BAAJ,8BAAiBH,YAAWZ,sBAA5B;WACXc,SAAS,CAACE,QAAVF,gDAAsBF,YAAWJ,0BAAjCM,GAA0C;AAAEG,MAAAA,WAAW,EAAE;AAAf,KAA1CH;AAVsB,GAAXP,EAYpB,CAACP,UAAD,EAAaT,KAAb,CAZoBgB;;AAgBtBW,EAAAA,eAAAA,CAAU;QACJC,uBAAAA,CAAU5B,KAAV4B,KAAoB5B,KAAK,KAAK,IAAI;QAClC6B,qBAAAA,CAAQ7B,KAAR6B,KAAkB7B,KAAK,CAAC8B,KAAN9B,CAAY,UAAC+B,IAAD;aAAUH,uBAAAA,CAAUG,IAAVH,KAAmBG,IAAI,KAAK;AAAlD,KAAA/B,GAAuD;AAE7EO,IAAAA,aAAa,CAACP,KAAD,EAAQ;AACnByB,MAAAA,QAAQ,EAAEV;AADS,KAAR,CAAbR;WAIO;UACDqB,uBAAAA,CAAU5B,KAAV4B,KAAoB5B,KAAK,KAAK,IAAI;UAClC6B,qBAAAA,CAAQ7B,KAAR6B,KAAkB7B,KAAK,CAAC8B,KAAN9B,CAAY,UAAC+B,IAAD;eAAUH,uBAAAA,CAAUG,IAAVH,KAAmBG,IAAI,KAAK;AAAlD,OAAA/B,GAAuD;AAE7EQ,MAAAA,eAAe,CAACR,KAAD,CAAfQ;AAJF;AARO,GAATmB,EAcG,CAACpB,aAAD,EAAgBC,eAAhB,EAAiCR,KAAjC,EAAwCe,aAAxC,CAdHY;SAgBOrB,aAAa,CAACP,KAAD;;;"}
@@ -29,6 +29,8 @@ var typeAssertion = require('@hi-ui/type-assertion');
29
29
 
30
30
  var funcUtils = require('@hi-ui/func-utils');
31
31
 
32
+ var objectUtils = require('@hi-ui/object-utils');
33
+
32
34
  var domUtils = require('@hi-ui/dom-utils');
33
35
 
34
36
  function _interopDefaultLegacy(e) {
@@ -102,13 +104,13 @@ var useForm = function useForm(_a) {
102
104
  // ])
103
105
 
104
106
  var getFieldValue = React.useCallback(function (fieldName) {
105
- return funcUtils.getNested(formStateRef.current.values, fieldName);
107
+ return objectUtils.getNested(formStateRef.current.values, fieldName);
106
108
  }, [formStateRef]);
107
109
  var getFieldsValue = React.useCallback(function () {
108
110
  return formStateRef.current.values;
109
111
  }, [formStateRef]);
110
112
  var getFieldError = React.useCallback(function (fieldName) {
111
- return funcUtils.getNested(formStateRef.current.errors, fieldName);
113
+ return objectUtils.getNested(formStateRef.current.errors, fieldName);
112
114
  }, [formStateRef]);
113
115
  var getFieldsError = React.useCallback(function () {
114
116
  return formStateRef.current.errors;
@@ -169,7 +171,7 @@ var useForm = function useForm(_a) {
169
171
  payload: false
170
172
  });
171
173
  setFieldError(field, '');
172
- return funcUtils.setNested({}, field, value);
174
+ return objectUtils.setNested({}, field, value);
173
175
  }, function (errorMsg) {
174
176
  var _a, _b, _c;
175
177
 
@@ -226,7 +228,7 @@ var useForm = function useForm(_a) {
226
228
  }); // touched 给外部控制展示,而不是当做参数暴露
227
229
 
228
230
  var shouldValidateField = // shouldValidate ?? (validateAfterTouched ? getNested(formState.touched, field) : true)
229
- validateAfterTouched ? funcUtils.getNested(formState.touched, field) && shouldValidate : shouldValidate;
231
+ validateAfterTouched ? objectUtils.getNested(formState.touched, field) && shouldValidate : shouldValidate;
230
232
 
231
233
  if (shouldValidateField) {
232
234
  validateField(field, value);
@@ -263,13 +265,16 @@ var useForm = function useForm(_a) {
263
265
 
264
266
  return nextValue;
265
267
  }, []);
266
- var handleFieldChange = React.useCallback(function (fieldName, valuePropName, valueCollectPipe, shouldValidate) {
268
+ var handleFieldChange = React.useCallback(function (fieldName, valuePropName, valueDispatchTransform, shouldValidate) {
267
269
  return function (evt) {
268
- // TODO: 传递 onChange 其它参数
269
- var nextValue = typeAssertion.isFunction(valueCollectPipe) ? valueCollectPipe(evt) : normalizeValueFromChange(evt, valuePropName);
270
+ for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
271
+ args[_key - 1] = arguments[_key];
272
+ }
273
+
274
+ var nextValue = typeAssertion.isFunction(valueDispatchTransform) ? valueDispatchTransform.apply(void 0, [evt].concat(args)) : normalizeValueFromChange(evt, valuePropName);
270
275
  setFieldValue(fieldName, nextValue, shouldValidate);
271
- var changedValues = funcUtils.setNested({}, fieldName, nextValue);
272
- var allValues = funcUtils.setNested(Object.assign({}, formState.values), fieldName, nextValue);
276
+ var changedValues = objectUtils.setNested({}, fieldName, nextValue);
277
+ var allValues = objectUtils.setNested(Object.assign({}, formState.values), fieldName, nextValue);
273
278
  onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValues, allValues);
274
279
  };
275
280
  }, [setFieldValue, onValuesChange, formState.values, normalizeValueFromChange]);
@@ -459,46 +464,39 @@ var useForm = function useForm(_a) {
459
464
  onReset: handleReset
460
465
  });
461
466
  });
462
- var getFieldProps = React.useCallback(function (props, ref) {
467
+ var getFieldProps = React.useCallback(function (props) {
463
468
  var _returnProps;
464
469
 
465
470
  if (props === void 0) {
466
471
  props = {};
467
472
  }
468
473
 
469
- if (ref === void 0) {
470
- ref = null;
471
- }
472
-
473
474
  var _props = props,
474
475
  field = _props.field,
475
476
  _props$valuePropName = _props.valuePropName,
476
477
  valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
477
- _props$valueCollectPr = _props.valueCollectPropName,
478
- valueCollectPropName = _props$valueCollectPr === void 0 ? 'onChange' : _props$valueCollectPr,
479
- valueCollectPipe = _props.valueCollectPipe,
480
- valueSyncPipe = _props.valueSyncPipe,
478
+ _props$valueChangeFun = _props.valueChangeFuncPropName,
479
+ valueChangeFuncPropName = _props$valueChangeFun === void 0 ? 'onChange' : _props$valueChangeFun,
480
+ valueDispatchTransform = _props.valueDispatchTransform,
481
+ valueConnectTransform = _props.valueConnectTransform,
481
482
  _props$validateTrigge = _props.validateTrigger,
482
483
  validateTriggerProp = _props$validateTrigge === void 0 ? validateTriggersMemo : _props$validateTrigge,
483
484
  children = _props.children;
484
- var controlProps = children.props || {};
485
+ var controlProps = children && children.props || {};
485
486
  var validateTrigger = typeAssertion.isArray(validateTriggerProp) ? validateTriggerProp : [validateTriggerProp];
486
- var validateOnCollect = validateTrigger.includes(valueCollectPropName);
487
+ var validateOnCollect = validateTrigger.includes(valueChangeFuncPropName);
487
488
  var validateOnBlur = validateTrigger.includes('onBlur');
488
- var controlledValue = funcUtils.getNested(formState.values, field);
489
- var returnProps = (_returnProps = {
490
- ref: ref
491
- }, _returnProps[valuePropName] = typeAssertion.isFunction(valueSyncPipe) ? valueSyncPipe(controlledValue) : controlledValue, _returnProps[valueCollectPropName] = funcUtils.callAllFuncs(controlProps[valueCollectPropName], handleFieldChange(field, valuePropName, valueCollectPipe, validateOnCollect)), _returnProps.onBlur = funcUtils.callAllFuncs(controlProps.onBlur, handleFieldBlur(field, validateOnBlur)), _returnProps.invalid = getFieldError(field), _returnProps);
489
+ var controlledValue = objectUtils.getNested(formState.values, field);
490
+ var returnProps = (_returnProps = {}, _returnProps[valuePropName] = typeAssertion.isFunction(valueConnectTransform) ? valueConnectTransform(controlledValue) : controlledValue, _returnProps[valueChangeFuncPropName] = funcUtils.callAllFuncs(controlProps[valueChangeFuncPropName], handleFieldChange(field, valuePropName, valueDispatchTransform, validateOnCollect)), _returnProps.onBlur = funcUtils.callAllFuncs(controlProps.onBlur, handleFieldBlur(field, validateOnBlur)), _returnProps.invalid = getFieldError(field), _returnProps);
492
491
  validateTrigger.forEach(function (triggerName) {
493
- if ([valueCollectPropName, 'onBlur'].indexOf(triggerName) === -1) {
494
- // @ts-ignore
492
+ if ([valueChangeFuncPropName, 'onBlur'].indexOf(triggerName) === -1) {
495
493
  returnProps[triggerName] = funcUtils.callAllFuncs(controlProps[triggerName], handleFieldTrigger(field));
496
494
  }
497
495
  });
498
496
  return returnProps;
499
497
  }, [formState, handleFieldChange, handleFieldBlur, validateTriggersMemo, handleFieldTrigger, getFieldError]);
500
498
  var getFieldRules = React.useCallback(function (fieldName) {
501
- return funcUtils.getNested(rules, fieldName);
499
+ return objectUtils.getNested(rules, fieldName);
502
500
  }, [rules]);
503
501
  return Object.assign(Object.assign({}, formState), {
504
502
  setFormState: setFormState,
@@ -557,17 +555,17 @@ function formReducer(state, action) {
557
555
 
558
556
  case 'SET_FIELD_VALUE':
559
557
  return Object.assign(Object.assign({}, state), {
560
- values: funcUtils.setNested(state.values, action.payload.field, action.payload.value)
558
+ values: objectUtils.setNested(state.values, action.payload.field, action.payload.value)
561
559
  });
562
560
 
563
561
  case 'SET_FIELD_TOUCHED':
564
562
  return Object.assign(Object.assign({}, state), {
565
- touched: funcUtils.setNested(state.touched, action.payload.field, action.payload.value)
563
+ touched: objectUtils.setNested(state.touched, action.payload.field, action.payload.value)
566
564
  });
567
565
 
568
566
  case 'SET_FIELD_ERROR':
569
567
  return Object.assign(Object.assign({}, state), {
570
- errors: funcUtils.setNested(state.errors, action.payload.field, action.payload.value)
568
+ errors: objectUtils.setNested(state.errors, action.payload.field, action.payload.value)
571
569
  });
572
570
 
573
571
  case 'SET_FORM':