oak-domain 2.4.0 → 2.4.2

package/lib/utils/validator.js

@@ -1,123 +1,123 @@
-/**
- * Created by Xc on 2018/12/23.
- */
-'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;
-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))));
-};
-exports.isMobile = isMobile;
-var isPassword = function (text) {
-    return ((text) && (typeof text === "string") && (/^[a-zA-Z0-9!.@]{8,16}$/.test(text)));
-};
-exports.isPassword = isPassword;
-var isCaptcha = function (text) {
-    return ((text) && (typeof text === "string") && (/^\d{4}$/.test(text)));
-};
-exports.isCaptcha = isCaptcha;
-var isIdCardNumber = function (text) {
-    return ((typeof text === "string") && text.length === 18 && (/^\d{6}(18|19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test(text)));
-};
-exports.isIdCardNumber = isIdCardNumber;
-var isPassportNumber = function (text) {
-    // 护照
-    // 规则： 14/15开头 + 7位数字, G + 8位数字, P + 7位数字, S/D + 7或8位数字,等
-    // 样本： 141234567, G12345678, P1234567
-    return typeof text === 'string' && /^([a-zA-z]|[0-9]){5,17}$/.test(text);
-};
-exports.isPassportNumber = isPassportNumber;
-var isHkCardNumber = function (text) {
-    // 港澳居民来往内地通行证
-    // 规则： H/M + 10位或6位数字
-    // 样本： H1234567890
-    return typeof text === 'string' && /^([A-Z]\d{6,10}(\(\w{1}\))?)$/.test(text);
-};
-exports.isHkCardNumber = isHkCardNumber;
-var isAmCardNumber = function (text) {
-    return typeof text === 'string' && /^([A-Z]\d{6,10}(\(\w{1}\))?)$/.test(text);
-};
-exports.isAmCardNumber = isAmCardNumber;
-var isTwCardNumber = function (text) {
-    // 台湾居民来往大陆通行证
-    // 规则： 新版8位或18位数字， 旧版10位数字 + 英文字母
-    // 样本： 12345678 或 1234567890B
-    return typeof text === 'string' && /^\d{8}|^[a-zA-Z0-9]{10}|^\d{18}$/.test(text);
-};
-exports.isTwCardNumber = isTwCardNumber;
-var isBirthNumber = function (text) {
-    return typeof text === 'string' && /^[a-zA-Z0-9]{5,21}$/.test(text);
-};
-exports.isBirthNumber = isBirthNumber;
-var isSoldierNumber = function (text) {
-    // 军官证
-    // 规则： 军/兵/士/文/职/广/（其他中文） + "字第" + 4到8位字母或数字 + "号"
-    // 样本： 军字第2001988号, 士字第P011816X号
-    return typeof text === 'string' && /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/.test(text);
-};
-exports.isSoldierNumber = isSoldierNumber;
-var isUrl = function (str) {
-    var regex = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
-    return typeof str === "string" && regex.test(str);
-};
-exports.isUrl = isUrl;
-var isNickname = function (str) {
-    return str && typeof str === "string" && str.trim().length > 0 && str.length < 16;
-};
-exports.isNickname = isNickname;
-var isSizedCaptcha = function (text, size) {
-    return typeof text === 'string' && text.length === size && !isNaN(parseInt(text, 10));
-};
-exports.isSizedCaptcha = isSizedCaptcha;
-var isDigital = function (digital) {
-    return /^\d{6,12}$/.test(digital);
-};
-exports.isDigital = isDigital;
-var isPhone = function (phone) {
-    // return /^((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/.test(phone);
-    return /^(\(\d{3,4}\)|\d{3,4}-)?\d{7,8}$/.test(phone);
-};
-exports.isPhone = isPhone;
-var isNumber = function (str) {
-    return /^[0-9]*$/.test(str);
-};
-exports.isNumber = isNumber;
-var isMoney = function (str, zero) {
-    // 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);
-};
-exports.isMoney = isMoney;
-var isVehicleNumber = function (str) {
-    // const xreg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
-    // const creg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
-    var reg = /^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/;
-    return reg.test(str);
-};
-exports.isVehicleNumber = isVehicleNumber;
-function checkAttributesNotNull(entity, data, attributes, allowEmpty) {
-    var attrs = attributes.filter(function (attr) {
-        if (data[attr] === null || data[attr] === '' || data[attr] === undefined) {
-            return true;
-        }
-        if (!allowEmpty && !data.hasOwnProperty(attr)) {
-            return true;
-        }
-    });
-    if (attrs.length > 0) {
-        throw new types_1.OakInputIllegalException(entity, attrs, '属性不能为空');
-    }
-}
-exports.checkAttributesNotNull = checkAttributesNotNull;
-;
-function checkAttributesScope(entity, data, attributes) {
-    var attrs = attributes.filter(function (attr) { return !data.hasOwnProperty(attr); });
-    if (attrs.length > 0) {
-        throw new types_1.OakInputIllegalException(entity, attrs, '多余的属性');
-    }
-}
-exports.checkAttributesScope = checkAttributesScope;
+/**
+ * Created by Xc on 2018/12/23.
+ */
+'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;
+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))));
+};
+exports.isMobile = isMobile;
+var isPassword = function (text) {
+    return ((text) && (typeof text === "string") && (/^[a-zA-Z0-9!.@]{8,16}$/.test(text)));
+};
+exports.isPassword = isPassword;
+var isCaptcha = function (text) {
+    return ((text) && (typeof text === "string") && (/^\d{4}$/.test(text)));
+};
+exports.isCaptcha = isCaptcha;
+var isIdCardNumber = function (text) {
+    return ((typeof text === "string") && text.length === 18 && (/^\d{6}(18|19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test(text)));
+};
+exports.isIdCardNumber = isIdCardNumber;
+var isPassportNumber = function (text) {
+    // 护照
+    // 规则： 14/15开头 + 7位数字, G + 8位数字, P + 7位数字, S/D + 7或8位数字,等
+    // 样本： 141234567, G12345678, P1234567
+    return typeof text === 'string' && /^([a-zA-z]|[0-9]){5,17}$/.test(text);
+};
+exports.isPassportNumber = isPassportNumber;
+var isHkCardNumber = function (text) {
+    // 港澳居民来往内地通行证
+    // 规则： H/M + 10位或6位数字
+    // 样本： H1234567890
+    return typeof text === 'string' && /^([A-Z]\d{6,10}(\(\w{1}\))?)$/.test(text);
+};
+exports.isHkCardNumber = isHkCardNumber;
+var isAmCardNumber = function (text) {
+    return typeof text === 'string' && /^([A-Z]\d{6,10}(\(\w{1}\))?)$/.test(text);
+};
+exports.isAmCardNumber = isAmCardNumber;
+var isTwCardNumber = function (text) {
+    // 台湾居民来往大陆通行证
+    // 规则： 新版8位或18位数字， 旧版10位数字 + 英文字母
+    // 样本： 12345678 或 1234567890B
+    return typeof text === 'string' && /^\d{8}|^[a-zA-Z0-9]{10}|^\d{18}$/.test(text);
+};
+exports.isTwCardNumber = isTwCardNumber;
+var isBirthNumber = function (text) {
+    return typeof text === 'string' && /^[a-zA-Z0-9]{5,21}$/.test(text);
+};
+exports.isBirthNumber = isBirthNumber;
+var isSoldierNumber = function (text) {
+    // 军官证
+    // 规则： 军/兵/士/文/职/广/（其他中文） + "字第" + 4到8位字母或数字 + "号"
+    // 样本： 军字第2001988号, 士字第P011816X号
+    return typeof text === 'string' && /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/.test(text);
+};
+exports.isSoldierNumber = isSoldierNumber;
+var isUrl = function (str) {
+    var regex = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+    return typeof str === "string" && regex.test(str);
+};
+exports.isUrl = isUrl;
+var isNickname = function (str) {
+    return str && typeof str === "string" && str.trim().length > 0 && str.length < 16;
+};
+exports.isNickname = isNickname;
+var isSizedCaptcha = function (text, size) {
+    return typeof text === 'string' && text.length === size && !isNaN(parseInt(text, 10));
+};
+exports.isSizedCaptcha = isSizedCaptcha;
+var isDigital = function (digital) {
+    return /^\d{6,12}$/.test(digital);
+};
+exports.isDigital = isDigital;
+var isPhone = function (phone) {
+    // return /^((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/.test(phone);
+    return /^(\(\d{3,4}\)|\d{3,4}-)?\d{7,8}$/.test(phone);
+};
+exports.isPhone = isPhone;
+var isNumber = function (str) {
+    return /^[0-9]*$/.test(str);
+};
+exports.isNumber = isNumber;
+var isMoney = function (str, zero) {
+    // 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);
+};
+exports.isMoney = isMoney;
+var isVehicleNumber = function (str) {
+    // const xreg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
+    // const creg=/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+    var reg = /^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/;
+    return reg.test(str);
+};
+exports.isVehicleNumber = isVehicleNumber;
+function checkAttributesNotNull(entity, data, attributes, allowEmpty) {
+    var attrs = attributes.filter(function (attr) {
+        if (data[attr] === null || data[attr] === '' || data[attr] === undefined) {
+            return true;
+        }
+        if (!allowEmpty && !data.hasOwnProperty(attr)) {
+            return true;
+        }
+    });
+    if (attrs.length > 0) {
+        throw new types_1.OakInputIllegalException(entity, attrs, '属性不能为空');
+    }
+}
+exports.checkAttributesNotNull = checkAttributesNotNull;
+;
+function checkAttributesScope(entity, data, attributes) {
+    var attrs = attributes.filter(function (attr) { return !data.hasOwnProperty(attr); });
+    if (attrs.length > 0) {
+        throw new types_1.OakInputIllegalException(entity, attrs, '多余的属性');
+    }
+}
+exports.checkAttributesScope = checkAttributesScope;

package/package.json

@@ -1,48 +1,48 @@
-{
-    "name": "oak-domain",
-    "version": "2.4.0",
-    "author": {
-        "name": "XuChang"
-    },
-    "scripts": {
-        "make:domain": "ts-node scripts/make.ts",
-        "build": "tsc",
-        "prebuild": "npm run make:domain",
-        "test": "ts-node test/testFilter.ts"
-    },
-    "files": [
-        "lib/**/*",
-        "src/entities/*"
-    ],
-    "devDependencies": {
-        "@babel/cli": "^7.12.13",
-        "@babel/core": "^7.12.13",
-        "@babel/plugin-proposal-class-properties": "^7.12.13",
-        "@babel/preset-env": "^7.12.13",
-        "@babel/preset-typescript": "^7.12.13",
-        "@types/assert": "^1.5.6",
-        "@types/cross-spawn": "^6.0.2",
-        "@types/fs-extra": "^9.0.13",
-        "@types/lodash": "^4.14.182",
-        "@types/luxon": "^2.0.9",
-        "@types/mocha": "^8.2.0",
-        "@types/node": "^14.14.25",
-        "@types/react": "^17.0.2",
-        "@types/uuid": "^8.3.0",
-        "@types/wechat-miniprogram": "^3.4.1",
-        "assert": "^2.0.0",
-        "cross-env": "^7.0.2",
-        "cross-spawn": "^7.0.3",
-        "fs-extra": "^10.0.0",
-        "mocha": "^8.2.1",
-        "ts-node": "~10.9.1",
-        "tslib": "^2.4.0",
-        "typescript": "^4.9.4"
-    },
-    "dependencies": {
-        "@datasert/cronjs-matcher": "^1.2.0",
-        "dayjs": "^1.11.5",
-        "lodash": "^4.17.21",
-        "uuid": "^9.0.0"
-    }
-}
+{
+    "name": "oak-domain",
+    "version": "2.4.2",
+    "author": {
+        "name": "XuChang"
+    },
+    "scripts": {
+        "make:domain": "ts-node scripts/make.ts",
+        "build": "tsc",
+        "prebuild": "npm run make:domain",
+        "test": "ts-node test/testFilter.ts"
+    },
+    "files": [
+        "lib/**/*",
+        "src/entities/*"
+    ],
+    "devDependencies": {
+        "@babel/cli": "^7.12.13",
+        "@babel/core": "^7.12.13",
+        "@babel/plugin-proposal-class-properties": "^7.12.13",
+        "@babel/preset-env": "^7.12.13",
+        "@babel/preset-typescript": "^7.12.13",
+        "@types/assert": "^1.5.6",
+        "@types/cross-spawn": "^6.0.2",
+        "@types/fs-extra": "^9.0.13",
+        "@types/lodash": "^4.14.182",
+        "@types/luxon": "^2.0.9",
+        "@types/mocha": "^8.2.0",
+        "@types/node": "^14.14.25",
+        "@types/react": "^17.0.2",
+        "@types/uuid": "^8.3.0",
+        "@types/wechat-miniprogram": "^3.4.1",
+        "assert": "^2.0.0",
+        "cross-env": "^7.0.2",
+        "cross-spawn": "^7.0.3",
+        "fs-extra": "^10.0.0",
+        "mocha": "^8.2.1",
+        "ts-node": "~10.9.1",
+        "tslib": "^2.4.0",
+        "typescript": "^4.7.4"
+    },
+    "dependencies": {
+        "@datasert/cronjs-matcher": "^1.2.0",
+        "dayjs": "^1.11.5",
+        "lodash": "^4.17.21",
+        "uuid": "^9.0.0"
+    }
+}

package/src/entities/Modi.ts

@@ -1,68 +1,68 @@
-import { ActionDef } from '../types/Action';
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Index } from '../types/Storage';
-
-export interface Schema extends EntityShape {
-    targetEntity: String<32>;       // 要操作的目标对象
-    entity: String<32>;             // 关联的目标对象
-    entityId: String<64>;           // 关联的目标对象id
-    action: String<16>;
-    data: Object;
-    filter?: Object;
-    extra?: Object;
-};
-
-type IState = 'active' | 'applied' | 'abandoned';
-type IAction = 'apply' | 'abandon';
-
-const IActionDef: ActionDef<IAction, IState> = {
-    stm: {
-        apply: ['active', 'applied'],
-        abandon: ['active', 'abandoned'],
-    },
-    is: 'active',
-};
-
-type Action = IAction;
-
-const indexes: Index<Schema>[] = [
-    {
-        name: 'index_state',
-        attributes: [
-            {
-                name: 'iState',
-                direction: 'ASC',
-            }
-        ],
-    },
-];
-
-const locale: LocaleDef<Schema, Action, '', {
-    iState: IState,
-}> = {
-    zh_CN: {
-        attr: {
-            targetEntity: '目标对象',
-            entity: '关联对象',
-            entityId: '关联对象Id',
-            action: '动作',
-            data: '数据',
-            filter: '条件',
-            extra: '其它',
-            iState: '状态',
-        },
-        action: {
-            abandon: '放弃',
-            apply: '应用',
-        },
-        v: {
-            iState: {
-                active: '活跃的',
-                abandoned: '放弃的',
-                applied: '应用的',
-            },
-        },
-    },
-};
+import { ActionDef } from '../types/Action';
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Index } from '../types/Storage';
+
+export interface Schema extends EntityShape {
+    targetEntity: String<32>;       // 要操作的目标对象
+    entity: String<32>;             // 关联的目标对象
+    entityId: String<64>;           // 关联的目标对象id
+    action: String<16>;
+    data: Object;
+    filter?: Object;
+    extra?: Object;
+};
+
+type IState = 'active' | 'applied' | 'abandoned';
+type IAction = 'apply' | 'abandon';
+
+const IActionDef: ActionDef<IAction, IState> = {
+    stm: {
+        apply: ['active', 'applied'],
+        abandon: ['active', 'abandoned'],
+    },
+    is: 'active',
+};
+
+type Action = IAction;
+
+const indexes: Index<Schema>[] = [
+    {
+        name: 'index_state',
+        attributes: [
+            {
+                name: 'iState',
+                direction: 'ASC',
+            }
+        ],
+    },
+];
+
+const locale: LocaleDef<Schema, Action, '', {
+    iState: IState,
+}> = {
+    zh_CN: {
+        attr: {
+            targetEntity: '目标对象',
+            entity: '关联对象',
+            entityId: '关联对象Id',
+            action: '动作',
+            data: '数据',
+            filter: '条件',
+            extra: '其它',
+            iState: '状态',
+        },
+        action: {
+            abandon: '放弃',
+            apply: '应用',
+        },
+        v: {
+            iState: {
+                active: '活跃的',
+                abandoned: '放弃的',
+                applied: '应用的',
+            },
+        },
+    },
+};

package/src/entities/ModiEntity.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Modi } from './Modi';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const config: Configuration = {
-    actionType: 'appendOnly',
-};
-
-const locale: LocaleDef<Schema, '', '', {}> = {
-    zh_CN: {
-        attr: {
-            modi: '更新',
-            entity: '关联对象',
-            entityId: '关联对象id',
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Modi } from './Modi';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const config: Configuration = {
+    actionType: 'appendOnly',
+};
+
+const locale: LocaleDef<Schema, '', '', {}> = {
+    zh_CN: {
+        attr: {
+            modi: '更新',
+            entity: '关联对象',
+            entityId: '关联对象id',
+        },
+    },
+};

package/src/entities/Oper.ts

@@ -1,28 +1,28 @@
-import { String, Int, Datetime, Image, Boolean, Text } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as User } from './User';
-
-export interface Schema extends EntityShape {
-    action: String<16>;
-    data: Object;
-    filter?: Object;
-    extra?: Object;
-    operator?: User;
-};
-
-const configuration: Configuration = {
-    actionType: 'appendOnly',
-}
-
-const locale: LocaleDef<Schema, '', '', {}> = {
-    zh_CN: {
-        attr: {
-            action: '动作',
-            data: '数据',
-            filter: '选择条件',
-            extra: '其它',
-            operator: '操作者',
-        },
-    },
-};
+import { String, Int, Datetime, Image, Boolean, Text } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as User } from './User';
+
+export interface Schema extends EntityShape {
+    action: String<16>;
+    data: Object;
+    filter?: Object;
+    extra?: Object;
+    operator?: User;
+};
+
+const configuration: Configuration = {
+    actionType: 'appendOnly',
+}
+
+const locale: LocaleDef<Schema, '', '', {}> = {
+    zh_CN: {
+        attr: {
+            action: '动作',
+            data: '数据',
+            filter: '选择条件',
+            extra: '其它',
+            operator: '操作者',
+        },
+    },
+};

package/src/entities/OperEntity.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const config: Configuration = {
-    actionType: 'appendOnly',
-};
-
-const locale: LocaleDef<Schema, '', '', {}> = {
-    zh_CN: {
-        attr: {
-            oper: '操作',
-            entity: '关联对象',
-            entityId: '关联对象id',
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const config: Configuration = {
+    actionType: 'appendOnly',
+};
+
+const locale: LocaleDef<Schema, '', '', {}> = {
+    zh_CN: {
+        attr: {
+            oper: '操作',
+            entity: '关联对象',
+            entityId: '关联对象id',
+        },
+    },
+};