@nutui/nutui-react-taro 3.0.1 → 3.0.2

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 (82) hide show
  1. package/dist/cjs/hooks/use-client-rect.js +1 -0
  2. package/dist/cjs/packages/datepicker/style/style.css +70 -0
  3. package/dist/cjs/packages/datepickerview/style/index.js +1 -0
  4. package/dist/cjs/packages/datepickerview/style/style.css +70 -0
  5. package/dist/cjs/packages/fixednav/fixednav.js +20 -14
  6. package/dist/cjs/packages/fixednav/style/fixednav.scss +0 -15
  7. package/dist/cjs/packages/fixednav/style/style.css +0 -14
  8. package/dist/cjs/packages/fixednav/style/style.harmony.css +0 -14
  9. package/dist/cjs/packages/form/form.d.ts +2 -0
  10. package/dist/cjs/packages/form/form.js +11 -2
  11. package/dist/cjs/packages/form/index.d.ts +2 -1
  12. package/dist/cjs/packages/form/index.js +1 -0
  13. package/dist/cjs/packages/form/style/form.scss +0 -66
  14. package/dist/cjs/packages/form/style/style.css +31 -21
  15. package/dist/cjs/packages/form/style/style.harmony.css +1 -67
  16. package/dist/cjs/packages/form/types.d.ts +2 -1
  17. package/dist/cjs/packages/form/useform.d.ts +2 -1
  18. package/dist/cjs/packages/form/useform.js +338 -247
  19. package/dist/cjs/packages/formitem/formitem.d.ts +1 -0
  20. package/dist/cjs/packages/formitem/formitem.js +57 -45
  21. package/dist/cjs/packages/formitem/style/formitem.scss +101 -21
  22. package/dist/cjs/packages/formitem/style/style.css +89 -12
  23. package/dist/cjs/packages/formitem/style/style.harmony.css +89 -12
  24. package/dist/cjs/packages/input/input.js +3 -1
  25. package/dist/cjs/packages/picker/style/index.js +1 -0
  26. package/dist/cjs/packages/picker/style/style.css +70 -0
  27. package/dist/cjs/packages/signature/signature.js +1 -1
  28. package/dist/cjs/packages/swipe/style/style.css +3 -3
  29. package/dist/cjs/packages/swipe/style/style.harmony.css +3 -3
  30. package/dist/cjs/packages/swipe/style/swipe.scss +7 -3
  31. package/dist/cjs/packages/swipe/swipe.js +14 -15
  32. package/dist/cjs/utils/get-rect-by-taro.d.ts +1 -1
  33. package/dist/cjs/utils/get-rect-by-taro.js +4 -1
  34. package/dist/cjs/utils/get-system-info.js +4 -5
  35. package/dist/cjs/utils/merge.d.ts +14 -0
  36. package/dist/cjs/utils/merge.js +98 -0
  37. package/dist/cjs/utils/platform-taro.js +4 -5
  38. package/dist/cjs/utils/to-array.d.ts +1 -0
  39. package/dist/cjs/utils/to-array.js +18 -0
  40. package/dist/es/hooks/use-client-rect.js +1 -0
  41. package/dist/es/packages/datepicker/style/style.css +70 -0
  42. package/dist/es/packages/datepickerview/style/index.js +1 -0
  43. package/dist/es/packages/datepickerview/style/style.css +70 -0
  44. package/dist/es/packages/fixednav/fixednav.js +20 -14
  45. package/dist/es/packages/fixednav/style/fixednav.scss +0 -15
  46. package/dist/es/packages/fixednav/style/style.css +0 -14
  47. package/dist/es/packages/fixednav/style/style.harmony.css +0 -14
  48. package/dist/es/packages/form/form.d.ts +10 -0
  49. package/dist/es/packages/form/form.js +11 -2
  50. package/dist/es/packages/form/index.d.ts +2 -1
  51. package/dist/es/packages/form/index.js +2 -1
  52. package/dist/es/packages/form/style/form.scss +0 -66
  53. package/dist/es/packages/form/style/style.css +31 -21
  54. package/dist/es/packages/form/style/style.harmony.css +1 -67
  55. package/dist/es/packages/form/types.d.ts +2 -1
  56. package/dist/es/packages/form/useform.d.ts +2 -1
  57. package/dist/es/packages/form/useform.js +336 -248
  58. package/dist/es/packages/formitem/formitem.d.ts +1 -0
  59. package/dist/es/packages/formitem/formitem.js +58 -46
  60. package/dist/es/packages/formitem/style/formitem.scss +101 -21
  61. package/dist/es/packages/formitem/style/style.css +89 -12
  62. package/dist/es/packages/formitem/style/style.harmony.css +89 -12
  63. package/dist/es/packages/input/input.js +3 -1
  64. package/dist/es/packages/picker/style/index.js +1 -0
  65. package/dist/es/packages/picker/style/style.css +70 -0
  66. package/dist/es/packages/signature/signature.js +2 -2
  67. package/dist/es/packages/swipe/style/style.css +3 -3
  68. package/dist/es/packages/swipe/style/style.harmony.css +3 -3
  69. package/dist/es/packages/swipe/style/swipe.scss +7 -3
  70. package/dist/es/packages/swipe/swipe.js +14 -15
  71. package/dist/es/utils/get-rect-by-taro.d.ts +1 -1
  72. package/dist/es/utils/get-rect-by-taro.js +4 -1
  73. package/dist/es/utils/get-system-info.js +4 -4
  74. package/dist/es/utils/merge.d.ts +14 -0
  75. package/dist/es/utils/merge.js +68 -0
  76. package/dist/es/utils/platform-taro.js +4 -4
  77. package/dist/es/utils/to-array.d.ts +1 -0
  78. package/dist/es/utils/to-array.js +8 -0
  79. package/dist/nutui.react.umd.js +4301 -4084
  80. package/dist/style.css +1 -1
  81. package/dist/style.scss +34 -34
  82. package/package.json +1 -1
@@ -24,6 +24,7 @@ var _context = require("../form/context");
24
24
  var _index = /*#__PURE__*/ _interop_require_default._(require("../cell/index"));
25
25
  var _typings = require("../../utils/typings");
26
26
  var _isforwardrefcomponent = require("../../utils/is-forward-ref-component");
27
+ var _toarray = require("../../utils/to-array");
27
28
  var _useform = require("../form/useform");
28
29
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
29
30
  required: false,
@@ -36,7 +37,6 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
36
37
  }
37
38
  ],
38
39
  errorMessageAlign: 'left',
39
- validateTrigger: 'onChange',
40
40
  shouldUpdate: false,
41
41
  noStyle: false
42
42
  });
@@ -51,15 +51,19 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
51
51
  props
52
52
  ]), (0, _define_property._)(_this, "cancelRegister", void 0), (0, _define_property._)(_this, "componentRef", void 0), (0, _define_property._)(_this, "eventOff", void 0), (0, _define_property._)(_this, "getControlled", function(children) {
53
53
  var _children_props;
54
- var _this_context = _this.context, setFieldsValue = _this_context.setFieldsValue, getFieldValue = _this_context.getFieldValue;
55
- var dispatch = _this.context.getInternal(_useform.SECRET).dispatch;
54
+ var _this_context_formInstance = _this.context.formInstance, setFieldsValue = _this_context_formInstance.setFieldsValue, getFieldValue = _this_context_formInstance.getFieldValue;
55
+ var dispatch = _this.context.formInstance.getInternal(_useform.SECRET).dispatch;
56
56
  var _this_props = _this.props, _this_props_name = _this_props.name, name = _this_props_name === void 0 ? '' : _this_props_name;
57
57
  if (children === null || children === void 0 ? void 0 : (_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.defaultValue) {
58
- console.warn('通过 initialValue 设置初始值');
58
+ if (process.env.NODE_ENV !== 'production') {
59
+ console.warn('[NutUI] FormItem:', '请通过 initialValue 设置初始值,而不是 defaultValue');
60
+ }
59
61
  }
60
62
  var fieldValue = getFieldValue(name);
61
63
  var _obj;
62
- var controlled = (0, _object_spread_props._)((0, _object_spread._)({}, children.props), (_obj = {}, (0, _define_property._)(_obj, _this.props.valuePropName || 'value', fieldValue !== undefined ? fieldValue : _this.props.initialValue), (0, _define_property._)(_obj, _this.props.trigger || 'onChange', function() {
64
+ var controlled = (0, _object_spread_props._)((0, _object_spread._)({}, children.props), (_obj = {
65
+ className: children.props.className
66
+ }, (0, _define_property._)(_obj, _this.props.valuePropName || 'value', fieldValue !== undefined ? fieldValue : _this.props.initialValue), (0, _define_property._)(_obj, _this.props.trigger || 'onChange', function() {
63
67
  for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
64
68
  args[_key] = arguments[_key];
65
69
  }
@@ -73,33 +77,27 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
73
77
  var _this_props;
74
78
  next = (_this_props = _this.props).getValueFromEvent.apply(_this_props, (0, _to_consumable_array._)(args));
75
79
  }
76
- setFieldsValue((0, _define_property._)({}, name, next), false);
80
+ setFieldsValue((0, _define_property._)({}, name, next));
77
81
  }), _obj));
78
82
  var validateTrigger = _this.props.validateTrigger;
79
- var validateTriggers = [
80
- _this.props.trigger || 'onChange'
81
- ];
82
- if (validateTrigger) {
83
- validateTriggers = typeof validateTrigger === 'string' ? [
84
- validateTrigger
85
- ] : (0, _to_consumable_array._)(validateTrigger);
86
- validateTriggers.forEach(function(trigger) {
87
- var originTrigger = controlled[trigger];
88
- controlled[trigger] = function() {
89
- for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
90
- args[_key] = arguments[_key];
91
- }
92
- if (originTrigger) {
93
- originTrigger.apply(void 0, (0, _to_consumable_array._)(args));
94
- }
95
- if (_this.props.rules && _this.props.rules.length) {
96
- dispatch({
97
- name: _this.props.name
98
- });
99
- }
100
- };
101
- });
102
- }
83
+ var mergedValidateTrigger = validateTrigger || _this.context.validateTrigger;
84
+ var validateTriggers = (0, _toarray.toArray)(mergedValidateTrigger);
85
+ validateTriggers.forEach(function(trigger) {
86
+ var originTrigger = controlled[trigger];
87
+ controlled[trigger] = function() {
88
+ for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
89
+ args[_key] = arguments[_key];
90
+ }
91
+ if (originTrigger) {
92
+ originTrigger.apply(void 0, (0, _to_consumable_array._)(args));
93
+ }
94
+ if (_this.props.rules && _this.props.rules.length) {
95
+ dispatch({
96
+ name: _this.props.name
97
+ });
98
+ }
99
+ };
100
+ });
103
101
  if ((0, _isforwardrefcomponent.isForwardRefComponent)(children)) {
104
102
  controlled.ref = function(componentInstance) {
105
103
  var originRef = children.ref;
@@ -124,34 +122,36 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
124
122
  });
125
123
  }), (0, _define_property._)(_this, "onStoreChange", function(type) {
126
124
  if (type === 'reset') {
127
- _this.context.errors[_this.props.name] = [];
125
+ _this.context.formInstance.errors[_this.props.name] = [];
128
126
  _this.refresh();
129
127
  } else {
130
128
  _this.forceUpdate();
131
129
  }
132
130
  }), (0, _define_property._)(_this, "renderLayout", function(childNode) {
133
131
  var _item_;
134
- var _$_object_spread = (0, _object_spread._)({}, defaultProps, _this.props), label = _$_object_spread.label, name = _$_object_spread.name, required = _$_object_spread.required, rules = _$_object_spread.rules, className = _$_object_spread.className, style = _$_object_spread.style, align = _$_object_spread.align, errorMessageAlign = _$_object_spread.errorMessageAlign;
132
+ var _$_object_spread = (0, _object_spread._)({}, defaultProps, _this.props), label = _$_object_spread.label, name = _$_object_spread.name, required = _$_object_spread.required, rules = _$_object_spread.rules, className = _$_object_spread.className, style = _$_object_spread.style, errorMessageAlign = _$_object_spread.errorMessageAlign, align = _$_object_spread.align;
135
133
  var requiredInRules = rules === null || rules === void 0 ? void 0 : rules.some(function(rule) {
136
134
  return rule.required;
137
135
  });
138
- var item = name ? _this.context.errors[name] : [];
139
- var starPosition = _this.context.starPosition;
140
- var renderStar = (required || requiredInRules) && /*#__PURE__*/ _react.default.createElement("i", {
141
- className: "required"
142
- });
143
- var renderLabel = /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, starPosition === 'left' ? renderStar : null, label, starPosition === 'right' ? renderStar : null);
136
+ var item = name ? _this.context.formInstance.errors[name] : [];
137
+ var starPosition = _this.context.formInstance.starPosition;
138
+ var renderStar = (required || requiredInRules) && /*#__PURE__*/ _react.default.createElement(_components.Text, {
139
+ className: "nut-form-item-label-required required"
140
+ }, "*");
141
+ var renderLabel = /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.Text, {
142
+ className: "nut-form-item-labeltxt"
143
+ }, starPosition === 'left' ? renderStar : null, label), starPosition === 'right' ? renderStar : null);
144
144
  return /*#__PURE__*/ _react.default.createElement(_index.default, {
145
- className: "nut-form-item ".concat(className),
145
+ className: "".concat(_this.getClassNameWithDirection('nut-form-item'), " ").concat(className),
146
146
  style: style,
147
147
  align: align,
148
148
  onClick: function onClick(e) {
149
149
  return _this.props.onClick && _this.props.onClick(e, _this.componentRef);
150
150
  }
151
151
  }, label ? /*#__PURE__*/ _react.default.createElement(_components.View, {
152
- className: "nut-cell-title nut-form-item-label"
152
+ className: "nut-cell-title ".concat(_this.getClassNameWithDirection('nut-form-item-label'))
153
153
  }, renderLabel) : null, /*#__PURE__*/ _react.default.createElement(_components.View, {
154
- className: "nut-cell-value nut-form-item-body"
154
+ className: "nut-cell-value ".concat(_this.getClassNameWithDirection('nut-form-item-body'))
155
155
  }, /*#__PURE__*/ _react.default.createElement(_components.View, {
156
156
  className: "nut-form-item-body-slots"
157
157
  }, childNode), /*#__PURE__*/ _react.default.createElement(_components.View, {
@@ -173,12 +173,12 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
173
173
  key: "componentDidMount",
174
174
  value: function componentDidMount() {
175
175
  // Form设置initialValues时的处理
176
- var _this_context_getInternal = this.context.getInternal(_useform.SECRET), _this_context_getInternal_store = _this_context_getInternal.store, store = _this_context_getInternal_store === void 0 ? {} : _this_context_getInternal_store, setInitialValues = _this_context_getInternal.setInitialValues;
176
+ var _this_context_formInstance_getInternal = this.context.formInstance.getInternal(_useform.SECRET), _this_context_formInstance_getInternal_store = _this_context_formInstance_getInternal.store, store = _this_context_formInstance_getInternal_store === void 0 ? {} : _this_context_formInstance_getInternal_store, setInitialValues = _this_context_formInstance_getInternal.setInitialValues;
177
177
  if (this.props.initialValue && this.props.name && !Object.keys(store).includes(this.props.name)) {
178
178
  setInitialValues((0, _object_spread_props._)((0, _object_spread._)({}, store), (0, _define_property._)({}, this.props.name, this.props.initialValue)), true);
179
179
  }
180
180
  // 注册组件实例到FormStore
181
- var _this_context_getInternal1 = this.context.getInternal(_useform.SECRET), registerField = _this_context_getInternal1.registerField, registerUpdate = _this_context_getInternal1.registerUpdate;
181
+ var _this_context_formInstance_getInternal1 = this.context.formInstance.getInternal(_useform.SECRET), registerField = _this_context_formInstance_getInternal1.registerField, registerUpdate = _this_context_formInstance_getInternal1.registerUpdate;
182
182
  this.cancelRegister = registerField(this);
183
183
  // 这里需要增加事件监听,因为此实现属于依赖触发
184
184
  this.eventOff = registerUpdate(this, this.props.shouldUpdate);
@@ -195,6 +195,15 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
195
195
  }
196
196
  }
197
197
  },
198
+ {
199
+ key: "getClassNameWithDirection",
200
+ value: function getClassNameWithDirection(className) {
201
+ if (className && this.context.labelPosition) {
202
+ return "".concat(className, " ").concat(className, "-").concat(this.context.labelPosition);
203
+ }
204
+ return className;
205
+ }
206
+ },
198
207
  {
199
208
  key: "render",
200
209
  value: function render() {
@@ -204,11 +213,14 @@ var FormItem = /*#__PURE__*/ function(_superClass) {
204
213
  if (!this.props.shouldUpdate) {
205
214
  returnChildNode = /*#__PURE__*/ _react.default.cloneElement(child, this.getControlled(child));
206
215
  } else {
207
- returnChildNode = child(this.context);
216
+ returnChildNode = child(this.context.formInstance);
208
217
  }
209
218
  return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, {
210
219
  key: this.state.resetCount
211
- }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode));
220
+ }, /*#__PURE__*/ _react.default.createElement(_components.View, {
221
+ className: this.context.disabled ? 'nut-form-item-disabled' : '',
222
+ catchMove: this.context.disabled
223
+ }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode)));
212
224
  }
213
225
  }
214
226
  ]);
@@ -1,40 +1,41 @@
1
1
  .nut-form-item {
2
2
  display: flex;
3
- align-items: center;
4
- padding: 4px 12px;
3
+ line-height: unset;
5
4
 
6
- &.error {
7
- &.line {
8
- &::before {
9
- border-bottom: 1px solid $form-item-error-line-color;
10
- transform: scaleX(1);
11
- transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
12
- }
13
- }
5
+ &-disabled {
6
+ opacity: 0.4;
7
+ pointer-events: none;
14
8
  }
15
9
 
16
10
  &-label {
11
+ display: flex;
12
+ flex-direction: row;
17
13
  font-size: $form-item-label-font-size;
18
14
  font-weight: normal;
19
15
  width: $form-item-label-width;
20
16
  margin-right: $form-item-label-margin-right;
21
- flex: none !important;
22
- display: inline-block !important;
17
+ flex: 0 0 auto;
23
18
  word-wrap: break-word;
24
19
  text-align: $form-item-label-text-align;
20
+ line-height: unset;
21
+ }
25
22
 
26
- .required {
27
- &::before {
28
- content: '*';
29
- color: $form-item-required-color;
30
- margin-right: $form-item-required-margin-right;
31
- }
32
- }
23
+ &-label-required {
24
+ color: $form-item-required-color;
25
+ margin-right: $form-item-required-margin-right;
26
+ display: block;
27
+ position: absolute;
28
+ left: -10px;
29
+ }
30
+
31
+ .nut-form-item-labeltxt {
32
+ position: relative;
33
+ font-size: 12px;
33
34
  }
34
35
 
35
36
  &-body {
36
37
  flex: 1;
37
- display: flex !important;
38
+ display: flex;
38
39
  flex-direction: column;
39
40
 
40
41
  &-slots {
@@ -45,6 +46,10 @@
45
46
  border: 0;
46
47
  }
47
48
 
49
+ .nut-input-container {
50
+ height: auto;
51
+ }
52
+
48
53
  .nut-input-text {
49
54
  font-size: $form-item-body-font-size;
50
55
  text-align: $form-item-body-input-text-align;
@@ -61,7 +66,7 @@
61
66
  }
62
67
 
63
68
  .nut-textarea {
64
- padding: 0 !important;
69
+ padding: 0;
65
70
 
66
71
  .nut-textarea-textarea {
67
72
  font: inherit;
@@ -77,6 +82,7 @@
77
82
  }
78
83
  }
79
84
  }
85
+
80
86
  [dir='rtl'] .nut-form-item,
81
87
  .nut-rtl .nut-form-item {
82
88
  &-label {
@@ -91,22 +97,96 @@
91
97
  }
92
98
  }
93
99
  }
100
+
94
101
  &-body {
95
102
  &-slots {
96
103
  text-align: right;
104
+
97
105
  .nut-icon-ArrowRight,
98
106
  .nut-icon-ArrowLeft {
99
107
  transform: rotateY(180deg);
100
108
  }
109
+
101
110
  .nut-input-text {
102
111
  text-align: right;
103
112
  }
113
+
104
114
  .nut-textarea-textarea {
105
115
  text-align: right;
106
116
  }
107
117
  }
108
118
  }
119
+
109
120
  &-tips {
110
121
  text-align: right;
111
122
  }
112
123
  }
124
+
125
+ /* position */
126
+
127
+ .nut-form-item-label-right {
128
+ justify-content: flex-end;
129
+ padding-right: 24px;
130
+ white-space: nowrap;
131
+ }
132
+
133
+ .nut-form-item-label-left {
134
+ position: relative;
135
+ padding-left: 12px;
136
+ white-space: nowrap;
137
+ }
138
+
139
+ .nut-form-item-label-left-required {
140
+ display: block;
141
+ line-height: 1.5;
142
+ position: absolute;
143
+ left: 0.1em;
144
+ }
145
+
146
+ .nut-form-item-top {
147
+ flex-direction: column;
148
+ align-items: flex-start;
149
+ white-space: nowrap;
150
+ }
151
+
152
+ .nut-form-item-label-top {
153
+ display: block;
154
+ padding-bottom: 4px;
155
+ padding-right: 24px;
156
+ }
157
+
158
+ .nut-form-item-body-top {
159
+ margin-left: 0;
160
+ width: 100%;
161
+ }
162
+
163
+ [dir='rtl'] .form-layout-right .nut-form-item-label,
164
+ .nut-rtl .form-layout-right .nut-form-item-label {
165
+ text-align: left;
166
+ padding-right: 0;
167
+ padding-left: 24px;
168
+ }
169
+
170
+ [dir='rtl'] .form-layout-left .nut-form-item-label,
171
+ .nut-rtl .form-layout-left .nut-form-item-label {
172
+ text-align: right;
173
+ padding-left: 0;
174
+ padding-right: 12px;
175
+
176
+ .required {
177
+ left: auto;
178
+ right: 0.1em;
179
+ }
180
+ }
181
+
182
+ [dir='rtl'] .form-layout-top .nut-form-item-label,
183
+ .nut-rtl .form-layout-top .nut-form-item-label {
184
+ padding-right: 0;
185
+ padding-left: 24px;
186
+ }
187
+
188
+ [dir='rtl'] .form-layout-top .nut-form-item-body,
189
+ .nut-rtl .form-layout-top .nut-form-item-body {
190
+ margin-left: 0;
191
+ margin-right: 0;
192
+ }
@@ -4,32 +4,38 @@
4
4
  /* #endif */
5
5
  .nut-form-item {
6
6
  display: flex;
7
- align-items: center;
8
- padding: 4px 12px;
7
+ line-height: unset;
9
8
  }
10
- .nut-form-item.error.line::before {
11
- border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-color-primary, #ff0f23));
12
- transform: scaleX(1);
13
- transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
9
+ .nut-form-item-disabled {
10
+ opacity: 0.4;
11
+ pointer-events: none;
14
12
  }
15
13
  .nut-form-item-label {
14
+ display: flex;
15
+ flex-direction: row;
16
16
  font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
17
17
  font-weight: normal;
18
18
  width: var(--nutui-form-item-label-width, 90px);
19
19
  margin-right: var(--nutui-form-item-label-margin-right, 10px);
20
- flex: none !important;
21
- display: inline-block !important;
20
+ flex: 0 0 auto;
22
21
  word-wrap: break-word;
23
22
  text-align: var(--nutui-form-item-label-text-align, left);
23
+ line-height: unset;
24
24
  }
25
- .nut-form-item-label .required::before {
26
- content: "*";
25
+ .nut-form-item-label-required {
27
26
  color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
28
27
  margin-right: var(--nutui-form-item-required-margin-right, 4px);
28
+ display: block;
29
+ position: absolute;
30
+ left: -10px;
31
+ }
32
+ .nut-form-item .nut-form-item-labeltxt {
33
+ position: relative;
34
+ font-size: 12px;
29
35
  }
30
36
  .nut-form-item-body {
31
37
  flex: 1;
32
- display: flex !important;
38
+ display: flex;
33
39
  flex-direction: column;
34
40
  }
35
41
  .nut-form-item-body-slots {
@@ -39,6 +45,9 @@
39
45
  padding: 0;
40
46
  border: 0;
41
47
  }
48
+ .nut-form-item-body-slots .nut-input-container {
49
+ height: auto;
50
+ }
42
51
  .nut-form-item-body-slots .nut-input-text {
43
52
  font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
44
53
  text-align: var(--nutui-form-item-body-input-text-align, left);
@@ -53,7 +62,7 @@
53
62
  min-height: 24px;
54
63
  }
55
64
  .nut-form-item-body-slots .nut-textarea {
56
- padding: 0 !important;
65
+ padding: 0;
57
66
  }
58
67
  .nut-form-item-body-slots .nut-textarea .nut-textarea-textarea {
59
68
  font: inherit;
@@ -97,4 +106,72 @@
97
106
  [dir=rtl] .nut-form-item-tips,
98
107
  .nut-rtl .nut-form-item-tips {
99
108
  text-align: right;
109
+ }
110
+
111
+ /* position */
112
+ .nut-form-item-label-right {
113
+ justify-content: flex-end;
114
+ padding-right: 24px;
115
+ white-space: nowrap;
116
+ }
117
+
118
+ .nut-form-item-label-left {
119
+ position: relative;
120
+ padding-left: 12px;
121
+ white-space: nowrap;
122
+ }
123
+
124
+ .nut-form-item-label-left-required {
125
+ display: block;
126
+ line-height: 1.5;
127
+ position: absolute;
128
+ left: 0.1em;
129
+ }
130
+
131
+ .nut-form-item-top {
132
+ flex-direction: column;
133
+ align-items: flex-start;
134
+ white-space: nowrap;
135
+ }
136
+
137
+ .nut-form-item-label-top {
138
+ display: block;
139
+ padding-bottom: 4px;
140
+ padding-right: 24px;
141
+ }
142
+
143
+ .nut-form-item-body-top {
144
+ margin-left: 0;
145
+ width: 100%;
146
+ }
147
+
148
+ [dir=rtl] .form-layout-right .nut-form-item-label,
149
+ .nut-rtl .form-layout-right .nut-form-item-label {
150
+ text-align: left;
151
+ padding-right: 0;
152
+ padding-left: 24px;
153
+ }
154
+
155
+ [dir=rtl] .form-layout-left .nut-form-item-label,
156
+ .nut-rtl .form-layout-left .nut-form-item-label {
157
+ text-align: right;
158
+ padding-left: 0;
159
+ padding-right: 12px;
160
+ }
161
+ [dir=rtl] .form-layout-left .nut-form-item-label .required,
162
+ .nut-rtl .form-layout-left .nut-form-item-label .required {
163
+ left: auto;
164
+ right: 0.1em;
165
+ }
166
+
167
+ [dir=rtl] .form-layout-top .nut-form-item-label,
168
+ .nut-rtl .form-layout-top .nut-form-item-label {
169
+ padding-right: 0;
170
+ padding-left: 24px;
171
+ }
172
+
173
+ [dir=rtl] .form-layout-top .nut-form-item-body,
174
+ .nut-rtl .form-layout-top .nut-form-item-body {
175
+ margin-left: 0;
176
+ margin-right: 0;
100
177
  }
@@ -4,32 +4,38 @@
4
4
  /* #endif */
5
5
  .nut-form-item {
6
6
  display: flex;
7
- align-items: center;
8
- padding: 4px 12px;
7
+ line-height: unset;
9
8
  }
10
- .nut-form-item.error.line::before {
11
- border-bottom: 1px solid #ff0f23;
12
- transform: scaleX(1);
13
- transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
9
+ .nut-form-item-disabled {
10
+ opacity: 0.4;
11
+ pointer-events: none;
14
12
  }
15
13
  .nut-form-item-label {
14
+ display: flex;
15
+ flex-direction: row;
16
16
  font-size: 14px;
17
17
  font-weight: normal;
18
18
  width: 90px;
19
19
  margin-right: 10px;
20
- flex: none !important;
21
- display: inline-block !important;
20
+ flex: 0 0 auto;
22
21
  word-wrap: break-word;
23
22
  text-align: left;
23
+ line-height: unset;
24
24
  }
25
- .nut-form-item-label .required::before {
26
- content: "*";
25
+ .nut-form-item-label-required {
27
26
  color: #ff0f23;
28
27
  margin-right: 4px;
28
+ display: block;
29
+ position: absolute;
30
+ left: -10px;
31
+ }
32
+ .nut-form-item .nut-form-item-labeltxt {
33
+ position: relative;
34
+ font-size: 12px;
29
35
  }
30
36
  .nut-form-item-body {
31
37
  flex: 1;
32
- display: flex !important;
38
+ display: flex;
33
39
  flex-direction: column;
34
40
  }
35
41
  .nut-form-item-body-slots {
@@ -39,6 +45,9 @@
39
45
  padding: 0;
40
46
  border: 0;
41
47
  }
48
+ .nut-form-item-body-slots .nut-input-container {
49
+ height: auto;
50
+ }
42
51
  .nut-form-item-body-slots .nut-input-text {
43
52
  font-size: 14px;
44
53
  text-align: left;
@@ -53,7 +62,7 @@
53
62
  min-height: 24px;
54
63
  }
55
64
  .nut-form-item-body-slots .nut-textarea {
56
- padding: 0 !important;
65
+ padding: 0;
57
66
  }
58
67
  .nut-form-item-body-slots .nut-textarea .nut-textarea-textarea {
59
68
  font: inherit;
@@ -105,4 +114,72 @@
105
114
  [dir=rtl] .nut-form-item-tips,
106
115
  .nut-rtl .nut-form-item-tips {
107
116
  text-align: right;
117
+ }
118
+
119
+ /* position */
120
+ .nut-form-item-label-right {
121
+ justify-content: flex-end;
122
+ padding-right: 24px;
123
+ white-space: nowrap;
124
+ }
125
+
126
+ .nut-form-item-label-left {
127
+ position: relative;
128
+ padding-left: 12px;
129
+ white-space: nowrap;
130
+ }
131
+
132
+ .nut-form-item-label-left-required {
133
+ display: block;
134
+ line-height: 1.5;
135
+ position: absolute;
136
+ left: 0.1em;
137
+ }
138
+
139
+ .nut-form-item-top {
140
+ flex-direction: column;
141
+ align-items: flex-start;
142
+ white-space: nowrap;
143
+ }
144
+
145
+ .nut-form-item-label-top {
146
+ display: block;
147
+ padding-bottom: 4px;
148
+ padding-right: 24px;
149
+ }
150
+
151
+ .nut-form-item-body-top {
152
+ margin-left: 0;
153
+ width: 100%;
154
+ }
155
+
156
+ [dir=rtl] .form-layout-right .nut-form-item-label,
157
+ .nut-rtl .form-layout-right .nut-form-item-label {
158
+ text-align: left;
159
+ padding-right: 0;
160
+ padding-left: 24px;
161
+ }
162
+
163
+ [dir=rtl] .form-layout-left .nut-form-item-label,
164
+ .nut-rtl .form-layout-left .nut-form-item-label {
165
+ text-align: right;
166
+ padding-left: 0;
167
+ padding-right: 12px;
168
+ }
169
+ [dir=rtl] .form-layout-left .nut-form-item-label .required,
170
+ .nut-rtl .form-layout-left .nut-form-item-label .required {
171
+ left: auto;
172
+ right: 0.1em;
173
+ }
174
+
175
+ [dir=rtl] .form-layout-top .nut-form-item-label,
176
+ .nut-rtl .form-layout-top .nut-form-item-label {
177
+ padding-right: 0;
178
+ padding-left: 24px;
179
+ }
180
+
181
+ [dir=rtl] .form-layout-top .nut-form-item-body,
182
+ .nut-rtl .form-layout-top .nut-form-item-body {
183
+ margin-left: 0;
184
+ margin-right: 0;
108
185
  }
@@ -165,7 +165,9 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
165
165
  name: name,
166
166
  className: "nut-input-native",
167
167
  ref: inputRef,
168
- style: getTextAlign(),
168
+ style: {
169
+ textAlign: getTextAlign()
170
+ },
169
171
  type: inputType(type),
170
172
  password: type === 'password',
171
173
  maxlength: maxLength,
@@ -1,2 +1,3 @@
1
1
  import '../../popup/style';
2
+ import '../../pickerview/style';
2
3
  import './picker.scss';