amis-core 2.0.2 → 2.2.0

package/esm/renderers/Item.d.ts

@@ -119,6 +119,18 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
         maximum?: string;
         minLength?: string;
         minimum?: string;
+        isDateTimeSame?: string;
+        isDateTimeBefore?: string;
+        isDateTimeAfter?: string;
+        isDateTimeSameOrBefore?: string;
+        isDateTimeSameOrAfter?: string;
+        isDateTimeBetween?: string;
+        isTimeSame?: string;
+        isTimeBefore?: string;
+        isTimeAfter?: string;
+        isTimeSameOrBefore?: string;
+        isTimeSameOrAfter?: string;
+        isTimeBetween?: string;
         [propName: string]: any;
     };
     validations?: string | {
@@ -202,6 +214,66 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
          * 最小值为指定值
          */
         minimum?: number;
+        /**
+         * 和目标日期相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isDateTimeSame?: string | string[];
+        /**
+         * 早于目标日期，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isDateTimeBefore?: string | string[];
+        /**
+         * 晚于目标日期，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isDateTimeAfter?: string | string[];
+        /**
+         * 早于目标日期或和目标日期相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isDateTimeSameOrBefore?: string | string[];
+        /**
+         * 晚于目标日期或和目标日期相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isDateTimeSameOrAfter?: string | string[];
+        /**
+         * 日期处于目标日期范围，支持指定粒度和区间的开闭形式，默认到毫秒, 左右开区间
+         * @version 2.2.0
+         */
+        isDateTimeBetween?: string | string[];
+        /**
+         * 和目标时间相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isTimeSame?: string | string[];
+        /**
+         * 早于目标时间，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isTimeBefore?: string | string[];
+        /**
+         * 晚于目标时间，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isTimeAfter?: string | string[];
+        /**
+         * 早于目标时间或和目标时间相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isTimeSameOrBefore?: string | string[];
+        /**
+         * 晚于目标时间或和目标时间相同，支持指定粒度，默认到毫秒
+         * @version 2.2.0
+         */
+        isTimeSameOrAfter?: string | string[];
+        /**
+         * 时间处于目标时间范围，支持指定粒度和区间的开闭形式，默认到毫秒, 左右开区间
+         * @version 2.2.0
+         */
+        isTimeBetween?: string | string[];
         [propName: string]: any;
     };
     /**
@@ -444,6 +516,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
+        /**
+         * 输入提示，聚焦的时候显示
+         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -462,6 +537,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -480,6 +558,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
@@ -500,6 +581,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
+                /**
+                 * 表单 control 是否为 inline 模式。
+                 */
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
                 id: import("mobx-state-tree").ISimpleType<string>;
@@ -518,6 +602,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
+                /**
+                 * 表单 control 是否为 inline 模式。
+                 */
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         };
@@ -545,6 +632,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -563,6 +653,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
@@ -582,6 +675,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -600,6 +696,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -608,6 +707,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
+        /**
+         * 输入提示，聚焦的时候显示
+         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -626,6 +728,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -644,6 +749,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         readonly stores: {
@@ -664,6 +772,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
+                /**
+                 * 表单 control 是否为 inline 模式。
+                 */
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
                 id: import("mobx-state-tree").ISimpleType<string>;
@@ -682,6 +793,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
                 addChildId: (id: string) => void;
+                /**
+                 * 表单 control 是否为 inline 模式。
+                 */
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         };
@@ -709,6 +823,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -727,6 +844,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
         removeStore(store: {
@@ -746,6 +866,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").ISimpleType<string>;
@@ -764,6 +887,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
@@ -775,4 +901,5 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
 };
 export declare function registerFormItem(config: FormItemConfig): RendererConfig;
 export declare function FormItem(config: FormItemBasicConfig): (component: FormControlComponent) => any;
+export declare function getFormItemByName(name: string): boolean;
 export default FormItem;

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -7,7 +7,7 @@ import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __meta
 import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { reaction } from 'mobx';
-import { registerRenderer } from '../factory.js';
+import { registerRenderer, renderersMap } from '../factory.js';
 import { isMobile, ucFirst, getWidthRate, autobind, anyChanged } from '../utils/helper.js';
 import { observer } from 'mobx-react';
 import { filter } from '../utils/tpl.js';
@@ -80,9 +80,8 @@ var FormItemWrap = /** @class */ (function (_super) {
                             return [4 /*yield*/, (formItem === null || formItem === void 0 ? void 0 : formItem.loadAutoUpdateData(autoFill.api, ctx, !!((_c = autoFill.api) === null || _c === void 0 ? void 0 : _c.silent)))];
                         case 2:
                             result = _e.sent();
-                            if (!result)
-                                return [2 /*return*/];
-                            this.lastSearchTerm = (_d = getVariable(result, itemName)) !== null && _d !== void 0 ? _d : term;
+                            this.lastSearchTerm =
+                                (_d = (result && getVariable(result, itemName))) !== null && _d !== void 0 ? _d : term;
                             if (autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) {
                                 result = dataMapping(autoFill.fillMapping, result);
                             }
@@ -841,5 +840,8 @@ function FormItem(config) {
         return renderer.component;
     };
 }
+function getFormItemByName(name) {
+    return renderersMap[name];
+}
 
-export { FormItem, FormItemWrap, asFormItem, FormItem as default, detectProps, registerFormItem };
+export { FormItem, FormItemWrap, asFormItem, FormItem as default, detectProps, getFormItemByName, registerFormItem };

package/esm/renderers/Options.d.ts

@@ -72,6 +72,10 @@ export interface FormOptionsControl extends FormBaseControl {
      * 新增时的表单项。
      */
     addControls?: Array<PlainObject>;
+    /**
+     * 控制新增弹框设置项
+     */
+    addDialog?: PlainObject;
     /**
      * 是否可以新增
      */
@@ -92,6 +96,10 @@ export interface FormOptionsControl extends FormBaseControl {
      * 选项修改的表单项
      */
     editControls?: Array<PlainObject>;
+    /**
+     * 控制编辑弹框设置项
+     */
+    editDialog?: PlainObject;
     /**
      * 是否可删除
      */

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -14,15 +14,17 @@ import 'amis-formula';
 import 'moment';
 import { createObject, setVariable } from '../utils/object.js';
 import { isPureVariable } from '../utils/isPureVariable.js';
+import { getVariable } from '../utils/getVariable.js';
 import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { filter } from '../utils/tpl.js';
 import findIndex from 'lodash/findIndex';
 import isPlainObject from 'lodash/isPlainObject';
-import merge from 'lodash/merge';
 import { normalizeOptions } from '../utils/normalizeOptions.js';
 import { optionValueCompare } from '../utils/optionValueCompare.js';
+import { isEqual } from 'lodash';
+import { keyToPath } from '../utils/keyToPath.js';
 
 var detectProps = detectProps$1.concat([
     'value',
@@ -136,6 +138,9 @@ function registerOptionsControl(config) {
                         .then(function () { return _this.normalizeValue(); });
                 }
             }
+            else if (!isEqual(props.value, prevProps.value) && props.formInited) {
+                this.normalizeValue();
+            }
             if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
                 formItem === null || formItem === void 0 ? void 0 : formItem.syncOptions(undefined, props.data);
             }
@@ -194,9 +199,16 @@ function registerOptionsControl(config) {
                         })
                     }
                     : createObject(__assign(__assign({}, data), { ancestors: getTreeAncestors(formItem.filteredOptions, selectedOptions[0], true) }), selectedOptions[0]));
-                Object.keys(toSync_1).forEach(function (key) {
-                    if (isPlainObject(toSync_1[key]) && isPlainObject(data[key])) {
-                        toSync_1[key] = merge({}, data[key], toSync_1[key]);
+                Object.keys(autoFill).forEach(function (key) {
+                    var keys = keyToPath(key);
+                    // 如果左边的 key 是一个路径
+                    // 这里不希望直接把原始对象都给覆盖没了
+                    // 而是保留原始的对象，只修改指定的属性
+                    if (keys.length > 1 && isPlainObject(data[keys[0]])) {
+                        var obj = __assign({}, data[keys[0]]);
+                        var value = getVariable(toSync_1, key);
+                        toSync_1[keys[0]] = obj;
+                        setVariable(toSync_1, key, value);
                     }
                 });
                 onBulkChange(toSync_1);
@@ -204,21 +216,40 @@ function registerOptionsControl(config) {
         };
         // 当前值，跟设置预期的值格式不一致时自动转换。
         FormOptionsItem.prototype.normalizeValue = function () {
-            var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, value = _a.value, multiple = _a.multiple, formItem = _a.formItem, valueField = _a.valueField; _a.enableNodePath; _a.pathSeparator; var onChange = _a.onChange;
-            if (!formItem || joinValues !== false || !formItem.options.length) {
+            var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, value = _a.value, multiple = _a.multiple, formItem = _a.formItem, valueField = _a.valueField, delimiter = _a.delimiter; _a.enableNodePath; _a.pathSeparator; var onChange = _a.onChange;
+            if (!formItem || !formItem.options.length) {
                 return;
             }
-            if (extractValue === false &&
+            if (joinValues !== false) {
+                // 只处理多选且值为 array 的情况，因为理应为分隔符隔开的字符串
+                if (!(multiple && Array.isArray(value)))
+                    return;
+                var selectedOptions = formItem.getSelectedOptions(value);
+                onChange === null || onChange === void 0 ? void 0 : onChange((multiple
+                    ? selectedOptions.concat()
+                    : selectedOptions.length
+                        ? [selectedOptions[0]]
+                        : [])
+                    .map(function (selectedOption) {
+                    return typeof selectedOption === 'string' ||
+                        typeof selectedOption === 'number'
+                        ? selectedOption
+                        : selectedOption[valueField || 'value'];
+                })
+                    .join(delimiter || ','));
+            }
+            else if (extractValue === false &&
                 (typeof value === 'string' || typeof value === 'number')) {
                 var selectedOptions = formItem.getSelectedOptions(value);
                 onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? selectedOptions.concat() : selectedOptions[0]);
             }
             else if (extractValue === true &&
                 value &&
-                !((Array.isArray(value) &&
+                !((multiple &&
+                    Array.isArray(value) &&
                     value.every(function (val) { return typeof val === 'string' || typeof val === 'number'; })) ||
-                    typeof value === 'string' ||
-                    typeof value === 'number')) {
+                    (!multiple &&
+                        (typeof value === 'string' || typeof value === 'number')))) {
                 var selectedOptions = formItem
                     .getSelectedOptions(value)
                     .map(function (selectedOption) { return selectedOption[valueField || 'value']; });
@@ -474,12 +505,12 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var _a, addControls, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _b, payload, e_1, isPrevented, options;
+                var _a, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _b, payload, e_1, isPrevented, options;
                 var _c;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
-                            _a = this.props, addControls = _a.addControls, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, optionLabel = _a.optionLabel, addApi = _a.addApi, source = _a.source, data = _a.data, valueField = _a.valueField, model = _a.formItem, createBtnLabel = _a.createBtnLabel, env = _a.env, __ = _a.translate;
+                            _a = this.props, addControls = _a.addControls, addDialog = _a.addDialog, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, optionLabel = _a.optionLabel, addApi = _a.addApi, source = _a.source, data = _a.data, valueField = _a.valueField, model = _a.formItem, createBtnLabel = _a.createBtnLabel, env = _a.env, __ = _a.translate;
                             // 禁用或者没有配置 name
                             if (disabled || !model) {
                                 return [2 /*return*/];
@@ -504,10 +535,7 @@ function registerOptionsControl(config) {
                             if (!skipForm) return [3 /*break*/, 1];
                             _b = ctx;
                             return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, onOpenDialog({
-                                type: 'dialog',
-                                title: createBtnLabel || "\u65B0\u589E".concat(optionLabel || '选项'),
-                                body: {
+                        case 1: return [4 /*yield*/, onOpenDialog(__assign(__assign({ type: 'dialog', title: createBtnLabel || "\u65B0\u589E".concat(optionLabel || '选项') }, addDialog), { body: {
                                     type: 'form',
                                     api: addApi,
                                     controls: __spreadArray([
@@ -522,8 +550,7 @@ function registerOptionsControl(config) {
                                             value: parent
                                         }
                                     ], (addControls || []), true)
-                                }
-                            }, ctx)];
+                                } }), ctx)];
                         case 2:
                             _b = _d.sent();
                             _d.label = 3;
@@ -600,11 +627,11 @@ function registerOptionsControl(config) {
             if (origin === void 0) { origin = value; }
             if (skipForm === void 0) { skipForm = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var _a, editControls, disabled, labelField, onOpenDialog, editApi, env, source, data, model, optionLabel, __, result, _b, payload, e_2, isPrevented, indexes;
+                var _a, editControls, editDialog, disabled, labelField, onOpenDialog, editApi, env, source, data, model, optionLabel, __, result, _b, payload, e_2, isPrevented, indexes;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            _a = this.props, editControls = _a.editControls, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, editApi = _a.editApi, env = _a.env, source = _a.source, data = _a.data, model = _a.formItem, optionLabel = _a.optionLabel, __ = _a.translate;
+                            _a = this.props, editControls = _a.editControls, editDialog = _a.editDialog, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, editApi = _a.editApi, env = _a.env, source = _a.source, data = _a.data, model = _a.formItem, optionLabel = _a.optionLabel, __ = _a.translate;
                             if (disabled || !model) {
                                 return [2 /*return*/];
                             }
@@ -621,17 +648,13 @@ function registerOptionsControl(config) {
                             if (!skipForm) return [3 /*break*/, 1];
                             _b = value;
                             return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, onOpenDialog({
-                                type: 'dialog',
-                                title: __('Options.editLabel', {
+                        case 1: return [4 /*yield*/, onOpenDialog(__assign(__assign({ type: 'dialog', title: __('Options.editLabel', {
                                     label: optionLabel || __('Options.label')
-                                }),
-                                body: {
+                                }) }, editDialog), { body: {
                                     type: 'form',
                                     api: editApi,
                                     controls: editControls
-                                }
-                            }, createObject(data, value))];
+                                } }), createObject(data, value))];
                         case 2:
                             _b = _c.sent();
                             _c.label = 3;
@@ -687,11 +710,11 @@ function registerOptionsControl(config) {
         };
         FormOptionsItem.prototype.handleOptionDelete = function (value) {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, deleteConfirmText, disabled, data, deleteApi, env, model, source, valueField, __, ctx, confirmed, _b, isPrevented, result, options, indexes, e_3;
+                var _a, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _b, isPrevented, result, options, indexes, e_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            _a = this.props, deleteConfirmText = _a.deleteConfirmText, disabled = _a.disabled, data = _a.data, deleteApi = _a.deleteApi, env = _a.env, model = _a.formItem, source = _a.source, valueField = _a.valueField, __ = _a.translate;
+                            _a = this.props, deleteConfirmText = _a.deleteConfirmText, disabled = _a.disabled, data = _a.data, deleteApi = _a.deleteApi, onDelete = _a.onDelete, env = _a.env, model = _a.formItem, source = _a.source, valueField = _a.valueField, __ = _a.translate;
                             if (disabled || !model) {
                                 return [2 /*return*/];
                             }
@@ -717,10 +740,8 @@ function registerOptionsControl(config) {
                             }
                             _c.label = 5;
                         case 5:
-                            _c.trys.push([5, 7, , 8]);
-                            if (!deleteApi) {
-                                throw new Error(__('Options.deleteAPI'));
-                            }
+                            _c.trys.push([5, 8, , 9]);
+                            if (!deleteApi) return [3 /*break*/, 7];
                             return [4 /*yield*/, env.fetcher(deleteApi, ctx, {
                                     method: 'delete'
                                 })];
@@ -728,8 +749,15 @@ function registerOptionsControl(config) {
                             result = _c.sent();
                             if (!result.ok) {
                                 env.notify('error', result.msg || __('deleteFailed'));
+                                return [2 /*return*/];
+                            }
+                            _c.label = 7;
+                        case 7:
+                            // 由外部代码实现删除逻辑
+                            if (onDelete) {
+                                onDelete(ctx);
                             }
-                            else if (source) {
+                            if (source) {
                                 this.reload();
                             }
                             else {
@@ -739,13 +767,13 @@ function registerOptionsControl(config) {
                                     model.setOptions(spliceTree(options, indexes, 1), this.changeOptionValue, data);
                                 }
                             }
-                            return [3 /*break*/, 8];
-                        case 7:
+                            return [3 /*break*/, 9];
+                        case 8:
                             e_3 = _c.sent();
                             console.error(e_3);
                             env.notify('error', e_3.message);
-                            return [3 /*break*/, 8];
-                        case 8: return [2 /*return*/];
+                            return [3 /*break*/, 9];
+                        case 9: return [2 /*return*/];
                     }
                 });
             });

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -40,6 +40,15 @@ function wrapControl(ComposedComponent) {
                 _this.controlRef = _this.controlRef.bind(_this);
                 _this.handleBlur = _this.handleBlur.bind(_this);
                 if (!name) {
+                    // 一般情况下这些表单项都是需要 name 的，提示一下
+                    if (typeof type === 'string' &&
+                        (type.startsWith('input-') ||
+                            type.endsWith('select') ||
+                            type === 'switch' ||
+                            type === 'textarea' ||
+                            type === 'radios')) {
+                        console.warn('name is required', _this.props.$schema);
+                    }
                     return _this;
                 }
                 var propValue = _this.props.value;
@@ -213,8 +222,7 @@ function wrapControl(ComposedComponent) {
                 }
                 else if (model) {
                     var valueByName = getVariable(props.data, model.name);
-                    if (valueByName !== undefined &&
-                        isEqual(props.defaultValue, prevProps.defaultValue)) {
+                    if (isEqual(props.defaultValue, prevProps.defaultValue)) {
                         // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
                         if (
                         // 然后才是查看关联的 name 属性值是否变化

package/esm/store/app.js

@@ -1,11 +1,11 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
 import { __assign } from 'tslib';
 import { types } from 'mobx-state-tree';
-import { mapTree, guid, findTree } from '../utils/helper.js';
+import { mapTree, findTree, guid } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
 import { createObject } from '../utils/object.js';