oak-domain 5.1.0 → 5.1.2

package/lib/base-app-domain/ActionDefDict.d.ts

@@ -1,7 +1,5 @@
 export declare const actionDefDict: {
-    log: {
-        iState: import("../types").ActionDef<string, string>;
-    };
+    log: {};
     modi: {
         iState: import("../types").ActionDef<string, string>;
     };

package/lib/base-app-domain/Log/Action.d.ts

@@ -1,12 +1,6 @@
-import { ActionDef } from "../../types/Action";
 import { GenericAction } from "../../actions/action";
-export type IState = 'normal' | 'rollbacked' | string;
-export type State = IState | string;
 export type IAction = 'undo' | 'redo' | string;
 export type ParticularAction = IAction;
 export declare const actions: string[];
-export declare const IActionDef: ActionDef<IAction, IState>;
 export type Action = GenericAction | ParticularAction | string;
-export declare const actionDefDict: {
-    iState: ActionDef<string, string>;
-};
+export declare const actionDefDict: {};

package/lib/base-app-domain/Log/Action.js

@@ -1,14 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actionDefDict = exports.IActionDef = exports.actions = void 0;
+exports.actionDefDict = exports.actions = void 0;
 exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "undo", "redo"];
-exports.IActionDef = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
-exports.actionDefDict = {
-    iState: exports.IActionDef
-};
+exports.actionDefDict = {};

package/lib/base-app-domain/Log/Schema.d.ts

@@ -1,7 +1,7 @@
 import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "../../types/Entity";
-import { Action, ParticularAction, IState } from "./Action";
+import { Action, ParticularAction } from "./Action";
 import { String } from "../../types/DataType";
 import * as Oper from "../Oper/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
@@ -9,13 +9,13 @@ import * as OperEntity from "../OperEntity/Schema";
 export type OpSchema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    iState?: IState | null;
+    iState: "normal" | "rollbacked";
 };
 export type OpAttr = keyof OpSchema;
 export type Schema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    iState?: IState | null;
+    iState: "normal" | "rollbacked";
     oper$log?: Array<Oper.Schema>;
     oper$log$$aggr?: AggregationResult<Oper.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
@@ -32,7 +32,7 @@ type AttrFilter = {
     $$updateAt$$: Q_DateValue;
     entity: Q_StringValue;
     entityId: Q_StringValue;
-    iState: Q_EnumValue<IState>;
+    iState: Q_EnumValue<"normal" | "rollbacked">;
     oper$log: Oper.Filter & SubQueryPredicateMetadata;
     modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
     operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;

package/lib/base-app-domain/Log/Storage.js

@@ -19,6 +19,7 @@ exports.desc = {
             }
         },
         iState: {
+            notNull: true,
             type: "enum",
             enumeration: ["normal", "rollbacked"]
         }

package/lib/base-app-domain/Log/Style.js

@@ -6,10 +6,4 @@ exports.style = {
         undo: '',
         redo: '',
     },
-    color: {
-        iState: {
-            normal: '#229954',
-            rollbacked: '#2C3E50',
-        },
-    },
 };

package/lib/entities/Log.d.ts

@@ -1,16 +1,11 @@
-import { ActionDef } from '../types/Action';
 import { String } from '../types/DataType';
 import { EntityShape } from '../types/Entity';
 import { EntityDesc } from '../types/EntityDesc';
 export interface Schema extends EntityShape {
     entity: String<32>;
     entityId: String<64>;
+    iState: 'normal' | 'rollbacked';
 }
-export type IState = 'normal' | 'rollbacked';
-export type State = IState;
 export type IAction = 'undo' | 'redo';
 export type Action = IAction;
-export declare const IActionDef: ActionDef<IAction, IState>;
-export declare const entityDesc: EntityDesc<Schema, Action, '', {
-    iState: IState;
-}>;
+export declare const entityDesc: EntityDesc<Schema, Action>;

package/lib/entities/Log.js

@@ -1,14 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityDesc = exports.IActionDef = void 0;
+exports.entityDesc = void 0;
 ;
-exports.IActionDef = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
 exports.entityDesc = {
     locales: {
         zh_CN: {
@@ -35,11 +28,5 @@ exports.entityDesc = {
             undo: '',
             redo: '',
         },
-        color: {
-            iState: {
-                normal: '#229954',
-                rollbacked: '#2C3E50',
-            },
-        },
     },
 };

package/lib/store/AsyncRowStore.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncContext = void 0;
 const tslib_1 = require("tslib");
+const types_1 = require("../types");
 const action_1 = require("../actions/action");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const filter_1 = require("./filter");
@@ -81,9 +82,14 @@ class AsyncContext {
                 break;
             }
             case 'remove': {
+                const deleteAt = data[types_1.DeleteAtAttribute];
+                (0, assert_1.default)(deleteAt);
                 this.opRecords.push({
                     id,
                     a: 'r',
+                    d: {
+                        [types_1.DeleteAtAttribute]: deleteAt,
+                    },
                     e: entity,
                     f: filter,
                 });

package/lib/store/CascadeStore.d.ts

@@ -67,7 +67,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
         afterFns: (() => R)[];
     };
     protected preProcessDataCreated<T extends keyof ED>(entity: T, data: ED[T]['Create']['data']): void;
-    protected preProcessDataUpdated(data: Record<string, any>): void;
+    protected preProcessDataUpdated(action: string, data: Record<string, any>, async?: true): void;
     judgeRelation(entity: keyof ED, attr: string): string | 1 | 2 | string[] | 0 | -1;
     /**
      * 和具体的update过程无关的例程放在这里，包括对later动作的处理、对oper的记录以及对record的收集等

package/lib/store/CascadeStore.js

@@ -23,7 +23,7 @@ class CascadeStore extends RowStore_1.RowStore {
     operationRewriters = [];
     async reinforceSelectionAsync(entity, selection, context, option, isAggr) {
         if (!isAggr && !selection.distinct) {
-            this.reinforceSelectionInner(entity, selection, context);
+            this.reinforceSelectionInner(entity, selection, context, option);
         }
         const rewriterPromises = this.selectionRewriters.map(ele => ele(this.getSchema(), entity, selection, context, option, isAggr));
         if (rewriterPromises.length > 0) {
@@ -32,14 +32,14 @@ class CascadeStore extends RowStore_1.RowStore {
     }
     reinforceSelectionSync(entity, selection, context, option, isAggr) {
         if (!isAggr && !selection.distinct) {
-            this.reinforceSelectionInner(entity, selection, context);
+            this.reinforceSelectionInner(entity, selection, context, option);
         }
         this.selectionRewriters.forEach(ele => {
             const result = ele(this.getSchema(), entity, selection, context, option, isAggr);
             (0, assert_1.default)(!(result instanceof Promise));
         });
     }
-    reinforceSelectionInner(entity, selection, context) {
+    reinforceSelectionInner(entity, selection, context, option) {
         const { filter, data, sorter } = selection;
         const assignNecessaryProjectionAttrs = (projectionNode, attrs) => {
             attrs.forEach((attr) => {
@@ -240,7 +240,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             else {
                                 assignNecessaryProjectionAttrs(data, ['entity', 'entityId']);
                             }
-                            this.reinforceSelectionInner(rel[0], projectionNode[attr], context);
+                            this.reinforceSelectionInner(rel[0], projectionNode[attr], context, option);
                         }
                     }
                 }
@@ -272,7 +272,7 @@ class CascadeStore extends RowStore_1.RowStore {
             // 如果对象上有relation关系，在此将本用户相关的relation和actionAuth全部取出
             // 还要将actionAuth上没有relation关系但destEntity为本对象的行也全部取出，这些是指向userId的可能路径
             // 放在这里有点怪异，暂先这样
-            if (context instanceof AsyncRowStore_1.AsyncContext) {
+            if (context instanceof AsyncRowStore_1.AsyncContext && !option.dontCollect) {
                 const userId = context.getCurrentUserId(true);
                 if (userId && !entities_1.SYSTEM_RESERVE_ENTITIES.includes(entity2)) {
                     if (this.getSchema()[entity2].relation && !projectionNode.userRelation$entity) {
@@ -289,7 +289,11 @@ class CascadeStore extends RowStore_1.RowStore {
                                         id: 1,
                                         name: 1,
                                         display: 1,
-                                    }
+                                        [Entity_1.CreateAtAttribute]: 1,
+                                        [Entity_1.UpdateAtAttribute]: 1,
+                                    },
+                                    [Entity_1.CreateAtAttribute]: 1,
+                                    [Entity_1.UpdateAtAttribute]: 1,
                                 },
                                 filter: {
                                     userId,
@@ -331,10 +335,12 @@ class CascadeStore extends RowStore_1.RowStore {
         const cascadeSelectionFns = [];
         const supportMtoJoin = this.supportManyToOneJoin();
         const { toModi } = this.getSchema()[entity];
+        const projection = {};
         (0, assert_1.default)(typeof projection2 === 'object');
         for (const attr in projection2) {
             const relation = (0, relation_1.judgeRelation)(this.storageSchema, entity, attr);
             if (relation === 1 || relation == 0) {
+                projection[attr] = projection2[attr];
             }
             else if (relation === 2) {
                 // 基于entity/entityId的多对一
@@ -364,6 +370,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
+                    projection[attr] = subProjection;
                 }
                 else {
                     cascadeSelectionFns.push((result) => {
@@ -451,6 +458,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
+                    projection[attr] = subProjection;
                 }
                 else {
                     cascadeSelectionFns.push((result) => {
@@ -640,7 +648,7 @@ class CascadeStore extends RowStore_1.RowStore {
             }
         }
         return {
-            projection: projection2,
+            projection,
             cascadeSelectionFns,
         };
     }
@@ -698,7 +706,7 @@ class CascadeStore extends RowStore_1.RowStore {
                 option2.modiParentEntity = entity;
             }
         }
-        if (toLog && action !== 'create') {
+        if (toLog && action !== 'create' && !option.dontCreateOper) {
             // 此对象（及其下辖的cascade更新都需要记录log)            
             (0, assert_1.default)(typeof filter.id === 'string');
             (0, assert_1.default)(!option2.logId, 'undo无法支持嵌套');
@@ -710,6 +718,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         id: (0, uuid_1.generateNewId)(),
                         data: {
                             id: logId,
+                            iState: 'normal',
                         },
                         action: 'create',
                     }
@@ -1012,8 +1021,8 @@ class CascadeStore extends RowStore_1.RowStore {
                 }
             }
             Object.assign(data2, {
-                [Entity_1.CreateAtAttribute]: now,
-                [Entity_1.UpdateAtAttribute]: now,
+                [Entity_1.CreateAtAttribute]: data2[Entity_1.CreateAtAttribute] || now,
+                [Entity_1.UpdateAtAttribute]: data2[Entity_1.UpdateAtAttribute] || now,
                 [Entity_1.DeleteAtAttribute]: null,
             });
         };
@@ -1025,9 +1034,18 @@ class CascadeStore extends RowStore_1.RowStore {
         }
     }
     // 对更新的数据，去掉所有的undefined属性
-    preProcessDataUpdated(data) {
+    preProcessDataUpdated(action, data, async) {
         const undefinedKeys = Object.keys(data).filter(ele => data[ele] === undefined);
         undefinedKeys.forEach(ele => (0, lodash_1.unset)(data, ele));
+        // 优化一下，如果不更新任何属性，则不实际执行
+        const now = Date.now();
+        // 后台应该还是以实际操作时间为准，前台以传入的updateAt来界定操作的产生“时间”，这里可用来避免同一次更新被算做多次
+        if ((Object.keys(data).length > 0 || action !== 'update') && (!data[Entity_1.UpdateAtAttribute] || async)) {
+            data[Entity_1.UpdateAtAttribute] = now;
+        }
+        if (action === 'remove' && (!data[Entity_1.DeleteAtAttribute] || async)) {
+            data[Entity_1.DeleteAtAttribute] = now;
+        }
     }
     judgeRelation(entity, attr) {
         return (0, relation_1.judgeRelation)(this.storageSchema, entity, attr);
@@ -1212,7 +1230,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             };
                             const closeRootMode = context.openRootMode();
                             await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: true,
+                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
                             });
                             closeRootMode();
                         }
@@ -1256,8 +1274,12 @@ class CascadeStore extends RowStore_1.RowStore {
                         });
                     });
                 }
+                if (ids.length === 0) {
+                    // 如果没有行需要更新/删除，直接返回
+                    return {};
+                }
                 if (data) {
-                    this.preProcessDataUpdated(data);
+                    this.preProcessDataUpdated(action, data, true);
                 }
                 if (option.modiParentEntity && !['modi', 'modiEntity'].includes(entity)) {
                     // 延时更新，变成对modi的插入
@@ -1270,16 +1292,15 @@ class CascadeStore extends RowStore_1.RowStore {
                         if (updateAttrCount === 0) {
                             return {};
                         }
+                        // 尝试和当前targetEntity的最后一条create/update进行合并，优化modi的条数
                         const upsertModis = await this.selectAbjointRowAsync('modi', {
                             data: {
                                 id: 1,
                                 data: 1,
+                                action: 1,
                             },
                             filter: {
                                 targetEntity: entity,
-                                action: {
-                                    $in: ['create', 'update'],
-                                },
                                 entity: option.modiParentEntity,
                                 entityId: option.modiParentId,
                                 iState: 'active',
@@ -1301,17 +1322,19 @@ class CascadeStore extends RowStore_1.RowStore {
                             count: 1,
                         }, context, option);
                         if (upsertModis.length > 0) {
-                            const { data: originData, id: originId } = upsertModis[0];
-                            modiUpsert = {
-                                id: 'dummy',
-                                action: 'update',
-                                data: {
-                                    data: Object.assign({}, originData, data),
-                                },
-                                filter: {
-                                    id: originId,
-                                }
-                            };
+                            const { data: originData, id: originId, action } = upsertModis[0];
+                            if (['create', 'update'].includes(action)) {
+                                modiUpsert = {
+                                    id: 'dummy',
+                                    action: 'update',
+                                    data: {
+                                        data: Object.assign({}, originData, data),
+                                    },
+                                    filter: {
+                                        id: originId,
+                                    }
+                                };
+                            }
                         }
                     }
                     if (!modiUpsert) {
@@ -1384,7 +1407,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             };
                             const closeRootMode = context.openRootMode();
                             await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: true,
+                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
                             });
                             closeRootMode();
                         }
@@ -1394,22 +1417,18 @@ class CascadeStore extends RowStore_1.RowStore {
                             context.saveOpRecord(entity, {
                                 id: operId,
                                 action,
-                                data: {},
+                                data: data,
                                 filter: {
                                     id: {
                                         $in: ids,
                                     }
-                                }
+                                },
                             });
                         }
                     }
                     else {
                         const updateAttrCount = Object.keys(data).length;
                         if (updateAttrCount > 0) {
-                            // 优化一下，如果不更新任何属性，则不实际执行
-                            Object.assign(data, {
-                                [Entity_1.UpdateAtAttribute]: now,
-                            });
                             if (!option.dontCollect) {
                                 context.saveOpRecord(entity, {
                                     id: operId,
@@ -1423,11 +1442,6 @@ class CascadeStore extends RowStore_1.RowStore {
                                 });
                             }
                         }
-                        else if (action !== 'update') {
-                            // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
-                            await createOper();
-                            return {};
-                        }
                         else {
                             return {};
                         }
@@ -1483,15 +1497,10 @@ class CascadeStore extends RowStore_1.RowStore {
                 if (action === 'remove') {
                 }
                 else {
+                    this.preProcessDataUpdated(action, data);
                     const updateAttrCount = Object.keys(data).length;
-                    if (updateAttrCount > 0) {
+                    if (updateAttrCount == 0) {
                         // 优化一下，如果不更新任何属性，则不实际执行
-                        Object.assign(data, {
-                            $$updateAt$$: now,
-                        });
-                        this.preProcessDataUpdated(data);
-                    }
-                    else {
                         return 0;
                     }
                 }

package/lib/store/RelationAuth.js

@@ -60,6 +60,7 @@ class RelationAuth {
             const relationAuths = context.select('relationAuth', {
                 data: {
                     id: 1,
+                    pathId: 1,
                     path: {
                         id: 1,
                         sourceEntity: 1,
@@ -732,6 +733,7 @@ class RelationAuth {
             const actionAuths = context.select('actionAuth', {
                 data: {
                     id: 1,
+                    pathId: 1,
                     path: {
                         id: 1,
                         value: 1,
@@ -830,15 +832,21 @@ class RelationAuth {
                             value: 1,
                             recursive: 1,
                         },
+                        pathId: 1,
                         deActions: 1,
+                        relationId: 1,
                         relation: {
                             id: 1,
+                            entity: 1,
+                            entityId: 1,
                             userRelation$relation: {
                                 $entity: 'userRelation',
                                 data: {
                                     id: 1,
                                     entity: 1,
                                     entityId: 1,
+                                    userId: 1,
+                                    relationId: 1,
                                 },
                                 filter: {
                                     userId: context.getCurrentUserId(),
@@ -1123,6 +1131,7 @@ async function getUserRelationsByActions(params, context) {
     const actionAuths = await context.select('actionAuth', {
         data: {
             id: 1,
+            pathId: 1,
             path: {
                 id: 1,
                 value: 1,

package/lib/store/relation.d.ts

@@ -9,4 +9,4 @@ import { StorageSchema } from "../types/Storage";
  * @param row
  * @returns
  */
-export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecoganized?: boolean): string | 1 | 2 | string[] | 0 | -1;
+export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecognized?: boolean): string | 1 | 2 | string[] | 0 | -1;

package/lib/store/relation.js

@@ -13,7 +13,7 @@ const Entity_1 = require("../types/Entity");
  * @param row
  * @returns
  */
-function judgeRelation(schema, entity, attr, allowUnrecoganized) {
+function judgeRelation(schema, entity, attr, allowUnrecognized) {
     const { [entity]: { attributes } } = schema;
     if (attr.startsWith(Demand_1.EXPRESSION_PREFIX) || attr.startsWith('#')) {
         // 表达式属性或者metadata
@@ -27,8 +27,8 @@ function judgeRelation(schema, entity, attr, allowUnrecoganized) {
         const firstDelimiter = attr.indexOf('$');
         const entity2 = attr.slice(0, firstDelimiter);
         (0, assert_1.default)(schema.hasOwnProperty(entity2));
-        const secondDelemiter = attr.indexOf('$', firstDelimiter + 1);
-        const foreignKey = attr.slice(firstDelimiter + 1, secondDelemiter > 0 ? secondDelemiter : attr.length);
+        const secondDelimiter = attr.indexOf('$', firstDelimiter + 1);
+        const foreignKey = attr.slice(firstDelimiter + 1, secondDelimiter > 0 ? secondDelimiter : attr.length);
         const { [entity2]: { attributes: attributes2 } } = schema;
         if (foreignKey === 'entity') {
             // 基于反指对象的反向关联
@@ -63,7 +63,7 @@ function judgeRelation(schema, entity, attr, allowUnrecoganized) {
         if (Entity_1.initinctiveAttributes.includes(attr)) {
             return 1;
         }
-        else if (allowUnrecoganized) {
+        else if (allowUnrecognized) {
             return -1;
         }
         else {

package/lib/store/triggers.js

@@ -46,7 +46,6 @@ async function undoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -61,7 +60,6 @@ async function undoLog(log, context) {
                         data: undoData[id],
                     }, {
                         blockTrigger: true,
-                        dontCollect: true,
                         dontCreateOper: true,
                     });
                 }
@@ -81,7 +79,6 @@ async function undoLog(log, context) {
                         }
                     }, {
                         blockTrigger: true,
-                        dontCollect: true,
                         dontCreateOper: true,
                     });
                 }
@@ -89,20 +86,24 @@ async function undoLog(log, context) {
             }
         }
     }
-    await context.operate('oper', {
+    await context.operate('log', {
         id: 'dummy',
         action: 'undo',
         data: {
             iState: 'rollbacked',
+            oper$log: {
+                id: 'dummy',
+                action: 'undo',
+                data: {
+                    iState: 'rollbacked',
+                },
+            },
         },
         filter: {
-            id: {
-                $in: oper$log.map(ele => ele.id)
-            }
-        }
+            id: log.id,
+        },
     }, {
         blockTrigger: true,
-        dontCollect: true,
         dontCreateOper: true,
     });
 }
@@ -124,7 +125,6 @@ async function redoLog(log, context) {
                     data: data,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -137,7 +137,6 @@ async function redoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -150,27 +149,30 @@ async function redoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
             }
         }
     }
-    await context.operate('oper', {
+    await context.operate('log', {
         id: 'dummy',
         action: 'redo',
         data: {
             iState: 'normal',
+            oper$log: {
+                id: 'dummy',
+                action: 'redo',
+                data: {
+                    iState: 'normal',
+                },
+            },
         },
         filter: {
-            id: {
-                $in: oper$log.map(ele => ele.id)
-            }
-        }
+            id: log.id,
+        },
     }, {
         blockTrigger: true,
-        dontCollect: true,
         dontCreateOper: true,
     });
 }
@@ -201,11 +203,12 @@ exports.logTriggers = [
                     },
                     entity: 1,
                     entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     id: ids[0],
                 },
-            }, {});
+            }, { dontCollect: true });
             const logs = await context.select('log', {
                 data: {
                     id: 1,
@@ -217,8 +220,13 @@ exports.logTriggers = [
                             action: 1,
                             targetEntity: 1,
                             filter: 1,
+                            iState: 1,
                         },
                     },
+                    iState: 1,
+                    entity: 1,
+                    entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     iState: 'normal',
@@ -271,11 +279,12 @@ exports.logTriggers = [
                     iState: 1,
                     entity: 1,
                     entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     id: ids[0],
                 },
-            }, {});
+            }, { dontCollect: true });
             const logs = await context.select('log', {
                 data: {
                     id: 1,
@@ -287,8 +296,13 @@ exports.logTriggers = [
                             action: 1,
                             targetEntity: 1,
                             filter: 1,
+                            iState: 1,
                         },
                     },
+                    iState: 1,
+                    entity: 1,
+                    entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     iState: 'rollbacked',
@@ -345,7 +359,7 @@ exports.logTriggers = [
                     iState: 'rollbacked',
                 },
             }, {});
-            return (result.oper.remove || 0) + (result2.log.remove || 0);
+            return (result.oper?.remove || 0) + (result2.log?.remove || 0);
         }
     }
 ];

package/lib/types/Auth.d.ts

@@ -4,7 +4,7 @@ import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { ModiTurn } from './Trigger';
-export type CheckerType = 'row' | 'data' | 'logical' | 'logicalData';
+export type CheckerType = 'row' | 'data' | 'logical' | 'logicalData' | 'relation';
 /**
  * conditionalFilter是指该action发生时，operation所操作的行中有满足conditionalFilter的行
  * 被转化成trigger的filter条件，详细可看trigger中的说明

package/lib/types/Connector.d.ts

@@ -21,7 +21,9 @@ export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt exte
         headers?: Record<string, any>;
     }>;
     serializeException: (exception: OakException<ED>, headers: IncomingHttpHeaders, body: any) => {
-        body: any;
+        body: {
+            exception: string;
+        };
         headers?: Record<string, any>;
     };
     getSubscribeRouter: () => string;

package/lib/types/Entity.d.ts

@@ -162,6 +162,9 @@ export type UpdateOpResult<ED extends EntityDict, T extends keyof ED> = {
 export type RemoveOpResult<ED extends EntityDict, T extends keyof ED> = {
     id: string;
     a: 'r';
+    d: {
+        [DeleteAtAttribute]: number;
+    };
     e: T;
     f?: Filter;
 };

package/lib/types/Exception.d.ts

@@ -169,6 +169,12 @@ export declare class OakExternalException<ED extends EntityDict & BaseEntityDict
     constructor(source: string, code?: string, message?: string, data?: any);
     toString(): string;
 }
+/**
+ * socket连接异常
+ */
+export declare class OakSocketConnectException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
+    constructor(message?: string);
+}
 export declare function makeException<ED extends EntityDict & BaseEntityDict>(data: {
     name: string;
     message?: string;

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+exports.makeException = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -385,6 +385,16 @@ class OakExternalException extends OakUserException {
     }
 }
 exports.OakExternalException = OakExternalException;
+/**
+ * socket连接异常
+ */
+class OakSocketConnectException extends OakUserException {
+    constructor(message) {
+        super(message || '连接出现问题，请尝试刷新页面');
+    }
+}
+exports.OakSocketConnectException = OakSocketConnectException;
+;
 function makeException(data) {
     const { name } = data;
     let e = undefined;
@@ -473,6 +483,10 @@ function makeException(data) {
             e = new OakServerProxyException(data.message);
             break;
         }
+        case 'OakSocketConnectException': {
+            e = new OakSocketConnectException(data.message);
+            break;
+        }
         default:
             return;
     }

package/lib/types/Sync.d.ts

@@ -51,7 +51,7 @@ export interface SyncRemoteConfigBase<ED extends EntityDict & BaseEntityDict, Cx
     pushEntities?: Array<PushEntityDef<ED, keyof ED, Cxt>>;
     pullEntities?: Array<PullEntityDef<ED, keyof ED, Cxt>>;
 }
-interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
+export interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
     getPushInfo: (context: Cxt, option: {
         remoteEntityId: string;
         userId: string;
@@ -60,6 +60,18 @@ interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends A
         selfId: string;
         remoteEntityId: string;
     }) => Promise<RemotePullInfo>;
+    /**
+     * 同步失败回调
+     */
+    onFailed?: (result: {
+        data: {
+            entity: keyof ED;
+            action: ED[keyof ED]['Action'];
+            data: ED[keyof ED]['Operation']['data'];
+            rowIds: string[];
+        }[];
+        reason: Error;
+    }, context: Cxt) => Promise<void>;
 }
 export interface SyncSelfConfigBase<ED extends EntityDict & BaseEntityDict> {
     endpoint?: string;

package/lib/types/Trigger.js

@@ -17,6 +17,7 @@ exports.CHECKER_PRIORITY_MAP = {
     logical: 33,
     row: 51,
     data: 61,
+    relation: 56
 };
 ;
 ;

package/lib/utils/SimpleConnector.d.ts

@@ -60,8 +60,9 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         headers?: Record<string, any> | undefined;
     }>;
     serializeException(exception: OakException<ED>, headers: IncomingHttpHeaders, body: any): {
-        body: any;
-        headers?: Record<string, any> | undefined;
+        body: {
+            exception: string;
+        };
     };
     getBridgeRouter(): string;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.0",
+    "version": "5.1.2",
     "author": {
         "name": "XuChang"
     },

package/src/entities/Log.ts

@@ -6,24 +6,14 @@ import { EntityDesc } from '../types/EntityDesc';
 export interface Schema extends EntityShape {
     entity: String<32>;             // 关联的目标对象
     entityId: String<64>;           // 关联的目标对象id
+    iState: 'normal' | 'rollbacked';
 };
 
-export type IState = 'normal' | 'rollbacked';
-export type State = IState;
 export type IAction = 'undo' | 'redo';
 export type Action = IAction;
-export const IActionDef: ActionDef<IAction, IState> = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
 
 
-export const entityDesc: EntityDesc<Schema, Action, '', {
-    iState: IState,
-}> = {
+export const entityDesc: EntityDesc<Schema, Action> = {
     locales: {
         zh_CN: {
             name: '日志',
@@ -49,11 +39,5 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
             undo: '',
             redo: '',
         },
-        color: {
-            iState: {
-                normal: '#229954',
-                rollbacked: '#2C3E50',
-            },
-        },
     },
 };