amis-core 3.5.2 → 3.6.0

package/lib/renderers/Item.d.ts

@@ -515,6 +515,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -533,9 +536,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -553,6 +562,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -571,6 +583,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -598,6 +613,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -616,6 +634,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -635,6 +656,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -653,6 +677,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
@@ -679,6 +706,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -697,9 +727,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
+        /**
+         * @deprecated 用 description 代替
+         */
         readonly stores: {
             [propName: string]: {
                 id: string;
@@ -717,6 +753,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -735,6 +774,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
                 onChildStoreDispose(child: any): void;
                 syncProps(props: any, prevProps: any, list?: string[]): void;
                 dispose: (callback?: (() => void) | undefined) => void;
+                /**
+                 * 配置当前表单项展示模式
+                 */
                 addChildId: (id: string) => void;
                 removeChildId: (id: string) => void;
             }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -762,6 +804,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -780,6 +825,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
@@ -799,6 +847,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -817,6 +868,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             onChildStoreDispose(child: any): void;
             syncProps(props: any, prevProps: any, list?: string[]): void;
             dispose: (callback?: (() => void) | undefined) => void;
+            /**
+             * 配置当前表单项展示模式
+             */
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/Options.d.ts

@@ -64,6 +64,10 @@ export interface FormOptionsControl extends FormBaseControl {
      * @default ''
      */
     resetValue?: string;
+    /**
+     * 懒加载字段
+     */
+    deferField?: string;
     /**
      * 延时加载的 API，当选项中有 defer: true 的选项时，点开会通过此接口扩充。
      */
@@ -136,7 +140,7 @@ export interface OptionsControlProps extends FormControlProps, Omit<FormOptionsC
     selectedOptions: Array<Option>;
     setOptions: (value: Array<any>, skipNormalize?: boolean) => void;
     setLoading: (value: boolean) => void;
-    reloadOptions: (setError?: boolean) => void;
+    reloadOptions: (setError?: boolean, isInit?: boolean, data?: Record<string, any>) => void;
     deferLoad: (option: Option) => void;
     leftDeferLoad: (option: Option, leftOptions: Option) => void;
     expandTreeOptions: (nodePathArr: any[]) => void;

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -173,7 +173,7 @@ function registerOptionsControl(config) {
                     var prevOptions = resolveVariableAndFilter.resolveVariableAndFilter(prevProps.source, prevProps.data, '| raw');
                     var options = resolveVariableAndFilter.resolveVariableAndFilter(props.source, props.data, '| raw');
                     if (prevOptions !== options) {
-                        formItem.setOptions(normalizeOptions.normalizeOptions(options || [], undefined, props.valueField || 'value'), this.changeOptionValue, props.data);
+                        formItem.loadOptionsFromDataScope(props.source, props.data, this.changeOptionValue);
                         this.normalizeValue();
                     }
                 }
@@ -419,12 +419,13 @@ function registerOptionsControl(config) {
         FormOptionsItem.prototype.reload = function () {
             return this.reloadOptions();
         };
-        FormOptionsItem.prototype.reloadOptions = function (setError, isInit) {
+        FormOptionsItem.prototype.reloadOptions = function (setError, isInit, data) {
             if (isInit === void 0) { isInit = false; }
-            var _a = this.props, source = _a.source, formItem = _a.formItem, data = _a.data, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue, valueField = _a.valueField;
+            if (data === void 0) { data = this.props.data; }
+            var _a = this.props, source = _a.source, formItem = _a.formItem, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue; _a.valueField;
             if (formItem && isPureVariable.isPureVariable(source)) {
                 mobxStateTree.isAlive(formItem) &&
-                    formItem.setOptions(normalizeOptions.normalizeOptions(resolveVariableAndFilter.resolveVariableAndFilter(source, data, '| raw') || [], undefined, valueField), this.changeOptionValue, data);
+                    formItem.loadOptionsFromDataScope(source, data, this.changeOptionValue);
                 return;
             }
             else if (!formItem || !api.isEffectiveApi(source, data)) {
@@ -532,12 +533,12 @@ function registerOptionsControl(config) {
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, result, _d, payload, e_1, isPrevented, options;
                 var _e;
                 return tslib.__generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
-                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
+                            _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, deferField = _c.deferField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
                             // 禁用或者没有配置 name
                             if (disabled || !model) {
                                 return [2 /*return*/];
@@ -622,7 +623,8 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (!(parent === null || parent === void 0 ? void 0 : parent.defer)) return [3 /*break*/, 10];
+                            if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 10];
                             return [4 /*yield*/, this.deferLoad(parent)];
                         case 9:
                             _f.sent();
@@ -850,7 +852,7 @@ function registerOptionsControl(config) {
         tslib.__decorate([
             helper.autobind,
             tslib.__metadata("design:type", Function),
-            tslib.__metadata("design:paramtypes", [Boolean, Object]),
+            tslib.__metadata("design:paramtypes", [Boolean, Object, Object]),
             tslib.__metadata("design:returntype", void 0)
         ], FormOptionsItem.prototype, "reloadOptions", null);
         tslib.__decorate([

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,7 +11,6 @@ var tslib = require('tslib');
 var React = require('react');
 var debounce = require('lodash/debounce');
 var isEqual = require('lodash/isEqual');
-var factory = require('../factory.js');
 var combo = require('../store/combo.js');
 var helper = require('../utils/helper.js');
 var formula = require('../utils/formula.js');
@@ -76,14 +75,14 @@ function wrapControl(ComposedComponent) {
             tslib.__extends(class_1, _super);
             function class_1(props) {
                 var _this = this;
-                var _a, _b;
+                var _a;
                 _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce__default["default"](_this.emitChange.bind(_this), 250, {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
+                var _b = _this.props, form = _b.formStore, formItem$1 = _b.formItem, rootStore = _b.rootStore, store = _b.store, onChange = _b.onChange, data = _b.data, inputGroupControl = _b.inputGroupControl, colIndex = _b.colIndex, rowIndex = _b.rowIndex, _c = _b.$schema, id = _c.id, type = _c.type, required = _c.required, validations = _c.validations, validationErrors = _c.validationErrors, unique = _c.unique, value = _c.value, extraName = _c.extraName; _c.multiple; var delimiter = _c.delimiter, valueField = _c.valueField, labelField = _c.labelField, joinValues = _c.joinValues, extractValue = _c.extractValue, selectFirst = _c.selectFirst, autoFill = _c.autoFill, clearValueOnHidden = _c.clearValueOnHidden, validateApi = _c.validateApi, minLength = _c.minLength, maxLength = _c.maxLength, validateOnChange = _c.validateOnChange, label = _c.label, pagination = _c.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -100,11 +99,6 @@ function wrapControl(ComposedComponent) {
                     name = tokenize.tokenize(name, data);
                 }
                 if (!name) {
-                    // 一般情况下这些表单项都是需要 name 的，提示一下
-                    if (typeof type === 'string' &&
-                        ((_a = factory.getRendererByName(type)) === null || _a === void 0 ? void 0 : _a.isFormItem)) {
-                        console.warn('name is required', _this.props.$schema);
-                    }
                     return _this;
                 }
                 var propValue = _this.props.value;
@@ -120,10 +114,10 @@ function wrapControl(ComposedComponent) {
                 _this.model = model;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName }));
+                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
-                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
+                    ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === combo.ComboStore.name) {
                     var combo$1 = form.parentStore;
                     combo$1.bindUniuqueItem(model);
                 }
@@ -236,7 +230,8 @@ function wrapControl(ComposedComponent) {
                     'minLength',
                     'maxLength',
                     'label',
-                    'extraName'
+                    'extraName',
+                    'pagination'
                 ], prevProps.$schema, props.$schema, function (changes) {
                     model.config(tslib.__assign(tslib.__assign({}, changes), { 
                         // todo 优化后面两个
@@ -572,9 +567,7 @@ function wrapControl(ComposedComponent) {
                     formItem: this.model,
                     formMode: control.mode || formMode,
                     ref: this.controlRef,
-                    data: model
-                        ? model.getMergedData(data || (store === null || store === void 0 ? void 0 : store.data))
-                        : data || (store === null || store === void 0 ? void 0 : store.data),
+                    data: data || (store === null || store === void 0 ? void 0 : store.data),
                     name: (_c = model === null || model === void 0 ? void 0 : model.name) !== null && _c !== void 0 ? _c : control.name,
                     value: value,
                     changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
@@ -587,8 +580,8 @@ function wrapControl(ComposedComponent) {
                     prinstine: model ? model.prinstine : undefined,
                     setPrinstineValue: this.setPrinstineValue,
                     onValidate: this.validate,
-                    onFlushChange: this.flushChange,
-                    render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
+                    onFlushChange: this.flushChange
+                    // render: this.renderChild // 如果覆盖，那么用的就是 form 上的 render，这个里面用到的 data 是比较旧的。
                     // !没了这个， tree 里的 options 渲染会出问题
                     // todo 理论上不应该影响，待确认
                     // _filteredOptions: this.model?.filteredOptions

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */