amis-core 6.2.2 → 6.4.0

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -181,6 +181,7 @@ function wrapControl(ComposedComponent) {
                     };
                     addHook === null || addHook === void 0 ? void 0 : addHook(this.hook2);
                 }
+                formItem === null || formItem === void 0 ? void 0 : formItem.init();
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
                 var _this = this;
@@ -300,25 +301,27 @@ function wrapControl(ComposedComponent) {
                 var model = this.model;
                 var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
                 var isExp = formula.isExpression(value);
-                if (isExp) {
-                    model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
-                    'formulaChanged');
-                }
-                else {
-                    var initialValue = model.extraName
-                        ? [
-                            getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
-                            getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
-                        ]
-                        : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
-                    if (model.extraName &&
-                        initialValue.every(function (item) { return item === undefined; })) {
-                        initialValue = undefined;
-                    }
-                    model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : formula.replaceExpression(value), typeof initialValue !== 'undefined'
-                        ? 'initialValue'
+                var initialValue = model.extraName
+                    ? [
+                        getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                        getVariable.getVariable(data, model.extraName, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                    ]
+                    : getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData);
+                if (model.extraName &&
+                    initialValue.every(function (item) { return item === undefined; })) {
+                    initialValue = undefined;
+                }
+                if (typeof initialValue === 'undefined') {
+                    value = isExp
+                        ? formula.FormulaExec['formula'](value, data)
+                        : formula.replaceExpression(value);
+                }
+                model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : value, // 对组件默认值进行运算
+                typeof initialValue !== 'undefined'
+                    ? 'initialValue'
+                    : isExp
+                        ? 'formulaChanged'
                         : 'defaultValue');
-                }
             };
             class_1.prototype.disposeModel = function () {
                 var _a;
@@ -342,7 +345,7 @@ function wrapControl(ComposedComponent) {
             };
             class_1.prototype.controlRef = function (control) {
                 var _this = this;
-                var _a = this.props, addHook = _a.addHook, removeHook = _a.removeHook; _a.formStore;
+                var _a = this.props, addHook = _a.addHook, removeHook = _a.removeHook; _a.formStore; var formItemRef = _a.formItemRef;
                 // 因为 control 有可能被 n 层 hoc 包裹。
                 while (control && control.getWrappedInstance) {
                     control = control.getWrappedInstance();
@@ -364,6 +367,7 @@ function wrapControl(ComposedComponent) {
                     removeHook === null || removeHook === void 0 ? void 0 : removeHook(this.hook);
                     this.hook = undefined;
                 }
+                formItemRef === null || formItemRef === void 0 ? void 0 : formItemRef(control);
                 // 注册到 Scoped 上
                 var originRef = this.control;
                 this.control = control;
@@ -394,14 +398,15 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.validate = function () {
+                var _a, _b;
                 return tslib.__awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
-                    return tslib.__generator(this, function (_b) {
-                        switch (_b.label) {
+                    var _c, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
+                    return tslib.__generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0:
                                 if (!this.model)
                                     return [2 /*return*/];
-                                _a = this.props, form = _a.formStore, data = _a.data, formItemDispatchEvent = _a.formItemDispatchEvent;
+                                _c = this.props, form = _c.formStore, data = _c.data, formItemDispatchEvent = _c.formItemDispatchEvent;
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -412,15 +417,16 @@ function wrapControl(ComposedComponent) {
                                 });
                                 return [4 /*yield*/, Promise.all(validPromises)];
                             case 1:
-                                result = _b.sent();
+                                result = _d.sent();
                                 return [3 /*break*/, 4];
                             case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = [_b.sent()];
-                                _b.label = 4;
+                                result = [_d.sent()];
+                                _d.label = 4;
                             case 4:
                                 valid = !result.some(function (item) { return item === false; });
-                                formItemDispatchEvent === null || formItemDispatchEvent === void 0 ? void 0 : formItemDispatchEvent(valid ? 'formItemValidateSucc' : 'formItemValidateError', data);
+                                (_a = (formItemDispatchEvent !== null && formItemDispatchEvent !== void 0 ? formItemDispatchEvent : this.props.dispatchEvent)) === null || _a === void 0 ? void 0 : _a(valid ? 'formItemValidateSucc' : 'formItemValidateError', (_b = form === null || form === void 0 ? void 0 : form.data) !== null && _b !== void 0 ? _b : this.props.data // form里的一定是最新的数据
+                                );
                                 return [2 /*return*/, valid];
                         }
                     });

package/lib/store/app.d.ts

@@ -54,11 +54,11 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
-    setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
-    closeDrawer(result?: any): void;
+    setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDialog(confirmed?: any, data?: any): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
+    closeDrawer(confirmed?: any, data?: any): void;
     getDialogScoped(): import("..").IScopedContext | null;
     getDrawerScoped(): import("..").IScopedContext | null;
 } & {

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */