oak-domain 2.6.2 → 2.6.4

package/lib/store/filter.js

@@ -13,7 +13,7 @@ function addFilterSegment() {
     }
     var filter = {};
     filters.forEach(function (ele) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (ele) {
             for (var k in ele) {
                 if (k === '$and') {
@@ -24,25 +24,17 @@ function addFilterSegment() {
                         filter.$and = ele[k];
                     }
                 }
-                else if (k === '$or') {
-                    if (filter.$or) {
-                        (_b = filter.$or).push.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(ele[k]), false));
-                    }
-                    else {
-                        filter.$or = ele[k];
-                    }
-                }
                 else if (filter.hasOwnProperty(k)) {
                     if (filter.$and) {
-                        filter.$and.push((_c = {},
-                            _c[k] = ele[k],
-                            _c));
+                        filter.$and.push((_b = {},
+                            _b[k] = ele[k],
+                            _b));
                     }
                     else {
                         filter.$and = [
-                            (_d = {},
-                                _d[k] = ele[k],
-                                _d)
+                            (_c = {},
+                                _c[k] = ele[k],
+                                _c)
                         ];
                     }
                 }

package/lib/types/Auth.d.ts

@@ -1,4 +1,4 @@
-import { CascadeActionAuth, CascadeRelationAuth, ActionOnRemove } from ".";
+import { CascadeActionAuth, CascadeRelationAuth, ActionOnRemove, SyncOrAsync } from ".";
 import { AsyncContext } from "../store/AsyncRowStore";
 import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
@@ -12,21 +12,21 @@ export declare type DataChecker<ED extends EntityDict, T extends keyof ED, Cxt e
     type: 'data';
     entity: T;
     action: Omit<ED[T]['Action'], 'remove'> | Array<Omit<ED[T]['Action'], 'remove'>>;
-    checker: (data: ED[T]['Create']['data'] | ED[T]['Update']['data'], context: Cxt) => any | Promise<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter'] | Promise<ED[T]['Selection']['filter']>);
+    checker: (data: ED[T]['Create']['data'] | ED[T]['Update']['data'], context: Cxt) => SyncOrAsync<any>;
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
 };
 export declare type RowChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
     priority?: number;
     type: 'row';
     entity: T;
     action: Omit<ED[T]['Action'], 'create'> | Array<Omit<ED[T]['Action'], 'create'>>;
-    filter: ED[T]['Selection']['filter'] | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => ED[T]['Selection']['filter'] | Promise<ED[T]['Selection']['filter']>);
+    filter: ED[T]['Selection']['filter'] | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
     errMsg?: string;
     inconsistentRows?: {
         entity: keyof ED;
         selection: (filter?: ED[T]['Selection']['filter']) => ED[keyof ED]['Selection'];
     };
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter'] | Promise<ED[T]['Update']['filter']>);
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
 };
 export declare type RelationChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
     priority?: number;
@@ -34,9 +34,9 @@ export declare type RelationChecker<ED extends EntityDict, T extends keyof ED, C
     entity: T;
     when?: 'after';
     action: ED[T]['Action'] | Array<ED[T]['Action']>;
-    relationFilter: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => ED[T]['Selection']['filter'] | Promise<ED[T]['Selection']['filter']>;
+    relationFilter: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>;
     errMsg: string;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter'] | Promise<ED[T]['Selection']['filter']>);
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
 };
 export declare type LogicalChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
     priority?: number;
@@ -44,8 +44,8 @@ export declare type LogicalChecker<ED extends EntityDict, T extends keyof ED, Cx
     when?: 'after';
     entity: T;
     action: ED[T]['Action'] | Array<ED[T]['Action']>;
-    checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => any | Promise<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter']);
+    checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<any>;
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
 };
 export declare type LogicalRelationChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
     priority?: number;
@@ -54,7 +54,7 @@ export declare type LogicalRelationChecker<ED extends EntityDict, T extends keyo
     entity: T;
     action: ED[T]['Action'] | Array<ED[T]['Action']>;
     checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => any | Promise<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter']);
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
 };
 export declare type Checker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = DataChecker<ED, T, Cxt> | RowChecker<ED, T, Cxt> | RelationChecker<ED, T, Cxt> | LogicalChecker<ED, T, Cxt> | LogicalRelationChecker<ED, T, Cxt>;
 export declare type AuthDef<ED extends EntityDict, T extends keyof ED> = {

package/lib/types/DataType.d.ts

@@ -8,11 +8,14 @@ export declare type Text = string;
 export declare type Image = string;
 export declare type File = string;
 export declare type Datetime = number | Date;
+export declare type Day = number | Date;
+export declare type Time = number | Date;
 export declare type Boolean = boolean;
+export declare type Price = number;
 export declare type PrimaryKey = string;
 export declare type ForeignKey<E extends string> = string;
 export declare type Sequence = string;
 export { Geo, SingleGeo } from './Geo';
-export declare type DataTypes = number | string | Datetime | Geo | Object | SingleGeo;
+export declare type DataTypes = number | string | Datetime | Day | Time | Geo | Object | SingleGeo;
 export declare const types: string[];
 export declare const unIndexedTypes: string[];

package/lib/types/DataType.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unIndexedTypes = exports.types = void 0;
-exports.types = ['Int', 'Uint', 'Double', 'Float', 'String', 'Text', 'Datetime', 'Boolean', 'Image', 'File', 'Geo', 'SingleGeo'];
+exports.types = ['Int', 'Uint', 'Double', 'Float', 'String', 'Text', 'Datetime', 'Day', 'Time',
+    'Boolean', 'Image', 'File', 'Geo', 'SingleGeo', 'Price'];
 exports.unIndexedTypes = ['Text', 'Image', 'File', 'Object'];

package/lib/types/Exception.d.ts

@@ -92,6 +92,12 @@ export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyo
 export declare class OakDeadlock<ED extends EntityDict> extends OakUserException<ED> {
     constructor(message?: string | undefined);
 }
+export declare class OakPreConditionUnsetException<ED extends EntityDict> extends OakUserException<ED> {
+    entity?: keyof ED;
+    code?: string;
+    constructor(message?: string | undefined, entity?: keyof ED | undefined, code?: string | undefined);
+    toString(): string;
+}
 export declare function makeException<ED extends EntityDict>(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.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakException = void 0;
+exports.makeException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakException = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var OakException = /** @class */ (function (_super) {
@@ -252,6 +252,25 @@ var OakDeadlock = /** @class */ (function (_super) {
 }(OakUserException));
 exports.OakDeadlock = OakDeadlock;
 ;
+var OakPreConditionUnsetException = /** @class */ (function (_super) {
+    tslib_1.__extends(OakPreConditionUnsetException, _super);
+    function OakPreConditionUnsetException(message, entity, code) {
+        var _this = _super.call(this, message || '前置条件不满足') || this;
+        _this.entity = entity,
+            _this.code = code;
+        return _this;
+    }
+    OakPreConditionUnsetException.prototype.toString = function () {
+        return JSON.stringify({
+            name: this.constructor.name,
+            message: this.message,
+            code: this.code,
+            entity: this.entity,
+        });
+    };
+    return OakPreConditionUnsetException;
+}(OakUserException));
+exports.OakPreConditionUnsetException = OakPreConditionUnsetException;
 function makeException(data) {
     var name = data.name;
     switch (name) {
@@ -320,6 +339,11 @@ function makeException(data) {
             e.setOpRecords(data.opRecords);
             return e;
         }
+        case 'OakPreConditionUnsetException': {
+            var e = new OakPreConditionUnsetException(data.message, data.entity, data.code);
+            e.setOpRecords(data.opRecords);
+            return e;
+        }
         default:
             return;
     }

package/lib/types/Locale.d.ts

@@ -13,6 +13,7 @@ declare type LocaleOfValue<V extends Record<string, string>> = {
 };
 export declare type LocaleDef<Sc extends Record<string, any>, Ac extends string, R extends string, V extends Record<string, string>> = {
     [L in Language]?: {
+        name: string;
         attr: LocaleOfSchema<Sc> & {
             [A in keyof V]: string;
         };

package/lib/types/Polyfill.d.ts

@@ -20,4 +20,5 @@ declare type IsOptional<T, K extends keyof T> = {
 export declare type OptionalKeys<T> = {
     [K in keyof T]: IsOptional<T, K>;
 }[keyof T];
+export declare type SyncOrAsync<T> = T | Promise<T>;
 export {};

package/lib/types/Storage.d.ts

@@ -26,6 +26,7 @@ export interface Attribute {
     notNull?: boolean;
     unique?: boolean;
     sequenceStart?: number;
+    enumeration?: string[];
 }
 export declare type Attributes<SH extends EntityShape> = Omit<{
     [attrName in keyof SH]: Attribute;

package/lib/types/Style.d.ts

@@ -0,0 +1,11 @@
+import { EntityDict } from './Entity';
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+declare type ThemeColor = 'default' | 'success' | 'warning' | 'error';
+export declare type ColorDict<ED extends BaseEntityDict & EntityDict> = {
+    [T in keyof ED]?: {
+        [A in keyof ED[T]['OpSchema']]?: {
+            [E in ED[T]['OpSchema'][A]]?: ThemeColor | `#${string}`;
+        };
+    };
+};
+export {};

package/lib/types/Style.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/Timer.d.ts

@@ -1,5 +1,6 @@
+import { RecurrenceRule, RecurrenceSpecDateRange, RecurrenceSpecObjLit } from 'node-schedule';
 import { EntityDict } from './Entity';
-import { AsyncContext } from "../store/AsyncRowStore";
+import { AsyncContext } from '../store/AsyncRowStore';
 declare type RoutineFn<ED extends EntityDict, Cxt extends AsyncContext<ED>> = (context: Cxt) => Promise<string>;
 export declare type Routine<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
     name: string;
@@ -7,7 +8,7 @@ export declare type Routine<ED extends EntityDict, Cxt extends AsyncContext<ED>>
 };
 export declare type Timer<ED extends EntityDict, Cxt extends AsyncContext<ED>> = {
     name: string;
-    cron: string;
+    cron: RecurrenceRule | RecurrenceSpecDateRange | RecurrenceSpecObjLit | Date | string | number;
     fn: RoutineFn<ED, Cxt>;
 };
 export {};

package/lib/types/index.d.ts

@@ -19,3 +19,4 @@ export * from './Connector';
 export * from './Timer';
 export * from './Port';
 export * from './Endpoint';
+export * from './Style';

package/lib/types/index.js

@@ -22,3 +22,4 @@ tslib_1.__exportStar(require("./Connector"), exports);
 tslib_1.__exportStar(require("./Timer"), exports);
 tslib_1.__exportStar(require("./Port"), exports);
 tslib_1.__exportStar(require("./Endpoint"), exports);
+tslib_1.__exportStar(require("./Style"), exports);

package/lib/types/schema/DataTypes.d.ts

@@ -29,4 +29,6 @@ export interface DataTypeParams {
     precision?: number;
     scale?: number;
     signed?: boolean;
+    max?: number;
+    min?: number;
 }

package/lib/utils/SimpleConnector.js

@@ -10,7 +10,7 @@ function makeContentTypeAndBody(data) {
     if (process.env.OAK_PLATFORM !== 'wechatMp') {
         if (data instanceof FormData) {
             return {
-                contentType: 'multipart/form-data',
+                // contentType: 'multipart/form-data',
                 body: data,
             };
         }
@@ -39,11 +39,12 @@ var SimpleConnector = /** @class */ (function (_super) {
                         _a = makeContentTypeAndBody(params), contentType = _a.contentType, body = _a.body;
                         return [4 /*yield*/, global.fetch(this.serverUrl, {
                                 method: 'POST',
-                                headers: {
-                                    'Content-Type': contentType,
+                                headers: Object.assign({
                                     'oak-cxt': cxtStr,
                                     'oak-aspect': name,
-                                },
+                                }, contentType && {
+                                    'Content-Type': contentType,
+                                }),
                                 body: body,
                             })];
                     case 1:
@@ -106,7 +107,7 @@ var SimpleConnector = /** @class */ (function (_super) {
         });
     };
     SimpleConnector.prototype.serializeResult = function (result, context, headers, body) {
-        if (result instanceof stream_1.Stream) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer) {
             return {
                 body: result,
             };

package/lib/utils/mask.d.ts

@@ -0,0 +1,5 @@
+declare const maskIdCard: (idCardNumber: string) => string;
+declare const maskMobile: (mobile: string) => string;
+declare const maskName: (name: string) => string;
+declare const maskStar: (str: string, front: number, end: number, star: string) => string;
+export { maskIdCard, maskMobile, maskName, maskStar, };

package/lib/utils/mask.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maskStar = exports.maskName = exports.maskMobile = exports.maskIdCard = void 0;
+var maskIdCard = function (idCardNumber) {
+    if (!idCardNumber instanceof String) {
+        throw new Error("身份证号码必须是String类型");
+    }
+    var begin = idCardNumber.slice(0, 4);
+    var end = idCardNumber.slice(idCardNumber.length - 4, 4);
+    for (var i = 0; i < idCardNumber.length - 8; i++) {
+        begin = begin.concat("*");
+    }
+    return begin.concat(end);
+};
+exports.maskIdCard = maskIdCard;
+var maskMobile = function (mobile) {
+    var begin = mobile.slice(0, 3);
+    var end = mobile.slice(7, 11);
+    return begin.concat("****").concat(end);
+};
+exports.maskMobile = maskMobile;
+var maskName = function (name) {
+    return name.slice(0, name.length - 1).concat("*");
+};
+exports.maskName = maskName;
+var maskStar = function (str, frontLen, endLen, star) {
+    if (star === void 0) { star = '*'; }
+    var len = str.length - frontLen - endLen;
+    var xing = '';
+    for (var i = 0; i < len; i++) {
+        xing += star;
+    }
+    return str.substring(0, frontLen) + xing + str.substring(str.length - endLen);
+};
+exports.maskStar = maskStar;

package/lib/utils/money.d.ts

@@ -0,0 +1,5 @@
+declare const ToCent: (float: number) => number;
+declare const ToYuan: (int: number) => number;
+declare const StringToCent: (value: string, allowNegative?: true) => number | undefined;
+declare const CentToString: (value: number) => string | undefined;
+export { ToCent, ToYuan, StringToCent, CentToString, };

package/lib/utils/money.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CentToString = exports.StringToCent = exports.ToYuan = exports.ToCent = void 0;
+var ToCent = function (float) {
+    return Math.round(float * 100);
+};
+exports.ToCent = ToCent;
+var ToYuan = function (int) {
+    return Math.round(int) / 100;
+};
+exports.ToYuan = ToYuan;
+var StringToCent = function (value, allowNegative) {
+    var numValue = parseInt(value, 10);
+    if (typeof numValue === 'number' && (numValue >= 0 || allowNegative)) {
+        return ToCent(numValue);
+    }
+};
+exports.StringToCent = StringToCent;
+var CentToString = function (value) {
+    if (typeof value === 'number') {
+        return "".concat(ToYuan(value));
+    }
+};
+exports.CentToString = CentToString;

package/lib/utils/validator.d.ts

@@ -1,3 +1,4 @@
+import { EntityDict } from "../types";
 declare type ValidatorFunction = (text: string, size?: number) => string | boolean;
 declare type ValidatorMoneyFunction = (text: string, zero?: boolean) => string | boolean;
 export declare const isMobile: ValidatorFunction;
@@ -15,9 +16,10 @@ export declare const isNickname: ValidatorFunction;
 export declare const isSizedCaptcha: ValidatorFunction;
 export declare const isDigital: ValidatorFunction;
 export declare const isPhone: ValidatorFunction;
+export declare const isTel: ValidatorFunction;
 export declare const isNumber: ValidatorFunction;
 export declare const isMoney: ValidatorMoneyFunction;
 export declare const isVehicleNumber: ValidatorFunction;
-export declare function checkAttributesNotNull<T extends Record<string, any>>(entity: string, data: T, attributes: Array<keyof T>, allowEmpty?: true): void;
-export declare function checkAttributesScope<T extends Record<string, any>>(entity: string, data: T, attributes: Array<keyof T>): void;
+export declare function checkAttributesNotNull<ED extends EntityDict, T extends keyof EntityDict>(entity: T, data: Partial<ED[T]['CreateSingle']['data']>, attributes: Array<keyof ED[T]['CreateSingle']['data']>, allowEmpty?: true): void;
+export declare function checkAttributesScope<ED extends EntityDict, T extends keyof EntityDict>(entity: T, data: Partial<ED[T]['CreateSingle']['data']>, attributes: Array<keyof ED[T]['CreateSingle']['data']>): void;
 export {};

package/lib/utils/validator.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAttributesScope = exports.checkAttributesNotNull = exports.isVehicleNumber = exports.isMoney = exports.isNumber = exports.isPhone = exports.isDigital = exports.isSizedCaptcha = exports.isNickname = exports.isUrl = exports.isSoldierNumber = exports.isBirthNumber = exports.isTwCardNumber = exports.isAmCardNumber = exports.isHkCardNumber = exports.isPassportNumber = exports.isIdCardNumber = exports.isCaptcha = exports.isPassword = exports.isMobile = void 0;
+exports.checkAttributesScope = exports.checkAttributesNotNull = exports.isVehicleNumber = exports.isMoney = exports.isNumber = exports.isTel = exports.isPhone = exports.isDigital = exports.isSizedCaptcha = exports.isNickname = exports.isUrl = exports.isSoldierNumber = exports.isBirthNumber = exports.isTwCardNumber = exports.isAmCardNumber = exports.isHkCardNumber = exports.isPassportNumber = exports.isIdCardNumber = exports.isCaptcha = exports.isPassword = exports.isMobile = void 0;
 var types_1 = require("../types");
 var isMobile = function (text) {
     return ((text) && (typeof text === "string") && ((/^1[3|4|5|6|7|8|9]\d{9}$/.test(text))));
@@ -79,14 +79,19 @@ var isPhone = function (phone) {
     return /^(\(\d{3,4}\)|\d{3,4}-)?\d{7,8}$/.test(phone);
 };
 exports.isPhone = isPhone;
+var isTel = function (text) {
+    // 1、133xxxx4545 2、0571-630xx239 3、400-123-1400
+    var reg = /^(((\d{3,4}-)?[0-9]{7,8})|(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}|((400)-(\d{3})-(\d{4})(.)(\d{1,4})|(400)-(\d{3})-(\d{4}$)|(400)(\d{3})(\d{4}$)|(400)-(\d{4})-(\d{3}$)))$/.test(text);
+    return reg;
+};
+exports.isTel = isTel;
 var isNumber = function (str) {
     return /^[0-9]*$/.test(str);
 };
 exports.isNumber = isNumber;
 var isMoney = function (str, zero) {
-    // zero为true包含零
+    // 金额，最多可以有两位小数 zero为true包含零
     if (zero) {
-        // 金额，最多可以有两位小数
         return /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(str);
     }
     return /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/.test(str);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.6.2",
+    "version": "2.6.4",
     "author": {
         "name": "XuChang"
     },
@@ -27,6 +27,7 @@
         "@types/luxon": "^2.0.9",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.14.25",
+        "@types/node-schedule": "^2.1.0",
         "@types/react": "^17.0.2",
         "@types/uuid": "^8.3.0",
         "@types/wechat-miniprogram": "^3.4.1",
@@ -40,9 +41,9 @@
         "typescript": "^4.7.4"
     },
     "dependencies": {
-        "@datasert/cronjs-matcher": "^1.2.0",
         "dayjs": "^1.11.5",
         "lodash": "^4.17.21",
+        "node-schedule": "^2.1.1",
         "uuid": "^9.0.0"
     }
 }

package/src/entities/Modi.ts

@@ -43,6 +43,7 @@ const locale: LocaleDef<Schema, Action, '', {
     iState: IState,
 }> = {
     zh_CN: {
+        name: '更新',
         attr: {
             targetEntity: '目标对象',
             entity: '关联对象',

package/src/entities/ModiEntity.ts

@@ -15,6 +15,7 @@ const config: Configuration = {
 
 const locale: LocaleDef<Schema, '', '', {}> = {
     zh_CN: {
+        name: '更新对象连接',
         attr: {
             modi: '更新',
             entity: '关联对象',

package/src/entities/Oper.ts

@@ -17,6 +17,7 @@ const configuration: Configuration = {
 
 const locale: LocaleDef<Schema, '', '', {}> = {
     zh_CN: {
+        name: '操作',
         attr: {
             action: '动作',
             data: '数据',

package/src/entities/OperEntity.ts

@@ -15,6 +15,7 @@ const config: Configuration = {
 
 const locale: LocaleDef<Schema, '', '', {}> = {
     zh_CN: {
+        name: '操作对象连接',
         attr: {
             oper: '操作',
             entity: '关联对象',

package/src/entities/User.ts

@@ -25,6 +25,7 @@ const locale: LocaleDef<Schema, Action, '', {
     userState: UserState;
 }> = {
     zh_CN: {
+        name: '用户',
         attr: {
             name: '姓名',
             nickname: '昵称',

package/src/entities/UserEntityGrant.ts

@@ -15,6 +15,7 @@ const locale: LocaleDef<
     {}
 > = {
     zh_CN: {
+        name: '用户授权',
         attr: {
             relation: '关系',
             entity: '关联对象',

package/lib/utils/cron.d.ts

@@ -1 +0,0 @@
-export declare function schedule(cron: string, fn: (date: Date) => any): void;

package/lib/utils/cron.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.schedule = void 0;
-var tslib_1 = require("tslib");
-var cronjs_matcher_1 = require("@datasert/cronjs-matcher");
-var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
-function schedule(cron, fn) {
-    var futureMatches = (0, cronjs_matcher_1.getFutureMatches)(cron, {
-        matchCount: 1,
-    });
-    var date = (0, dayjs_1.default)(futureMatches[0]);
-    var interval = date.diff((0, dayjs_1.default)(), 'ms');
-    setTimeout(function () {
-        fn(new Date());
-        schedule(cron, fn);
-    }, interval);
-}
-exports.schedule = schedule;