amis-core 6.13.0-beta.2 → 6.13.0-beta.21

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -13,10 +13,10 @@ var iRenderer = require('./iRenderer.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
-var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 var isEqual = require('lodash/isEqual');
@@ -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;
     },
@@ -1054,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;
@@ -1065,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) {
@@ -1170,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')) {
@@ -1247,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) {
@@ -1590,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]>;
 } & {

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -25,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;

package/lib/theme.js

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

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/animations.js

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

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * 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.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/attachmentAdpator.js

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

package/lib/utils/autobind.js

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

package/lib/utils/browser.js

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

package/lib/utils/columnsSplit.js

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

package/lib/utils/concatData.js

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

package/lib/utils/dataMapping.js

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

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var moment = require('moment');
 var object = require('./object.js');
-var tokenize = require('./tokenize.js');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -38,7 +38,7 @@ var filterDate = function (value, data, format, utc) {
     }
     // todo
     var date = new Date();
-    value = tokenize.tokenize(value, object.createObject(data, {
+    value = resolveVariableAndFilter.resolveVariableAndFilter(value, object.createObject(data, {
         now: mm().toDate(),
         today: mm([date.getFullYear(), date.getMonth(), date.getDate()])
     }), '| raw');
@@ -70,12 +70,9 @@ var filterDate = function (value, data, format, utc) {
         return mm([date_2.getFullYear(), date_2.getMonth(), date_2.getDate()]);
     }
     else {
-        var result = utc ? mm(value).local() : mm(value);
-        return result.isValid()
-            ? result
-            : utc
-                ? mm(value, format).local()
-                : mm(value, format);
+        // 优先通过指定格式解析，如果失败，则通过默认格式解析
+        var date_3 = [mm(value, format), mm(value)].find(function (item) { return item.isValid(); }) || mm(value);
+        return utc ? date_3.local() : date_3;
     }
 };
 function parseDuration(str) {

package/lib/utils/debug.js

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

package/lib/utils/decodeEntity.js

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

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * 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) {

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * 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.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter-schema.js

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

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -17,8 +17,8 @@ require('moment');
 require('lodash/isPlainObject');
 var getVariable = require('./getVariable.js');
 require('./memoryParse.js');
-require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
+require('@rc-component/mini-decimal');
 require('./filter.js');
 var grammar = require('./grammar.js');
 

package/lib/utils/getPageId.js

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

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

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

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -24,11 +24,11 @@ var autobind$1 = require('./autobind.js');
 require('amis-formula');
 require('moment');
 var object = require('./object.js');
-var tokenize = require('./tokenize.js');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
+var tokenize = require('./tokenize.js');
 var resolveVariable = require('./resolveVariable.js');
-var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./memoryParse.js');
 require('./filter.js');
 var string2regExp = require('./string2regExp.js');

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
+export * from './tpl-builtin';
 export * from './api';
 export * from './attachmentAdpator';
 export * from './autobind';
@@ -50,7 +51,6 @@ export * from './SimpleMap';
 export * from './string2regExp';
 export * from './style';
 export * from './tokenize';
-export * from './tpl-builtin';
 export * from './tpl';
 export * from './uncontrollable';
 export * from './validations';

package/lib/utils/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -7,28 +7,28 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var api = require('./api.js');
 require('tslib');
+var amisFormula = require('amis-formula');
+require('moment');
+require('lodash/isPlainObject');
+require('./memoryParse.js');
+require('@rc-component/mini-decimal');
+require('./filter.js');
+var api = require('./api.js');
 require('file-saver');
 var browser = require('./browser.js');
 var ColorScale = require('./ColorScale.js');
 var columnsSplit = require('./columnsSplit.js');
-require('lodash/isPlainObject');
-var amisFormula = require('amis-formula');
-require('./memoryParse.js');
 var DataSchema = require('./DataSchema.js');
 var DataScope = require('./DataScope.js');
-require('moment');
 var debug = require('./debug.js');
 var dom = require('./dom.js');
 var errors = require('./errors.js');
 var tpl = require('./tpl.js');
 var helper = require('./helper.js');
-require('./filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('@rc-component/mini-decimal');
 var highlight = require('./highlight.js');
 var icon = require('./icon.js');
 var image = require('./image.js');
@@ -55,6 +55,18 @@ var Animation = require('./Animation.js');
 
 
 
+Object.defineProperty(exports, 'getFilters', {
+	enumerable: true,
+	get: function () { return amisFormula.getFilters; }
+});
+Object.defineProperty(exports, 'registerFilter', {
+	enumerable: true,
+	get: function () { return amisFormula.registerFilter; }
+});
+Object.defineProperty(exports, 'registerFunction', {
+	enumerable: true,
+	get: function () { return amisFormula.registerFunction; }
+});
 exports.addApiRequestAdaptor = api.addApiRequestAdaptor;
 exports.addApiResponseAdaptor = api.addApiResponseAdaptor;
 exports.addApiResponseAdator = api.addApiResponseAdator;
@@ -84,18 +96,6 @@ exports.chromeVersion = browser.chromeVersion;
 exports.isSafari = browser.isSafari;
 exports.ColorScale = ColorScale.ColorScale;
 exports.columnsSplit = columnsSplit.columnsSplit;
-Object.defineProperty(exports, 'getFilters', {
-	enumerable: true,
-	get: function () { return amisFormula.getFilters; }
-});
-Object.defineProperty(exports, 'registerFilter', {
-	enumerable: true,
-	get: function () { return amisFormula.registerFilter; }
-});
-Object.defineProperty(exports, 'registerFunction', {
-	enumerable: true,
-	get: function () { return amisFormula.registerFunction; }
-});
 exports.DataSchema = DataSchema.DataSchema;
 exports.DATASCHEMA_TYPE_MAP = DataScope.DATASCHEMA_TYPE_MAP;
 exports.DataScope = DataScope.DataScope;
@@ -228,8 +228,10 @@ exports.getCustomVendor = icon.getCustomVendor;
 exports.registerCustomVendor = icon.registerCustomVendor;
 exports.getImageDimensions = image.getImageDimensions;
 exports.toDataURL = image.toDataURL;
+exports.appearSensor = resizeSensor.appearSensor;
 exports.getComputedStyle = resizeSensor.getComputedStyle;
 exports.resizeSensor = resizeSensor.resizeSensor;
+exports.resizeSensorV2 = resizeSensor.resizeSensorV2;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.addRule = validations.addRule;
 exports.str2rules = validations.str2rules;