amis-core 6.9.0-rc.1 → 6.9.0-rc.11

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.1
+ * amis-core v6.9.0-rc.11
  * Copyright 2018-2024 fex
  */
 
@@ -42,6 +42,7 @@ var isPureVariable = require('./utils/isPureVariable.js');
 var jsonSchema2AmisSchema = require('./utils/json-schema-2-amis-schema.js');
 var keyToPath = require('./utils/keyToPath.js');
 var labelToString = require('./utils/labelToString.js');
+var loopTooMuch = require('./utils/loopTooMuch.js');
 var makeSorter = require('./utils/makeSorter.js');
 var normalizeLink = require('./utils/normalizeLink.js');
 var normalizeOptions = require('./utils/normalizeOptions.js');
@@ -74,6 +75,7 @@ var resolveCondition = require('./utils/resolveCondition.js');
 var arraySlice = require('./utils/arraySlice.js');
 var math = require('./utils/math.js');
 var Animation = require('./utils/Animation.js');
+var animations = require('./utils/animations.js');
 var index = require('./store/index.js');
 var mobxStateTree = require('mobx-state-tree');
 var locale = require('./locale.js');
@@ -115,6 +117,7 @@ var Form = require('./renderers/Form.js');
 var SchemaRenderer = require('./SchemaRenderer.js');
 var CustomStyle = require('./components/CustomStyle.js');
 var StatusScoped = require('./StatusScoped.js');
+var StyleManager = require('./StyleManager.js');
 var stripNumber = require('./utils/stripNumber.js');
 var iRenderer = require('./store/iRenderer.js');
 var service = require('./store/service.js');
@@ -139,7 +142,11 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.9.0-rc.1';
+var version = '6.9.0-rc.11';
+window.amisVersionInfo = {
+    version: '6.9.0-rc.11',
+    buildTime: '2024-11-19T09:27:22.613Z'
+};
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -213,6 +220,7 @@ exports.addSchemaFilter = factory.addSchemaFilter;
 exports.clearStoresCache = factory.clearStoresCache;
 exports.extendDefaultEnv = factory.extendDefaultEnv;
 exports.filterSchema = factory.filterSchema;
+exports.getGlobalOptions = factory.getGlobalOptions;
 exports.getRendererByName = factory.getRendererByName;
 exports.getRenderers = factory.getRenderers;
 exports.loadAllAsyncRenderers = factory.loadAllAsyncRenderers;
@@ -220,9 +228,11 @@ exports.loadAsyncRenderer = factory.loadAsyncRenderer;
 exports.loadAsyncRenderersByType = factory.loadAsyncRenderersByType;
 exports.registerRenderer = factory.registerRenderer;
 exports.resolveRenderer = factory.resolveRenderer;
+exports.setGlobalOptions = factory.setGlobalOptions;
 exports.unRegisterRenderer = factory.unRegisterRenderer;
 exports.updateEnv = factory.updateEnv;
 exports.addApiRequestAdaptor = api.addApiRequestAdaptor;
+exports.addApiResponseAdaptor = api.addApiResponseAdaptor;
 exports.addApiResponseAdator = api.addApiResponseAdator;
 exports.buildApi = api.buildApi;
 exports.callStrFunction = api.callStrFunction;
@@ -321,6 +331,7 @@ exports.findTreeAll = helper.findTreeAll;
 exports.findTreeIndex = helper.findTreeIndex;
 exports.flattenTree = helper.flattenTree;
 exports.flattenTreeWithLeafNodes = helper.flattenTreeWithLeafNodes;
+exports.formateId = helper.formateId;
 exports.getLevelFromClassName = helper.getLevelFromClassName;
 exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;
@@ -394,6 +405,7 @@ exports.isPureVariable = isPureVariable.isPureVariable;
 exports.JSONSchme2AMisSchema = jsonSchema2AmisSchema.JSONSchme2AMisSchema;
 exports.keyToPath = keyToPath.keyToPath;
 exports.labelToString = labelToString.labelToString;
+exports.loopTooMuch = loopTooMuch.loopTooMuch;
 exports.makeSorter = makeSorter.makeSorter;
 exports.normalizeLink = normalizeLink.normalizeLink;
 exports.normalizeOptions = normalizeOptions.normalizeOptions;
@@ -478,6 +490,7 @@ exports.numberFormatter = math.numberFormatter;
 exports.safeAdd = math.safeAdd;
 exports.safeSub = math.safeSub;
 exports.animation = Animation["default"];
+exports.createAnimationStyle = animations.createAnimationStyle;
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
 exports.registerStore = index.registerStore;
@@ -512,6 +525,7 @@ exports.FormItemWrap = Item.FormItemWrap;
 exports.getFormItemByName = Item.getFormItemByName;
 exports.registerFormItem = Item.registerFormItem;
 exports.OptionsControl = Options.OptionsControl;
+exports.OptionsControlBase = Options.OptionsControlBase;
 exports.registerOptionsControl = Options.registerOptionsControl;
 exports.addRootWrapper = Root.addRootWrapper;
 exports.envOverwrite = envOverwrite.envOverwrite;
@@ -568,6 +582,7 @@ exports.FormRenderer = Form.FormRenderer;
 exports.RENDERER_TRANSMISSION_OMIT_PROPS = SchemaRenderer.RENDERER_TRANSMISSION_OMIT_PROPS;
 exports.CustomStyle = CustomStyle["default"];
 exports.StatusScoped = StatusScoped.StatusScoped;
+exports.styleManager = StyleManager["default"];
 exports.stripNumber = stripNumber.stripNumber;
 exports.iRendererStore = iRenderer.iRendererStore;
 exports.ServiceStore = service.ServiceStore;

package/lib/locale.d.ts

@@ -16,7 +16,7 @@ export interface LocaleProps {
     translate: TranslateFn;
 }
 export declare const LocaleContext: React.Context<string>;
-export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T): {
+export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T, methods?: Array<string>): {
     new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
         locale?: string | undefined;
         translate?: ((str: string, ...args: any[]) => string) | undefined;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.1
+ * amis-core v6.9.0-rc.11
  * Copyright 2018-2024 fex
  */
 
@@ -99,7 +99,7 @@ function setDefaultLocale(locale) {
     defaultLocale = locale;
 }
 var LocaleContext = React__default["default"].createContext('');
-function localeable(ComposedComponent) {
+function localeable(ComposedComponent, methods) {
     var _a;
     var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
             tslib.__extends(class_1, _super);
@@ -141,6 +141,17 @@ function localeable(ComposedComponent) {
         _a.contextType = LocaleContext,
         _a.ComposedComponent = ComposedComponent,
         _a), ComposedComponent);
+    if (Array.isArray(methods)) {
+        methods.forEach(function (method) {
+            if (ComposedComponent.prototype[method]) {
+                result.prototype[method] = function () {
+                    var _a;
+                    var fn = (_a = this.ref) === null || _a === void 0 ? void 0 : _a[method];
+                    return fn ? fn.apply(this.ref, arguments) : undefined;
+                };
+            }
+        });
+    }
     return result;
 }
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.1
+ * amis-core v6.9.0-rc.11
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -263,7 +263,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     onSubmit?: (values: object, action: any) => any;
     onChange?: (values: object, diff: object, props: any) => any;
     onFailed?: (reason: string, errors: any) => any;
-    onFinished: (values: object, action: any) => any;
+    onFinished: (values: object, action: ActionObject, store: IFormStore) => any;
     onValidate: (values: object, form: any) => any;
     onValidChange?: (valid: boolean, props: any) => void;
     messages: {
@@ -338,7 +338,7 @@ export default class Form extends React.Component<FormProps, object> {
     onInit(): Promise<void>;
     reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): Promise<any>;
     receive(values: object, name?: string, replace?: boolean): Promise<any>;
-    silentReload(target?: string, query?: any): void;
+    silentReload(target?: string, query?: any): Promise<any>;
     initInterval(value: any): any;
     isValidated(): boolean;
     validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.1
+ * amis-core v6.9.0-rc.11
  * Copyright 2018-2024 fex
  */
 
@@ -111,6 +111,7 @@ var Form = /** @class */ (function (_super) {
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
         _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
+        _this.flush = _this.flush.bind(_this);
         var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode, formLazyChange = props.formLazyChange;
         store.setCanAccessSuperData(canAccessSuperData !== false);
         store.setPersistData(persistData);
@@ -394,7 +395,7 @@ var Form = /** @class */ (function (_super) {
                     case 3:
                         // 派发初始化接口请求完成事件
                         this.dispatchInited(result);
-                        return [2 /*return*/];
+                        return [2 /*return*/, store.data];
                 }
             });
         });
@@ -405,7 +406,7 @@ var Form = /** @class */ (function (_super) {
         return this.reload();
     };
     Form.prototype.silentReload = function (target, query) {
-        this.reload(target, query, undefined, true);
+        return this.reload(target, query, undefined, true);
     };
     Form.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
@@ -623,7 +624,7 @@ var Form = /** @class */ (function (_super) {
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             onChange && onChange.apply(null, changeProps);
                         }
-                        store.clearRestError();
+                        mobxStateTree.isAlive(store) && store.clearRestError();
                         if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.handleAction(undefined, {
                                 type: 'submit',
@@ -697,6 +698,9 @@ var Form = /** @class */ (function (_super) {
                         _f.sent();
                         _f.label = 2;
                     case 2:
+                        if (!mobxStateTree.isAlive(store)) {
+                            return [2 /*return*/];
+                        }
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -897,7 +901,7 @@ var Form = /** @class */ (function (_super) {
                                 if (values === false) {
                                     return store.data;
                                 }
-                                if (onFinished && onFinished(values, action) === false) {
+                                if (onFinished && onFinished(values, action, store) === false) {
                                     return values;
                                 }
                                 resetAfterSubmit && store.reset(_this.handleReset(action));
@@ -1256,7 +1260,8 @@ var Form = /** @class */ (function (_super) {
             removeHook: this.removeHook,
             renderFormItems: this.renderFormItems,
             formItemDispatchEvent: this.formItemDispatchEvent,
-            formPristine: form.pristine
+            formPristine: form.pristine,
+            onFlushForm: this.flush
             // value: (control as any)?.name
             //   ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
             //   : (control as any)?.value,

package/lib/renderers/Item.d.ts

@@ -362,6 +362,7 @@ export interface FormItemBasicConfig extends Partial<RendererConfig> {
     renderDescription?: boolean;
     test?: RegExp | TestFunc;
     storeType?: string;
+    formItemStoreType?: string;
     validations?: string;
     strictMode?: boolean;
     /**
@@ -460,7 +461,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean, ignoreSelf?: boolean): void;
+    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
     buildAutoFillSchema(): {
         popOverContainer: any;
         popOverClassName: any;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.1
+ * amis-core v6.9.0-rc.11
  * Copyright 2018-2024 fex
  */
 
@@ -136,7 +136,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             if (!result) {
                                 return [2 /*return*/];
                             }
-                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false, true);
+                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false);
                             _e.label = 3;
                         case 3: return [3 /*break*/, 5];
                         case 4:
@@ -293,10 +293,9 @@ var FormItemWrap = /** @class */ (function (_super) {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits, ignoreSelf) {
+    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits) {
         if (skipIfExits === void 0) { skipIfExits = false; }
-        if (ignoreSelf === void 0) { ignoreSelf = false; }
-        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data, formItem = _a.formItem;
+        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data; _a.formItem;
         var toSync = dataMapping.dataMapping(mapping, ctx);
         var tmpData = tslib.__assign({}, data);
         var result = tslib.__assign({}, toSync);
@@ -323,9 +322,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             }
         });
         // 是否忽略自己的设置
-        if (ignoreSelf && (formItem === null || formItem === void 0 ? void 0 : formItem.name)) {
-            object.deleteVariable(result, formItem.name);
-        }
+        // if (ignoreSelf && formItem?.name) {
+        //   deleteVariable(result, formItem.name);
+        // }
         onBulkChange(result);
     };
     FormItemWrap.prototype.buildAutoFillSchema = function () {
@@ -1038,7 +1037,7 @@ function asFormItem(config) {
             })(mobxReact.observer(Control));
             delete config.storeType;
         }
-        return wrapControl.wrapControl(hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
+        return wrapControl.wrapControl(config, hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
                 tslib.__extends(class_1, _super);
                 function class_1(props) {
                     var _this = _super.call(this, props) || this;

package/lib/renderers/Options.d.ts

@@ -2,7 +2,7 @@
  * @file 所有列表选择类控件的父级，比如 Select、Radios、Checkboxes、
  * List、ButtonGroup 等等
  */
-import { Api, PlainObject, OptionProps, BaseApiObject } from '../types';
+import { Api, PlainObject, ActionObject, OptionProps, BaseApiObject } from '../types';
 import { FormControlProps, FormItemBasicConfig, FormBaseControl } from './Item';
 export type OptionsControlComponent = React.ComponentType<FormControlProps>;
 import React from 'react';
@@ -156,5 +156,50 @@ export interface OptionsProps extends FormControlProps, Omit<OptionProps, 'class
     optionLabel?: string;
 }
 export declare const detectProps: string[];
+export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S = any> extends React.Component<T, S> {
+    readonly config: OptionsConfig;
+    toDispose: Array<() => void>;
+    input: any;
+    mounted: boolean;
+    constructor(props: T, config: OptionsConfig);
+    componentDidMount(): void;
+    shouldComponentUpdate(nextProps: OptionsProps): boolean;
+    componentDidUpdate(prevProps: OptionsProps): void;
+    componentWillUnmount(): void;
+    oldDispatchOptionEvent(eventName: string, eventData?: any): Promise<boolean>;
+    dispatchOptionEvent(eventName: string, eventData?: any): Promise<boolean>;
+    doAction(action: ActionObject, data: object, throwErrors: boolean): void;
+    normalizeValue(): void;
+    getWrappedInstance(): any;
+    inputRef(ref: any): void;
+    handleToggle(option: Option, submitOnChange?: boolean, changeImmediately?: boolean): Promise<void>;
+    /**
+     * 初始化时处理默认全选逻辑
+     */
+    defaultCheckAll(): void;
+    /**
+     * 选中的值经过joinValues和delimiter等规则处理输出规定格式的值
+     * @param valueArray 选中值的数组
+     * @returns 通过joinValues和delimiter等规则输出规定格式的值
+     */
+    formatValueArray(valueArray: Array<Option>): string | Option | Option[];
+    handleToggleAll(): Promise<void>;
+    toggleValue(option: Option, originValue?: any): string | Option | Option[];
+    reload(): Promise<import("../types").Payload | null> | undefined;
+    reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<import("../types").Payload | null> | undefined;
+    deferLoad(option: Option): Promise<void>;
+    leftDeferLoad(option: Option, leftOptions: Option): void;
+    expandTreeOptions(nodePathArr: any[]): void;
+    initOptions(data: any): Promise<void>;
+    focus(): void;
+    changeOptionValue(value: any): void;
+    setOptions(options: Array<any>, skipNormalize?: boolean): void;
+    syncOptions(): void;
+    setLoading(value: boolean): void;
+    handleOptionAdd(idx?: number | Array<number>, value?: any, skipForm?: boolean, callback?: (value: any) => any): Promise<void>;
+    handleOptionEdit(value: any, origin?: any, skipForm?: boolean, callback?: (value: any) => any): Promise<void>;
+    handleOptionDelete(value: any, callback?: (value: any) => any): Promise<void>;
+    render(): React.ReactNode;
+}
 export declare function registerOptionsControl(config: OptionsConfig): import("..").RendererConfig;
 export declare function OptionsControl(config: OptionsBasicConfig): <T extends React.ComponentType<OptionsControlProps>>(component: T) => T;