diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index 1c141fe16..46b6c8266 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; +declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; export default checkers; diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index 0017a6f93..0bf145940 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -1,7 +1,7 @@ import { Style } from '../../../../types/Style'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 26655e31f..6a8e95a3d 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -1,7 +1,7 @@ import { Config } from '../../../types/Config'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 6ae0fa0ba..ddf7ac3b4 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,9 +12,9 @@ declare const _default: & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/entities/User.d.ts b/es/entities/User.d.ts index d12f24fc9..7d671fbad 100644 --- a/es/entities/User.d.ts +++ b/es/entities/User.d.ts @@ -1,7 +1,9 @@ import { String, Text, Boolean, Datetime } from 'oak-domain/lib/types/DataType'; +import { ActionDef } from 'oak-domain/lib/types/Action'; import { Schema as ExtraFile } from './ExtraFile'; import { Schema as WechatQrCode } from './WechatQrCode'; import { EntityShape } from 'oak-domain/lib/types/Entity'; +import { EntityDesc } from 'oak-domain/lib/types/EntityDesc'; import { Schema as Address } from './Address'; import { Schema as Account } from './Account'; export interface Schema extends EntityShape { @@ -20,3 +22,16 @@ export interface Schema extends EntityShape { addresses?: Address[]; accounts: Account[]; } +type IdAction = 'verify' | 'accept' | 'reject'; +type IdState = 'unverified' | 'verified' | 'verifying'; +type UserAction = 'activate' | 'disable' | 'enable' | 'mergeTo' | 'mergeFrom'; +export type UserState = 'shadow' | 'normal' | 'disabled' | 'merged'; +export declare const UserActionDef: ActionDef; +export type Action = UserAction | IdAction; +export declare const entityDesc: EntityDesc['gender']; + idCardType: Required['idCardType']; +}>; +export {}; diff --git a/es/entities/User.js b/es/entities/User.js index 211392c9b..2fce39cd9 100644 --- a/es/entities/User.js +++ b/es/entities/User.js @@ -7,7 +7,7 @@ const IdActionDef = { }, is: 'unverified', }; -const UserActionDef = { +export const UserActionDef = { stm: { activate: ['shadow', 'normal'], disable: [['normal', 'shadow'], 'disabled'], @@ -16,7 +16,7 @@ const UserActionDef = { mergeFrom: ['normal', 'normal'], }, }; -const entityDesc = { +export const entityDesc = { locales: { "zh_CN": { name: '用户', @@ -110,4 +110,3 @@ const entityDesc = { }, ] }; -export {}; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 0770eae70..6fb3c0b29 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/package.json b/package.json index 89c6ee2d7..0b3b58939 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ "copy-wxml": "copyfiles -u 1 src/**/*.wxml es/", "prebuild": "npm run make:locale", "build": "tsc -p tsconfig.lib.json && tsc -p tsconfig.es.json && npm run copy-js && npm run copy-less && npm run copy-wxs && npm run copy-svg && npm run copy-xml && npm run copy-wxml", + "build:analyze": "tsc -p tsconfig.es.json --diagnostics", "gen:areaDebug": "ts-node ./scripts/generateAreaDebug.ts", "gen:subway": "ts-node ./scripts/local/getAmapSubway.ts", "clean:dir": "ts-node ./scripts/cleanDtsAndJs", diff --git a/src/data/index.ts b/src/data/index.ts index 37969867f..babb37f69 100644 --- a/src/data/index.ts +++ b/src/data/index.ts @@ -5,15 +5,17 @@ import station from "./station"; import subwayStation from "./subwayStation"; import actionAuth from './actionAuth'; import path from './path'; +import i18n from "./i18n"; export default { - user: users, - mobile: mobiles, - token: tokens, - area, - subway, - station, - subwayStation, - actionAuth, - path, + user: users, + mobile: mobiles, + token: tokens, + area, + subway, + station, + subwayStation, + actionAuth, + path, + i18n, }; diff --git a/src/entities/User.ts b/src/entities/User.ts index a0c8a9a1c..cfaf84741 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -36,8 +36,8 @@ const IdActionDef: ActionDef = { }; type UserAction = 'activate' | 'disable' | 'enable' | 'mergeTo' | 'mergeFrom'; -type UserState = 'shadow' | 'normal' | 'disabled' | 'merged'; -const UserActionDef: ActionDef = { +export type UserState = 'shadow' | 'normal' | 'disabled' | 'merged'; +export const UserActionDef: ActionDef = { stm: { activate: ['shadow', 'normal'], disable: [['normal', 'shadow'], 'disabled'], @@ -47,9 +47,9 @@ const UserActionDef: ActionDef = { }, }; -type Action = UserAction | IdAction; +export type Action = UserAction | IdAction; -const entityDesc: EntityDesc['gender'];