@zat-design/sisyphus-react 3.7.2-beta.4 → 3.7.2-beta.6

package/es/ProForm/utils/rulesCreator.js

@@ -22,28 +22,30 @@ export var rulesCreator = function rulesCreator(_ref) {
     required = _ref.required;
   var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
-  result = rules.map(function (ruleItem) {
-    var rule = _objectSpread({}, ruleItem);
-    if (rule instanceof Object && 'type' in rule) {
-      if (Object.keys(regExp).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!isNullValue(value) && !regExp[rule.type].test(value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
-      }
-      if (Object.keys(validate).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!isNullValue(value) && !validate[rule.type](value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
+  if (Array.isArray(rules)) {
+    result = rules.map(function (ruleItem) {
+      var rule = _objectSpread({}, ruleItem);
+      if (rule instanceof Object && 'type' in rule) {
+        if (Object.keys(regExp).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!isNullValue(value) && !regExp[rule.type].test(value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
+        if (Object.keys(validate).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!isNullValue(value) && !validate[rule.type](value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
       }
-    }
-    return rule;
-  });
+      return rule;
+    });
+  }
   if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
     var customRequired = {
       validator: function validator(rules, value) {

package/es/ProForm/utils/valueType.js

@@ -18,7 +18,7 @@ var transformRatio = function transformRatio(_ref) {
     return {
       normalize: function normalize(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {};
         }
@@ -26,7 +26,7 @@ var transformRatio = function transformRatio(_ref) {
       },
       getValueProps: function getValueProps(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {
             value: []

package/es/ProUpload/index.js

@@ -71,7 +71,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = _objectWithoutProperties(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = useSensor(PointerSensor, {
     activationConstraint: {
       distance: 10

package/es/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

package/lib/ProForm/utils/rulesCreator.js

@@ -30,28 +30,30 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
     required = _ref.required;
   var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
   var result = [];
-  result = rules.map(function (ruleItem) {
-    var rule = (0, _objectSpread2.default)({}, ruleItem);
-    if (rule instanceof Object && 'type' in rule) {
-      if (Object.keys(_utils.regExp).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
-      }
-      if (Object.keys(_utils.validate).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
+  if (Array.isArray(rules)) {
+    result = rules.map(function (ruleItem) {
+      var rule = (0, _objectSpread2.default)({}, ruleItem);
+      if (rule instanceof Object && 'type' in rule) {
+        if (Object.keys(_utils.regExp).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
+        if (Object.keys(_utils.validate).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
       }
-    }
-    return rule;
-  });
+      return rule;
+    });
+  }
   if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
     var customRequired = {
       validator: function validator(rules, value) {

package/lib/ProForm/utils/valueType.js

@@ -25,7 +25,7 @@ var transformRatio = function transformRatio(_ref) {
     return {
       normalize: function normalize(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {};
         }
@@ -33,7 +33,7 @@ var transformRatio = function transformRatio(_ref) {
       },
       getValueProps: function getValueProps(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {
             value: []

package/lib/ProUpload/index.js

@@ -78,7 +78,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = (0, _core.useSensor)(_core.PointerSensor, {
     activationConstraint: {
       distance: 10

package/lib/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.2-beta.4",
+  "version": "3.7.2-beta.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",