amis-core 3.2.0 → 3.3.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -41,6 +41,7 @@ var Column = mobxStateTree.types
     type: mobxStateTree.types.optional(mobxStateTree.types.string, 'plain'),
     name: mobxStateTree.types.maybe(mobxStateTree.types.string),
     value: mobxStateTree.types.frozen(),
+    id: '',
     groupName: '',
     toggled: false,
     toggable: true,
@@ -54,6 +55,8 @@ var Column = mobxStateTree.types
     fixed: '',
     index: 0,
     rawIndex: 0,
+    width: 0,
+    minWidth: 0,
     breakpoint: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     pristine: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     remark: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
@@ -76,6 +79,12 @@ var Column = mobxStateTree.types
         self.enableSearch = value;
         var table = mobxStateTree.getParent(self, 2);
         table.persistSaveToggledColumns();
+    },
+    setWidth: function (value, minWidth) {
+        self.width = value;
+        if (typeof minWidth === 'number') {
+            self.minWidth = minWidth;
+        }
     }
 }); });
 var Row = mobxStateTree.types
@@ -268,6 +277,7 @@ var TableStore = iRenderer.iRendererStore
     formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
     maxKeepItemSelectionLength: Infinity,
     keepItemSelectionOnPageChange: false,
+    useFixedLayout: false,
     // 导出 Excel 按钮的 loading 状态
     exportExcelLoading: false,
     searchFormExpanded: false // 用来控制搜索框是否展开了，那个自动根据 searchable 生成的表单 autoGenerateFilter
@@ -325,23 +335,6 @@ var TableStore = iRenderer.iRendererStore
                     helper.isBreakpoint(item.breakpoint);
         });
     }
-    function getLeftFixedColumns() {
-        if (self.dragging) {
-            return [];
-        }
-        var columns = getFilteredColumns().filter(function (item) { return item.fixed === 'left'; });
-        // 有才带过去，没有就不带了
-        if (columns.length) {
-            columns = getFilteredColumns().filter(function (item) { return item.fixed === 'left' || /^__/.test(item.type); });
-        }
-        return columns;
-    }
-    function getRightFixedColumns() {
-        if (self.dragging) {
-            return [];
-        }
-        return getFilteredColumns().filter(function (item) { return item.fixed === 'right'; });
-    }
     function isSelected(row) {
         return !!~self.selectedRows.indexOf(row);
     }
@@ -453,7 +446,11 @@ var TableStore = iRenderer.iRendererStore
                 (item.has.length === 1 && item.label === item.has[0].label)
                 ? 2
                 : 1;
-            return tslib.__assign(tslib.__assign({}, item), { rowSpan: rowSpan, label: rowSpan === 2 ? item.label || item.has[0].label : item.label });
+            return tslib.__assign(tslib.__assign({}, item), { rowSpan: rowSpan, label: rowSpan === 2 ? item.label || item.has[0].label : item.label, fixed: item.has.every(function (column) { return column.fixed; })
+                    ? item.has[0].fixed
+                    : undefined, get width() {
+                    return item.has.reduce(function (a, b) { return a + b.width; }, 0);
+                } });
         });
     }
     function getFirstToggledColumnIndex() {
@@ -486,12 +483,6 @@ var TableStore = iRenderer.iRendererStore
         get footableColumns() {
             return getFootableColumns();
         },
-        get leftFixedColumns() {
-            return getLeftFixedColumns();
-        },
-        get rightFixedColumns() {
-            return getRightFixedColumns();
-        },
         get toggableColumns() {
             return getToggableColumns();
         },
@@ -576,6 +567,55 @@ var TableStore = iRenderer.iRendererStore
                 }
             });
             return list;
+        },
+        get columnWidthReady() {
+            return getFilteredColumns().every(function (column) { return column.width; });
+        },
+        getStickyStyles: function (column, columns) {
+            var stickyClassName = '';
+            var style = {};
+            var autoFixLeftColumns = ['__checkme', '__dragme', '__expandme'];
+            if (column.fixed === 'left' ||
+                autoFixLeftColumns.includes(column.type)) {
+                stickyClassName = 'is-sticky is-sticky-left';
+                var index = columns.indexOf(column) - 1;
+                if (columns
+                    .slice(index + 2)
+                    .every(function (col) {
+                    return !((col && col.fixed === 'left') ||
+                        autoFixLeftColumns.includes(col.type));
+                })) {
+                    stickyClassName += ' is-sticky-last-left';
+                }
+                var left = 0;
+                while (index >= 0) {
+                    var col = columns[index];
+                    if ((col && col.fixed === 'left') ||
+                        autoFixLeftColumns.includes(col.type)) {
+                        left += col.width;
+                    }
+                    index--;
+                }
+                style.left = left;
+            }
+            else if (column.fixed === 'right') {
+                stickyClassName = 'is-sticky is-sticky-right';
+                var right = 0;
+                var index = columns.indexOf(column) + 1;
+                if (columns.slice(0, index - 1).every(function (col) { return col.fixed !== 'right'; })) {
+                    stickyClassName += ' is-sticky-first-right';
+                }
+                var len = columns.length;
+                while (index < len) {
+                    var col = columns[index];
+                    if (col && col.fixed === 'right') {
+                        right += col.width;
+                    }
+                    index++;
+                }
+                style.right = right;
+            }
+            return [style, stickyClassName];
         }
     };
 })
@@ -616,12 +656,6 @@ var TableStore = iRenderer.iRendererStore
             var columns = config.columns
                 .filter(function (column) { return column; })
                 .concat();
-            if (!columns.length) {
-                columns.push({
-                    type: 'text',
-                    label: '空'
-                });
-            }
             // 更新列顺序，afterCreate生命周期中更新columns不会触发组件的render
             var key = getPersistDataKey(columns);
             var data = localStorage.getItem(key);
@@ -638,28 +672,10 @@ var TableStore = iRenderer.iRendererStore
                     });
                 }
             }
-            columns.unshift({
-                type: '__expandme',
-                toggable: false,
-                className: 'Table-expandCell'
-            });
-            columns.unshift({
-                type: '__checkme',
-                fixed: 'left',
-                toggable: false,
-                className: 'Table-checkCell'
-            });
-            columns.unshift({
-                type: '__dragme',
-                toggable: false,
-                className: 'Table-dragCell'
-            });
-            columns = columns.map(function (item, index) { return (tslib.__assign(tslib.__assign({}, item), { index: index, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX, className: item.className || '', 
-                /** 提前映射变量，方便后续view中使用 */
-                label: isPureVariable.isPureVariable(item.label)
-                    ? resolveVariableAndFilter.resolveVariableAndFilter(item.label, self.data)
-                    : item.label })); });
-            self.columns.replace(columns);
+            updateColumns(columns);
+        }
+        if (config.tableLayout === 'fixed') {
+            self.useFixedLayout = true;
         }
     }
     function updateColumns(columns) {
@@ -687,15 +703,18 @@ var TableStore = iRenderer.iRendererStore
                 toggable: false,
                 className: 'Table-dragCell'
             });
-            columns = columns.map(function (item, index) { return (tslib.__assign(tslib.__assign({}, item), { index: index, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX, 
+            columns = columns.map(function (item, index) { return (tslib.__assign(tslib.__assign({}, item), { id: helper.guid(), index: index, width: 0, minWidth: 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX, 
                 /** 提前映射变量，方便后续view中使用 */
                 label: isPureVariable.isPureVariable(item.label)
                     ? resolveVariableAndFilter.resolveVariableAndFilter(item.label, self.data)
                     : item.label })); });
             self.columns.replace(columns);
-            persistSaveToggledColumns();
+            self.useFixedLayout = self.columns.some(function (column) { return column.pristine.width; });
         }
     }
+    function invalidTableColumnWidth() {
+        self.columns.forEach(function (column) { return column.setWidth(0); });
+    }
     function combineCell(arr, keys) {
         if (!keys.length || !arr.length) {
             return arr;
@@ -838,6 +857,7 @@ var TableStore = iRenderer.iRendererStore
             self.expandedRows.replace(getExpandAllRows(self.rows));
         }
         self.dragging = false;
+        invalidTableColumnWidth(); // 更新内容需要重新计算表格布局
     }
     // 获取所有层级的子节点id
     function getExpandAllRows(arr) {
@@ -1142,6 +1162,7 @@ var TableStore = iRenderer.iRendererStore
     return {
         update: update,
         updateColumns: updateColumns,
+        invalidTableColumnWidth: invalidTableColumnWidth,
         initRows: initRows,
         updateSelected: updateSelected,
         toggleAll: toggleAll,
@@ -1164,6 +1185,9 @@ var TableStore = iRenderer.iRendererStore
         persistSaveToggledColumns: persistSaveToggledColumns,
         setSearchFormExpanded: setSearchFormExpanded,
         toggleSearchFormExpanded: toggleSearchFormExpanded,
+        setUseFixedLayout: function (value) {
+            self.useFixedLayout = !!value;
+        },
         // events
         afterCreate: function () {
             setTimeout(function () {

package/lib/store/table2.d.ts

@@ -1,5 +1,6 @@
 import { Instance, SnapshotIn, IAnyModelType } from 'mobx-state-tree';
 import { Api, fetchOptions } from '../types';
+import { IFormStore } from './form';
 export declare const Column: import("mobx-state-tree").IModelType<{
     title: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     name: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -140,6 +141,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     pageSize: import("mobx-state-tree").IType<number | undefined, number, number>;
     dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     rowSelectionKeyField: import("mobx-state-tree").IType<string | undefined, string, string>;
+    formsRef: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -458,6 +460,52 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
         reset(): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>))[];
     readonly keyField: string;
+    readonly modified: number;
+    readonly modifiedRows: ({
+        storeType: string;
+        id: string;
+        parentId: string;
+        name: string;
+        pristine: any;
+        data: any;
+        index: number;
+        newIndex: number;
+        depth: number;
+        children: import("mobx-state-tree").IMSTArray<IAnyModelType> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>>;
+        path: string;
+    } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean): void;
+        reset(): void;
+    } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
+        storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
+        id: import("mobx-state-tree").ISimpleType<string>;
+        parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
+        name: import("mobx-state-tree").ISimpleType<string>;
+        pristine: import("mobx-state-tree").IType<any, any, any>;
+        data: import("mobx-state-tree").IType<any, any, any>;
+        index: import("mobx-state-tree").ISimpleType<number>;
+        newIndex: import("mobx-state-tree").ISimpleType<number>;
+        depth: import("mobx-state-tree").ISimpleType<number>;
+        children: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<IAnyModelType>, [undefined]>;
+        path: import("mobx-state-tree").IType<string | undefined, string, string>;
+    }, {
+        readonly checked: boolean;
+        readonly modified: boolean;
+        readonly moved: boolean;
+        readonly locals: any;
+        getDataWithModifiedChilden(): any;
+    } & {
+        replaceWith(data: any): void;
+        change(values: object, savePristine?: boolean): void;
+        reset(): void;
+    }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
 } & {
     update: (config: Partial<STableStore2>) => void;
     persistSaveToggledColumns: () => void;
@@ -472,6 +520,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     toggleAllColumns: () => void;
     afterCreate(): void;
     saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
+    addForm: (form: IFormStore, rowIndex: number) => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ITableStore2 = Instance<typeof TableStore2>;
 export type STableStore2 = SnapshotIn<typeof TableStore2>;

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -158,7 +158,8 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     pageNo: 1,
     pageSize: 10,
     dragging: false,
-    rowSelectionKeyField: 'id'
+    rowSelectionKeyField: 'id',
+    formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), [])
 })
     .views(function (self) {
     function getToggable() {
@@ -219,6 +220,25 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     function getMoved() {
         return getMovedRows().length;
     }
+    function getModifiedRows(rows, modifiedRows) {
+        if (rows === void 0) { rows = []; }
+        if (modifiedRows === void 0) { modifiedRows = []; }
+        rows = rows && rows.length ? rows : self.rows;
+        rows.forEach(function (item) {
+            if (item.children && item.children.length) {
+                getModifiedRows(item.children, modifiedRows);
+            }
+            var diff = helper.difference(item.data, item.pristine);
+            var hasDifference = Object.keys(diff).length;
+            if (hasDifference) {
+                modifiedRows.push(item);
+            }
+        });
+        return modifiedRows;
+    }
+    function getModified() {
+        return getModifiedRows().length;
+    }
     return {
         get toggable() {
             return getToggable();
@@ -268,6 +288,12 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         },
         get keyField() {
             return self.rowSelectionKeyField;
+        },
+        get modified() {
+            return getModified();
+        },
+        get modifiedRows() {
+            return getModifiedRows();
         }
     };
 })
@@ -536,6 +562,12 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         self.rows.replace(rows);
         self.dragging = false;
     }
+    function addForm(form, rowIndex) {
+        self.formsRef.push({
+            id: form.id,
+            rowIndex: rowIndex
+        });
+    }
     return {
         update: update,
         persistSaveToggledColumns: persistSaveToggledColumns,
@@ -566,7 +598,8 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
                 }
             }, 200);
         },
-        saveRemote: saveRemote
+        saveRemote: saveRemote,
+        addForm: addForm
     };
 });
 

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,6 +18,9 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var themes = {
     default: {},
     cxd: {
@@ -122,8 +125,8 @@ function themeable(ComposedComponent) {
                 var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent)
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
-                var body = (React__default["default"].createElement(ComposedComponent, tslib.__assign({}, config.getComponentConfig(ComposedComponent.themeKey), this.props, injectedProps, refConfig)));
-                return this.context ? (body) : (React__default["default"].createElement(ThemeContext.Provider, { value: theme }, body));
+                var body = (_J$X_(ComposedComponent, tslib.__assign({}, config.getComponentConfig(ComposedComponent.themeKey), this.props, injectedProps, refConfig)));
+                return this.context ? (body) : (_J$X_(ThemeContext.Provider, { value: theme }, body));
             };
             return class_1;
         }(React__default["default"].Component)),

package/lib/types.d.ts

@@ -183,8 +183,9 @@ export interface ApiObject extends BaseApiObject {
     operationName?: string;
     body?: PlainObject;
     query?: PlainObject;
-    adaptor?: (payload: object, response: fetcherResult, api: ApiObject) => any;
-    requestAdaptor?: (api: ApiObject) => ApiObject;
+    mockResponse?: PlainObject;
+    adaptor?: (payload: object, response: fetcherResult, api: ApiObject, context: any) => any;
+    requestAdaptor?: (api: ApiObject, context: any) => ApiObject | Promise<ApiObject>;
     /** 是否过滤为空字符串的 query 参数 */
     filterEmptyQuery?: boolean;
 }
@@ -211,7 +212,7 @@ export interface fetchOptions {
     errorMessage?: string;
     autoAppend?: boolean;
     beforeSend?: (data: any) => any;
-    onSuccess?: (json: Payload) => any;
+    onSuccess?: (json: Payload, data: any) => any;
     onFailed?: (json: Payload) => any;
     silent?: boolean;
     [propName: string]: any;
@@ -497,6 +498,19 @@ export interface BaseSchemaWithoutType {
     style?: {
         [propName: string]: any;
     };
+    /**
+     * 编辑器配置，运行时可以忽略
+     */
+    editorSetting?: {
+        /**
+         * 组件名称，通常是业务名称方便定位
+         */
+        displayName?: string;
+        /**
+         * 编辑器假数据，方便展示
+         */
+        mock?: any;
+    };
 }
 export type OperatorType = 'equal' | 'not_equal' | 'is_empty' | 'is_not_empty' | 'like' | 'not_like' | 'starts_with' | 'ends_with' | 'less' | 'less_or_equal' | 'greater' | 'greater_or_equal' | 'between' | 'not_between' | 'select_equals' | 'select_not_equals' | 'select_any_in' | 'select_not_any_in' | {
     label: string;

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.d.ts

@@ -14,7 +14,7 @@ export declare function str2function(contents: string, ...args: Array<string>):
 export declare function str2AsyncFunction(contents: string, ...args: Array<string>): Function | null;
 export declare function responseAdaptor(ret: fetcherResult, api: ApiObject): Payload;
 export declare function wrapFetcher(fn: (config: fetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
-export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject): Promise<Payload>;
+export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject, context: any): Promise<Payload>;
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
  * @param api
@@ -24,7 +24,7 @@ export declare function jsFetcher(fetcher: (config: fetcherConfig) => Promise<fe
 export declare function jsonpFetcher(api: ApiObject): Promise<fetcherResult>;
 export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
-export declare function isValidApi(api: string): boolean | "";
+export declare function isValidApi(api: string): boolean;
 export declare function isEffectiveApi(api?: Api, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
 export declare function isSameApi(apiA: ApiObject | ApiCacheConfig, apiB: ApiObject | ApiCacheConfig): boolean;
 export declare function getApiCache(api: ApiObject): ApiCacheConfig | undefined;