amis-editor 6.4.1 → 6.6.0

package/esm/renderer/ValidateApiControl.js

@@ -0,0 +1,87 @@
+/**
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
+ * Copyright 2018-2024 @fex
+ */
+
+import { __extends, __decorate } from 'tslib';
+import React__default from 'react';
+import { FormItem } from 'amis';
+import { getSchemaTpl, tipedLabel } from 'amis-editor-core';
+import { i18n } from 'i18n-runtime';
+
+/**
+ * @file 表单项校验配置
+ */
+var ValidationApiControl = /** @class */function (_super) {
+  __extends(ValidationApiControl, _super);
+  function ValidationApiControl(props) {
+    return _super.call(this, props) || this;
+  }
+  ValidationApiControl.prototype.renderValidateApiControl = function () {
+    var _a = this.props,
+      onBulkChange = _a.onBulkChange,
+      render = _a.render;
+    return React__default.createElement("div", {
+      className: "ae-ValidationControl-item"
+    }, render('validate-api-control', {
+      type: 'form',
+      wrapWithPanel: false,
+      className: 'w-full mb-2',
+      bodyClassName: 'p-none',
+      wrapperComponent: 'div',
+      mode: 'horizontal',
+      data: {
+        switchStatus: this.props.data.validateApi !== undefined
+      },
+      preventEnterSubmit: true,
+      submitOnChange: true,
+      onSubmit: function (_a) {
+        var switchStatus = _a.switchStatus,
+          validateApi = _a.validateApi;
+        onBulkChange && onBulkChange({
+          validateApi: !switchStatus ? undefined : validateApi
+        });
+      },
+      body: [getSchemaTpl('switch', {
+        label: tipedLabel(i18n("240a19929878c26f5e4c41c08f63cd1c"), i18n("ae7ca6f3dec57a73ddc145a7094adc97")),
+        name: 'switchStatus'
+      }), {
+        type: 'container',
+        className: 'ae-ExtendMore ae-ValidationControl-item-input',
+        bodyClassName: 'w-full',
+        visibleOn: 'this.switchStatus',
+        data: {
+          // 放在form中则包含的表达式会被求值
+          validateApi: this.props.data.validateApi
+        },
+        body: [getSchemaTpl('apiControl', {
+          name: 'validateApi',
+          renderLabel: true,
+          label: '',
+          mode: 'normal',
+          className: 'w-full'
+        })]
+      }]
+    }));
+  };
+  ValidationApiControl.prototype.render = function () {
+    return React__default.createElement(React__default.Fragment, null, this.renderValidateApiControl());
+  };
+  return ValidationApiControl;
+}(React__default.Component);
+/** @class */(function (_super) {
+  __extends(ValidationApiControlRenderer, _super);
+  function ValidationApiControlRenderer() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  ValidationApiControlRenderer = __decorate([FormItem({
+    type: 'ae-validationApiControl',
+    renderLabel: false,
+    strictMode: false
+  })], ValidationApiControlRenderer);
+  return ValidationApiControlRenderer;
+})(ValidationApiControl);
+
+export { ValidationApiControl as default };
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/ValidationControl.d.ts

@@ -2,6 +2,7 @@
  * @file 表单项校验配置
  */
 import React from 'react';
+import { ConditionBuilderFields } from 'amis';
 import { ValidatorData } from './ValidationItem';
 import type { FormControlProps } from 'amis-core';
 import { Validator, ValidatorTag } from '../validator';
@@ -18,10 +19,14 @@ interface ValidationControlState {
         defaultValidators: Record<string, Validator>;
         builtInValidators: Record<string, Validator>;
     };
+    fields: ConditionBuilderFields;
 }
 export default class ValidationControl extends React.Component<ValidationControlProps, ValidationControlState> {
+    cache?: any;
     constructor(props: ValidationControlProps);
+    componentDidMount(): Promise<void>;
     componentWillReceiveProps(nextProps: ValidationControlProps): void;
+    buildFieldsData(): Promise<any>;
     getAvaliableValids(props: ValidationControlProps): {
         defaultValidators: Record<string, Validator>;
         moreValidators: Record<string, Validator>;
@@ -58,7 +63,6 @@ export default class ValidationControl extends React.Component<ValidationControl
      * 规则列表
      */
     renderValidaton(): React.JSX.Element;
-    renderValidateApiControl(): React.JSX.Element;
     render(): React.JSX.Element;
 }
 export declare class ValidationControlRenderer extends ValidationControl {

package/esm/renderer/ValidationControl.js

@@ -1,16 +1,16 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
-import { __extends, __read, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __read, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import groupBy from 'lodash/groupBy';
 import remove from 'lodash/remove';
 import cx from 'classnames';
-import { FormItem } from 'amis';
-import { getSchemaTpl, tipedLabel, autobind } from 'amis-editor-core';
+import { flattenTree, FormItem } from 'amis';
+import { isObjectShallowModified, getConditionVariables, autobind } from 'amis-editor-core';
 import ValidationItem from './ValidationItem.js';
 import { getValidatorsByTag, getValidator } from '../validator.js';
 import { i18n } from 'i18n-runtime';
@@ -23,20 +23,60 @@ var ValidationControl = /** @class */function (_super) {
   function ValidationControl(props) {
     var _this = _super.call(this, props) || this;
     _this.state = {
-      avaliableValids: _this.getAvaliableValids(props)
+      avaliableValids: _this.getAvaliableValids(props),
+      fields: []
     };
     return _this;
   }
+  ValidationControl.prototype.componentDidMount = function () {
+    return __awaiter(this, void 0, void 0, function () {
+      var fieldsArr;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, this.buildFieldsData()];
+          case 1:
+            fieldsArr = _a.sent();
+            this.setState({
+              fields: fieldsArr
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
   ValidationControl.prototype.componentWillReceiveProps = function (nextProps) {
-    if (this.props.data.type !== nextProps.data.type) {
+    var _a, _b, _c;
+    if (this.props.data.type !== nextProps.data.type || ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.required) !== nextProps.data.required || isObjectShallowModified((_b = this.cache) === null || _b === void 0 ? void 0 : _b.validations, nextProps.data.validations) || isObjectShallowModified((_c = this.cache) === null || _c === void 0 ? void 0 : _c.validationErrors, nextProps.data.validationErrors)) {
       this.setState({
         avaliableValids: this.getAvaliableValids(nextProps)
       });
-      var validators = this.transformValid(this.props.data);
-      this.updateValidation(validators);
+      // const validators = this.transformValid(this.props.data);
+      // this.updateValidation(validators);
     }
     // todo 删除不允许配置的值
   };
+  ValidationControl.prototype.buildFieldsData = function () {
+    return __awaiter(this, void 0, void 0, function () {
+      var variablesArr, arr;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, getConditionVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            arr = flattenTree(variablesArr, function (item) {
+              var obj = {
+                label: item.label,
+                value: item.value
+              };
+              return obj;
+            });
+            return [2 /*return*/, arr];
+        }
+      });
+    });
+  };
   ValidationControl.prototype.getAvaliableValids = function (props) {
     var data = props.data,
       tag = props.tag;
@@ -72,6 +112,7 @@ var ValidationControl = /** @class */function (_super) {
   ValidationControl.prototype.updateValidation = function (validators) {
     var onBulkChange = this.props.onBulkChange;
     if (!validators.length) {
+      this.cache = undefined;
       onBulkChange && onBulkChange({
         required: undefined,
         validations: undefined,
@@ -95,11 +136,12 @@ var ValidationControl = /** @class */function (_super) {
         message && (validationErrors[name] = message);
       }
     });
-    onBulkChange && onBulkChange({
+    this.cache = {
       required: required,
       validations: Object.keys(validations).length ? validations : undefined,
       validationErrors: Object.keys(validationErrors).length ? validationErrors : undefined
-    });
+    };
+    onBulkChange && onBulkChange(__assign({}, this.cache));
   };
   /**
    * 添加规则
@@ -221,10 +263,12 @@ var ValidationControl = /** @class */function (_super) {
     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 _d = this.state,
+      _e = _d.avaliableValids,
+      defaultValidators = _e.defaultValidators,
+      moreValidators = _e.moreValidators,
+      builtInValidators = _e.builtInValidators,
+      fields = _d.fields;
     var validators = this.transformValid(this.props.data);
     var rules = [];
     validators = validators.concat();
@@ -234,6 +278,7 @@ var ValidationControl = /** @class */function (_super) {
         return v.name === validName;
       });
       rules.push(React__default.createElement(ValidationItem, {
+        fields: fields,
         key: validName,
         validator: defaultValidators[validName],
         data: data.length ? data[0] : {
@@ -251,9 +296,12 @@ var ValidationControl = /** @class */function (_super) {
         return v.name === validName;
       });
       rules.push(React__default.createElement(ValidationItem, {
+        fields: fields,
         key: validName,
         validator: builtInValidators[validName],
-        data: data.length ? data[0] : {
+        data: data.length ? __assign(__assign({}, data[0]), {
+          isBuiltIn: true
+        }) : {
           name: validName,
           value: true,
           isBuiltIn: true
@@ -273,6 +321,7 @@ var ValidationControl = /** @class */function (_super) {
           return;
         }
         rules.push(React__default.createElement(ValidationItem, {
+          fields: fields,
           key: valid.name,
           data: valid,
           classPrefix: classPrefix,
@@ -287,54 +336,7 @@ var ValidationControl = /** @class */function (_super) {
     return React__default.createElement("div", {
       className: "ae-ValidationControl-rules",
       key: "rules"
-    }, rules, this.renderValidateApiControl());
-  };
-  ValidationControl.prototype.renderValidateApiControl = function () {
-    var _a = this.props,
-      onBulkChange = _a.onBulkChange,
-      render = _a.render;
-    return React__default.createElement("div", {
-      className: "ae-ValidationControl-item"
-    }, render('validate-api-control', {
-      type: 'form',
-      wrapWithPanel: false,
-      className: 'w-full mb-2',
-      bodyClassName: 'p-none',
-      wrapperComponent: 'div',
-      mode: 'horizontal',
-      data: {
-        switchStatus: this.props.data.validateApi !== undefined
-      },
-      preventEnterSubmit: true,
-      submitOnChange: true,
-      onSubmit: function (_a) {
-        var switchStatus = _a.switchStatus,
-          validateApi = _a.validateApi;
-        onBulkChange && onBulkChange({
-          validateApi: !switchStatus ? undefined : validateApi
-        });
-      },
-      body: [getSchemaTpl('switch', {
-        label: tipedLabel(i18n("240a19929878c26f5e4c41c08f63cd1c"), i18n("ae7ca6f3dec57a73ddc145a7094adc97")),
-        name: 'switchStatus'
-      }), {
-        type: 'container',
-        className: 'ae-ExtendMore ae-ValidationControl-item-input',
-        bodyClassName: 'w-full',
-        visibleOn: 'this.switchStatus',
-        data: {
-          // 放在form中则包含的表达式会被求值
-          validateApi: this.props.data.validateApi
-        },
-        body: [getSchemaTpl('apiControl', {
-          name: 'validateApi',
-          renderLabel: true,
-          label: '',
-          mode: 'normal',
-          className: 'w-full'
-        })]
-      }]
-    }));
+    }, rules);
   };
   ValidationControl.prototype.render = function () {
     var className = this.props.className;
@@ -343,6 +345,7 @@ var ValidationControl = /** @class */function (_super) {
       key: "validation-control"
     }, this.renderDropdown(), this.renderValidaton());
   };
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], ValidationControl.prototype, "buildFieldsData", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleEditRule", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleRemoveRule", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Boolean, Object]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleSwitchRule", null);
@@ -362,4 +365,4 @@ var ValidationControl = /** @class */function (_super) {
 })(ValidationControl);
 
 export { ValidationControl as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/ValidationItem.d.ts

@@ -3,6 +3,7 @@
  */
 import React from 'react';
 import { Validator } from '../validator';
+import type { ConditionBuilderFields } from 'amis';
 export type ValidatorData = {
     name: string;
     value?: any;
@@ -23,6 +24,7 @@ export interface ValidationItemProps {
      */
     isDefault: boolean;
     validator: Validator;
+    fields?: ConditionBuilderFields;
     onEdit?: (data: ValidatorData) => void;
     onDelete?: (name: string) => void;
     onSwitch?: (checked: boolean, data?: ValidatorData) => void;

package/esm/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -84,6 +84,7 @@ var ValidationItem = /** @class */function (_super) {
       value = _a.value,
       message = _a.message,
       checked = _a.checked;
+    var fields = this.props.fields;
     var i18nEnabled = getI18nEnabled();
     var control = [];
     if (!checked) {
@@ -128,6 +129,9 @@ var ValidationItem = /** @class */function (_super) {
         message: message
       }
     }, {
+      data: __assign(__assign({}, this.props.data), {
+        fields: fields
+      }),
       onSubmit: this.handleEdit
     })) : null;
   };
@@ -164,4 +168,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ValidationItem as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/ValueFormatControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -109,4 +109,4 @@ var ValueFormatControl = function (props) {
 FormItem({
   type: 'ae-valueFormat'
 })(ValueFormatControl);
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/crud2-control/AddColumnModal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -255,4 +255,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = themeable(AddColumnModal);
 
 export { AddColumnModal$1 as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/crud2-control/CRUDColumnControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -473,4 +473,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 export { CRUDColumnControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/crud2-control/CRUDFiltersControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -691,4 +691,4 @@ var CRUDFiltersControl = /** @class */function (_super) {
 })(CRUDFiltersControl);
 
 export { CRUDFiltersControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/crud2-control/CRUDToolbarControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -406,4 +406,4 @@ var CRUDToolbarControl = /** @class */function (_super) {
 })(CRUDToolbarControl);
 
 export { CRUDToolbarControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/event-control/DialogActionPanel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -633,4 +633,4 @@ function DialogActionPanel(_a) {
 var DialogActionPanel$1 = observer(DialogActionPanel);
 
 export { DialogActionPanel$1 as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/event-control/action-config-dialog.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -238,18 +238,18 @@ var ActionDialog = /** @class */function (_super) {
               type: 'tpl',
               tpl: i18n("0174bdde9517fa331bf7d716a553e023"),
               className: 'action-panel-title',
-              visibleOn: 'data.actionType',
+              visibleOn: 'this.actionType',
               inline: false
             }, {
               type: 'tpl',
               className: 'action-desc',
               tpl: '${__actionDesc}',
-              visibleOn: 'data.actionType'
+              visibleOn: 'this.actionType'
             }, {
               type: 'tpl',
               tpl: i18n("0aeca07a02601a8e701a46d1a8b5ce43"),
               className: 'action-panel-title',
-              visibleOn: 'data.actionType',
+              visibleOn: 'this.actionType',
               inline: false
             }, {
               type: 'container',
@@ -264,11 +264,11 @@ var ActionDialog = /** @class */function (_super) {
                 tpl: i18n("e370757f933a8ecd87bf0255c3ce45d0"),
                 inline: false,
                 className: 'action-panel-title',
-                visibleOn: 'data.actionType'
+                visibleOn: 'this.actionType'
               }, {
                 type: 'button-group-select',
                 name: 'ignoreError',
-                visibleOn: 'data.actionType',
+                visibleOn: 'this.actionType',
                 label: tipedLabel(i18n("0e7bb2c7879f0a34c02f547820b0b0b3"), i18n("5d9fe78268b03e8aa41ac316ef610d9a")),
                 mode: 'horizontal',
                 pipeIn: function (value, data) {
@@ -287,7 +287,7 @@ var ActionDialog = /** @class */function (_super) {
                   label: i18n("9cdfce42ef0fa346511538131e51328f"),
                   value: '3'
                 }],
-                description: i18n("17817a4d2da41f4261f4155ada59e395")
+                description: '<%= this.ignoreError === false ? "找不到组件和动作执行失败都中断" : typeof this.ignoreError === "undefined" ? "找不到组件容忍，动作执行失败才中断" : ""%>'
               }, getSchemaTpl('expressionFormulaControl', {
                 name: 'stopPropagation',
                 label: tipedLabel(i18n("8c2bb89f516205027b9ed6609fb17726"), i18n("46a3c6ab94da0b16a707bdd3b74c9e09")),
@@ -295,7 +295,7 @@ var ActionDialog = /** @class */function (_super) {
                 variables: '${variables}',
                 mode: 'horizontal',
                 size: 'lg',
-                visibleOn: 'data.actionType'
+                visibleOn: 'this.actionType'
               }), getSchemaTpl('expressionFormulaControl', {
                 name: 'expression',
                 label: i18n("da1ed600ce65be863766444e60c2da05"),
@@ -304,7 +304,7 @@ var ActionDialog = /** @class */function (_super) {
                 mode: 'horizontal',
                 size: 'lg',
                 placeholder: i18n("13b2de1073f76444c49d2c6a21e46e26"),
-                visibleOn: 'data.actionType'
+                visibleOn: 'this.actionType'
               })]
             }],
             columnClassName: 'right-panel'
@@ -327,4 +327,4 @@ var ActionDialog = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ActionDialog as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/event-control/action-config-panel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -55,4 +55,4 @@ var ActionConfigPanel = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ActionConfigPanel as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/event-control/comp-action-select.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -74,4 +74,4 @@ var CmptActionSelect = /** @class */function (_super) {
 }(React__default.Component);
 
 export { BASE_ACTION_PROPS, CmptActionSelect as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};