amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

package/lib/renderer/ValidationControl.d.ts

@@ -5,7 +5,7 @@ import React from 'react';
 import { ValidatorData } from './ValidationItem';
 import type { FormControlProps } from 'amis-core';
 import { Validator, ValidatorTag } from '../validator';
-export declare type ValidatorFilter = string[] | ((ctx: any) => string[]);
+export type ValidatorFilter = string[] | ((ctx: any) => string[]);
 export interface ValidationControlProps extends FormControlProps {
     /**
      * 匹配验证器标签进行默认和顶部可选的验证器展示

package/lib/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -28,341 +28,349 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 /**
  * @file 表单项校验配置
  */
-
-var ValidationControl =
-/** @class */
-function (_super) {
+var ValidationControl = /** @class */function (_super) {
   tslib.__extends(ValidationControl, _super);
-
   function ValidationControl(props) {
     var _this = _super.call(this, props) || this;
-
     _this.state = {
       avaliableValids: _this.getAvaliableValids(props)
     };
     return _this;
   }
-
-  ValidationControl.prototype.componentWillReceiveProps = function (nextProps) {
-    if (this.props.data.type !== nextProps.data.type) {
-      this.setState({
-        avaliableValids: this.getAvaliableValids(nextProps)
-      });
-      var validators = this.transformValid(this.props.data);
-      this.updateValidation(validators);
-    } // todo 删除不允许配置的值
-
-  };
-
-  ValidationControl.prototype.getAvaliableValids = function (props) {
-    var data = props.data,
+  Object.defineProperty(ValidationControl.prototype, "componentWillReceiveProps", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (nextProps) {
+      if (this.props.data.type !== nextProps.data.type) {
+        this.setState({
+          avaliableValids: this.getAvaliableValids(nextProps)
+        });
+        var validators = this.transformValid(this.props.data);
+        this.updateValidation(validators);
+      }
+      // todo 删除不允许配置的值
+    }
+  });
+
+  Object.defineProperty(ValidationControl.prototype, "getAvaliableValids", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (props) {
+      var data = props.data,
         tag = props.tag;
-    tag = typeof tag === 'string' ? tag : tag(data);
-    return validator.getValidatorsByTag(tag);
-  };
-
-  ValidationControl.prototype.transformValid = function (data) {
-    var required = data.required,
+      tag = typeof tag === 'string' ? tag : tag(data);
+      return validator.getValidatorsByTag(tag);
+    }
+  });
+  Object.defineProperty(ValidationControl.prototype, "transformValid", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (data) {
+      var required = data.required,
         validations = data.validations,
         validationErrors = data.validationErrors;
-    var validators = [];
-
-    if (required) {
-      validators.push({
-        name: 'required',
-        value: true,
-        message: validationErrors === null || validationErrors === void 0 ? void 0 : validationErrors.required
-      });
-    }
-
-    if (validations) {
-      Object.keys(validations).forEach(function (name) {
+      var validators = [];
+      if (required) {
         validators.push({
-          name: name,
-          value: validations[name],
-          message: validationErrors === null || validationErrors === void 0 ? void 0 : validationErrors[name]
+          name: 'required',
+          value: true,
+          message: validationErrors === null || validationErrors === void 0 ? void 0 : validationErrors.required
         });
-      });
+      }
+      if (validations) {
+        Object.keys(validations).forEach(function (name) {
+          validators.push({
+            name: name,
+            value: validations[name],
+            message: validationErrors === null || validationErrors === void 0 ? void 0 : validationErrors[name]
+          });
+        });
+      }
+      return validators;
     }
-
-    return validators;
-  };
+  });
   /**
    * 统一更新校验相关字段
    */
-
-
-  ValidationControl.prototype.updateValidation = function (validators) {
-    var onBulkChange = this.props.onBulkChange;
-
-    if (!validators.length) {
+  Object.defineProperty(ValidationControl.prototype, "updateValidation", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (validators) {
+      var onBulkChange = this.props.onBulkChange;
+      if (!validators.length) {
+        onBulkChange && onBulkChange({
+          required: undefined,
+          validations: undefined,
+          validationErrors: undefined
+        });
+        return;
+      }
+      var required = undefined;
+      var validations = {};
+      var validationErrors = {};
+      validators.forEach(function (data) {
+        var name = data.name,
+          value = data.value,
+          message = data.message;
+        if (name === 'required') {
+          required = value;
+          return;
+        }
+        if (value != null) {
+          validations[name] = value;
+          message && (validationErrors[name] = message);
+        }
+      });
       onBulkChange && onBulkChange({
-        required: undefined,
-        validations: undefined,
-        validationErrors: undefined
+        required: required,
+        validations: Object.keys(validations).length ? validations : undefined,
+        validationErrors: Object.keys(validationErrors).length ? validationErrors : undefined
       });
-      return;
     }
-
-    var required = undefined;
-    var validations = {};
-    var validationErrors = {};
-    validators.forEach(function (data) {
-      var name = data.name,
-          value = data.value,
-          message = data.message;
-
-      if (name === 'required') {
-        required = value;
-        return;
-      }
-
-      if (value != null) {
-        validations[name] = value;
-        message && (validationErrors[name] = message);
-      }
-    });
-    onBulkChange && onBulkChange({
-      required: required,
-      validations: Object.keys(validations).length ? validations : undefined,
-      validationErrors: Object.keys(validationErrors).length ? validationErrors : undefined
-    });
-  };
+  });
   /**
    * 添加规则
    *
    * @param {Validator} valid 校验规则配置
    */
-
-
-  ValidationControl.prototype.handleAddValidator = function (valid) {
-    var validators = this.transformValid(this.props.data);
-    validators.push({
-      name: valid.name,
-      value: valid.schema ? '' : true,
-      message: ''
-    });
-    this.updateValidation(validators);
-  };
+  Object.defineProperty(ValidationControl.prototype, "handleAddValidator", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (valid) {
+      var validators = this.transformValid(this.props.data);
+      validators.push({
+        name: valid.name,
+        value: valid.schema ? '' : true,
+        message: ''
+      });
+      this.updateValidation(validators);
+    }
+  });
   /**
    * 更新校验规则
    */
-
-
-  ValidationControl.prototype.handleEditRule = function (data) {
-    var validators = this.transformValid(this.props.data);
-    var validator = validators.find(function (v) {
-      return v.name === data.name;
-    });
-
-    if (validator) {
-      validator.value = data.value;
-      validator.message = data.message;
-    } else {
-      /** 预设的校验规则props.data取不到 */
-      validators.push(data);
+  Object.defineProperty(ValidationControl.prototype, "handleEditRule", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (data) {
+      var validators = this.transformValid(this.props.data);
+      var validator = validators.find(function (v) {
+        return v.name === data.name;
+      });
+      if (validator) {
+        validator.value = data.value;
+        validator.message = data.message;
+      } else {
+        /** 预设的校验规则props.data取不到 */
+        validators.push(data);
+      }
+      this.updateValidation(validators);
     }
-
-    this.updateValidation(validators);
-  };
+  });
   /**
    * 删除校验规则
    */
-
-
-  ValidationControl.prototype.handleRemoveRule = function (valid) {
-    var validators = this.transformValid(this.props.data);
-    remove__default["default"](validators, function (v) {
-      return v.name === valid;
-    });
-    this.updateValidation(validators);
-  };
+  Object.defineProperty(ValidationControl.prototype, "handleRemoveRule", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (valid) {
+      var validators = this.transformValid(this.props.data);
+      remove__default["default"](validators, function (v) {
+        return v.name === valid;
+      });
+      this.updateValidation(validators);
+    }
+  });
   /**
    * 开关默认规则
    */
-
-
-  ValidationControl.prototype.handleSwitchRule = function (checked, data) {
-    var validators = this.transformValid(this.props.data);
-    var valid = validators.find(function (v) {
-      return v.name === data.name;
-    });
-
-    if (!valid) {
-      valid = {
-        name: data.name
-      };
-      validators.push(valid);
+  Object.defineProperty(ValidationControl.prototype, "handleSwitchRule", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (checked, data) {
+      var validators = this.transformValid(this.props.data);
+      var valid = validators.find(function (v) {
+        return v.name === data.name;
+      });
+      if (!valid) {
+        valid = {
+          name: data.name
+        };
+        validators.push(valid);
+      }
+      valid.value = checked ? data.value : undefined;
+      valid.message = checked ? data.message : undefined;
+      this.updateValidation(validators);
     }
-
-    valid.value = checked ? data.value : undefined;
-    valid.message = checked ? data.message : undefined;
-    this.updateValidation(validators);
-  };
+  });
   /**
    * 添加规则下拉框
    */
-
-
-  ValidationControl.prototype.renderDropdown = function () {
-    var _this = this;
-
-    var _a = this.props,
+  Object.defineProperty(ValidationControl.prototype, "renderDropdown", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var _a = this.props,
         render = _a.render,
         _b = _a.validations,
         validations = _b === void 0 ? {} : _b;
-    var moreValidators = this.state.avaliableValids.moreValidators; // 去掉已经选用的
-
-    var validators = Object.values(moreValidators).filter(function (item) {
-      return !validations.hasOwnProperty(item.name);
-    });
-    var buttons = Object.entries(groupBy__default["default"](validators, 'group')).map(function (_a) {
-      var group = _a[0],
+      var moreValidators = this.state.avaliableValids.moreValidators;
+      // 去掉已经选用的
+      var validators = Object.values(moreValidators).filter(function (item) {
+        return !validations.hasOwnProperty(item.name);
+      });
+      var buttons = Object.entries(groupBy__default["default"](validators, 'group')).map(function (_a) {
+        var group = _a[0],
           validations = _a[1];
-      return {
-        label: group,
-        children: validations.map(function (v) {
-          return {
-            label: v.label,
-            onClick: function () {
-              return _this.handleAddValidator(v);
-            }
-          };
-        })
-      };
-    });
-    return React__default["default"].createElement("div", {
-      className: "ae-ValidationControl-dropdown"
-    }, render('validation-control-dropdown', {
-      type: 'dropdown-button',
-      btnClassName: 'ae-ValidationControl-dropdown-btn',
-      menuClassName: 'ae-ValidationControl-dropdown-menu',
-      level: 'link',
-      size: 'md',
-      icon: 'fa fa-plus',
-      label: '',
-      tooltip: i18nRuntime.i18n("442781667396d6eff51113f482d89e54"),
-      placement: 'top',
-      align: 'right',
-      tooltipTrigger: 'hover',
-      closeOnClick: true,
-      closeOnOutside: true,
-      hideCaret: true,
-      disabled: buttons.length === 0,
-      buttons: buttons
-    }, {
-      key: 'validation-control-dropdown',
-      popOverContainer: null
-    }));
-  };
+        return {
+          label: group,
+          children: validations.map(function (v) {
+            return {
+              label: v.label,
+              onClick: function () {
+                return _this.handleAddValidator(v);
+              }
+            };
+          })
+        };
+      });
+      return React__default["default"].createElement("div", {
+        className: "ae-ValidationControl-dropdown"
+      }, render('validation-control-dropdown', {
+        type: 'dropdown-button',
+        btnClassName: 'ae-ValidationControl-dropdown-btn',
+        menuClassName: 'ae-ValidationControl-dropdown-menu',
+        level: 'link',
+        size: 'md',
+        icon: 'fa fa-plus',
+        label: '',
+        tooltip: i18nRuntime.i18n("442781667396d6eff51113f482d89e54"),
+        placement: 'left',
+        align: 'right',
+        tooltipTrigger: 'hover',
+        closeOnClick: true,
+        closeOnOutside: true,
+        hideCaret: true,
+        disabled: buttons.length === 0,
+        buttons: buttons
+      }, {
+        key: 'validation-control-dropdown',
+        popOverContainer: null
+      }));
+    }
+  });
   /**
    * 规则列表
    */
-
-
-  ValidationControl.prototype.renderValidaton = function () {
-    var _this = this;
-
-    var _a, _b, _c;
-
-    var classPrefix = (_c = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.theme) === null || _c === void 0 ? void 0 : _c.classPrefix;
-    var _d = this.state.avaliableValids,
+  Object.defineProperty(ValidationControl.prototype, "renderValidaton", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var _a, _b, _c;
+      var classPrefix = (_c = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.theme) === null || _c === void 0 ? void 0 : _c.classPrefix;
+      var _d = this.state.avaliableValids,
         defaultValidators = _d.defaultValidators,
         moreValidators = _d.moreValidators,
         builtInValidators = _d.builtInValidators;
-    var validators = this.transformValid(this.props.data);
-    var rules = [];
-    validators = validators.concat(); // 优先渲染默认的顺序
-
-    Object.keys(defaultValidators).forEach(function (validName) {
-      var data = remove__default["default"](validators, function (v) {
-        return v.name === validName;
-      });
-      rules.push(React__default["default"].createElement(ValidationItem["default"], {
-        key: validName,
-        validator: defaultValidators[validName],
-        data: data.length ? data[0] : {
-          name: validName
-        },
-        classPrefix: classPrefix,
-        isDefault: defaultValidators.hasOwnProperty(validName),
-        onEdit: _this.handleEditRule,
-        onDelete: _this.handleRemoveRule,
-        onSwitch: _this.handleSwitchRule
-      }));
-    });
-    Object.keys(builtInValidators).forEach(function (validName) {
-      var data = remove__default["default"](validators, function (v) {
-        return v.name === validName;
+      var validators = this.transformValid(this.props.data);
+      var rules = [];
+      validators = validators.concat();
+      // 优先渲染默认的顺序
+      Object.keys(defaultValidators).forEach(function (validName) {
+        var data = remove__default["default"](validators, function (v) {
+          return v.name === validName;
+        });
+        rules.push(React__default["default"].createElement(ValidationItem["default"], {
+          key: validName,
+          validator: defaultValidators[validName],
+          data: data.length ? data[0] : {
+            name: validName
+          },
+          classPrefix: classPrefix,
+          isDefault: defaultValidators.hasOwnProperty(validName),
+          onEdit: _this.handleEditRule,
+          onDelete: _this.handleRemoveRule,
+          onSwitch: _this.handleSwitchRule
+        }));
       });
-      rules.push(React__default["default"].createElement(ValidationItem["default"], {
-        key: validName,
-        validator: builtInValidators[validName],
-        data: data.length ? data[0] : {
-          name: validName,
-          value: true,
-          isBuiltIn: true
-        },
-        classPrefix: classPrefix,
-        isDefault: builtInValidators.hasOwnProperty(validName),
-        onEdit: _this.handleEditRule,
-        onDelete: _this.handleRemoveRule,
-        onSwitch: _this.handleSwitchRule
-      }));
-    }); // 剩余的按顺序渲染
-
-    if (validators.length) {
-      validators.forEach(function (valid) {
-        var validator$1 = moreValidators[valid.name] || validator.getValidator(valid.name);
-
-        if (!validator$1) {
-          return;
-        }
-
+      Object.keys(builtInValidators).forEach(function (validName) {
+        var data = remove__default["default"](validators, function (v) {
+          return v.name === validName;
+        });
         rules.push(React__default["default"].createElement(ValidationItem["default"], {
-          key: valid.name,
-          data: valid,
+          key: validName,
+          validator: builtInValidators[validName],
+          data: data.length ? data[0] : {
+            name: validName,
+            value: true,
+            isBuiltIn: true
+          },
           classPrefix: classPrefix,
-          validator: validator$1,
-          isDefault: defaultValidators.hasOwnProperty(valid.name),
+          isDefault: builtInValidators.hasOwnProperty(validName),
           onEdit: _this.handleEditRule,
           onDelete: _this.handleRemoveRule,
           onSwitch: _this.handleSwitchRule
         }));
       });
+      // 剩余的按顺序渲染
+      if (validators.length) {
+        validators.forEach(function (valid) {
+          var validator$1 = moreValidators[valid.name] || validator.getValidator(valid.name);
+          if (!validator$1) {
+            return;
+          }
+          rules.push(React__default["default"].createElement(ValidationItem["default"], {
+            key: valid.name,
+            data: valid,
+            classPrefix: classPrefix,
+            validator: validator$1,
+            isDefault: defaultValidators.hasOwnProperty(valid.name),
+            onEdit: _this.handleEditRule,
+            onDelete: _this.handleRemoveRule,
+            onSwitch: _this.handleSwitchRule
+          }));
+        });
+      }
+      return React__default["default"].createElement("div", {
+        className: "ae-ValidationControl-rules",
+        key: "rules"
+      }, rules);
     }
-
-    return React__default["default"].createElement("div", {
-      className: "ae-ValidationControl-rules",
-      key: "rules"
-    }, rules);
-  };
-
-  ValidationControl.prototype.render = function () {
-    var className = this.props.className;
-    return React__default["default"].createElement("div", {
-      className: cx__default["default"]('ae-ValidationControl', className),
-      key: "validation-control"
-    }, this.renderDropdown(), this.renderValidaton());
-  };
-
+  });
+  Object.defineProperty(ValidationControl.prototype, "render", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var className = this.props.className;
+      return React__default["default"].createElement("div", {
+        className: cx__default["default"]('ae-ValidationControl', className),
+        key: "validation-control"
+      }, this.renderDropdown(), this.renderValidaton());
+    }
+  });
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ValidationControl.prototype, "handleEditRule", null);
-
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], ValidationControl.prototype, "handleRemoveRule", null);
-
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Boolean, Object]), tslib.__metadata("design:returntype", void 0)], ValidationControl.prototype, "handleSwitchRule", null);
-
   return ValidationControl;
 }(React__default["default"].Component);
-
-/** @class */
-(function (_super) {
+/** @class */(function (_super) {
   tslib.__extends(ValidationControlRenderer, _super);
-
   function ValidationControlRenderer() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
-
   ValidationControlRenderer = tslib.__decorate([amis.FormItem({
     type: 'ae-validationControl',
     renderLabel: false

package/lib/renderer/ValidationItem.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { Validator } from '../validator';
-export declare type ValidatorData = {
+export type ValidatorData = {
     name: string;
     value?: any;
     message?: string;