amis-core 6.11.0-beta.1 → 6.11.0-beta.2

package/lib/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/factory.d.ts

@@ -20,6 +20,7 @@ export interface RendererBasicConfig {
     defaultProps?: (type: string, schema: any) => any;
     shouldSyncSuperStore?: (store: any, props: any, prevProps: any) => boolean | undefined;
     storeExtendsData?: boolean | ((props: any) => boolean);
+    onGlobalVarChanged?: (instance: React.Component, schema: any, data: any) => void | boolean;
     weight?: number;
     isolateScope?: boolean;
     isFormItem?: boolean;

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/globalVar.d.ts

@@ -0,0 +1,173 @@
+/**
+ * 全局变量
+ *
+ * 用于实现跨组件、跨页面的数据共享，支持持久化。
+ */
+import { JSONSchema } from './types';
+import { IRootStore } from './store/root';
+/**
+ * 全局变量的定义
+ */
+export interface GlobalVariableItem {
+    id?: string;
+    /**
+     * 设计态属性。
+     * 全局变量类型，不是数据体类型，而是用于区分不同的配置方式。
+     * 这个字段运行时无含义，主要用于编辑器中的分类。
+     *
+     * 比如平台可能扩充：应用级别、页面级别、用户级别、数据字典关联、数据模型关联等。
+     * amis 中内置了：builtin 为简单的客户端存储，服务端存储需要外部扩充。
+     *
+     * @default builtin
+     */
+    type?: string | 'builtin';
+    /**
+     * 变量名
+     */
+    key: string;
+    /**
+     * 变量标题
+     */
+    label?: string;
+    /**
+     * 变量描述
+     */
+    description?: string;
+    /**
+     * 默认值
+     */
+    defaultValue?: string;
+    /**
+     * 值的数据类型定义
+     */
+    valueSchema?: JSONSchema;
+    /**
+     * 数据作用域
+     */
+    scope?: 'page' | 'app';
+    /**
+     * 数据存储方式
+     */
+    storageOn?: 'client' | 'server' | 'session';
+    /**
+     * 是否只读，不允许修改，运行态属性。
+     */
+    readonly?: boolean;
+    /**
+     * @default true
+     * 是否自动保存，如果不特殊配置，会自动保存
+     */
+    autoSave?: boolean;
+    validationErrors?: any;
+    validations?: any;
+    [propName: string]: any;
+}
+export type GlobalVarGetter = (variable: GlobalVariableItem, context: GlobalVarContext) => Promise<any>;
+export type GlobalVarBulkGetter = (context: GlobalVarContext) => Promise<Record<string, any>> | Record<string, any>;
+export type GlobalVarSetter = (variable: GlobalVariableItem, value: Record<string, any>, context: GlobalVarContext) => Promise<any>;
+export type GlobalVarBulkSetter = (values: Record<string, any>, context: GlobalVarContext) => Promise<any> | any;
+export interface GlobalVariableItemFull extends GlobalVariableItem {
+    /**
+     * 校验数值是否合法
+     * @param value
+     * @returns
+     */
+    validate?: (value: any, values: Record<string, any>) => string | void;
+    /**
+     * 权重，用于排序
+     */
+    order?: number;
+    /**
+     * 单个数据初始化获取
+     * @returns
+     */
+    getter?: GlobalVarGetter;
+    /**
+     * 批量数据初始化获取
+     * @returns
+     */
+    bulkGetter?: GlobalVarBulkGetter;
+    /**
+     * 当个数据修改保存
+     * @param value
+     * @returns
+     */
+    setter?: GlobalVarSetter;
+    /**
+     * 批量全局变量数据保存，多个变量一起保存
+     * @param values
+     * @returns
+     */
+    bulkSetter?: GlobalVarBulkSetter;
+}
+/**
+ * 全局变量的状态
+ */
+export interface GlobalVariableState {
+    /**
+     * 当前值
+     */
+    value: any;
+    /**
+     * 原始值
+     */
+    pristine: any;
+    /**
+     * 是否正在加载, 或者说正在获取
+     */
+    busy?: boolean;
+    /**
+     * 是否已经初始化
+     */
+    initialized: boolean;
+    /**
+     * 数据是否合法
+     */
+    valid: boolean;
+    /**
+     * 错误馨馨
+     */
+    errorMessages: string[];
+    /**
+     * 是否有变更
+     */
+    touched: boolean;
+    /**
+     * 是否有保存
+     */
+    saved: boolean;
+}
+export interface GlobalVarContext {
+    variables: Array<GlobalVariableItem>;
+    [propName: string]: any;
+}
+/**
+ * 全局变量处理器, 可以处理全变量的初始化、校验、存储等操作
+ */
+export type GlobalVariableHandler = (variable: GlobalVariableItem | GlobalVariableItemFull, context: GlobalVarContext) => GlobalVariableItemFull | void | ((variable: GlobalVariableItem | GlobalVariableItemFull, context: GlobalVarContext) => GlobalVariableItemFull | void);
+/**
+ * 注册全局变量处理器
+ * @param handler
+ */
+export declare function registerGlobalVariableHandler(handler: GlobalVariableHandler): void;
+/**
+ * 通过处理器构建全局变量细节对象，用于后续的初始化、校验、存储等操作
+ * @param variable
+ * @param context
+ * @returns
+ */
+export declare function buildGlobalVariable(variable: GlobalVariableItem | GlobalVariableItemFull, context: GlobalVarContext): GlobalVariableItemFull;
+/**
+ * 构建变量初始状态
+ * @returns
+ */
+export declare function createGlobalVarState(): GlobalVariableState;
+export declare function isGlobalVarExpression(value: string): boolean;
+/**
+ * 监控组件的全局变量
+ * @param schema
+ * @param topStore
+ * @param callback
+ * @returns
+ */
+export declare function observeGlobalVars(schema: any, topStore: IRootStore, callback: () => void): () => void;

package/lib/globalVar.js

@@ -0,0 +1,130 @@
+/**
+ * amis-core v6.11.0-beta.2
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var formula = require('./utils/formula.js');
+var mobx = require('mobx');
+var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
+
+/**
+ * 全局变量
+ *
+ * 用于实现跨组件、跨页面的数据共享，支持持久化。
+ */
+var handlers = [];
+/**
+ * 注册全局变量处理器
+ * @param handler
+ */
+function registerGlobalVariableHandler(handler) {
+    handlers.push(handler);
+}
+/**
+ * 通过处理器构建全局变量细节对象，用于后续的初始化、校验、存储等操作
+ * @param variable
+ * @param context
+ * @returns
+ */
+function buildGlobalVariable(variable, context) {
+    var postHandlers = [];
+    var result = handlers.reduce(function (item, handler) {
+        var result = handler(item, context);
+        if (typeof result === 'function') {
+            postHandlers.push(result);
+        }
+        return (result !== null && result !== void 0 ? result : item);
+    }, variable);
+    result = postHandlers.reduce(function (item, handler) { var _a; return (_a = handler(item, context)) !== null && _a !== void 0 ? _a : item; }, result);
+    return result;
+}
+/**
+ * 构建变量初始状态
+ * @returns
+ */
+function createGlobalVarState() {
+    return {
+        value: undefined,
+        pristine: undefined,
+        initialized: false,
+        valid: true,
+        errorMessages: [],
+        touched: false,
+        saved: false
+    };
+}
+// 前两个是历史遗留，后两个是新的
+var globalVarFields = ['__page.', 'appVariables.', 'global.', 'globalState.'];
+function isGlobalVarExpression(value) {
+    return (typeof value === 'string' &&
+        formula.isExpression(value) &&
+        globalVarFields.some(function (k) { return value.includes(k); }));
+}
+/**
+ * 监控组件的全局变量
+ * @param schema
+ * @param topStore
+ * @param callback
+ * @returns
+ */
+function observeGlobalVars(schema, topStore, callback) {
+    var expressions = [];
+    Object.keys(schema).forEach(function (key) {
+        var value = schema[key];
+        if (isGlobalVarExpression(value)) {
+            expressions.push({
+                key: key,
+                value: value
+            });
+        }
+        else if ([
+            'items',
+            'body',
+            'buttons',
+            'header',
+            'columns',
+            'tabs',
+            'footer',
+            'actions',
+            'toolbar'
+        ].includes(key)) {
+            var items = Array.isArray(value) ? value : [value];
+            items.forEach(function (item) {
+                if (isGlobalVarExpression(item === null || item === void 0 ? void 0 : item.visibleOn)) {
+                    expressions.push({
+                        key: "".concat(key, ".x.visibleOn"),
+                        value: item.visibleOn
+                    });
+                }
+                else if (isGlobalVarExpression(item === null || item === void 0 ? void 0 : item.hiddenOn)) {
+                    expressions.push({
+                        key: "".concat(key, ".x.hiddenOn"),
+                        value: item.hiddenOn
+                    });
+                }
+            });
+        }
+    });
+    if (!expressions.length) {
+        return function () { };
+    }
+    var unReaction = mobx.reaction(function () {
+        return expressions
+            .map(function (exp) {
+            return "".concat(exp.key, ":").concat(resolveVariableAndFilter.resolveVariableAndFilter(exp.value, topStore.downStream, '| json' // 如果用了复杂对象，要靠这个来比较
+            ));
+        })
+            .join(',');
+    }, callback);
+    return unReaction;
+}
+
+exports.buildGlobalVariable = buildGlobalVariable;
+exports.createGlobalVarState = createGlobalVarState;
+exports.isGlobalVarExpression = isGlobalVarExpression;
+exports.observeGlobalVars = observeGlobalVars;
+exports.registerGlobalVariableHandler = registerGlobalVariableHandler;

package/lib/globalVarClientHandler.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/globalVarClientHandler.js

@@ -0,0 +1,67 @@
+/**
+ * amis-core v6.11.0-beta.2
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+var tslib = require('tslib');
+var globalVar = require('./globalVar.js');
+
+function loadClientData(key, variables) {
+    var str = localStorage.getItem(key);
+    var data = {};
+    try {
+        data = JSON.parse(str || '{}');
+    }
+    catch (e) {
+        console.error("parse localstorage \"".concat(key, " error\""), e);
+    }
+    var filterData = {};
+    variables.forEach(function (item) {
+        if (data.hasOwnProperty(item.key)) {
+            filterData[item.key] = data[item.key];
+        }
+    });
+    return filterData;
+}
+function saveClientData(key, values, variables) {
+    var str = localStorage.getItem(key);
+    var data = {};
+    try {
+        data = JSON.parse(str || '{}');
+    }
+    catch (e) {
+        console.error("parse localstorage \"".concat(key, " error\""), e);
+    }
+    Object.assign(data, values);
+    localStorage.setItem(key, JSON.stringify(data));
+}
+function bulkClientGetter(_a) {
+    var variables = _a.variables;
+    return loadClientData('amis-client-vars', variables);
+}
+function bulkClientSetter(values, context) {
+    return saveClientData('amis-client-vars', values, context.variables);
+}
+function pageBulkClientGetter(context) {
+    var variables = context.variables;
+    var key = "amis-client-vars-".concat(context.pageId || location.pathname);
+    return loadClientData(key, variables);
+}
+function pageBulkClientSetter(values, context) {
+    var key = "amis-client-vars-".concat(context.pageId || location.pathname);
+    return saveClientData(key, values, context.variables);
+}
+/**
+ * 注册全局变量处理器，用来处理 storageOn 为 client 的变量
+ *
+ * 并且根据变量的 scope 来决定是 page 还是全局的
+ *
+ * 将数据存入 localStorage
+ */
+globalVar.registerGlobalVariableHandler(function (variable, context) {
+    if (variable.storageOn === 'client') {
+        return tslib.__assign(tslib.__assign({}, variable), { bulkGetter: variable.scope === 'page' ? pageBulkClientGetter : bulkClientGetter, bulkSetter: variable.scope === 'page' ? pageBulkClientSetter : bulkClientSetter });
+    }
+});

package/lib/globalVarDefaultValueHandler.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/globalVarDefaultValueHandler.js

@@ -0,0 +1,30 @@
+/**
+ * amis-core v6.11.0-beta.2
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+var tslib = require('tslib');
+var globalVar = require('./globalVar.js');
+
+/**
+ * 格式化默认值
+ */
+globalVar.registerGlobalVariableHandler(function (variable, context) {
+    var _a;
+    if (variable.defaultValue && typeof variable.defaultValue === 'string') {
+        var defaultValue = variable.defaultValue;
+        try {
+            var value = defaultValue;
+            var valueType = (_a = variable.valueSchema) === null || _a === void 0 ? void 0 : _a.type;
+            if (valueType && ['number', 'array', 'object'].includes(valueType)) {
+                value = JSON.parse(defaultValue);
+            }
+            return tslib.__assign(tslib.__assign({}, variable), { defaultValue: value });
+        }
+        catch (e) {
+            // do nothing
+        }
+    }
+});

package/lib/index.d.ts

@@ -15,7 +15,10 @@ export * from './utils/index';
 export * from './utils/animations';
 export * from './types';
 export * from './store';
+export * from './globalVar';
 import * as utils from './utils/helper';
+import './globalVarClientHandler';
+import './globalVarDefaultValueHandler';
 import { RegisterStore, registerStore } from './store';
 import type { IColumn, IColumn2, IRow, IRow2 } from './store';
 import { setDefaultLocale, getDefaultLocale, makeTranslator, register as registerLocale, extendLocale, removeLocaleData, localeable } from './locale';

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -77,6 +77,9 @@ 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 globalVar = require('./globalVar.js');
+require('./globalVarClientHandler.js');
+require('./globalVarDefaultValueHandler.js');
 var mobxStateTree = require('mobx-state-tree');
 var locale = require('./locale.js');
 var Scoped = require('./Scoped.js');
@@ -142,10 +145,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.11.0-beta.1';
+var version = '6.11.0-beta.2';
 window.amisVersionInfo = {
-    version: '6.11.0-beta.1',
-    buildTime: '2024-12-13T01:40:03.918Z'
+    version: '6.11.0-beta.2',
+    buildTime: '2024-12-24T03:28:18.483Z'
 };
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
@@ -251,6 +254,7 @@ exports.removeApiRequestAdaptor = api.removeApiRequestAdaptor;
 exports.removeApiResponseAdaptor = api.removeApiResponseAdaptor;
 exports.responseAdaptor = api.responseAdaptor;
 exports.setApiCache = api.setApiCache;
+exports.shouldBlockedBySendOnApi = api.shouldBlockedBySendOnApi;
 exports.str2AsyncFunction = api.str2AsyncFunction;
 exports.str2function = api.str2function;
 exports.wrapAdaptor = api.wrapAdaptor;
@@ -500,6 +504,11 @@ exports.createAnimationStyle = animations.createAnimationStyle;
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;
 exports.registerStore = index.registerStore;
+exports.buildGlobalVariable = globalVar.buildGlobalVariable;
+exports.createGlobalVarState = globalVar.createGlobalVarState;
+exports.isGlobalVarExpression = globalVar.isGlobalVarExpression;
+exports.observeGlobalVars = globalVar.observeGlobalVars;
+exports.registerGlobalVariableHandler = globalVar.registerGlobalVariableHandler;
 exports.extendLocale = locale.extendLocale;
 exports.getDefaultLocale = locale.getDefaultLocale;
 exports.localeable = locale.localeable;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.1
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -381,7 +381,7 @@ export default class Form extends React.Component<FormProps, object> {
     renderBody(): React.JSX.Element;
     render(): JSX.Element;
 }
-export declare class FormRenderer extends Form {
+export declare class FormRendererBase extends Form {
     static contextType: React.Context<IScopedContext>;
     constructor(props: FormProps, context: IScopedContext);
     componentDidMount(): void;
@@ -397,3 +397,5 @@ export declare class FormRenderer extends Form {
     setData(values: object, replace?: boolean): void;
     getData(): any;
 }
+export declare class FormRenderer extends FormRendererBase {
+}