amis-core 6.7.0 → 6.8.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var iRenderer = require('./iRenderer.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
@@ -103,6 +104,9 @@ var Column = mobxStateTree.types
         var _a;
         var table = mobxStateTree.getParent(self, 2);
         return (((_a = table.filteredColumns.find(function (column) { return !column.type.startsWith('__'); })) === null || _a === void 0 ? void 0 : _a.id) === self.id);
+    },
+    get columnKey() {
+        return self.pristine.uid || self.name || self.label || self.rawIndex;
     }
 }); })
     .actions(function (self) { return ({
@@ -118,10 +122,13 @@ var Column = mobxStateTree.types
     setToggled: function (value) {
         self.toggled = value;
     },
-    setEnableSearch: function (value) {
+    setEnableSearch: function (value, skipSave) {
+        if (skipSave === void 0) { skipSave = false; }
         self.enableSearch = value;
-        var table = mobxStateTree.getParent(self, 2);
-        table.persistSaveToggledColumns();
+        if (!skipSave) {
+            var table = mobxStateTree.getParent(self, 2);
+            table.persistSaveToggledColumns();
+        }
     },
     setMinWidth: function (value) {
         self.minWidth = value;
@@ -372,7 +379,6 @@ var TableStore = iRenderer.iRendererStore
     .named('TableStore')
     .props({
     columns: mobxStateTree.types.array(Column),
-    columnsKey: '',
     rows: mobxStateTree.types.array(Row),
     selectedRows: mobxStateTree.types.array(mobxStateTree.types.reference(Row)),
     expandedRows: mobxStateTree.types.array(mobxStateTree.types.string),
@@ -594,6 +600,9 @@ var TableStore = iRenderer.iRendererStore
     }
     return {
         getSelectionUpperLimit: getSelectionUpperLimit,
+        get columnsKey() {
+            return location.pathname + self.path;
+        },
         get columnsData() {
             return getColumnsExceptBuiltinTypes();
         },
@@ -712,7 +721,8 @@ var TableStore = iRenderer.iRendererStore
         get columnWidthReady() {
             return getFilteredColumns().every(function (column) { return column.realWidth; });
         },
-        getStickyStyles: function (column, columns) {
+        getStickyStyles: function (column, columns, colSpan) {
+            if (colSpan === void 0) { colSpan = 1; }
             var stickyClassName = '';
             var style = {};
             var autoFixLeftColumns = ['__checkme', '__dragme', '__expandme'];
@@ -721,7 +731,7 @@ var TableStore = iRenderer.iRendererStore
                 stickyClassName = 'is-sticky is-sticky-left';
                 var index = columns.indexOf(column) - 1;
                 if (columns
-                    .slice(index + 2)
+                    .slice(index + (colSpan - 1) + 2)
                     .every(function (col) {
                     return !((col && col.fixed === 'left') ||
                         autoFixLeftColumns.includes(col.type));
@@ -835,7 +845,6 @@ var TableStore = iRenderer.iRendererStore
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
         if (config.columns && Array.isArray(config.columns)) {
-            self.columnsKey = getPersistDataKey(config.columns);
             var columns = config.columns
                 .map(function (column) {
                 if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
@@ -858,7 +867,9 @@ var TableStore = iRenderer.iRendererStore
                 var order_1 = tableMetaData === null || tableMetaData === void 0 ? void 0 : tableMetaData.columnOrder;
                 if (Array.isArray(order_1) && order_1.length != 0) {
                     columns = sortBy__default["default"](columns, function (item, index) {
-                        return order_1.indexOf(item.name || item.label || index);
+                        var columnKey = item.uid || item.name || item.label || index;
+                        var idx = order_1.indexOf(columnKey);
+                        return idx === -1 ? Number.MAX_SAFE_INTEGER : idx;
                     });
                 }
             }
@@ -1085,26 +1096,28 @@ var TableStore = iRenderer.iRendererStore
         if (self.combineNum) {
             arr = autoCombineCell(arr, self.columns, self.combineNum, self.combineFromIndex);
         }
-        replaceRow(arr, reUseRow);
+        var allMatched = replaceRow(arr, reUseRow);
         self.isNested = self.rows.some(function (item) { return item.children.length || (item.defer && !item.loaded); });
-        // 前 20 个直接渲染，后面的按需渲染
-        if (self.lazyRenderAfter &&
-            self.falttenedRows.length > self.lazyRenderAfter) {
-            for (var i = self.lazyRenderAfter, len = self.falttenedRows.length; i < len; i++) {
-                self.falttenedRows[i].appeared = false;
-                self.falttenedRows[i].lazyRender = true;
+        if (!allMatched) {
+            // 前 20 个直接渲染，后面的按需渲染
+            if (self.lazyRenderAfter &&
+                self.falttenedRows.length > self.lazyRenderAfter) {
+                for (var i = self.lazyRenderAfter, len = self.falttenedRows.length; i < len; i++) {
+                    self.falttenedRows[i].appeared = false;
+                    self.falttenedRows[i].lazyRender = true;
+                }
+            }
+            var expand = self.footable && self.footable.expand;
+            if (expand === 'first' ||
+                (self.expandConfig && self.expandConfig.expand === 'first')) {
+                self.rows.length && self.expandedRows.push(self.rows[0].id);
+            }
+            else if ((expand === 'all' && !self.footable.accordion) ||
+                (self.expandConfig &&
+                    self.expandConfig.expand === 'all' &&
+                    !self.expandConfig.accordion)) {
+                self.expandedRows.replace(getExpandAllRows(self.rows));
             }
-        }
-        var expand = self.footable && self.footable.expand;
-        if (expand === 'first' ||
-            (self.expandConfig && self.expandConfig.expand === 'first')) {
-            self.rows.length && self.expandedRows.push(self.rows[0].id);
-        }
-        else if ((expand === 'all' && !self.footable.accordion) ||
-            (self.expandConfig &&
-                self.expandConfig.expand === 'all' &&
-                !self.expandConfig.accordion)) {
-            self.expandedRows.replace(getExpandAllRows(self.rows));
         }
         self.dragging = false;
     }
@@ -1122,7 +1135,21 @@ var TableStore = iRenderer.iRendererStore
     function replaceRow(arr, reUseRow) {
         if (reUseRow === false) {
             self.rows.replace(arr.map(function (item) { return Row.create(item); }));
-            return;
+            return false;
+        }
+        else if (reUseRow === 'match') {
+            var rows_1 = self.falttenedRows;
+            var allMatched_1 = true;
+            self.rows.replace(arr.map(function (item) {
+                var exist = rows_1.find(function (row) { return row.id === item.id; });
+                if (exist) {
+                    exist.replaceWith(item);
+                    return exist;
+                }
+                allMatched_1 = false;
+                return Row.create(item);
+            }));
+            return allMatched_1;
         }
         var pool = arr.concat();
         // 把多的删了先
@@ -1142,6 +1169,7 @@ var TableStore = iRenderer.iRendererStore
             }
             index++;
         }
+        return false;
     }
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
@@ -1245,8 +1273,8 @@ var TableStore = iRenderer.iRendererStore
         var maxIndex = lastCheckedRowIndex > rowIndex ? lastCheckedRowIndex : rowIndex + 1;
         var rows = checkableRows.slice(minIndex, maxIndex);
         try {
-            for (var rows_1 = tslib.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
-                var rowItem = rows_1_1.value;
+            for (var rows_2 = tslib.__values(rows), rows_2_1 = rows_2.next(); !rows_2_1.done; rows_2_1 = rows_2.next()) {
+                var rowItem = rows_2_1.value;
                 // 如果上一个是选中状态，则将之间的所有 check 都变成可选
                 if (!(lastCheckedRow.checked &&
                     maxLength &&
@@ -1258,7 +1286,7 @@ var TableStore = iRenderer.iRendererStore
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (rows_1_1 && !rows_1_1.done && (_a = rows_1.return)) _a.call(rows_1);
+                if (rows_2_1 && !rows_2_1.done && (_a = rows_2.return)) _a.call(rows_2);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -1356,9 +1384,9 @@ var TableStore = iRenderer.iRendererStore
         var rows = self.rows.concat();
         helper.eachTree(rows, function (item) {
             if (item.children) {
-                var rows_2 = item.children.concat().sort(function (a, b) { return a.index - b.index; });
-                rows_2.forEach(function (item) { return item.reset(); });
-                item.children.replace(rows_2);
+                var rows_3 = item.children.concat().sort(function (a, b) { return a.index - b.index; });
+                rows_3.forEach(function (item) { return item.reset(); });
+                item.children.replace(rows_3);
             }
         });
         rows.forEach(function (item) { return item.reset(); });
@@ -1400,13 +1428,21 @@ var TableStore = iRenderer.iRendererStore
      */
     function persistSaveToggledColumns() {
         var key = self.columnsKey;
+        var toggledColumns = self.activeToggaleColumns;
+        var activedSearchableColumns = self.activedSearchableColumns;
         localStorage.setItem(key, JSON.stringify({
-            // 可显示列index
-            toggledColumnIndex: self.activeToggaleColumns.map(function (item) { return item.index; }),
+            // 记录隐藏的字段，因为默认不设置是显示的，设置了隐藏才需要记录，这样新出来的字段才会默认显示
+            unToggledColumns: self.columnsData
+                .filter(function (item) { return !toggledColumns.includes(item); })
+                .map(function (item) { return item.columnKey; }),
             // 列排序，name，label可能不存在
-            columnOrder: self.columnsData.map(function (item) { return item.name || item.label || item.rawIndex; }),
-            // 已激活的可查询列
-            enabledSearchableColumn: self.activedSearchableColumns.map(function (item) { return item.name; })
+            columnOrder: self.columnsData.map(function (item) { return item.columnKey; }),
+            // 同理只记录不启用的，因为默认是启用的
+            disabledSearchableColumn: self.columnsData
+                .filter(function (item) {
+                return item.searchable && !activedSearchableColumns.includes(item);
+            })
+                .map(function (item) { return item.columnKey; })
         }));
     }
     function addForm(form, rowIndex) {
@@ -1441,14 +1477,6 @@ var TableStore = iRenderer.iRendererStore
             }
         }
     }
-    function getPersistDataKey(columns) {
-        // 这里的columns使用除了__开头的所有列
-        return (location.pathname +
-            self.path +
-            // 不能 sort 因为原始列的顺序设计器是可能改变的，此时如果缓存了打开会失效
-            // 还是缓存的顺序，不符合用户调整列顺序的预期
-            columns.map(function (item, index) { return item.name || item.label || index; }).join('-'));
-    }
     function setSearchFormExpanded(value) {
         self.searchFormExpanded = !!value;
     }
@@ -1498,16 +1526,18 @@ var TableStore = iRenderer.iRendererStore
                 var key = self.columnsKey;
                 var data = localStorage.getItem(key);
                 if (data) {
-                    var tableMetaData_1 = JSON.parse(data);
-                    var toggledColumns_1 = object.isObject(tableMetaData_1)
-                        ? tableMetaData_1 === null || tableMetaData_1 === void 0 ? void 0 : tableMetaData_1.toggledColumnIndex
-                        : tableMetaData_1; // 兼容之前的类型
+                    var tableMetaData = JSON.parse(data);
+                    var unToggledColumns_1 = Array.isArray(tableMetaData.unToggledColumns)
+                        ? tableMetaData.unToggledColumns
+                        : [];
+                    var disabledSearchableColumn_1 = Array.isArray(tableMetaData.disabledSearchableColumn)
+                        ? tableMetaData.disabledSearchableColumn
+                        : [];
                     self.toggableColumns.forEach(function (item) {
-                        return item.setToggled(!!~toggledColumns_1.indexOf(item.index));
+                        return item.setToggled(!unToggledColumns_1.includes(item.columnKey));
                     });
                     self.searchableColumns.forEach(function (item) {
-                        var _a;
-                        item.setEnableSearch(!!~((_a = tableMetaData_1 === null || tableMetaData_1 === void 0 ? void 0 : tableMetaData_1.enabledSearchableColumn) !== null && _a !== void 0 ? _a : []).indexOf(item.name));
+                        item.setEnableSearch(!disabledSearchableColumn_1.includes(item.columnKey), true);
                     });
                 }
             }, 200);

package/lib/store/table2.js

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

package/lib/theme.js

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

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.js

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

package/lib/utils/arraySlice.js

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

package/lib/utils/attachmentAdpator.js

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

package/lib/utils/autobind.js

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

package/lib/utils/browser.js

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

package/lib/utils/columnsSplit.js

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

package/lib/utils/concatData.js

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

package/lib/utils/dataMapping.js

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

package/lib/utils/date.js

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

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -395,11 +395,18 @@ function debug(cat, msg, ext) {
     console.groupCollapsed('[amis debug]', msg);
     console.debug(ext);
     console.groupEnd();
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'debug',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     store.logs.push(log);
 }
@@ -412,11 +419,18 @@ function warning(cat, msg, ext) {
     if (!isEnabled) {
         return;
     }
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'warn',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     console.groupCollapsed('amis debug', msg);
     console.trace(log);

package/lib/utils/decodeEntity.js

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

package/lib/utils/dom.js

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

package/lib/utils/errors.js

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

package/lib/utils/escapeHtml.js

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

package/lib/utils/filter-schema.js

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

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,7 @@ require('tslib');
 require('moment');
 require('lodash/isPlainObject');
 var getVariable = require('./getVariable.js');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

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

package/lib/utils/helper.d.ts

@@ -8,6 +8,7 @@ import { cloneObject, createObject, deleteVariable, extendObject, isObject, setV
 import { string2regExp } from './string2regExp';
 import { getVariable } from './getVariable';
 import { keyToPath } from './keyToPath';
+import type { IStatusStore } from '../store/status';
 export { createObject, cloneObject, isObject, string2regExp, getVariable, setVariable, deleteVariable, keyToPath, extendObject };
 export declare function preventDefault(event: TouchEvent | Event): void;
 export declare function isMobile(): any;
@@ -52,11 +53,13 @@ export declare function hasVisibleExpression(schema: {
     hidden?: boolean;
 }): boolean;
 export declare function isVisible(schema: {
+    id?: string;
+    name?: string;
     visibleOn?: string;
     hiddenOn?: string;
     visible?: boolean;
     hidden?: boolean;
-}, data?: object): boolean;
+}, data?: object, statusStore?: IStatusStore): any;
 export declare function isUnfolded(node: any, config: {
     foldedField?: string;
     unfoldedField?: string;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -28,11 +28,13 @@ var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('./resolveVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
+require('./memoryParse.js');
 require('./filter.js');
 var string2regExp = require('./string2regExp.js');
 var getVariable = require('./getVariable.js');
 var keyToPath = require('./keyToPath.js');
 var formula = require('./formula.js');
+var mobxStateTree = require('mobx-state-tree');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -296,7 +298,19 @@ function makeColumnClassBuild(steps, classNameTpl) {
 function hasVisibleExpression(schema) {
     return !!(schema.visibleOn || schema.hiddenOn);
 }
-function isVisible(schema, data) {
+function isVisible(schema, data, statusStore) {
+    var _a;
+    // 有状态时，状态优先
+    if ((schema.id || schema.name) && statusStore) {
+        var id = tpl.filter(schema.id, data);
+        var name_1 = tpl.filter(schema.name, data);
+        var visible = mobxStateTree.isAlive(statusStore)
+            ? (_a = statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : statusStore.visibleState[name_1]
+            : undefined;
+        if (typeof visible !== 'undefined') {
+            return visible;
+        }
+    }
     return !(schema.hidden ||
         schema.visible === false ||
         (schema.hiddenOn &&
@@ -428,7 +442,9 @@ function difference(object$1, base, keepProps) {
                     result_1[key] = a;
                 }
                 // isEquals 里面没有处理好递归引用对象的情况
-                if (!isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
+                if (object$1.hasOwnProperty(key) && // 其中一个不是自己的属性，就不要比对了
+                    base.hasOwnProperty(key) &&
+                    !isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
                     return;
                 }
                 if (!object$1.hasOwnProperty(key)) {

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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