amis-core 3.5.2 → 3.6.0

package/esm/store/form.js

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

package/esm/store/formItem.d.ts

@@ -40,6 +40,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     joinValues: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     extractValue: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     options: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any[], any[], any[]>, [undefined]>;
+    optionsRaw: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any[], any[], any[]>, [undefined]>;
     expressionsInOptions: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     selectFirst: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     autoFill: import("mobx-state-tree").IType<any, any, any>;
@@ -55,6 +56,8 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     inputGroupControl: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     colIndex: import("mobx-state-tree").IType<any, any, any>;
     rowIndex: import("mobx-state-tree").IType<any, any, any>;
+    pagination: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    accumulatedOptions: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any[], any[], any[]>, [undefined]>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -75,13 +78,21 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     readonly valid: boolean;
     readonly errClassNames: string;
     readonly lastSelectValue: string;
+    /** 数据源接口数据是否开启分页 */
+    readonly enableSourcePagination: boolean;
+    /** 数据源接口开启分页时当前页码 */
+    readonly sourcePageNum: number;
+    /** 数据源接口开启分页时每页显示条数 */
+    readonly sourcePerPageNum: number;
+    /** 数据源接口开启分页时数据总条数 */
+    readonly sourceTotalNum: number;
     getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
     splitExtraValue(value: any): any[];
     getMergedData(data: any): any;
 } & {
     focus: () => void;
     blur: () => void;
-    config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl }: {
+    config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
         extraName?: string | undefined;
         required?: boolean | undefined;
         unique?: boolean | undefined;
@@ -114,6 +125,11 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
             name: string;
             path: string;
         } | undefined;
+        pagination?: {
+            enable?: boolean | undefined;
+            page?: number | undefined;
+            perPage?: number | undefined;
+        } | undefined;
     }) => void;
     validate: (data: Object, hook?: any, customRules?: {
         [propName: string]: any;
@@ -124,10 +140,16 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
         rule: string;
     })[], tag?: string) => void;
     clearError: (tag?: string) => void;
+    setPagination: (params: {
+        page?: number | undefined;
+        perPage?: number | undefined;
+        total?: number | undefined;
+    }) => void;
     setOptions: (options: Array<object>, onChange?: ((value: any) => void) | undefined, data?: Object) => void;
     loadOptions: (api: Api, data?: object, config?: (fetchOptions & {
         extendsOptions?: boolean | undefined;
     }) | undefined, clearValue?: boolean, onChange?: ((value: any) => void) | undefined, setErrorFlag?: boolean) => Promise<Payload | null>;
+    loadOptionsFromDataScope: (source: string, ctx: Record<string, any>, onChange?: ((value: any) => void) | undefined) => any[];
     deferLoadOptions: (option: any, api: Api, data?: object, config?: fetchOptions | undefined) => Promise<Payload | null>;
     deferLoadLeftOptions: (option: any, leftOptions: any, api: Api, data?: object, config?: fetchOptions | undefined) => Promise<Payload | null>;
     expandTreeOptions: (nodePathArr: any[], api: Api, data?: object, config?: fetchOptions | undefined) => Promise<Payload | null | void>;

package/esm/store/formItem.js

@@ -1,15 +1,22 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
 import { __generator, __assign, __values, __spreadArray, __read } from 'tslib';
 import { types, flow, getEnv, isAlive } from 'mobx-state-tree';
 import isEqualWith from 'lodash/isEqualWith';
+import uniqWith from 'lodash/uniqWith';
 import { FormStore } from './form.js';
 import { validate, str2rules } from '../utils/validations.js';
 import { ComboStore } from './combo.js';
 import { evalExpression } from '../utils/tpl.js';
+import 'amis-formula';
+import 'moment';
+import { cloneObject, setVariable, createObject, isObject } from '../utils/object.js';
+import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
+import { dataMapping } from '../utils/dataMapping.js';
+import '../utils/filter.js';
 import { isEffectiveApi, buildApi } from '../utils/api.js';
 import findIndex from 'lodash/findIndex';
 import { findTree, spliceTree, flattenTree, findTreeIndex, isObjectShallowModified, filterTree, isArrayChildrenModified, eachTree, mapTree } from '../utils/helper.js';
@@ -21,8 +28,6 @@ import { StoreNode } from './node.js';
 import { getStoreById } from './manager.js';
 import { normalizeOptions } from '../utils/normalizeOptions.js';
 import { getOptionValueBindField, getOptionValue, optionValueCompare } from '../utils/optionValueCompare.js';
-import { dataMapping } from '../utils/dataMapping.js';
-import { cloneObject, setVariable, createObject, isObject } from '../utils/object.js';
 
 var ErrorDetail = types.model('ErrorDetail', {
     msg: '',
@@ -68,6 +73,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
     joinValues: true,
     extractValue: false,
     options: types.optional(types.frozen(), []),
+    optionsRaw: types.optional(types.frozen(), []),
     expressionsInOptions: false,
     selectFirst: false,
     autoFill: types.frozen(),
@@ -83,7 +89,18 @@ var FormItemStore = StoreNode.named('FormItemStore')
     /** 当前表单项所属的InputGroup父元素, 用于收集InputGroup的子元素 */
     inputGroupControl: types.optional(types.frozen(), {}),
     colIndex: types.frozen(),
-    rowIndex: types.frozen()
+    rowIndex: types.frozen(),
+    /** Transfer组件分页模式 */
+    pagination: types.optional(types.frozen(), {
+        enable: false,
+        /** 当前页数 */
+        page: 1,
+        /** 每页显示条数 */
+        perPage: 10,
+        /** 总条数 */
+        total: 0
+    }),
+    accumulatedOptions: types.optional(types.frozen(), [])
 })
     .views(function (self) {
     function getForm() {
@@ -134,6 +151,25 @@ var FormItemStore = StoreNode.named('FormItemStore')
         get lastSelectValue() {
             return getLastOptionValue();
         },
+        /** 数据源接口数据是否开启分页 */
+        get enableSourcePagination() {
+            return !!self.pagination.enable;
+        },
+        /** 数据源接口开启分页时当前页码 */
+        get sourcePageNum() {
+            var _a;
+            return (_a = self.pagination.page) !== null && _a !== void 0 ? _a : 1;
+        },
+        /** 数据源接口开启分页时每页显示条数 */
+        get sourcePerPageNum() {
+            var _a;
+            return (_a = self.pagination.perPage) !== null && _a !== void 0 ? _a : 10;
+        },
+        /** 数据源接口开启分页时数据总条数 */
+        get sourceTotalNum() {
+            var _a;
+            return (_a = self.pagination.total) !== null && _a !== void 0 ? _a : 0;
+        },
         getSelectedOptions: function (value, nodeValueArray) {
             if (value === void 0) { value = self.tmpValue; }
             // 查看是否命中缓存
@@ -221,7 +257,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
     var dialogCallbacks = new SimpleMap();
     var loadAutoUpdateCancel = null;
     function config(_a) {
-        var extraName = _a.extraName, required = _a.required, unique = _a.unique; _a.value; var isValueSchemaExp = _a.isValueSchemaExp, rules = _a.rules, messages = _a.messages, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, labelField = _a.labelField, joinValues = _a.joinValues, extractValue = _a.extractValue, type = _a.type, id = _a.id, selectFirst = _a.selectFirst, autoFill = _a.autoFill, clearValueOnHidden = _a.clearValueOnHidden, validateApi = _a.validateApi, maxLength = _a.maxLength, minLength = _a.minLength, validateOnChange = _a.validateOnChange, label = _a.label, inputGroupControl = _a.inputGroupControl;
+        var extraName = _a.extraName, required = _a.required, unique = _a.unique; _a.value; var isValueSchemaExp = _a.isValueSchemaExp, rules = _a.rules, messages = _a.messages, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, labelField = _a.labelField, joinValues = _a.joinValues, extractValue = _a.extractValue, type = _a.type, id = _a.id, selectFirst = _a.selectFirst, autoFill = _a.autoFill, clearValueOnHidden = _a.clearValueOnHidden, validateApi = _a.validateApi, maxLength = _a.maxLength, minLength = _a.minLength, validateOnChange = _a.validateOnChange, label = _a.label, inputGroupControl = _a.inputGroupControl, pagination = _a.pagination;
         if (typeof rules === 'string') {
             rules = str2rules(rules);
         }
@@ -253,6 +289,14 @@ var FormItemStore = StoreNode.named('FormItemStore')
         isObject(inputGroupControl) &&
             (inputGroupControl === null || inputGroupControl === void 0 ? void 0 : inputGroupControl.name) != null &&
             (self.inputGroupControl = inputGroupControl);
+        if (pagination && isObject(pagination) && !!pagination.enable) {
+            self.pagination = {
+                enable: true,
+                page: pagination.page ? pagination.page || 1 : 1,
+                perPage: pagination.perPage ? pagination.perPage || 10 : 10,
+                total: 0
+            };
+        }
         if (typeof rules !== 'undefined' ||
             typeof required !== 'undefined' ||
             typeof minLength === 'number' ||
@@ -283,7 +327,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
     }
     var validateCancel = null;
     var validate$1 = flow(function validate$1(data, hook, customRules) {
-        var json, combo, group;
+        var json, err_1, combo, group;
         var _a;
         var _b, _c, _d, _e, _f;
         return __generator(this, function (_g) {
@@ -301,24 +345,33 @@ var FormItemStore = StoreNode.named('FormItemStore')
                     _g.label = 2;
                 case 2:
                     addError(validate(self.tmpValue, data, customRules ? str2rules(customRules) : self.rules, self.messages, self.__));
-                    if (!(!self.errors.length && isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 4];
+                    if (!(!self.errors.length && isEffectiveApi(self.validateApi, data))) return [3 /*break*/, 6];
                     if (validateCancel) {
                         validateCancel();
                         validateCancel = null;
                     }
+                    _g.label = 3;
+                case 3:
+                    _g.trys.push([3, 5, , 6]);
                     return [4 /*yield*/, getEnv(self).fetcher(self.validateApi, 
                         /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
                         createObject(data, (_a = {}, _a[self.name] = self.tmpValue, _a)), {
-                            cancelExecutor: function (executor) { return (validateCancel = executor); }
+                            cancelExecutor: function (executor) {
+                                return (validateCancel = executor);
+                            }
                         })];
-                case 3:
+                case 4:
                     json = _g.sent();
                     validateCancel = null;
                     if (!json.ok && json.status === 422 && json.errors) {
                         addError(String((_d = (_c = (_b = self.validateApi) === null || _b === void 0 ? void 0 : _b.messages) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : (json.errors || json.msg || "\u8868\u5355\u9879\u300C".concat(self.name, "\u300D\u6821\u9A8C\u5931\u8D25"))));
                     }
-                    _g.label = 4;
-                case 4:
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _g.sent();
+                    addError(String(err_1));
+                    return [3 /*break*/, 6];
+                case 6:
                     self.validated = true;
                     if (self.unique && ((_f = (_e = self.form) === null || _e === void 0 ? void 0 : _e.parentStore) === null || _f === void 0 ? void 0 : _f.storeType) === 'ComboStore') {
                         combo = self.form.parentStore;
@@ -390,6 +443,12 @@ var FormItemStore = StoreNode.named('FormItemStore')
             finally { if (e_1) throw e_1.error; }
         }
     }
+    function setPagination(params) {
+        var _a = params || {}, page = _a.page, perPage = _a.perPage, total = _a.total;
+        if (self.enableSourcePagination) {
+            self.pagination = __assign(__assign(__assign(__assign({}, self.pagination), (page != null && typeof page === 'number' ? { page: page } : {})), (perPage != null && typeof perPage === 'number' ? { perPage: perPage } : {})), (total != null && typeof total === 'number' ? { total: total } : {}));
+        }
+    }
     function setOptions(options, onChange, data) {
         if (!Array.isArray(options)) {
             return;
@@ -397,6 +456,14 @@ var FormItemStore = StoreNode.named('FormItemStore')
         options = filterTree(options, function (item) { return item; });
         var originOptions = self.options.concat();
         self.options = options;
+        /** 开启分页后当前选项内容需要累加 */
+        self.accumulatedOptions = self.enableSourcePagination
+            ? uniqWith(__spreadArray(__spreadArray([], __read(originOptions), false), __read(options), false), function (lhs, rhs) {
+                var _a, _b;
+                return lhs[(_a = self.valueField) !== null && _a !== void 0 ? _a : 'value'] ===
+                    rhs[(_b = self.valueField) !== null && _b !== void 0 ? _b : 'value'];
+            })
+            : options;
         syncOptions(originOptions, data);
         var selectedOptions;
         if (onChange &&
@@ -486,12 +553,12 @@ var FormItemStore = StoreNode.named('FormItemStore')
     });
     var loadOptions = flow(function getInitData(api, data, config, clearValue, onChange, setErrorFlag) {
         var json, options;
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0: return [4 /*yield*/, fetchOptions(api, data, config, setErrorFlag)];
                 case 1:
-                    json = _d.sent();
+                    json = _h.sent();
                     if (!json) {
                         return [2 /*return*/, null];
                     }
@@ -503,6 +570,9 @@ var FormItemStore = StoreNode.named('FormItemStore')
                         json.data ||
                         [];
                     options = normalizeOptions(options, undefined, self.valueField);
+                    if (self.enableSourcePagination) {
+                        self.pagination = __assign(__assign({}, self.pagination), { page: parseInt((_d = json.data) === null || _d === void 0 ? void 0 : _d.page, 10) || 1, total: parseInt((_f = (_e = json.data) === null || _e === void 0 ? void 0 : _e.total) !== null && _f !== void 0 ? _f : (_g = json.data) === null || _g === void 0 ? void 0 : _g.count, 10) || 0 });
+                    }
                     if ((config === null || config === void 0 ? void 0 : config.extendsOptions) && self.selectedOptions.length > 0) {
                         self.selectedOptions.forEach(function (item) {
                             var exited = findTree(options, optionValueCompare(item, self.valueField || 'value'), {
@@ -527,6 +597,22 @@ var FormItemStore = StoreNode.named('FormItemStore')
             }
         });
     });
+    /**
+     * 从数据域加载选项数据源，注意这里默认source变量解析后是全量的数据源
+     */
+    function loadOptionsFromDataScope(source, ctx, onChange) {
+        var options = resolveVariableAndFilter(source, ctx, '| raw');
+        if (!Array.isArray(options)) {
+            return [];
+        }
+        options = normalizeOptions(options, undefined, self.valueField);
+        if (self.enableSourcePagination) {
+            self.pagination = __assign(__assign(__assign(__assign({}, self.pagination), ((ctx === null || ctx === void 0 ? void 0 : ctx.page) ? { page: ctx === null || ctx === void 0 ? void 0 : ctx.page } : {})), ((ctx === null || ctx === void 0 ? void 0 : ctx.perPage) ? { perPage: ctx === null || ctx === void 0 ? void 0 : ctx.perPage } : {})), { total: options.length });
+            options = options.slice((self.pagination.page - 1) * self.pagination.perPage, self.pagination.page * self.pagination.perPage);
+        }
+        setOptions(options, onChange, ctx);
+        return options;
+    }
     var loadAutoUpdateData = flow(function getAutoUpdateData(api, data, silent) {
         var json, result;
         var _a, _b;
@@ -948,8 +1034,10 @@ var FormItemStore = StoreNode.named('FormItemStore')
         setError: setError,
         addError: addError,
         clearError: clearError,
+        setPagination: setPagination,
         setOptions: setOptions,
         loadOptions: loadOptions,
+        loadOptionsFromDataScope: loadOptionsFromDataScope,
         deferLoadOptions: deferLoadOptions,
         deferLoadLeftOptions: deferLoadLeftOptions,
         expandTreeOptions: expandTreeOptions,

package/esm/store/iRenderer.js

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

package/esm/store/index.js

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

package/esm/store/list.js

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

package/esm/store/manager.js

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

package/esm/store/modal.js

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

package/esm/store/node.js

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

package/esm/store/pagination.js

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

package/esm/store/root.js

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

package/esm/store/service.js

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

package/esm/store/status.js

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