amis-editor 5.6.2 → 5.6.3

package/lib/renderer/TransferTableControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -24,238 +24,237 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
  * @file Transfer的表格对应选项
  */
 function BaseOptionControl(Cmpt) {
-  return (/** @class */function (_super) {
-      tslib.__extends(class_1, _super);
-      function class_1(props) {
-        var _this = _super.call(this, props) || this;
-        _this.internalProps = ['checked', 'editing'];
-        _this.state = {
-          api: props.data.source,
-          labelField: props.data.labelField,
-          valueField: props.data.valueField,
-          source: props.data.source ? /\$\{(.*?)\}/g.test(props.data.source) ? 'variable' : 'api' : 'custom'
-        };
-        _this.handleSourceChange = _this.handleSourceChange.bind(_this);
-        _this.handleAPIChange = _this.handleAPIChange.bind(_this);
-        _this.handleLableFieldChange = _this.handleLableFieldChange.bind(_this);
-        _this.handleValueFieldChange = _this.handleValueFieldChange.bind(_this);
-        _this.onChange = _this.onChange.bind(_this);
-        return _this;
-      }
-      /**
-       * 更新options字段的统一出口
-       */
-      class_1.prototype.onChange = function () {
-        var source = this.state.source;
-        var onBulkChange = this.props.onBulkChange;
-        var data = {
-          source: undefined,
-          options: undefined,
-          labelField: undefined,
-          valueField: undefined
-        };
-        if (['api', 'variable'].includes(source)) {
-          var _a = this.state,
-            api = _a.api,
-            labelField = _a.labelField,
-            valueField = _a.valueField;
-          data.source = api;
-          data.labelField = labelField || undefined;
-          data.valueField = valueField || undefined;
-        }
-        onBulkChange && onBulkChange(data);
-        return;
-      };
-      /**
-       * 切换选项类型
-       */
-      class_1.prototype.handleSourceChange = function (source) {
-        this.setState({
-          api: '',
-          source: source
-        }, this.onChange);
-      };
-      class_1.prototype.handleAPIChange = function (source) {
-        this.setState({
-          api: source
-        }, this.onChange);
+  return /** @class */function (_super) {
+    tslib.__extends(class_1, _super);
+    function class_1(props) {
+      var _this = _super.call(this, props) || this;
+      _this.internalProps = ['checked', 'editing'];
+      _this.state = {
+        api: props.data.source,
+        labelField: props.data.labelField,
+        valueField: props.data.valueField,
+        source: props.data.source ? /\$\{(.*?)\}/g.test(props.data.source) ? 'variable' : 'api' : 'custom'
       };
-      class_1.prototype.handleLableFieldChange = function (labelField) {
-        this.setState({
-          labelField: labelField
-        }, this.onChange);
-      };
-      class_1.prototype.handleValueFieldChange = function (valueField) {
-        this.setState({
-          valueField: valueField
-        }, this.onChange);
-      };
-      class_1.prototype.buildBatchAddSchema = function () {
-        return {
-          type: 'action',
-          actionType: 'dialog',
-          label: i18nRuntime.i18n("22de6ef85ed60ec54dbdc1d8583e5104"),
-          dialog: {
-            title: i18nRuntime.i18n("421252e16c6cb544fe9ce0be94a190e0"),
-            headerClassName: 'font-bold',
-            closeOnEsc: true,
-            closeOnOutside: false,
-            showCloseButton: true,
-            body: [{
-              type: 'alert',
-              level: 'warning',
-              body: [{
-                type: 'tpl',
-                tpl: i18nRuntime.i18n("c130bd5b55edefdaf8923269e9a52439")
-              }],
-              showIcon: true,
-              className: 'mb-2.5'
-            }, {
-              type: 'form',
-              wrapWithPanel: false,
-              mode: 'normal',
-              wrapperComponent: 'div',
-              resetAfterSubmit: true,
-              autoFocus: true,
-              preventEnterSubmit: true,
-              horizontal: {
-                left: 0,
-                right: 12
-              },
-              body: [{
-                name: 'batchOption',
-                type: 'textarea',
-                label: '',
-                placeholder: i18nRuntime.i18n("1e2f96a69fbef8caa8823a3067ebbdc7"),
-                trimContents: true,
-                minRows: 10,
-                maxRows: 50,
-                required: true
-              }]
-            }]
-          }
-        };
-      };
-      class_1.prototype.renderHeader = function () {
-        var _this = this;
-        var _a;
-        var _b = this.props,
-          render = _b.render,
-          label = _b.label,
-          labelRemark = _b.labelRemark,
-          useMobileUI = _b.useMobileUI,
-          env = _b.env,
-          popOverContainer = _b.popOverContainer;
-        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 = [{
-          label: i18nRuntime.i18n("01820262aa9ad5b130f8f5b86bfd2968"),
-          value: 'custom'
-        }, {
-          label: i18nRuntime.i18n("c8158b3cad598b0b5939788ca4efb298"),
-          value: 'api'
-        }, {
-          label: i18nRuntime.i18n("50334fc77fc5a2c2636f14f158d3c417"),
-          value: 'variable'
-        }].map(function (item) {
-          return tslib.__assign(tslib.__assign({}, item), {
-            onClick: function () {
-              return _this.handleSourceChange(item.value);
-            }
-          });
-        });
-        return React__default["default"].createElement("header", {
-          className: "ae-OptionControl-header"
-        }, React__default["default"].createElement("label", {
-          className: cx__default["default"]("".concat(classPrefix, "Form-label"))
-        }, label || '', labelRemark ? render('label-remark', {
-          type: 'remark',
-          icon: labelRemark.icon || 'warning-mark',
-          tooltip: labelRemark,
-          className: cx__default["default"]("Form-lableRemark", labelRemark === null || labelRemark === void 0 ? void 0 : labelRemark.className),
-          useMobileUI: useMobileUI,
-          container: popOverContainer || env.getModalContainer
-        }) : null), React__default["default"].createElement("div", null, render('validation-control-addBtn', {
-          type: 'dropdown-button',
-          level: 'link',
-          size: 'sm',
-          label: '${selected}',
-          align: 'right',
-          closeOnClick: true,
-          closeOnOutside: true,
-          buttons: optionSourceList
-        }, {
-          popOverContainer: null,
-          data: {
-            selected: optionSourceList.find(function (item) {
-              return item.value === source;
-            }).label
-          }
-        })));
+      _this.handleSourceChange = _this.handleSourceChange.bind(_this);
+      _this.handleAPIChange = _this.handleAPIChange.bind(_this);
+      _this.handleLableFieldChange = _this.handleLableFieldChange.bind(_this);
+      _this.handleValueFieldChange = _this.handleValueFieldChange.bind(_this);
+      _this.onChange = _this.onChange.bind(_this);
+      return _this;
+    }
+    /**
+     * 更新options字段的统一出口
+     */
+    class_1.prototype.onChange = function () {
+      var source = this.state.source;
+      var onBulkChange = this.props.onBulkChange;
+      var data = {
+        source: undefined,
+        options: undefined,
+        labelField: undefined,
+        valueField: undefined
       };
-      class_1.prototype.renderApiPanel = function () {
-        var render = this.props.render;
+      if (['api', 'variable'].includes(source)) {
         var _a = this.state,
-          source = _a.source,
           api = _a.api,
           labelField = _a.labelField,
           valueField = _a.valueField;
-        if (source !== 'api') {
-          return null;
-        }
-        return render('api', amisEditorCore.getSchemaTpl('apiControl', {
-          label: i18nRuntime.i18n("54ea89b497ec3bb319c68844dfa3687f"),
-          name: 'source',
-          className: 'ae-ExtendMore',
-          visibleOn: 'data.autoComplete !== false',
-          value: api,
-          onChange: this.handleAPIChange,
-          footer: [{
-            label: amisEditorCore.tipedLabel(i18nRuntime.i18n("7e9c83e86beb612377a94e6e8d1fc644"), i18nRuntime.i18n("26ff46d82166741297ce666b2792af85")),
-            type: 'input-text',
-            name: 'labelField',
-            value: labelField,
-            placeholder: i18nRuntime.i18n("6d4ce0631f37676a887c9599691fabec"),
-            onChange: this.handleLableFieldChange
+        data.source = api;
+        data.labelField = labelField || undefined;
+        data.valueField = valueField || undefined;
+      }
+      onBulkChange && onBulkChange(data);
+      return;
+    };
+    /**
+     * 切换选项类型
+     */
+    class_1.prototype.handleSourceChange = function (source) {
+      this.setState({
+        api: '',
+        source: source
+      }, this.onChange);
+    };
+    class_1.prototype.handleAPIChange = function (source) {
+      this.setState({
+        api: source
+      }, this.onChange);
+    };
+    class_1.prototype.handleLableFieldChange = function (labelField) {
+      this.setState({
+        labelField: labelField
+      }, this.onChange);
+    };
+    class_1.prototype.handleValueFieldChange = function (valueField) {
+      this.setState({
+        valueField: valueField
+      }, this.onChange);
+    };
+    class_1.prototype.buildBatchAddSchema = function () {
+      return {
+        type: 'action',
+        actionType: 'dialog',
+        label: i18nRuntime.i18n("22de6ef85ed60ec54dbdc1d8583e5104"),
+        dialog: {
+          title: i18nRuntime.i18n("421252e16c6cb544fe9ce0be94a190e0"),
+          headerClassName: 'font-bold',
+          closeOnEsc: true,
+          closeOnOutside: false,
+          showCloseButton: true,
+          body: [{
+            type: 'alert',
+            level: 'warning',
+            body: [{
+              type: 'tpl',
+              tpl: i18nRuntime.i18n("c130bd5b55edefdaf8923269e9a52439")
+            }],
+            showIcon: true,
+            className: 'mb-2.5'
           }, {
-            label: i18nRuntime.i18n("2e01f5f5889e33d003bec7857cd38445"),
-            type: 'input-text',
-            name: 'valueField',
-            value: valueField,
-            placeholder: i18nRuntime.i18n("959c27193eb0a41d01f4b53dcc4b9245"),
-            onChange: this.handleValueFieldChange
+            type: 'form',
+            wrapWithPanel: false,
+            mode: 'normal',
+            wrapperComponent: 'div',
+            resetAfterSubmit: true,
+            autoFocus: true,
+            preventEnterSubmit: true,
+            horizontal: {
+              left: 0,
+              right: 12
+            },
+            body: [{
+              name: 'batchOption',
+              type: 'textarea',
+              label: '',
+              placeholder: i18nRuntime.i18n("1e2f96a69fbef8caa8823a3067ebbdc7"),
+              trimContents: true,
+              minRows: 10,
+              maxRows: 50,
+              required: true
+            }]
           }]
-        }));
+        }
       };
-      class_1.prototype.render = function () {
-        var _a;
-        var _b = this.state,
-          source = _b.source,
-          api = _b.api,
-          labelField = _b.labelField,
-          valueField = _b.valueField;
-        var _c = this.props,
-          className = _c.className,
-          render = _c.render;
-        var cmptProps = tslib.__assign(tslib.__assign({}, this.props), {
-          data: tslib.__assign({
-            api: api,
-            labelField: labelField,
-            valueField: valueField
-          }, (_a = this.props) === null || _a === void 0 ? void 0 : _a.data)
+    };
+    class_1.prototype.renderHeader = function () {
+      var _this = this;
+      var _a;
+      var _b = this.props,
+        render = _b.render,
+        label = _b.label,
+        labelRemark = _b.labelRemark,
+        useMobileUI = _b.useMobileUI,
+        env = _b.env,
+        popOverContainer = _b.popOverContainer;
+      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 = [{
+        label: i18nRuntime.i18n("01820262aa9ad5b130f8f5b86bfd2968"),
+        value: 'custom'
+      }, {
+        label: i18nRuntime.i18n("c8158b3cad598b0b5939788ca4efb298"),
+        value: 'api'
+      }, {
+        label: i18nRuntime.i18n("50334fc77fc5a2c2636f14f158d3c417"),
+        value: 'variable'
+      }].map(function (item) {
+        return tslib.__assign(tslib.__assign({}, item), {
+          onClick: function () {
+            return _this.handleSourceChange(item.value);
+          }
         });
-        return React__default["default"].createElement("div", {
-          className: cx__default["default"]('ae-OptionControl', className)
-        }, this.renderHeader(), source === 'custom' ? React__default["default"].createElement(Cmpt, tslib.__assign({}, cmptProps)) : null, source === 'api' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', amisEditorCore.getSchemaTpl('sourceBindControl', {
-          label: false,
-          className: 'ae-ExtendMore'
-        }), {
-          onChange: this.handleAPIChange
-        }) : null);
-      };
-      return class_1;
-    }(React__default["default"].Component)
-  );
+      });
+      return React__default["default"].createElement("header", {
+        className: "ae-OptionControl-header"
+      }, React__default["default"].createElement("label", {
+        className: cx__default["default"]("".concat(classPrefix, "Form-label"))
+      }, label || '', labelRemark ? render('label-remark', {
+        type: 'remark',
+        icon: labelRemark.icon || 'warning-mark',
+        tooltip: labelRemark,
+        className: cx__default["default"]("Form-lableRemark", labelRemark === null || labelRemark === void 0 ? void 0 : labelRemark.className),
+        useMobileUI: useMobileUI,
+        container: popOverContainer || env.getModalContainer
+      }) : null), React__default["default"].createElement("div", null, render('validation-control-addBtn', {
+        type: 'dropdown-button',
+        level: 'link',
+        size: 'sm',
+        label: '${selected}',
+        align: 'right',
+        closeOnClick: true,
+        closeOnOutside: true,
+        buttons: optionSourceList
+      }, {
+        popOverContainer: null,
+        data: {
+          selected: optionSourceList.find(function (item) {
+            return item.value === source;
+          }).label
+        }
+      })));
+    };
+    class_1.prototype.renderApiPanel = function () {
+      var render = this.props.render;
+      var _a = this.state,
+        source = _a.source,
+        api = _a.api,
+        labelField = _a.labelField,
+        valueField = _a.valueField;
+      if (source !== 'api') {
+        return null;
+      }
+      return render('api', amisEditorCore.getSchemaTpl('apiControl', {
+        label: i18nRuntime.i18n("54ea89b497ec3bb319c68844dfa3687f"),
+        name: 'source',
+        className: 'ae-ExtendMore',
+        visibleOn: 'data.autoComplete !== false',
+        value: api,
+        onChange: this.handleAPIChange,
+        footer: [{
+          label: amisEditorCore.tipedLabel(i18nRuntime.i18n("7e9c83e86beb612377a94e6e8d1fc644"), i18nRuntime.i18n("26ff46d82166741297ce666b2792af85")),
+          type: 'input-text',
+          name: 'labelField',
+          value: labelField,
+          placeholder: i18nRuntime.i18n("6d4ce0631f37676a887c9599691fabec"),
+          onChange: this.handleLableFieldChange
+        }, {
+          label: i18nRuntime.i18n("2e01f5f5889e33d003bec7857cd38445"),
+          type: 'input-text',
+          name: 'valueField',
+          value: valueField,
+          placeholder: i18nRuntime.i18n("959c27193eb0a41d01f4b53dcc4b9245"),
+          onChange: this.handleValueFieldChange
+        }]
+      }));
+    };
+    class_1.prototype.render = function () {
+      var _a;
+      var _b = this.state,
+        source = _b.source,
+        api = _b.api,
+        labelField = _b.labelField,
+        valueField = _b.valueField;
+      var _c = this.props,
+        className = _c.className,
+        render = _c.render;
+      var cmptProps = tslib.__assign(tslib.__assign({}, this.props), {
+        data: tslib.__assign({
+          api: api,
+          labelField: labelField,
+          valueField: valueField
+        }, (_a = this.props) === null || _a === void 0 ? void 0 : _a.data)
+      });
+      return React__default["default"].createElement("div", {
+        className: cx__default["default"]('ae-OptionControl', className)
+      }, this.renderHeader(), source === 'custom' ? React__default["default"].createElement(Cmpt, tslib.__assign({}, cmptProps)) : null, source === 'api' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', amisEditorCore.getSchemaTpl('sourceBindControl', {
+        label: false,
+        className: 'ae-ExtendMore'
+      }), {
+        onChange: this.handleAPIChange
+      }) : null);
+    };
+    return class_1;
+  }(React__default["default"].Component);
 }
 var renderInput = function (name, placeholder, required, unique) {
   if (required === void 0) {
@@ -455,4 +454,4 @@ var TransferTableControl = BaseOptionControl(TransferTableOption);
 })(TransferTableControl);
 
 exports["default"] = TransferTableOption;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/lib/renderer/TreeOptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -625,4 +625,4 @@ var TreeOptionControl = /** @class */function (_super) {
 })(TreeOptionControl);
 
 exports["default"] = TreeOptionControl;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/lib/renderer/ValidationControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -48,7 +48,6 @@ var ValidationControl = /** @class */function (_super) {
     }
     // todo 删除不允许配置的值
   };
-
   ValidationControl.prototype.getAvaliableValids = function (props) {
     var data = props.data,
       tag = props.tag;
@@ -315,7 +314,6 @@ var ValidationControl = /** @class */function (_super) {
       wrapperComponent: 'div',
       mode: 'horizontal',
       data: {
-        validateApi: this.props.data.validateApi,
         switchStatus: this.props.data.validateApi !== undefined
       },
       preventEnterSubmit: true,
@@ -335,6 +333,10 @@ var ValidationControl = /** @class */function (_super) {
         className: 'ae-ExtendMore ae-ValidationControl-item-input',
         bodyClassName: 'w-full',
         visibleOn: 'this.switchStatus',
+        data: {
+          // 放在form中则包含的表达式会被求值
+          validateApi: this.props.data.validateApi
+        },
         body: [amisEditorCore.getSchemaTpl('apiControl', {
           name: 'validateApi',
           renderLabel: true,
@@ -370,4 +372,4 @@ var ValidationControl = /** @class */function (_super) {
 })(ValidationControl);
 
 exports["default"] = ValidationControl;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

package/lib/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -173,4 +173,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ValidationItem;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -148,11 +148,13 @@ var AddColumnModal = function (props) {
     show: visible,
     onHide: onClose,
     closeOnEsc: false,
-    contentClassName: "ae-Scaffold-Modal AMISCSSWrapper"
+    contentClassName: "ae-Scaffold-Modal :AMISCSSWrapper"
   }, React__default["default"].createElement(amis.Modal.Header, {
     showCloseButton: true,
     onClose: onClose
-  }, React__default["default"].createElement(amis.Modal.Title, null, i18nRuntime.i18n("49198f84cea6c212cd5d463037827cd5"))), React__default["default"].createElement(amis.Modal.Body, null, render('column-control-modal', {
+  }, React__default["default"].createElement(amis.Modal.Title, {
+    className: "ae-Scaffold-Modal-title"
+  }, i18nRuntime.i18n("49198f84cea6c212cd5d463037827cd5"))), React__default["default"].createElement(amis.Modal.Body, null, render('column-control-modal', {
     type: 'form',
     title: '',
     mode: 'horizontal',
@@ -262,4 +264,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = amis.themeable(AddColumnModal);
 
 exports["default"] = AddColumnModal$1;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.6.2
- * build time: 2023-10-31
+ * amis-editor v5.6.3
+ * build time: 2023-12-08
  * Copyright 2018-2023 @fex
  */
 
@@ -120,7 +120,6 @@ var CRUDColumnControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDColumnControl.prototype.dragRef = function (ref) {
     if (!this.drag && ref) {
       this.initDragging();
@@ -305,7 +304,6 @@ var CRUDColumnControl = /** @class */function (_super) {
       });
     });
   };
-
   CRUDColumnControl.prototype.renderOption = function (item, index) {
     var _this = this;
     var _a, _b, _c;
@@ -434,17 +432,17 @@ var CRUDColumnControl = /** @class */function (_super) {
       tipPlacement: "bottom",
       size: "sm",
       className: cx('flex')
-    }) : Array.isArray(options) && options.length > 0 ? React__default["default"].createElement(React__default["default"].Fragment, null, this.renderHeader(), React__default["default"].createElement("ul", {
+    }) : React__default["default"].createElement(React__default["default"].Fragment, null, this.renderHeader(), Array.isArray(options) && options.length > 0 ? React__default["default"].createElement("ul", {
       className: cx('ae-CRUDConfigControl-list'),
       ref: this.dragRef
     }, options.map(function (item, index) {
       return _this.renderOption(item, index);
-    }))) : React__default["default"].createElement("ul", {
+    })) : React__default["default"].createElement("ul", {
       className: cx('ae-CRUDConfigControl-list'),
       ref: this.dragRef
     }, React__default["default"].createElement("p", {
       className: cx("ae-CRUDConfigControl-placeholder")
-    }, i18nRuntime.i18n("21efd88b67a39834582ad99aabb9dc60"))), showAddModal ? React__default["default"].createElement(AddColumnModal["default"], {
+    }, i18nRuntime.i18n("21efd88b67a39834582ad99aabb9dc60")))), showAddModal ? React__default["default"].createElement(AddColumnModal["default"], {
       render: this.props.render,
       visible: showAddModal,
       initData: addModalData,
@@ -479,4 +477,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 exports.CRUDColumnControl = CRUDColumnControl;
-window.amisEditorVersionInfo={version:'5.6.2',buildTime:'2023-10-31'};
+window.amisEditorVersionInfo={version:'5.6.3',buildTime:'2023-12-08'};