amis-editor 5.2.5-beta.7 → 5.3.0

package/esm/renderer/TransferTableControl.d.ts

@@ -2,17 +2,18 @@
  * @file Transfer的表格对应选项
  */
 import React from 'react';
-import { SchemaApi } from 'amis/lib/Schema';
+import type { SchemaApi } from 'amis';
 import type { FormControlProps } from 'amis-core';
 import type { Option } from 'amis';
 interface OptionControlProps extends FormControlProps {
     className?: string;
 }
+type SourceType = 'custom' | 'api' | 'form' | 'variable';
 interface OptionControlState {
     api: SchemaApi;
     labelField: string;
     valueField: string;
-    source: 'custom' | 'api' | 'form';
+    source: SourceType;
 }
 export default class TransferTableOption extends React.Component<OptionControlProps, {}> {
     addColumns(): {
@@ -110,7 +111,7 @@ declare const TransferTableControl: {
         /**
          * 切换选项类型
          */
-        handleSourceChange(source: 'custom' | 'api' | 'form'): void;
+        handleSourceChange(source: SourceType): void;
         handleAPIChange(source: SchemaApi): void;
         handleLableFieldChange(labelField: string): void;
         handleValueFieldChange(valueField: string): void;

package/esm/renderer/TransferTableControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -23,7 +23,7 @@ function BaseOptionControl(Cmpt) {
           api: props.data.source,
           labelField: props.data.labelField,
           valueField: props.data.valueField,
-          source: props.data.source ? 'api' : 'custom'
+          source: props.data.source ? /\$\{(.*?)\}/g.test(props.data.source) ? 'variable' : 'api' : 'custom'
         };
         _this.handleSourceChange = _this.handleSourceChange.bind(_this);
         _this.handleAPIChange = _this.handleAPIChange.bind(_this);
@@ -44,7 +44,7 @@ function BaseOptionControl(Cmpt) {
           labelField: undefined,
           valueField: undefined
         };
-        if (source === 'api') {
+        if (['api', 'variable'].includes(source)) {
           var _a = this.state,
             api = _a.api,
             labelField = _a.labelField,
@@ -61,6 +61,7 @@ function BaseOptionControl(Cmpt) {
        */
       class_1.prototype.handleSourceChange = function (source) {
         this.setState({
+          api: '',
           source: source
         }, this.onChange);
       };
@@ -143,6 +144,9 @@ function BaseOptionControl(Cmpt) {
         }, {
           label: i18n("c8158b3cad598b0b5939788ca4efb298"),
           value: 'api'
+        }, {
+          label: i18n("50334fc77fc5a2c2636f14f158d3c417"),
+          value: 'variable'
         }].map(function (item) {
           return __assign(__assign({}, item), {
             onClick: function () {
@@ -220,7 +224,9 @@ function BaseOptionControl(Cmpt) {
           api = _b.api,
           labelField = _b.labelField,
           valueField = _b.valueField;
-        var className = this.props.className;
+        var _c = this.props,
+          className = _c.className,
+          render = _c.render;
         var cmptProps = __assign(__assign({}, this.props), {
           data: __assign({
             api: api,
@@ -230,7 +236,12 @@ function BaseOptionControl(Cmpt) {
         });
         return React__default.createElement("div", {
           className: cx('ae-OptionControl', className)
-        }, this.renderHeader(), source === 'custom' ? React__default.createElement(Cmpt, __assign({}, cmptProps)) : null, this.renderApiPanel());
+        }, this.renderHeader(), source === 'custom' ? React__default.createElement(Cmpt, __assign({}, cmptProps)) : null, source === 'api' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', getSchemaTpl('sourceBindControl', {
+          label: false,
+          className: 'ae-ExtendMore'
+        }), {
+          onChange: this.handleAPIChange
+        }) : null);
       };
       return class_1;
     }(React__default.Component)

package/esm/renderer/TreeOptionControl.d.ts

@@ -5,7 +5,7 @@ import React from 'react';
 import Sortable from 'sortablejs';
 import type { Option } from 'amis';
 import type { FormControlProps } from 'amis-core';
-import { SchemaApi } from 'amis/lib/Schema';
+import type { SchemaApi } from 'amis';
 export type OptionControlItem = Option & {
     checked?: boolean;
     _key?: string;
@@ -14,13 +14,14 @@ export interface OptionControlProps extends FormControlProps {
     className?: string;
     showIconField?: boolean;
 }
+export type SourceType = 'custom' | 'api' | 'apicenter' | 'variable';
 export interface OptionControlState {
     options: Array<OptionControlItem>;
     api: SchemaApi;
     labelField: string;
     valueField: string;
     iconField: string;
-    source: 'custom' | 'api' | 'apicenter';
+    source: SourceType;
     modalVisible: boolean;
 }
 export default class TreeOptionControl extends React.Component<OptionControlProps, OptionControlState> {
@@ -40,7 +41,7 @@ export default class TreeOptionControl extends React.Component<OptionControlProp
     /**
      * 切换选项类型
      */
-    handleSourceChange(source: 'custom' | 'api' | 'apicenter'): void;
+    handleSourceChange(source: SourceType): void;
     renderHeader(): JSX.Element;
     handleEditLabelOrValue(value: string, path: string, key: string): void;
     handleDelete(pathStr: string, index: number): void;

package/esm/renderer/TreeOptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -38,7 +38,7 @@ var TreeOptionControl = /** @class */function (_super) {
       labelField: labelField,
       valueField: valueField,
       iconField: showIconField ? iconField : undefined,
-      source: source ? 'api' : 'custom',
+      source: source ? /\$\{(.*?)\}/g.test(source) ? 'variable' : 'api' : 'custom',
       modalVisible: false
     };
     _this.sortables = [];
@@ -71,7 +71,12 @@ var TreeOptionControl = /** @class */function (_super) {
    * 更新options字段的统一出口
    */
   TreeOptionControl.prototype.onChange = function () {
-    var source = this.state.source;
+    var _a = this.state,
+      source = _a.source,
+      api = _a.api,
+      labelField = _a.labelField,
+      valueField = _a.valueField,
+      iconField = _a.iconField;
     var onBulkChange = this.props.onBulkChange;
     var data = {
       source: undefined,
@@ -84,12 +89,7 @@ var TreeOptionControl = /** @class */function (_super) {
       var options = this.state.options.concat();
       data.options = this.pretreatOptions(options);
     }
-    if (source === 'api' || source === 'apicenter') {
-      var _a = this.state,
-        api = _a.api,
-        labelField = _a.labelField,
-        valueField = _a.valueField,
-        iconField = _a.iconField;
+    if (source === 'api' || source === 'apicenter' || source === 'variable') {
       data.source = api;
       data.labelField = labelField || undefined;
       data.valueField = valueField || undefined;
@@ -103,6 +103,7 @@ var TreeOptionControl = /** @class */function (_super) {
    */
   TreeOptionControl.prototype.handleSourceChange = function (source) {
     this.setState({
+      api: '',
       source: source
     }, this.onChange);
   };
@@ -119,7 +120,7 @@ var TreeOptionControl = /** @class */function (_super) {
       hasApiCenter = _b.hasApiCenter;
     var classPrefix = (_a = env === null || env === void 0 ? void 0 : env.theme) === null || _a === void 0 ? void 0 : _a.classPrefix;
     var source = this.state.source;
-    var optionSourceList = __spreadArray([{
+    var optionSourceList = __spreadArray(__spreadArray([{
       label: i18n("01820262aa9ad5b130f8f5b86bfd2968"),
       value: 'custom'
     }, {
@@ -128,7 +129,10 @@ var TreeOptionControl = /** @class */function (_super) {
     }], __read(hasApiCenter ? [{
       label: i18n("e6ff6a97bf600c02942db3126a7077b8"),
       value: 'apicenter'
-    }] : []), false).map(function (item) {
+    }] : []), false), [{
+      label: i18n("50334fc77fc5a2c2636f14f158d3c417"),
+      value: 'variable'
+    }], false).map(function (item) {
       return __assign(__assign({}, item), {
         onClick: function () {
           return _this.handleSourceChange(item.value);
@@ -177,7 +181,7 @@ var TreeOptionControl = /** @class */function (_super) {
   };
   TreeOptionControl.prototype.handleDelete = function (pathStr, index) {
     var _this = this;
-    var _a;
+    var _a, _b;
     var options = cloneDeep(this.state.options);
     if (options.length === 1) {
       toast.warning(i18n("355c54009e364bf4396be424fba10e0f"), {
@@ -192,7 +196,7 @@ var TreeOptionControl = /** @class */function (_super) {
       var parentPath = this.getNodePath(pathStr).parentPath;
       var parentNode = get(options, parentPath, {});
       (_a = parentNode === null || parentNode === void 0 ? void 0 : parentNode.children) === null || _a === void 0 ? void 0 : _a.splice(index, 1);
-      if (!(parentNode === null || parentNode === void 0 ? void 0 : parentNode.children.length)) {
+      if (((_b = parentNode === null || parentNode === void 0 ? void 0 : parentNode.children) === null || _b === void 0 ? void 0 : _b.length) === 0) {
         // 去除僵尸子节点
         delete parentNode.children;
       }
@@ -521,9 +525,6 @@ var TreeOptionControl = /** @class */function (_super) {
       labelField = _c.labelField,
       valueField = _c.valueField,
       iconField = _c.iconField;
-    if (source === 'custom') {
-      return null;
-    }
     return render('api', getSchemaTpl('apiControl', {
       label: i18n("54ea89b497ec3bb319c68844dfa3687f"),
       name: 'source',
@@ -560,7 +561,9 @@ var TreeOptionControl = /** @class */function (_super) {
   TreeOptionControl.prototype.render = function () {
     var _this = this;
     var source = this.state.source;
-    var className = this.props.className;
+    var _a = this.props,
+      className = _a.className,
+      render = _a.render;
     return React__default.createElement("div", {
       className: cx('ae-TreeOptionControl', className)
     }, this.renderHeader(), source === 'custom' ? React__default.createElement("div", {
@@ -572,7 +575,12 @@ var TreeOptionControl = /** @class */function (_super) {
           modalVisible: true
         });
       }
-    }, "\u9009\u9879\u7BA1\u7406"), this.renderModal())) : null, this.renderApiPanel());
+    }, "\u9009\u9879\u7BA1\u7406"), this.renderModal())) : null, source === 'api' || source === 'apicenter' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', getSchemaTpl('sourceBindControl', {
+      label: false,
+      className: 'ae-ExtendMore'
+    }), {
+      onChange: this.handleAPIChange
+    }) : null);
   };
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], TreeOptionControl.prototype, "handleSourceChange", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String, Number]), __metadata("design:returntype", void 0)], TreeOptionControl.prototype, "handleDelete", null);

package/esm/renderer/ValidationControl.d.ts

@@ -58,6 +58,7 @@ export default class ValidationControl extends React.Component<ValidationControl
      * 规则列表
      */
     renderValidaton(): JSX.Element;
+    renderValidateApiControl(): JSX.Element;
     render(): JSX.Element;
 }
 export declare class ValidationControlRenderer extends ValidationControl {

package/esm/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -9,7 +9,7 @@ import groupBy from 'lodash/groupBy';
 import remove from 'lodash/remove';
 import cx from 'classnames';
 import { FormItem } from 'amis';
-import { autobind } from 'amis-editor-core';
+import { getSchemaTpl, tipedLabel, autobind } from 'amis-editor-core';
 import ValidationItem from './ValidationItem.js';
 import { getValidatorsByTag, getValidator } from '../validator.js';
 import { i18n } from 'i18n-runtime';
@@ -287,7 +287,51 @@ var ValidationControl = /** @class */function (_super) {
     return React__default.createElement("div", {
       className: "ae-ValidationControl-rules",
       key: "rules"
-    }, 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: {
+        validateApi: this.props.data.validateApi,
+        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"), "\u914D\u7F6E\u6821\u9A8C\u63A5\u53E3\uFF0C\u5BF9\u8868\u5355\u9879\u8FDB\u884C\u8FDC\u7A0B\u6821\u9A8C\uFF0C\u914D\u7F6E\u65B9\u5F0F\u4E0E\u666E\u901A\u63A5\u53E3\u4E00\u81F4<br />\n              1. \u63A5\u53E3\u8FD4\u56DE <span class=\"ae-ValidationControl-label-code\">{status: 0}</span> \u8868\u793A\u6821\u9A8C\u901A\u8FC7<br />\n              2. \u63A5\u53E3\u8FD4\u56DE <span class=\"ae-ValidationControl-label-code\">{status: 422}</span> \u8868\u793A\u6821\u9A8C\u4E0D\u901A\u8FC7<br />\n              3. \u82E5\u6821\u9A8C\u5931\u8D25\u65F6\u9700\u8981\u663E\u793A\u9519\u8BEF\u63D0\u793A\u4FE1\u606F\uFF0C\u8FD8\u9700\u8FD4\u56DE errors \u5B57\u6BB5\uFF0C\u793A\u4F8B<br />\n              <span class=\"ae-ValidationControl-label-code\">{status: 422, errors: '\u9519\u8BEF\u63D0\u793A\u6D88\u606F'}</span>\n              "),
+        name: 'switchStatus'
+      }), {
+        type: 'container',
+        className: 'ae-ExtendMore ae-ValidationControl-item-input',
+        bodyClassName: 'w-full',
+        visibleOn: 'this.switchStatus',
+        body: [getSchemaTpl('apiControl', {
+          name: 'validateApi',
+          renderLabel: true,
+          label: '',
+          mode: 'normal',
+          className: 'w-full'
+        })]
+      }]
+    }));
   };
   ValidationControl.prototype.render = function () {
     var className = this.props.className;

package/esm/renderer/ValidationItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -20,9 +20,9 @@ var ActionConfigPanel = /** @class */function (_super) {
   ActionConfigPanel.prototype.render = function () {
     var _a, _b, _c, _d;
     var _e = this.props,
-      data = _e.data,
-      onBulkChange = _e.onBulkChange,
-      render = _e.render,
+      data = _e.data;
+      _e.onBulkChange;
+      var render = _e.render,
       pluginActions = _e.pluginActions,
       actionConfigItemsMap = _e.actionConfigItemsMap;
     var actionType = data.__subActions ? data.groupType : data.actionType;
@@ -40,11 +40,7 @@ var ActionConfigPanel = /** @class */function (_super) {
       schema = data.__actionSchema;
     }
     return schema ? render('inner', schema, {
-      data: data,
-      onChange: function (value, field) {
-        var _a;
-        onBulkChange((_a = {}, _a[field] = value, _a));
-      }
+      data: data
     }) : data.__subActions ? React__default.createElement(React__default.Fragment, null) : React__default.createElement("div", {
       className: cx('ae-event-control-action-placeholder', {
         'no-settings': actionType

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/event-control/helper.d.ts

@@ -32,6 +32,7 @@ export declare const renderCmptSelect: (componentLabel: string, required: boolea
         __rendererName: string;
         __nodeId: string;
         __nodeSchema: string;
+        __isScopeContainer: string;
     };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
 }[];
@@ -51,6 +52,7 @@ export declare const renderCmptActionSelect: (componentLabel: string, required:
         __rendererName: string;
         __nodeId: string;
         __nodeSchema: string;
+        __isScopeContainer: string;
     };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
 } | {
@@ -78,9 +80,11 @@ export declare const getPropOfAcion: (action: ActionConfig, propName: string, ac
 } | undefined, allComponents?: ComponentInfo[]) => any;
 export declare const getOldActionSchema: (manager: EditorManager, context: BaseEventContext) => {
     type: string;
+    className: string;
     content: string;
     inline: boolean;
     tooltipTheme: string;
+    placement: string;
     body: {
         type: string;
         label: string;