@zat-design/sisyphus-react 3.4.3-beta.3 → 3.4.3-beta.4
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.
|
@@ -154,9 +154,9 @@ var Render = function Render(props) {
|
|
|
154
154
|
// ↑↑↑↑↑↑ formItem参数整理 ↑↑↑↑↑↑
|
|
155
155
|
Object.assign(otherFormItemProps, transforms, {
|
|
156
156
|
names: otherProps.names
|
|
157
|
-
}, internalRule,
|
|
158
|
-
required: labelRequired
|
|
159
|
-
}
|
|
157
|
+
}, internalRule, {
|
|
158
|
+
required: typeof labelRequired === 'boolean' ? labelRequired : _required
|
|
159
|
+
}, otherProps.isView && !requiredOnView ? {
|
|
160
160
|
required: false
|
|
161
161
|
} : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
|
|
162
162
|
_objectSpread({}, isUpperCase(type, upperCase)), {
|
|
@@ -152,9 +152,9 @@ var Render = function Render(props) {
|
|
|
152
152
|
// ↑↑↑↑↑↑ formItem参数整理 ↑↑↑↑↑↑
|
|
153
153
|
Object.assign(otherFormItemProps, transforms, {
|
|
154
154
|
names: otherProps.names
|
|
155
|
-
}, internalRule,
|
|
156
|
-
required: labelRequired
|
|
157
|
-
}
|
|
155
|
+
}, internalRule, {
|
|
156
|
+
required: typeof labelRequired === 'boolean' ? labelRequired : _required
|
|
157
|
+
}, otherProps.isView && !requiredOnView ? {
|
|
158
158
|
required: false
|
|
159
159
|
} : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
|
|
160
160
|
(0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
|