amis-core 6.13.0-beta.0 → 6.13.0-beta.10

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -98,7 +98,8 @@ var Column = mobxStateTree.types
     breakpoint: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     pristine: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     remark: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
-    className: mobxStateTree.types.union(mobxStateTree.types.string, mobxStateTree.types.frozen())
+    className: mobxStateTree.types.union(mobxStateTree.types.string, mobxStateTree.types.frozen()),
+    appeared: false
 })
     .views(function (self) { return ({
     get isPrimary() {
@@ -139,6 +140,9 @@ var Column = mobxStateTree.types
     },
     setRealWidth: function (value) {
         self.realWidth = value;
+    },
+    markAppeared: function (value) {
+        self.appeared = self.appeared || value;
     }
 }); });
 var Row = mobxStateTree.types
@@ -160,9 +164,9 @@ var Row = mobxStateTree.types
     loaded: false,
     loading: false,
     error: '',
-    depth: mobxStateTree.types.number,
-    appeared: true,
-    lazyRender: false
+    depth: mobxStateTree.types.number // 当前children位于第几层，便于使用getParent获取最顶层TableStore
+    // appeared: true,
+    // lazyRender: false
 })
     .views(function (self) { return ({
     get parent() {
@@ -360,9 +364,9 @@ var Row = mobxStateTree.types
             index++;
         }
     },
-    markAppeared: function (value) {
-        value && (self.appeared = !!value);
-    },
+    // markAppeared(value: any) {
+    //   value && (self.appeared = !!value);
+    // },
     markLoading: function (value) {
         self.loading = !!value;
     },
@@ -433,7 +437,8 @@ var TableStore = iRenderer.iRendererStore
     searchFormExpanded: false,
     lazyRenderAfter: 100,
     tableLayout: 'auto',
-    theadHeight: 0
+    theadHeight: 0,
+    persistKey: ''
 })
     .views(function (self) {
     function getColumnsExceptBuiltinTypes() {
@@ -621,6 +626,9 @@ var TableStore = iRenderer.iRendererStore
         },
         getSelectionUpperLimit: getSelectionUpperLimit,
         get columnsKey() {
+            if (self.persistKey) {
+                return tpl.filter(self.persistKey, self.data);
+            }
             var fn = mobxStateTree.getEnv(self).getPageId || getPageId.getPageId;
             return fn() + self.path;
         },
@@ -899,6 +907,7 @@ var TableStore = iRenderer.iRendererStore
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
         config.showIndex !== undefined && (self.showIndex = config.showIndex);
+        config.persistKey !== undefined && (self.persistKey = config.persistKey);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
                 .map(function (column) {
@@ -1049,7 +1058,8 @@ var TableStore = iRenderer.iRendererStore
         });
         document.body.removeChild(div);
     }
-    function syncTableWidth() {
+    function syncTableWidth(setWidth) {
+        if (setWidth === void 0) { setWidth = false; }
         var table = tableRef;
         if (!table) {
             return;
@@ -1060,7 +1070,9 @@ var TableStore = iRenderer.iRendererStore
         cols.forEach(function (col) {
             var index = parseInt(col.getAttribute('data-index'), 10);
             var column = self.columns[index];
-            column.setRealWidth(col.offsetWidth);
+            var realWidth = col.getBoundingClientRect().width;
+            column.setRealWidth(realWidth);
+            setWidth && column.setWidth(realWidth);
         });
     }
     function combineCell(arr, keys) {
@@ -1165,13 +1177,19 @@ var TableStore = iRenderer.iRendererStore
         self.isNested = self.rows.some(function (item) { return item.children.length || (item.defer && !item.loaded); });
         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;
-                }
-            }
+            // if (
+            //   self.lazyRenderAfter &&
+            //   self.falttenedRows.length > self.lazyRenderAfter
+            // ) {
+            //   for (
+            //     let 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')) {
@@ -1242,7 +1260,7 @@ var TableStore = iRenderer.iRendererStore
     function updateSelected(selected, valueField) {
         self.selectedRows.clear();
         selected.forEach(function (item) {
-            var resolved = helper.findTree(self.rows, function (a) { return a.pristine === item; });
+            var resolved = helper.findTree(self.rows, function (a) { return a.pristine === item || a.data === item; });
             // 先严格比较，
             if (!resolved) {
                 resolved = helper.findTree(self.rows, function (a) {
@@ -1585,6 +1603,10 @@ var TableStore = iRenderer.iRendererStore
         persistSaveToggledColumns: persistSaveToggledColumns,
         setSearchFormExpanded: setSearchFormExpanded,
         toggleSearchFormExpanded: toggleSearchFormExpanded,
+        switchToFixedLayout: function () {
+            this.syncTableWidth(true);
+            self.tableLayout = 'fixed';
+        },
         // events
         afterCreate: function () {
             setTimeout(function () {

package/lib/store/table2.d.ts

@@ -59,8 +59,10 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     pristineRaw: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    dialogSchema: import("mobx-state-tree").IType<any, any, any>;
     dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dialogData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    drawerSchema: import("mobx-state-tree").IType<any, any, any>;
     drawerOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     drawerData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 } & {
@@ -147,6 +149,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
     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]>;
     canAccessSuperData: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    persistKey: import("mobx-state-tree").IType<string | undefined, string, string>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -165,6 +168,8 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
 } & {
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean, changeReason?: import("../types").DataChangeReason | undefined): void;
+    temporaryUpdateGlobalVars(globalVar: any): void;
+    unDoTemporaryUpdateGlobalVars(): void;
     reset(): void;
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -15,6 +15,7 @@ var helper = require('../utils/helper.js');
 var api = require('../utils/api.js');
 var service = require('./service.js');
 var getPageId = require('../utils/getPageId.js');
+var tpl = require('../utils/tpl.js');
 var object = require('../utils/object.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -24,9 +25,10 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
 var ServerError = /** @class */ (function (_super) {
     tslib.__extends(ServerError, _super);
-    function ServerError() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function ServerError(msg) {
+        var _this = _super.call(this, msg) || this;
         _this.type = 'ServerError';
+        Object.setPrototypeOf(_this, ServerError.prototype);
         return _this;
     }
     return ServerError;
@@ -162,7 +164,8 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
     dragging: false,
     rowSelectionKeyField: 'id',
     formsRef: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
-    canAccessSuperData: false
+    canAccessSuperData: false,
+    persistKey: ''
 })
     .views(function (self) {
     function getToggable() {
@@ -324,6 +327,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
             (self.columnsTogglable = config.columnsTogglable);
         config.canAccessSuperData !== undefined &&
             (self.canAccessSuperData = !!config.canAccessSuperData);
+        config.persistKey !== undefined && (self.persistKey = config.persistKey);
         if (typeof config.orderBy === 'string') {
             setOrderByInfo(config.orderBy, config.order === 'desc' ? 'desc' : 'asc');
         }
@@ -366,10 +370,15 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         }
         persistSaveToggledColumns();
     }
-    function persistSaveToggledColumns() {
+    function getPersistKey() {
+        if (self.persistKey) {
+            return tpl.filter(self.persistKey, self.data);
+        }
         var fn = mobxStateTree.getEnv(self).getPageId || getPageId.getPageId;
-        var key = fn() +
-            self.path +
+        return fn() + self.path;
+    }
+    function persistSaveToggledColumns() {
+        var key = getPersistKey() +
             self.toggableColumns.map(function (item) { return item.name || item.index; }).join('-');
         localStorage.setItem(key, JSON.stringify(self.activeToggaleColumns.map(function (item) { return item.index; })));
     }
@@ -602,9 +611,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
                 if (!mobxStateTree.isAlive(self)) {
                     return;
                 }
-                var fn = mobxStateTree.getEnv(self).getPageId || getPageId.getPageId;
-                var key = fn() +
-                    self.path +
+                var key = getPersistKey() +
                     self.toggableColumns.map(function (item) { return item.name || item.index; }).join('-');
                 var data = localStorage.getItem(key);
                 if (data) {

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -501,14 +501,19 @@ function wrapFetcher(fn, tracker) {
                             api.dataType === 'form') {
                             api.data = helper.qsstringify(api.data, api.qsOptions);
                             api.headers = api.headers || (api.headers = {});
-                            api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                            if (!api.headers['Content-Type']) {
+                                api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                            }
                         }
                         else if (api.data &&
                             typeof api.data !== 'string' &&
                             api.dataType === 'json') {
                             api.data = JSON.stringify(api.data);
                             api.headers = api.headers || (api.headers = {});
-                            api.headers['Content-Type'] = 'application/json';
+                            // 避免覆盖用户自定义的Content-Type，如同为json请求，还有扩展的application/vnd.api+json
+                            if (!api.headers['Content-Type']) {
+                                api.headers['Content-Type'] = 'application/json';
+                            }
                         }
                         // 如果发送适配器中设置了 mockResponse
                         // 则直接跳过请求发送

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -86,6 +86,7 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
     var _b = offset.offset(overlayNode), overlayHeight = _b.height, overlayWidth = _b.width;
     var clip = container.getBoundingClientRect();
     var clip2 = overlayNode.getBoundingClientRect();
+    var clip3 = scrollParent.getBoundingClientRect();
     var scaleX = overlayNode.offsetWidth
         ? clip2.width / overlayNode.offsetWidth
         : 1;
@@ -170,11 +171,13 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
                     : myY === 'bottom'
                         ? overlayHeight
                         : overlayHeight / 2;
+            // 需考虑 iframe 之外的高度，并不属于可视区域
+            var scrollParentOffset = positionTop < 0 && window.self !== window.top ? clip3.y : 0;
             // 如果还有其他可选项，则做位置判断，是否在可视区域，不完全在则继续看其他定位情况。
             if (tests.length || isAuto) {
                 var transformed = {
                     x: clip.x + positionLeft / scaleX,
-                    y: clip.y + positionTop / scaleY,
+                    y: clip.y - scrollParentOffset + positionTop / scaleY,
                     width: overlayWidth,
                     height: overlayHeight
                 };
@@ -281,7 +284,7 @@ function getStyleNumber(element, styleName) {
     if (!element) {
         return 0;
     }
-    return (parseInt(getComputedStyle(element).getPropertyValue(styleName), 10) || 0);
+    return parseFloat(getComputedStyle(element).getPropertyValue(styleName)) || 0;
 }
 /** 根据关键字高亮显示文本内容 */
 function renderTextByKeyword(rendererText, curKeyword) {
@@ -315,7 +318,11 @@ function calculateHeight(element, excludeElement) {
         var nextSibling = selfNode.nextElementSibling;
         while (nextSibling) {
             var positon = getComputedStyle(nextSibling).position;
-            if (positon !== 'absolute' && positon !== 'fixed') {
+            var className = nextSibling.className;
+            if (positon !== 'absolute' &&
+                positon !== 'fixed' &&
+                !className.includes('Spinner') // 过滤掉Loading
+            ) {
                 var rect1 = selfNode.getBoundingClientRect();
                 var rect2 = nextSibling.getBoundingClientRect();
                 if (rect1.bottom <= rect2.top) {

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -14,6 +14,7 @@ var ServerError = /** @class */ (function (_super) {
     function ServerError(msg, response) {
         var _this = _super.call(this, msg) || this;
         _this.type = 'ServerError';
+        Object.setPrototypeOf(_this, ServerError.prototype);
         _this.response = response;
         return _this;
     }

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/getPageId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var memoryParse = require('./memoryParse.js');
 
 function isPureVariable(path) {
-    if (typeof path === 'string') {
+    if (typeof path === 'string' && path.includes('$')) {
         try {
             var ast = memoryParse.memoryParse(path);
             // 只有一个成员说明是纯表达式模式

package/lib/utils/json-schema-2-amis-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */