@zat-design/sisyphus-react 3.14.10-beta.3 → 3.14.10-beta.5
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/ProEnum/index.js
CHANGED
|
@@ -272,7 +272,7 @@ var ProEnum = props => {
|
|
|
272
272
|
return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join(',');
|
|
273
273
|
};
|
|
274
274
|
if (_isView) {
|
|
275
|
-
var __value = value
|
|
275
|
+
var __value = value !== null && value !== void 0 ? value : _defalutValue;
|
|
276
276
|
if (Array.isArray(__value)) {
|
|
277
277
|
return /*#__PURE__*/_jsx(Container, {
|
|
278
278
|
tooltip: true,
|
|
@@ -157,7 +157,7 @@ var Render = props => {
|
|
|
157
157
|
Object.assign(otherFormItemProps, transforms, {
|
|
158
158
|
names: otherProps.names
|
|
159
159
|
}, internalRule, {
|
|
160
|
-
required:
|
|
160
|
+
required: _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(item => item === null || item === void 0 ? void 0 : item.required)) || (typeof labelRequired === 'boolean' ? labelRequired : false)
|
|
161
161
|
}, otherProps.isView && !requiredOnView ? {
|
|
162
162
|
required: false
|
|
163
163
|
} : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的,其次取ProConfigProvider配置的
|
package/lib/ProEnum/index.js
CHANGED
|
@@ -279,7 +279,7 @@ var ProEnum = props => {
|
|
|
279
279
|
return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join(',');
|
|
280
280
|
};
|
|
281
281
|
if (_isView) {
|
|
282
|
-
var __value = value
|
|
282
|
+
var __value = value !== null && value !== void 0 ? value : _defalutValue;
|
|
283
283
|
if (Array.isArray(__value)) {
|
|
284
284
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
|
|
285
285
|
tooltip: true,
|
|
@@ -162,7 +162,7 @@ var Render = props => {
|
|
|
162
162
|
Object.assign(otherFormItemProps, transforms, {
|
|
163
163
|
names: otherProps.names
|
|
164
164
|
}, internalRule, {
|
|
165
|
-
required:
|
|
165
|
+
required: _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(item => item === null || item === void 0 ? void 0 : item.required)) || (typeof labelRequired === 'boolean' ? labelRequired : false)
|
|
166
166
|
}, otherProps.isView && !requiredOnView ? {
|
|
167
167
|
required: false
|
|
168
168
|
} : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的,其次取ProConfigProvider配置的
|