amis-editor 5.2.0-beta.0 → 5.2.0-beta.2

package/lib/renderer/StatusControl.d.ts

@@ -8,15 +8,20 @@ import type { SchemaCollection } from 'amis/lib/Schema';
 import type { FormSchema } from 'amis/lib/schema';
 export interface StatusControlProps extends FormControlProps {
     name: string;
-    expressioName: string;
+    expressionName: string;
     trueValue?: boolean;
     falseValue?: boolean;
     options?: Option[];
     children?: SchemaCollection;
     messages?: Pick<FormSchema, 'messages'>;
 }
+declare type StatusFormData = {
+    statusType: number;
+    expression: string;
+};
 interface StatusControlState {
     checked: boolean;
+    formData: StatusFormData;
 }
 export declare class StatusControl extends React.Component<StatusControlProps, StatusControlState> {
     static defaultProps: {
@@ -26,11 +31,11 @@ export declare class StatusControl extends React.Component<StatusControlProps, S
     constructor(props: StatusControlProps);
     initState(): {
         checked: boolean;
+        formData: StatusFormData;
     };
     shouldComponentUpdate(nextProps: StatusControlProps, nextState: StatusControlState): boolean;
     handleSwitch(value: boolean): void;
-    handleSubmit(values: any): void;
-    handleSelect(value: true | ''): void;
+    handleFormSubmit(values: StatusFormData): void;
     render(): JSX.Element;
     renderContent(): JSX.Element;
 }

package/lib/renderer/StatusControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.0
+ * amis-editor v5.2.0-beta.2
  * Copyright 2018-2022 @fex
  */
 
@@ -11,7 +11,8 @@ var tslib = require('tslib');
 var React = require('react');
 var cx = require('classnames');
 var amis = require('amis');
-var AMisCodeEditor = require('amis-editor-core');
+var amisEditorCore = require('amis-editor-core');
+var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,151 +22,191 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 /**
  * @file 状态配置组件
  */
-var StatusControl = /** @class */ (function (_super) {
-    tslib.__extends(StatusControl, _super);
-    function StatusControl(props) {
-        var _this = _super.call(this, props) || this;
-        _this.state = _this.initState();
-        return _this;
-    }
-    StatusControl.prototype.initState = function () {
-        var _a = this.props, _b = _a.data, ctx = _b === void 0 ? {} : _b, expressioName = _a.expressioName, name = _a.name, trueValue = _a.trueValue;
-        return {
-            checked: ctx[name] == trueValue || typeof ctx[expressioName] === 'string'
-        };
-    };
-    StatusControl.prototype.shouldComponentUpdate = function (nextProps, nextState) {
-        return nextState.checked !== this.state.checked;
-    };
-    StatusControl.prototype.handleSwitch = function (value) {
-        var _this = this;
-        var _a = this.props, trueValue = _a.trueValue, falseValue = _a.falseValue;
-        this.setState({ checked: value == trueValue ? true : false }, function () {
-            var _a;
-            var _b = _this.props, onBulkChange = _b.onBulkChange, expressioName = _b.expressioName, name = _b.name;
-            onBulkChange &&
-                onBulkChange((_a = {},
-                    _a[name] = value == trueValue ? trueValue : falseValue,
-                    _a[expressioName] = undefined,
-                    _a));
-        });
-    };
-    StatusControl.prototype.handleSubmit = function (values) {
-        var _a = this.props, onBulkChange = _a.onBulkChange, name = _a.name, expressioName = _a.expressioName;
-        values[name] = !values[name] ? undefined : values[name];
-        values[expressioName] = !values[expressioName]
-            ? undefined
-            : values[expressioName];
-        onBulkChange && onBulkChange(values);
-    };
-    StatusControl.prototype.handleSelect = function (value) {
-        var _a;
-        var _b = this.props, onBulkChange = _b.onBulkChange, name = _b.name, expressioName = _b.expressioName;
-        onBulkChange &&
-            onBulkChange((_a = {},
-                _a[value ? expressioName : name] = undefined,
-                _a[(!value && expressioName) || ''] = '',
-                _a));
-    };
-    StatusControl.prototype.render = function () {
-        var _a = this.props, className = _a.className; _a.data; var trueValue = _a.trueValue, falseValue = _a.falseValue; _a.env;
-        var checked = this.state.checked;
-        return (React__default["default"].createElement("div", { className: cx__default["default"]('ae-StatusControl', className) },
-            React__default["default"].createElement("header", { className: cx__default["default"]('ae-StatusControl-switch') },
-                React__default["default"].createElement("div", null,
-                    React__default["default"].createElement(amis.Switch, { className: "ae-BaseSwitch", size: "md", trueValue: trueValue, falseValue: falseValue, checked: checked, onChange: this.handleSwitch }))),
-            checked ? this.renderContent() : null));
-    };
-    StatusControl.prototype.renderContent = function () {
-        var _a = this.props, render = _a.render, label = _a.label; _a.data; var name = _a.name, expressioName = _a.expressioName, options = _a.options, children = _a.children, messages = _a.messages;
-        return (React__default["default"].createElement("div", { className: "ae-StatusControl-content" }, render('status-control-form', {
-            type: 'form',
-            title: '',
-            panelClassName: 'border-none shadow-none mb-0',
-            bodyClassName: 'p-none',
-            actionsClassName: 'border-none mt-2.5',
-            wrapperComponent: 'div',
-            submitOnChange: true,
-            autoFocus: true,
-            formLazyChange: true,
-            footerWrapClassName: 'hidden',
-            preventEnterSubmit: true,
-            messages: messages,
-            mode: 'horizontal',
-            horizontal: {
-                justify: true,
-                left: 3
-            },
-            body: tslib.__spreadArray([
-                {
-                    type: 'select',
-                    label: '条件',
-                    name: name,
-                    value: "typeof this.".concat(expressioName, " === \"string\" ? 2 : 1"),
-                    options: options || [
-                        {
-                            label: '静态',
-                            value: 1
-                        },
-                        {
-                            label: '表达式',
-                            value: 2
-                        }
-                    ],
-                    pipeIn: function (value) { return (typeof value === 'boolean' ? 1 : 2); },
-                    pipeOut: function (value) { return (value === 1 ? true : ''); },
-                    onChange: this.handleSelect
-                }
-            ], (Array.isArray(children)
-                ? children
-                : [
-                    children || {
-                        type: 'ae-formulaControl',
-                        name: expressioName,
-                        label: '表达式',
-                        placeholder: "\u8BF7\u8F93\u5165".concat(label, "\u6761\u4EF6"),
-                        visibleOn: "typeof this.".concat(name, " !== \"boolean\"")
-                    }
-                ]), true)
-        }, {
-            onSubmit: this.handleSubmit
-        })));
+
+var StatusControl =
+/** @class */
+function (_super) {
+  tslib.__extends(StatusControl, _super);
+
+  function StatusControl(props) {
+    var _this = _super.call(this, props) || this;
+
+    _this.state = _this.initState();
+    return _this;
+  }
+
+  StatusControl.prototype.initState = function () {
+    var _a = this.props,
+        _b = _a.data,
+        ctx = _b === void 0 ? {} : _b,
+        expressionName = _a.expressionName,
+        name = _a.name,
+        trueValue = _a.trueValue;
+    var formData = {
+      statusType: 1,
+      expression: ''
     };
-    StatusControl.defaultProps = {
-        trueValue: true,
-        falseValue: false
+
+    if (ctx[expressionName] || ctx[expressionName] === "") {
+      formData.statusType = 2;
+      formData.expression = ctx[expressionName];
+    }
+
+    return {
+      checked: ctx[name] == trueValue || typeof ctx[expressionName] === 'string',
+      formData: formData
     };
-    tslib.__decorate([
-        AMisCodeEditor.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Boolean]),
-        tslib.__metadata("design:returntype", void 0)
-    ], StatusControl.prototype, "handleSwitch", null);
-    tslib.__decorate([
-        AMisCodeEditor.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], StatusControl.prototype, "handleSubmit", null);
-    tslib.__decorate([
-        AMisCodeEditor.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], StatusControl.prototype, "handleSelect", null);
-    return StatusControl;
-}(React__default["default"].Component));
-/** @class */ ((function (_super) {
-    tslib.__extends(StatusControlRenderer, _super);
-    function StatusControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+  };
+
+  StatusControl.prototype.shouldComponentUpdate = function (nextProps, nextState) {
+    return nextState.checked !== this.state.checked;
+  };
+
+  StatusControl.prototype.handleSwitch = function (value) {
+    var _this = this;
+
+    var _a = this.props,
+        trueValue = _a.trueValue,
+        falseValue = _a.falseValue;
+    this.setState({
+      checked: value == trueValue ? true : false
+    }, function () {
+      var _a;
+
+      var _b = _this.props,
+          onBulkChange = _b.onBulkChange,
+          expressionName = _b.expressionName,
+          name = _b.name;
+      onBulkChange && onBulkChange((_a = {}, _a[name] = value == trueValue ? trueValue : falseValue, _a[expressionName] = undefined, _a));
+    });
+  };
+
+  StatusControl.prototype.handleFormSubmit = function (values) {
+    var _a;
+
+    var _b = this.props,
+        onBulkChange = _b.onBulkChange,
+        name = _b.name,
+        expressionName = _b.expressionName;
+    var data = (_a = {}, _a[name] = undefined, _a[expressionName] = undefined, _a);
+    this.setState({
+      formData: values
+    });
+
+    switch (values.statusType) {
+      case 1:
+        data[name] = true;
+        break;
+
+      case 2:
+        data[expressionName] = values.expression;
+        break;
     }
-    StatusControlRenderer = tslib.__decorate([
-        amis.FormItem({
-            type: 'ae-statusControl'
-        })
-    ], StatusControlRenderer);
-    return StatusControlRenderer;
-})(StatusControl));
+
+    onBulkChange && onBulkChange(data);
+  };
+
+  StatusControl.prototype.render = function () {
+    var _a = this.props,
+        className = _a.className;
+        _a.data;
+        var trueValue = _a.trueValue,
+        falseValue = _a.falseValue;
+        _a.env;
+    var checked = this.state.checked;
+    return React__default["default"].createElement("div", {
+      className: cx__default["default"]('ae-StatusControl', className)
+    }, React__default["default"].createElement("header", {
+      className: cx__default["default"]('ae-StatusControl-switch')
+    }, React__default["default"].createElement("div", null, React__default["default"].createElement(amis.Switch, {
+      className: "ae-BaseSwitch",
+      size: "md",
+      trueValue: trueValue,
+      falseValue: falseValue,
+      checked: checked,
+      onChange: this.handleSwitch
+    }))), checked ? this.renderContent() : null);
+  };
+
+  StatusControl.prototype.renderContent = function () {
+    var _a = this.props,
+        render = _a.render,
+        label = _a.label;
+        _a.data;
+        _a.name;
+        _a.expressionName;
+        var options = _a.options;
+        _a.children;
+        var messages = _a.messages;
+    var formData = this.state.formData;
+    return React__default["default"].createElement("div", {
+      className: "ae-StatusControl-content"
+    }, render('status-control-form', {
+      type: 'form',
+      title: '',
+      panelClassName: 'border-none shadow-none mb-0',
+      bodyClassName: 'p-none',
+      actionsClassName: 'border-none mt-2.5',
+      wrapperComponent: 'div',
+      submitOnChange: true,
+      autoFocus: true,
+      formLazyChange: true,
+      footerWrapClassName: 'hidden',
+      preventEnterSubmit: true,
+      messages: messages,
+      mode: 'horizontal',
+      horizontal: {
+        justify: true,
+        left: 3
+      },
+      body: [{
+        type: 'select',
+        label: i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622"),
+        name: 'statusType',
+        options: options || [{
+          label: i18nRuntime.i18n("8baf21fa26d6d24b4faa872953275d8d"),
+          value: 1
+        }, {
+          label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+          value: 2
+        }]
+      }, {
+        type: 'ae-formulaControl',
+        name: 'expression',
+        label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+        placeholder: "\u8BF7\u8F93\u5165".concat(label, "\u6761\u4EF6"),
+        visibleOn: 'this.statusType === 2'
+      }]
+    }, {
+      data: formData,
+      onSubmit: this.handleFormSubmit
+    }));
+  };
+
+  StatusControl.defaultProps = {
+    trueValue: true,
+    falseValue: false
+  };
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Boolean]), tslib.__metadata("design:returntype", void 0)], StatusControl.prototype, "handleSwitch", null);
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], StatusControl.prototype, "handleFormSubmit", null);
+
+  return StatusControl;
+}(React__default["default"].Component);
+
+/** @class */
+(function (_super) {
+  tslib.__extends(StatusControlRenderer, _super);
+
+  function StatusControlRenderer() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  StatusControlRenderer = tslib.__decorate([amis.FormItem({
+    type: 'ae-statusControl'
+  })], StatusControlRenderer);
+  return StatusControlRenderer;
+})(StatusControl);
 
 exports.StatusControl = StatusControl;

package/lib/renderer/SwitchMoreControl.d.ts

@@ -66,49 +66,59 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         itemClassName: string;
         icon: string;
         form: {
-            reload?: string | undefined;
-            hidden?: boolean | undefined;
-            disabled?: boolean | undefined;
-            api?: string | import("amis").BaseApiObject | undefined;
-            name?: string | undefined;
-            horizontal: import("amis").FormHorizontal;
             data: any;
-            body?: SchemaCollection | undefined;
-            title: any;
             className?: import("amis").SchemaClassName | undefined;
-            id?: string | undefined;
-            autoFocus: boolean | undefined;
-            tabs?: any;
-            visibleOn?: string | undefined;
             onEvent?: {
                 [propName: string]: {
                     weight?: number | undefined;
                     actions: import("amis").ListenerAction[];
                 };
             } | undefined;
+            body?: SchemaCollection | undefined;
+            title: any;
+            name?: string | undefined;
+            disabled?: boolean | undefined;
+            tabs?: any;
+            horizontal: import("amis").FormHorizontal;
+            mode: string;
+            actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
+            api?: string | import("amis").BaseApiObject | undefined;
+            hidden?: boolean | undefined;
+            reload?: string | undefined;
+            id?: string | undefined;
+            target?: string | undefined;
+            visibleOn?: string | undefined;
+            feedback?: any;
+            autoFocus: boolean | undefined;
             $ref?: string | undefined;
             disabledOn?: string | undefined;
             hiddenOn?: string | undefined;
             visible?: boolean | undefined;
-            mode: string;
-            fieldSet?: any;
+            primaryField?: string | undefined;
             messages?: {
                 validateFailed?: string | undefined;
             } | undefined;
+            fieldSet?: any;
             labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
+            labelWidth?: string | number | undefined;
             submitOnChange: boolean;
             initFetchOn?: string | undefined;
             initFetch?: boolean | undefined;
-            initApi?: string | import("amis").BaseApiObject | undefined;
             interval?: number | undefined;
             silentPolling?: boolean | undefined;
             stopAutoRefreshWhen?: string | undefined;
-            feedback?: any;
+            initApi?: string | import("amis").BaseApiObject | undefined;
             redirect?: string | undefined;
-            target?: string | undefined;
-            actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
             affixFooter?: boolean | undefined;
             debug?: boolean | undefined;
+            debugConfig?: {
+                levelExpand?: number | undefined;
+                enableClipboard?: boolean | undefined;
+                iconStyle?: "circle" | "triangle" | "square" | undefined;
+                quotesOnKeys?: boolean | undefined;
+                sortKeys?: boolean | undefined;
+                ellipsisThreshold?: number | false | undefined;
+            } | undefined;
             initAsyncApi?: string | import("amis").BaseApiObject | undefined;
             initFinishedField?: string | undefined;
             initCheckInterval?: number | undefined;
@@ -121,7 +131,6 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             clearAfterSubmit?: boolean | undefined;
             columnCount?: number | undefined;
             panelClassName: import("amis").ClassName;
-            primaryField?: string | undefined;
             submitOnInit?: boolean | undefined;
             submitText?: string | undefined;
             wrapWithPanel: boolean;
@@ -134,56 +143,65 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
             }[] | undefined;
             preventEnterSubmit: boolean;
             type: string;
-            bodyClassName: string;
             actionsClassName: string;
             wrapperComponent: string;
             formLazyChange: boolean;
         };
     };
     renderForm(): {
-        reload?: string | undefined;
-        hidden?: boolean | undefined;
-        disabled?: boolean | undefined;
-        api?: string | import("amis").BaseApiObject | undefined;
-        name?: string | undefined;
-        horizontal: import("amis").FormHorizontal;
         data: any;
-        body?: SchemaCollection | undefined;
-        title?: string | undefined;
         className?: import("amis").SchemaClassName | undefined;
-        id?: string | undefined;
-        autoFocus: boolean | undefined;
-        tabs?: any;
-        visibleOn?: string | undefined;
         onEvent?: {
             [propName: string]: {
                 weight?: number | undefined;
                 actions: import("amis").ListenerAction[];
             };
         } | undefined;
+        body?: SchemaCollection | undefined;
+        title?: string | undefined;
+        name?: string | undefined;
+        disabled?: boolean | undefined;
+        tabs?: any;
+        horizontal: import("amis").FormHorizontal;
+        mode: string;
+        actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
+        api?: string | import("amis").BaseApiObject | undefined;
+        hidden?: boolean | undefined;
+        reload?: string | undefined;
+        id?: string | undefined;
+        target?: string | undefined;
+        visibleOn?: string | undefined;
+        feedback?: any;
+        autoFocus: boolean | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
         hiddenOn?: string | undefined;
         visible?: boolean | undefined;
-        mode: string;
-        fieldSet?: any;
+        primaryField?: string | undefined;
         messages?: {
             validateFailed?: string | undefined;
         } | undefined;
+        fieldSet?: any;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
+        labelWidth?: string | number | undefined;
         submitOnChange: boolean;
         initFetchOn?: string | undefined;
         initFetch?: boolean | undefined;
-        initApi?: string | import("amis").BaseApiObject | undefined;
         interval?: number | undefined;
         silentPolling?: boolean | undefined;
         stopAutoRefreshWhen?: string | undefined;
-        feedback?: any;
+        initApi?: string | import("amis").BaseApiObject | undefined;
         redirect?: string | undefined;
-        target?: string | undefined;
-        actions?: import("amis/lib/renderers/Action").ActionSchema[] | undefined;
         affixFooter?: boolean | undefined;
         debug?: boolean | undefined;
+        debugConfig?: {
+            levelExpand?: number | undefined;
+            enableClipboard?: boolean | undefined;
+            iconStyle?: "circle" | "triangle" | "square" | undefined;
+            quotesOnKeys?: boolean | undefined;
+            sortKeys?: boolean | undefined;
+            ellipsisThreshold?: number | false | undefined;
+        } | undefined;
         initAsyncApi?: string | import("amis").BaseApiObject | undefined;
         initFinishedField?: string | undefined;
         initCheckInterval?: number | undefined;
@@ -196,7 +214,6 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         clearAfterSubmit?: boolean | undefined;
         columnCount?: number | undefined;
         panelClassName: import("amis").ClassName;
-        primaryField?: string | undefined;
         submitOnInit?: boolean | undefined;
         submitText?: string | undefined;
         wrapWithPanel: boolean;
@@ -209,7 +226,6 @@ export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchM
         }[] | undefined;
         preventEnterSubmit: boolean;
         type: string;
-        bodyClassName: string;
         actionsClassName: string;
         wrapperComponent: string;
         formLazyChange: boolean;