From bd9a4ba71fcc2d9b7821939021a605ab5a565478 Mon Sep 17 00:00:00 2001 From: wenjiarui Date: Tue, 22 Aug 2023 17:21:30 +0800 Subject: [PATCH] fixschame --- lib/data/i18n.js | 6 +-- lib/entities/ChangePasswordTemp.js | 32 ++++++++------- src/data/i18n.ts | 6 +-- src/entities/ChangePasswordTemp.ts | 40 +++++++++++-------- .../ChangePasswordTemp/Schema.ts | 1 + 5 files changed, 47 insertions(+), 38 deletions(-) diff --git a/lib/data/i18n.js b/lib/data/i18n.js index 005399849..e0f3db858 100644 --- a/lib/data/i18n.js +++ b/lib/data/i18n.js @@ -314,11 +314,11 @@ var i18ns = [ } }, { - id: "bcef8b0d14c15026960f496b9aa08e7f", - namespace: "oak-general-business-l-common", + id: "c92ab50ae7c0980c7a8cde78031a9ca9", + namespace: "oak-general-business-l-Common", language: "zh-CN", module: "oak-general-business", - position: "locales/common", + position: "locales/Common", data: { "noData": "暂无数据", "areYouSure": "请确认", diff --git a/lib/entities/ChangePasswordTemp.js b/lib/entities/ChangePasswordTemp.js index b5d6c3f09..9866b57dd 100644 --- a/lib/entities/ChangePasswordTemp.js +++ b/lib/entities/ChangePasswordTemp.js @@ -1,20 +1,22 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); ; -var locale = { - zh_CN: { - name: '密码修改记录', - attr: { - user: '用户', - prevPassword: '原密码', - newPassword: '新密码', - result: "修改结果", +var entityDesc = { + locales: { + zh_CN: { + name: '密码修改记录', + attr: { + user: '用户', + prevPassword: '原密码', + newPassword: '新密码', + result: "修改结果", + }, + v: { + result: { + success: '成功', + fail: '失败' + } + }, }, - v: { - result: { - success: '成功', - fail: '失败' - } - }, - }, + } }; diff --git a/src/data/i18n.ts b/src/data/i18n.ts index 939bfff54..424cc7162 100644 --- a/src/data/i18n.ts +++ b/src/data/i18n.ts @@ -314,11 +314,11 @@ const i18ns: I18n[] = [ } }, { - id: "bcef8b0d14c15026960f496b9aa08e7f", - namespace: "oak-general-business-l-common", + id: "c92ab50ae7c0980c7a8cde78031a9ca9", + namespace: "oak-general-business-l-Common", language: "zh-CN", module: "oak-general-business", - position: "locales/common", + position: "locales/Common", data: { "noData": "暂无数据", "areYouSure": "请确认", diff --git a/src/entities/ChangePasswordTemp.ts b/src/entities/ChangePasswordTemp.ts index 25c0baa5e..0c667be37 100644 --- a/src/entities/ChangePasswordTemp.ts +++ b/src/entities/ChangePasswordTemp.ts @@ -3,6 +3,7 @@ import { String, Text, Boolean, Datetime } from 'oak-domain/lib/types/DataType'; import { LocaleDef } from 'oak-domain/lib/types/Locale'; import { ActionDef, Index } from 'oak-domain/lib/types'; import { Schema as User } from './User'; +import { EntityDesc } from 'oak-domain/lib/types/EntityDesc'; export interface Schema extends EntityShape { user: User; @@ -12,22 +13,27 @@ export interface Schema extends EntityShape { }; -const locale: LocaleDef = { - zh_CN: { - name: '密码修改记录', - attr: { - user: '用户', - prevPassword: '原密码', - newPassword: '新密码', - result: "修改结果", +const entityDesc: EntityDesc = { + locales: { + zh_CN: { + name: '密码修改记录', + attr: { + user: '用户', + prevPassword: '原密码', + newPassword: '新密码', + result: "修改结果", + }, + v: { + result: { + success: '成功', + fail: '失败' + } + }, }, - v: { - result: { - success: '成功', - fail: '失败' - } - }, - }, + } }; diff --git a/src/oak-app-domain/ChangePasswordTemp/Schema.ts b/src/oak-app-domain/ChangePasswordTemp/Schema.ts index 717409cdd..fff193f79 100644 --- a/src/oak-app-domain/ChangePasswordTemp/Schema.ts +++ b/src/oak-app-domain/ChangePasswordTemp/Schema.ts @@ -7,6 +7,7 @@ import { ActionType, EntityShape } from "oak-domain/lib/types/Entity"; import { String, Text, Boolean, Datetime } from "oak-domain/lib/types/DataType"; import { LocaleDef } from "oak-domain/lib/types/Locale"; import { ActionDef, Index } from "oak-domain/lib/types"; +import { EntityDesc } from "oak-domain/lib/types/EntityDesc"; import * as User from "../User/Schema"; export type OpSchema = EntityShape & { userId: ForeignKey<"user">;