amis-core 3.5.2 → 3.6.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -66,6 +66,12 @@ function initChildren(children, depth, pindex, parentId, path) {
         };
     });
 }
+exports.SELECTED_STATUS = void 0;
+(function (SELECTED_STATUS) {
+    SELECTED_STATUS[SELECTED_STATUS["ALL"] = 0] = "ALL";
+    SELECTED_STATUS[SELECTED_STATUS["PARTIAL"] = 1] = "PARTIAL";
+    SELECTED_STATUS[SELECTED_STATUS["NONE"] = 2] = "NONE";
+})(exports.SELECTED_STATUS || (exports.SELECTED_STATUS = {}));
 var Column = mobxStateTree.types
     .model('Column', {
     label: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
@@ -152,6 +158,12 @@ var Row = mobxStateTree.types
     lazyRender: false
 })
     .views(function (self) { return ({
+    get parent() {
+        return mobxStateTree.getParent(self, 2);
+    },
+    get table() {
+        return mobxStateTree.getParent(self, self.depth * 2);
+    },
     get expandable() {
         var table;
         return !!((self && self.children.length) ||
@@ -160,6 +172,24 @@ var Row = mobxStateTree.types
                 table.footable &&
                 table.footableColumns.length));
     },
+    childrenSelected: function () {
+        var _a = self, children = _a.children, table = _a.table;
+        var selectedLength = children.filter(function (child) {
+            return table.isSelected(child);
+        }).length;
+        if (!selectedLength) {
+            return exports.SELECTED_STATUS.NONE;
+        }
+        if (selectedLength === children.length) {
+            return exports.SELECTED_STATUS.ALL;
+        }
+        return exports.SELECTED_STATUS.PARTIAL;
+    },
+    get partial() {
+        var childrenSelected = this.childrenSelected() === exports.SELECTED_STATUS.PARTIAL;
+        var childrenPartial = self.children.some(function (child) { return child.partial; });
+        return childrenSelected || childrenPartial;
+    },
     get checked() {
         return mobxStateTree.getParent(self, self.depth * 2).isSelected(self);
     },
@@ -261,7 +291,11 @@ var Row = mobxStateTree.types
 }); })
     .actions(function (self) { return ({
     toggle: function (checked) {
-        mobxStateTree.getParent(self, self.depth * 2).toggle(self, checked);
+        var table = self.table;
+        var row = self;
+        table.toggle(row, checked);
+        table.toggleAncestors(row);
+        table.toggleDescendants(row, checked);
     },
     toggleExpanded: function () {
         mobxStateTree.getParent(self, self.depth * 2).toggleExpanded(self);
@@ -368,7 +402,8 @@ var TableStore = iRenderer.iRendererStore
     exportExcelLoading: false,
     searchFormExpanded: false,
     lazyRenderAfter: 100,
-    tableLayout: 'auto'
+    tableLayout: 'auto',
+    theadHeight: 0
 })
     .views(function (self) {
     function getColumnsExceptBuiltinTypes() {
@@ -721,7 +756,7 @@ var TableStore = iRenderer.iRendererStore
             return self.rows.concat();
         },
         buildStyles: function (style) {
-            style = tslib.__assign({}, style);
+            style = tslib.__assign(tslib.__assign({}, style), { '--Table-thead-height': self.theadHeight + 'px' });
             getFilteredColumns().forEach(function (column) {
                 style["--Table-column-".concat(column.index, "-width")] =
                     column.realWidth + 'px';
@@ -919,7 +954,9 @@ var TableStore = iRenderer.iRendererStore
         if (!table) {
             return;
         }
-        var cols = [].slice.call(table.querySelectorAll(':scope>thead>tr>th[data-index]'));
+        var thead = table.querySelector(':scope>thead');
+        var cols = [].slice.call(thead.querySelectorAll('tr>th[data-index]'));
+        self.theadHeight = thead.offsetHeight;
         cols.forEach(function (col) {
             var index = parseInt(col.getAttribute('data-index'), 10);
             var column = self.columns[index];
@@ -1143,6 +1180,25 @@ var TableStore = iRenderer.iRendererStore
                 : checked && self.selectedRows.replace([row]);
         }
     }
+    function toggleAncestors(row) {
+        var parent = row.parent;
+        if (!parent.depth) {
+            return;
+        }
+        var selectedStatus = parent.childrenSelected();
+        toggle(parent, selectedStatus === exports.SELECTED_STATUS.ALL);
+        toggleAncestors(parent);
+    }
+    function toggleDescendants(row, checked) {
+        var children = row.children;
+        if (!(children === null || children === void 0 ? void 0 : children.length)) {
+            return;
+        }
+        children.forEach(function (child) {
+            toggle(child, checked);
+            toggleDescendants(child, checked);
+        });
+    }
     function getToggleShiftRows(row) {
         var e_1, _a;
         // 如果是同一个或非 multiple 模式下就和不用 shift 一样
@@ -1364,6 +1420,8 @@ var TableStore = iRenderer.iRendererStore
         toggleAll: toggleAll,
         getSelectedRows: getSelectedRows,
         toggle: toggle,
+        toggleAncestors: toggleAncestors,
+        toggleDescendants: toggleDescendants,
         toggleShift: toggleShift,
         getToggleShiftRows: getToggleShiftRows,
         toggleExpandAll: toggleExpandAll,

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -324,9 +324,6 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
         item = item || self.rows[fromIndex];
         if (item === null || item === void 0 ? void 0 : item.parentId) {
             var parent_1 = self.getRowById(item.parentId);
-            var offset = parent_1.children.indexOf(item) - fromIndex;
-            toIndex += offset;
-            fromIndex += offset;
             var newRows_1 = parent_1.children.concat();
             newRows_1.splice(fromIndex, 1);
             newRows_1.splice(toIndex, 0, item);

package/lib/theme.js

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

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { JSONSchema7 } from 'json-schema';
 import { ListenerAction } from './actions/Action';
-import { debounceConfig } from './utils/renderer-event';
+import { debounceConfig, trackConfig } from './utils/renderer-event';
 export interface Option {
     /**
      * 用来显示的文字
@@ -341,7 +341,7 @@ export interface EventTrack {
      * tabChange: tab 切换
      * netError: api 报错
      */
-    eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageLoaded' | 'pageHidden' | 'pageVisible';
+    eventType: 'api' | 'url' | 'link' | 'dialog' | 'drawer' | 'copy' | 'reload' | 'email' | 'prev' | 'next' | 'cancel' | 'close' | 'submit' | 'confirm' | 'reset' | 'reset-and-submit' | 'formItemChange' | 'tabChange' | 'pageLoaded' | 'pageHidden' | 'pageVisible' | string;
     /**
      * 事件数据
      */
@@ -471,6 +471,7 @@ export interface BaseSchemaWithoutType {
             weight?: number;
             actions: ListenerAction[];
             debounce?: debounceConfig;
+            track?: trackConfig;
         };
     };
     /**
@@ -508,6 +509,10 @@ export interface BaseSchemaWithoutType {
      * 编辑器配置，运行时可以忽略
      */
     editorSetting?: {
+        /**
+         * 组件行为、用途，如 create、update、remove
+         */
+        behavior?: string;
         /**
          * 组件名称，通常是业务名称方便定位
          */
@@ -516,6 +521,7 @@ export interface BaseSchemaWithoutType {
          * 编辑器假数据，方便展示
          */
         mock?: any;
+        [propName: string]: any;
     };
     /**
      * 可以组件级别用来关闭移动端样式

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.js

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

package/lib/utils/arraySlice.js

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

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -35,6 +35,8 @@ function attachmentAdpator(response, __, api) {
                 // 很可能是中文被 url-encode 了
                 if (filename && filename.replace(/[^%]/g, '').length > 2) {
                     filename = decodeURIComponent(filename);
+                    // 有些后端用错了，导致空格转义成了 +，这里转回来
+                    filename = filename.replace(/\+/g, ' ');
                 }
             }
             var type = response.headers['content-type'];

package/lib/utils/autobind.js

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

package/lib/utils/columnsSplit.js

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

package/lib/utils/dataMapping.js

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

package/lib/utils/date.js

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

package/lib/utils/debug.js

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

package/lib/utils/decodeEntity.js

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

package/lib/utils/dom.js

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

package/lib/utils/errors.js

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

package/lib/utils/escapeHtml.js

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

package/lib/utils/filter-schema.d.ts

@@ -17,5 +17,6 @@ export declare function filterClassNameObject(classValue: ClassValue, ctx?: Reco
  * @param schema
  * @param data
  */
-export declare function getExprProperties(schema: PlainObject, data?: object, blackList?: Array<string>, props?: any): PlainObject;
+export declare function getExprProperties(schema: PlainObject, data?: object, ignoreList?: Array<string>, props?: any): PlainObject;
+export declare function hasExprPropertiesChanged(schema: PlainObject, prevSchema: PlainObject): boolean;
 export default getExprProperties;

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -45,13 +45,13 @@ function filterClassNameObject(classValue, ctx) {
  * @param schema
  * @param data
  */
-function getExprProperties(schema, data, blackList, props) {
+function getExprProperties(schema, data, ignoreList, props) {
     if (data === void 0) { data = {}; }
-    if (blackList === void 0) { blackList = ['addOn', 'ref']; }
+    if (ignoreList === void 0) { ignoreList = ['addOn', 'ref']; }
     var exprProps = {};
     var ctx = null;
     Object.getOwnPropertyNames(schema).forEach(function (key) {
-        if (blackList && ~blackList.indexOf(key)) {
+        if (ignoreList && ~ignoreList.indexOf(key)) {
             return;
         }
         var parts = /^(.*)(On|Expr|(?:c|C)lassName)(Raw)?$/.exec(key);
@@ -90,7 +90,17 @@ function getExprProperties(schema, data, blackList, props) {
     });
     return exprProps;
 }
+function hasExprPropertiesChanged(schema, prevSchema) {
+    return Object.getOwnPropertyNames(schema).some(function (key) {
+        var parts = /^(.*)(On|Expr|(?:c|C)lassName)(Raw)?$/.exec(key);
+        if (parts) {
+            return schema[key] !== prevSchema[key];
+        }
+        return false;
+    });
+}
 
 exports["default"] = getExprProperties;
 exports.filterClassNameObject = filterClassNameObject;
 exports.getExprProperties = getExprProperties;
+exports.hasExprPropertiesChanged = hasExprPropertiesChanged;

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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

package/lib/utils/formula.js

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

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

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

package/lib/utils/helper.d.ts

@@ -41,7 +41,7 @@ type Mutable<T> = {
 };
 export declare function changedEffect<T extends Record<string, any>>(attrs: string | Array<string>, origin: T, data: T, effect: (changes: Partial<Mutable<T>>) => void, strictMode?: boolean): void;
 export declare function rmUndefined(obj: PlainObject): PlainObject;
-export declare function isObjectShallowModified(prev: any, next: any, strictMode?: boolean, ignoreUndefined?: boolean, statck?: Array<any>): boolean;
+export declare function isObjectShallowModified(prev: any, next: any, strictModeOrFunc?: boolean | ((lhs: any, rhs: any) => boolean), ignoreUndefined?: boolean, stack?: Array<any>): boolean;
 export declare function isArrayChildrenModified(prev: Array<any>, next: Array<any>, strictMode?: boolean): boolean;
 export declare function immutableExtends(to: any, from: any, deep?: boolean): any;
 export declare function makeColumnClassBuild(steps: number, classNameTpl?: string): (schema: Schema) => any;
@@ -341,7 +341,7 @@ export declare function JSONTraverse(json: any, mapper: (value: any, key: string
  * @param mapper
  * @returns
  */
-export declare function JSONValueMap(json: any, mapper: (value: any, key: string | number, host: Object, stack: Array<Object>) => any, stack?: Array<Object>): any;
+export declare function JSONValueMap(json: any, mapper: (value: any, key: string | number, host: Object, stack: Array<Object>) => any, deepFirst?: boolean, stack?: Array<Object>): any;
 export declare function convertArrayValueToMoment(value: number[], types: string[], mom: moment.Moment): moment.Moment;
 export declare function getRange(min: number, max: number, step?: number): number[];
 export declare function repeatCount(count: number, iterator: (index: number) => any): any[];

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.5.2
+ * amis-core v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -178,15 +178,15 @@ function rmUndefined(obj) {
     });
     return newObj;
 }
-function isObjectShallowModified(prev, next, strictMode, ignoreUndefined, statck) {
-    if (strictMode === void 0) { strictMode = true; }
+function isObjectShallowModified(prev, next, strictModeOrFunc, ignoreUndefined, stack) {
+    if (strictModeOrFunc === void 0) { strictModeOrFunc = true; }
     if (ignoreUndefined === void 0) { ignoreUndefined = false; }
-    if (statck === void 0) { statck = []; }
+    if (stack === void 0) { stack = []; }
     if (Array.isArray(prev) && Array.isArray(next)) {
         return prev.length !== next.length
             ? true
             : prev.some(function (prev, index) {
-                return isObjectShallowModified(prev, next[index], strictMode, ignoreUndefined, statck);
+                return isObjectShallowModified(prev, next[index], strictModeOrFunc, ignoreUndefined, stack);
             });
     }
     if (isNaN__default["default"](prev) && isNaN__default["default"](next)) {
@@ -196,9 +196,14 @@ function isObjectShallowModified(prev, next, strictMode, ignoreUndefined, statck
         null == next ||
         !object.isObject(prev) ||
         !object.isObject(next) ||
-        mobx.isObservable(prev) ||
-        mobx.isObservable(next)) {
-        return strictMode ? prev !== next : prev != next;
+        // 不是 Object.create 创建的对象
+        // 不是 plain object
+        prev.constructor !== Object ||
+        next.constructor !== Object) {
+        if (strictModeOrFunc && typeof strictModeOrFunc === 'function') {
+            return strictModeOrFunc(prev, next);
+        }
+        return strictModeOrFunc ? prev !== next : prev != next;
     }
     if (ignoreUndefined) {
         prev = rmUndefined(prev);
@@ -211,13 +216,13 @@ function isObjectShallowModified(prev, next, strictMode, ignoreUndefined, statck
         return true;
     }
     // 避免循环引用死循环。
-    if (~statck.indexOf(prev)) {
+    if (~stack.indexOf(prev)) {
         return false;
     }
-    statck.push(prev);
+    stack.push(prev);
     for (var i = keys.length - 1; i >= 0; i--) {
         var key = keys[i];
-        if (isObjectShallowModified(prev[key], next[key], strictMode, ignoreUndefined, statck)) {
+        if (isObjectShallowModified(prev[key], next[key], strictModeOrFunc, ignoreUndefined, stack)) {
             return true;
         }
     }
@@ -1372,43 +1377,46 @@ function JSONTraverse(json, mapper, maxDeep) {
  * @param mapper
  * @returns
  */
-function JSONValueMap(json, mapper, stack) {
+function JSONValueMap(json, mapper, deepFirst, stack) {
+    if (deepFirst === void 0) { deepFirst = false; }
     if (stack === void 0) { stack = []; }
     if (!isPlainObject__default["default"](json) && !Array.isArray(json)) {
         return json;
     }
     var iterator = function (origin, key, host, stack) {
+        var _a, _b;
         if (stack === void 0) { stack = []; }
-        var maped = mapper(origin, key, host, stack);
-        if (maped === origin && (isPlainObject__default["default"](origin) || Array.isArray(origin))) {
-            return JSONValueMap(origin, mapper, stack);
+        if (deepFirst) {
+            var value = JSONValueMap(origin, mapper, deepFirst, stack);
+            return (_a = mapper(value, key, host, stack)) !== null && _a !== void 0 ? _a : value;
+        }
+        var maped = (_b = mapper(origin, key, host, stack)) !== null && _b !== void 0 ? _b : origin;
+        // 如果不是深度优先，上层的对象都修改了，就不继续递归进到新返回的对象了
+        if (maped === origin) {
+            return JSONValueMap(origin, mapper, deepFirst, stack);
         }
         return maped;
     };
     if (Array.isArray(json)) {
-        var flag_1 = false;
-        var mapped = json.map(function (value, index) {
-            var result = iterator(value, index, json, [json].concat(stack));
-            if (result !== value) {
-                flag_1 = true;
-                return result;
-            }
-            return value;
+        var modified_1 = false;
+        var arr = json.map(function (value, index) {
+            var newValue = iterator(value, index, json, [json].concat(stack));
+            modified_1 = modified_1 || newValue !== value;
+            return newValue;
         });
-        return flag_1 ? mapped : json;
+        return modified_1 ? arr : json;
     }
-    var flag = false;
+    var modified = false;
     var toUpdate = {};
     Object.keys(json).forEach(function (key) {
         var value = json[key];
         var result = iterator(value, key, json, [json].concat(stack));
         if (result !== value) {
-            flag = true;
+            modified = true;
             toUpdate[key] = result;
-            return;
         }
     });
-    return flag
+    return modified
         ? tslib.__assign(tslib.__assign({}, json), toUpdate) : json;
 }
 function convertArrayValueToMoment(value, types, mom) {

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/isPureVariable.js

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

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

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

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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