From 3ad24f1faef63b740a2f2d2ca371f6ef7abcb7d7 Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Tue, 6 Aug 2024 10:38:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/action-toolbar/action-toolbar.tsx | 4 ++- src/common/rawitem/rawitem.tsx | 8 ++++-- src/locale/en/index.ts | 26 +++++++++++++++++++- src/locale/zh-CN/index.ts | 26 +++++++++++++++++++- 4 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/common/action-toolbar/action-toolbar.tsx b/src/common/action-toolbar/action-toolbar.tsx index 1f31789f3ea..ab330137d53 100644 --- a/src/common/action-toolbar/action-toolbar.tsx +++ b/src/common/action-toolbar/action-toolbar.tsx @@ -74,6 +74,8 @@ export const IBizActionToolbar = defineComponent({ ); } // 下拉模式 - return
下拉模式暂不支持
; + return ( +
{ibiz.i18n.t('component.actionToolbar.noSupportDropDown')}
+ ); }, }); diff --git a/src/common/rawitem/rawitem.tsx b/src/common/rawitem/rawitem.tsx index e94852e8746..fea5e0e862f 100644 --- a/src/common/rawitem/rawitem.tsx +++ b/src/common/rawitem/rawitem.tsx @@ -165,7 +165,11 @@ export const IBizRawItem = defineComponent({ } } } catch { - ibiz.log.error(`${rawItemType.value}类型自定义参数配置错误`); + ibiz.log.error( + ibiz.i18n.t('component.rawItem.errorConfig', { + type: rawItemType.value, + }), + ); } } } @@ -249,7 +253,7 @@ export const IBizRawItem = defineComponent({ - 你的浏览器不支持video标签 + {ibiz.i18n.t('component.rawItem.noSupportVideo')} ); diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 103ef1e6287..a720142b318 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -1,3 +1,27 @@ +import { en as runTimeEn } from '@ibiz-template/runtime'; +import { en as vue3UtilEn } from '@ibiz-template/vue3-util'; +import { en as modelHelperEn } from '@ibiz-template/model-helper'; +import { en as coreEn } from '@ibiz-template/core'; + export default { - name: 'zhangsan', + // 组件 + component: { + actionToolbar: { + noSupportDropDown: 'The drop-down mode is not supported', + }, + rawItem: { + errorConfig: '{type} type custom parameter configuration error', + noSupportVideo: 'Your browser does not support video tags', + }, + }, + // 部件 + control: {}, + // runTime + ...runTimeEn, + // vue3Util + ...vue3UtilEn, + // core + ...coreEn, + // modelHelper + ...modelHelperEn, }; diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index 58a41a16323..6c099b60f06 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -1,3 +1,27 @@ +import { zhCn as runTimeZhCN } from '@ibiz-template/runtime'; +import { zhCn as vue3UtilZhCN } from '@ibiz-template/vue3-util'; +import { zhCn as modelHelperZhCN } from '@ibiz-template/model-helper'; +import { zhCn as coreZhCN } from '@ibiz-template/core'; + export default { - name: '张三', + // 组件 + component: { + actionToolbar: { + noSupportDropDown: '下拉模式暂不支持', + }, + rawItem: { + errorConfig: '{type} 类型自定义参数配置错误', + noSupportVideo: '你的浏览器不支持video标签', + }, + }, + // 部件 + control: {}, + // runTime + ...runTimeZhCN, + // vue3Util + ...vue3UtilZhCN, + // core + ...coreZhCN, + // modelHelper + ...modelHelperZhCN, }; -- Gitee From d558eb15d516e20bb89d353008ded09b6bf1fb93 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Tue, 6 Aug 2024 15:39:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=BC=95=E6=93=8E=E3=80=81=E8=A7=86=E5=9B=BE=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E3=80=81=E9=9D=A2=E6=9D=BF=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E3=80=81=E5=A4=9A=E8=AF=AD=E8=A8=80=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E3=80=81mobApp=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/span/span-editor.controller.ts | 5 +- .../stepper/stepper-editor.controller.ts | 2 +- src/editor/upload/upload-editor.controller.ts | 4 +- src/locale/en/index.ts | 76 +++++++++++++++++++ src/locale/index.ts | 4 +- src/locale/zh-CN/index.ts | 70 +++++++++++++++++ .../unauthorized-handler.ts | 8 +- .../auth-userinfo/auth-userinfo.tsx | 2 +- .../nav-pos-index/nav-pos-index.tsx | 2 +- .../panel-video-player/panel-video-player.tsx | 2 +- .../wf-action-button/wf-action-button.tsx | 2 +- .../wf-step-trace/wf-step-trace.tsx | 16 +++- src/util/directive/loading.ts | 2 +- src/util/loading-util/loading-util.ts | 2 +- src/util/message-util/message-util.ts | 2 +- .../notification-util/notification-util.ts | 2 +- src/util/store/view-stack/view-stack.ts | 2 +- src/view-engine/mob-edit-view.engine.ts | 6 +- .../mob-wf-dyna-edit-view.engine.ts | 7 +- src/view-engine/wf-step-trace-view.engine.ts | 2 +- src/view/login-view/login-view.tsx | 26 ++++--- 21 files changed, 206 insertions(+), 38 deletions(-) diff --git a/src/editor/span/span-editor.controller.ts b/src/editor/span/span-editor.controller.ts index b9aa1a9e9e4..d15a5f1f0a9 100644 --- a/src/editor/span/span-editor.controller.ts +++ b/src/editor/span/span-editor.controller.ts @@ -52,7 +52,10 @@ export class SpanEditorController extends CodeListEditorController { } const { linkAppViewId } = this.model; if (!linkAppViewId) { - throw new RuntimeModelError(this.model, '请配置数据链接视图'); + throw new RuntimeModelError( + this.model, + ibiz.i18n.t('editor.common.linkViewConfigErr'), + ); } return ibiz.commands.execute( OpenAppViewCommand.TAG, diff --git a/src/editor/stepper/stepper-editor.controller.ts b/src/editor/stepper/stepper-editor.controller.ts index be31f108a56..44e9efa8220 100644 --- a/src/editor/stepper/stepper-editor.controller.ts +++ b/src/editor/stepper/stepper-editor.controller.ts @@ -15,5 +15,5 @@ export class StepperEditorController extends EditorController { * @author: zhujiamin * @Date: 2022-08-25 14:33:14 */ - public placeHolder = '请输入'; + public placeHolder = ibiz.i18n.t('editor.stepper.pleaseEnter'); } diff --git a/src/editor/upload/upload-editor.controller.ts b/src/editor/upload/upload-editor.controller.ts index c61895ef199..06647d72ca1 100644 --- a/src/editor/upload/upload-editor.controller.ts +++ b/src/editor/upload/upload-editor.controller.ts @@ -119,7 +119,7 @@ export class UploadEditorController extends EditorController { } catch (error) { throw new RuntimeModelError( uploadParams, - `配置uploadParams没有按标准JSON格式`, + ibiz.i18n.t('editor.upload.uploadJsonFormatErr'), ); } } @@ -129,7 +129,7 @@ export class UploadEditorController extends EditorController { } catch (error) { throw new RuntimeModelError( exportParams, - `配置exportParams没有按标准JSON格式`, + ibiz.i18n.t('editor.upload.exportJsonFormatErr'), ); } } diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index a720142b318..8ceaf166c6f 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -16,6 +16,82 @@ export default { }, // 部件 control: {}, + // 编辑器 + editor: { + common: { + linkViewConfigErr: 'Please configure the data link view', + }, + stepper: { + pleaseEnter: 'Please enter', + }, + upload: { + uploadJsonFormatErr: + 'The configuration of uploadparams did not follow the standard JSON format', + exportJsonFormatErr: + 'The configuration of exportparams did not follow the standard JSON format', + }, + }, + // 多语言 + locale: { + prompt: 'Prompt', + switchLanguagePrompt: + 'Switching languages requires refreshing the page, are you sure to switch?', + }, + mobApp: { + unauthorizedHandler: { + noFoundEnvParams: 'Unable to find environment parameter casLoginUrl', + prohibitAccessPrompt: 'Access to the current account is prohibited', + exitPrompt: 'Do you want to exit the current account?', + }, + }, + // 面板组件 + panelComponent: { + authUserinfo: { + visitor: 'Visitor', + }, + navPosIndex: { + noSupportPrompt: + 'Non routing mode navigation placeholder is not supported', + }, + panelVideoPlayer: { + noSupportPrompt: 'Your device does not support video tags', + }, + wfStepTrace: { + processingComplete: 'Processing completion time', + processingSteps: 'Processing steps', + processingPersonnel: 'Processing personnel', + submissionPath: 'Submission path', + }, + }, + // 工具 + util: { + loading: 'Loading', + notAchieved: 'Not implemented', + unrealized: 'Unrealized', + cacheWarningPrompt: + 'There is only one item in the cache stack and it cannot be navigated back', + }, + // 视图 + view: { + fillInUserName: 'Please fill in user the name', + fillInPassword: 'Please fill in the password', + loginFailed: 'Login failed', + enterUserName: 'Please enter the username', + enterPassword: 'Please enter the password', + userName: 'User name', + password: 'Password', + login: 'Login', + }, + // 视图引擎 + viewEngine: { + closeRemind: 'Close reminder', + confirmClosePrompt: + 'The form data has been modified, are you sure you want to close it?', + noExistVersionErr: 'The current workflow version does not exist', + noFoundFormModel: 'Unable to find the model for form {name}', + missingToolbarModel: 'Missing toolbar component model', + notReceivedPrompt: 'No appDataElementId received', + }, // runTime ...runTimeEn, // vue3Util diff --git a/src/locale/index.ts b/src/locale/index.ts index d32a2695ba6..7c4222289e9 100644 --- a/src/locale/index.ts +++ b/src/locale/index.ts @@ -70,8 +70,8 @@ export class IBizI18n implements I18n { setLang(lang: string): void { ibiz.confirm .warning({ - title: '提示', - desc: '切换语言需要刷新页面，确认切换?', + title: ibiz.i18n.t('locale.prompt'), + desc: ibiz.i18n.t('locale.switchLanguagePrompt'), }) .then(() => { localStorage.setItem('language', lang); diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index 6c099b60f06..3114b04f171 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -16,6 +16,76 @@ export default { }, // 部件 control: {}, + // 编辑器 + editor: { + common: { + linkViewConfigErr: '请配置数据链接视图', + }, + stepper: { + pleaseEnter: '请输入', + }, + upload: { + uploadJsonFormatErr: '配置uploadparams没有按标准JSON格式', + exportJsonFormatErr: '配置exportparams没有按标准JSON格式', + }, + }, + // 多语言 + locale: { + prompt: '提示', + switchLanguagePrompt: '切换语言需要刷新页面，确认切换?', + }, + mobApp: { + unauthorizedHandler: { + noFoundEnvParams: '找不到环境参数casLoginUrl', + prohibitAccessPrompt: '当前账户被禁止访问', + exitPrompt: '是否要退出当前账户？', + }, + }, + // 面板组件 + panelComponent: { + authUserinfo: { + visitor: '游客', + }, + navPosIndex: { + noSupportPrompt: '非路由模式导航占位暂未支持', + }, + panelVideoPlayer: { + noSupportPrompt: '您的设备不支持video标签', + }, + wfStepTrace: { + processingComplete: '处理完成时间', + processingSteps: '处理环节', + processingPersonnel: '处理人', + submissionPath: '提交路径', + }, + }, + // 工具 + util: { + loading: '加载中', + notAchieved: '没有实现', + unrealized: '未实现', + cacheWarningPrompt: '堆栈只有一个缓存不能后退了', + }, + // 视图 + view: { + fillInUserName: '请填写用户名', + fillInPassword: '请填写密码', + loginFailed: '登录失败', + enterUserName: '请输入用户名', + enterPassword: '请输入密码', + userName: '用户名', + password: '密码', + login: '登录', + }, + // 视图引擎 + viewEngine: { + closeRemind: '关闭提醒', + confirmClosePrompt: '表单数据已经修改，确定要关闭？', + noExistVersionErr: '当前工作流版本不存在', + noFoundFormModel: '找不到表单{name}的模型', + missingToolbarModel: '缺少工具栏部件模型', + notReceivedPrompt: '没有接收到appDataEntityId', + }, // runTime ...runTimeZhCN, // vue3Util diff --git a/src/mob-app/util/unauthorized-handler/unauthorized-handler.ts b/src/mob-app/util/unauthorized-handler/unauthorized-handler.ts index 82a4cefa999..925cf9fd4c4 100644 --- a/src/mob-app/util/unauthorized-handler/unauthorized-handler.ts +++ b/src/mob-app/util/unauthorized-handler/unauthorized-handler.ts @@ -33,7 +33,9 @@ export class UnauthorizedHandler implements IErrorHandler { */ protected async casLogin(): Promise { if (!ibiz.env.casLoginUrl) { - throw new RuntimeError('找不到环境参数casLoginUrl'); + throw new RuntimeError( + ibiz.i18n.t('mobApp.unauthorizedHandler.noFoundEnvParams'), + ); } const { origin } = window.location; const baseUrl = `${origin}${ibiz.env.baseUrl}`; @@ -91,8 +93,8 @@ export class UnauthorizedHandler implements IErrorHandler { */ protected async handle403(): Promise { const result = await ibiz.modal.confirm({ - title: '当前账户被禁止访问', - desc: '是否要退出当前账户？', + title: ibiz.i18n.t('mobApp.unauthorizedHandler.prohibitAccessPrompt'), + desc: ibiz.i18n.t('mobApp.unauthorizedHandler.exitPrompt'), }); if (result) { const bol = await ibiz.auth.logout(); diff --git a/src/panel-component/auth-userinfo/auth-userinfo.tsx b/src/panel-component/auth-userinfo/auth-userinfo.tsx index 52e469df630..11cd501baeb 100644 --- a/src/panel-component/auth-userinfo/auth-userinfo.tsx +++ b/src/panel-component/auth-userinfo/auth-userinfo.tsx @@ -20,7 +20,7 @@ export const AuthUserinfo = defineComponent({ const ns = useNamespace('user-info'); const c = prop.controller; const { - srfusername = '游客', + srfusername = ibiz.i18n.t('panelComponent.authUserinfo.visitor'), srfpersonname, srforgname, } = ibiz.appData?.context || {}; diff --git a/src/panel-component/nav-pos-index/nav-pos-index.tsx b/src/panel-component/nav-pos-index/nav-pos-index.tsx index 50104867395..277c76dda8b 100644 --- a/src/panel-component/nav-pos-index/nav-pos-index.tsx +++ b/src/panel-component/nav-pos-index/nav-pos-index.tsx @@ -70,7 +70,7 @@ export const NavPosIndex = defineComponent({ }} ) : ( -
非路由模式导航占位暂未支持
+
{ibiz.i18n.t('panelComponent.navPosIndex.noSupportPrompt')}
)} ); diff --git a/src/panel-component/panel-video-player/panel-video-player.tsx b/src/panel-component/panel-video-player/panel-video-player.tsx index b51b26a903c..d1dea0b7f3f 100644 --- a/src/panel-component/panel-video-player/panel-video-player.tsx +++ b/src/panel-component/panel-video-player/panel-video-player.tsx @@ -54,7 +54,7 @@ export const PanelVideoPlayer = defineComponent({ - 您的设备不支持video标签 + {ibiz.i18n.t('panelComponent.panelVideoPlayer.noSupportPrompt')} diff --git a/src/panel-component/wf-action-button/wf-action-button.tsx b/src/panel-component/wf-action-button/wf-action-button.tsx index a4ffc63abcb..edf54cbf40a 100644 --- a/src/panel-component/wf-action-button/wf-action-button.tsx +++ b/src/panel-component/wf-action-button/wf-action-button.tsx @@ -89,7 +89,7 @@ export const WFActionButton = defineComponent({ v-model:show={this.show} actions={wfButtons} close-on-click-overlay - cancel-text='取消' + cancel-text={ibiz.i18n.t('app.cancel')} close-on-click-action onSelect={this.handleButtonClick} >, diff --git a/src/panel-component/wf-step-trace/wf-step-trace.tsx b/src/panel-component/wf-step-trace/wf-step-trace.tsx index cd9db941971..acec0e25c06 100644 --- a/src/panel-component/wf-step-trace/wf-step-trace.tsx +++ b/src/panel-component/wf-step-trace/wf-step-trace.tsx @@ -34,28 +34,36 @@ export const WFStepTrace = defineComponent({
diff --git a/src/util/directive/loading.ts b/src/util/directive/loading.ts index 8e21006024d..d450c9c3d79 100644 --- a/src/util/directive/loading.ts +++ b/src/util/directive/loading.ts @@ -29,7 +29,7 @@ export interface ElementLoading extends HTMLElement { const createInstance = (el: ElementLoading) => { const ns = useNamespace('loading'); const options: ToastOptions = { - message: '加载中...', + message: `${ibiz.i18n.t('util.loading')}...`, forbidClick: true, teleport: el, className: ns.b(), diff --git a/src/util/loading-util/loading-util.ts b/src/util/loading-util/loading-util.ts index cbb3a8a6ec8..5b22176c770 100644 --- a/src/util/loading-util/loading-util.ts +++ b/src/util/loading-util/loading-util.ts @@ -50,7 +50,7 @@ export class LoadingUtil implements ILoadingUtil { const ns = useNamespace('loading'); if (this.count === 0) { this.loading = showLoadingToast({ - message: '加载中...', + message: `${ibiz.i18n.t('util.loading')}...`, forbidClick: true, className: ns.b(), loadingType: 'spinner', diff --git a/src/util/message-util/message-util.ts b/src/util/message-util/message-util.ts index 14b407ed5ea..7212bd7dacd 100644 --- a/src/util/message-util/message-util.ts +++ b/src/util/message-util/message-util.ts @@ -47,6 +47,6 @@ export class MessageUtil implements IMessageUtil { // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars notice(params: IMessageParams): void { - throw new RuntimeError('没有实现'); + throw new RuntimeError(ibiz.i18n.t('util.notAchieved')); } } diff --git a/src/util/notification-util/notification-util.ts b/src/util/notification-util/notification-util.ts index 9d6870a5b37..2699592b9ea 100644 --- a/src/util/notification-util/notification-util.ts +++ b/src/util/notification-util/notification-util.ts @@ -12,7 +12,7 @@ import { showNotify } from 'vant'; */ export class NotificationUtil implements INotificationUtil { default(_params: NotificationParams): void { - throw new Error('未实现'); + throw new Error(ibiz.i18n.t('util.unrealized')); } info(params: NotificationParams): void { diff --git a/src/util/store/view-stack/view-stack.ts b/src/util/store/view-stack/view-stack.ts index e888df3ce5a..7e9a3c95801 100644 --- a/src/util/store/view-stack/view-stack.ts +++ b/src/util/store/view-stack/view-stack.ts @@ -105,7 +105,7 @@ export const useViewStack = defineStore('viewStack', () => { */ const pop = () => { if (viewStack.cacheKeys.length < 2) { - throw new RuntimeError('堆栈只有一个缓存不能后退了'); + throw new RuntimeError(ibiz.i18n.t('util.cacheWarningPrompt')); } evt.emit('onBeforeStackChange', 'pop'); const popKey = viewStack.cacheKeys.pop(); diff --git a/src/view-engine/mob-edit-view.engine.ts b/src/view-engine/mob-edit-view.engine.ts index 301e97513ec..4bb36b1b830 100644 --- a/src/view-engine/mob-edit-view.engine.ts +++ b/src/view-engine/mob-edit-view.engine.ts @@ -40,8 +40,8 @@ export class MobEditViewEngine extends ViewEngineBase { modal.hooks.shouldDismiss.tapPromise(async context => { if (this.form.state.modified) { const isAllow = await ibiz.modal.confirm({ - title: '关闭提醒', - desc: '表单数据已经修改，确定要关闭？', + title: ibiz.i18n.t('viewEngine.closeRemind'), + desc: ibiz.i18n.t('viewEngine.confirmClosePrompt'), }); if (!isAllow) { context.allowClose = false; @@ -216,7 +216,7 @@ export class MobEditViewEngine extends ViewEngineBase { data.srfwftag ?? this.view.params.srfwftag ?? this.view.context.srfwftag, ); if (res.data.length === 0) { - throw new RuntimeError('当前工作流版本不存在'); + throw new RuntimeError(ibiz.i18n.t('viewEngine.noExistVersionErr')); } // todo 多个的情况要出一个确认框选择后走后续逻辑 diff --git a/src/view-engine/mob-wf-dyna-edit-view.engine.ts b/src/view-engine/mob-wf-dyna-edit-view.engine.ts index 72a9fac8f59..9428a1f21dc 100644 --- a/src/view-engine/mob-wf-dyna-edit-view.engine.ts +++ b/src/view-engine/mob-wf-dyna-edit-view.engine.ts @@ -187,7 +187,7 @@ export class MobWFDynaEditViewEngine extends MobEditViewEngine { if (!formModel) { throw new RuntimeModelError( this.view.model, - `找不到表单${processForm}的模型`, + ibiz.i18n.t('viewEngine.noFoundFormModel', { name: processForm }), ); } this.processForm = formModel; @@ -208,7 +208,10 @@ export class MobWFDynaEditViewEngine extends MobEditViewEngine { */ async calcWfToolbar(): Promise { if (!this.wfToolbar) { - throw new RuntimeModelError(this.view.model, '缺少工具栏部件模型'); + throw new RuntimeModelError( + this.view.model, + ibiz.i18n.t('viewEngine.missingToolbarModel'), + ); } this.wfToolbar?.clearExtraButtons(); diff --git a/src/view-engine/wf-step-trace-view.engine.ts b/src/view-engine/wf-step-trace-view.engine.ts index 74d8d1d32bc..8a675c4290a 100644 --- a/src/view-engine/wf-step-trace-view.engine.ts +++ b/src/view-engine/wf-step-trace-view.engine.ts @@ -50,7 +50,7 @@ export class WFStepTraceViewEngine extends ViewEngineBase { await super.onMounted(); const appDataEntityId = this.view.parentView?.model.appDataEntityId; if (!appDataEntityId) { - throw new RuntimeError('没有接收到appDataEntityId'); + throw new RuntimeError(ibiz.i18n.t('viewEngine.notReceivedPrompt')); } const app = ibiz.hub.getApp(this.view.context.srfappid); this.entityService = await app.deService.getService( diff --git a/src/view/login-view/login-view.tsx b/src/view/login-view/login-view.tsx index 479d607cbd4..f77f77eeec3 100644 --- a/src/view/login-view/login-view.tsx +++ b/src/view/login-view/login-view.tsx @@ -21,13 +21,13 @@ export const LoginView = defineComponent({ try { if (!loginData.username) { ibiz.notification.error({ - desc: '请填写用户名', + desc: ibiz.i18n.t('view.fillInUserName'), }); return; } if (!loginData.password) { ibiz.notification.error({ - desc: '请填写密码', + desc: ibiz.i18n.t('view.fillInPassword'), }); return; } @@ -43,7 +43,9 @@ export const LoginView = defineComponent({ loading.value = false; } catch (error) { ibiz.notification.error({ - desc: (error as IData)?.response?.data?.message || '登录失败', + desc: + (error as IData)?.response?.data?.message || + ibiz.i18n.t('view.loginFailed'), }); loading.value = false; } @@ -67,20 +69,24 @@ export const LoginView = defineComponent({
@@ -90,7 +96,7 @@ export const LoginView = defineComponent({ class={ns.b('login-btn')} onClick={this.login} > - 登录 + {ibiz.i18n.t('view.login')} -- Gitee From 3727ca21a133fdc4a47887cbf16812a7925a7735 Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Tue, 6 Aug 2024 16:46:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/dashboard/dashboard.tsx | 7 +- src/control/data-view/data-view.tsx | 2 +- .../form-group-panel/form-group-panel.tsx | 4 +- .../form-mdctrl-form/form-mdctrl-form.tsx | 8 +- .../form-mdctrl-md/form-mdctrl-md.tsx | 4 +- .../form-mdctrl-repeater.tsx | 4 +- .../repeater-multi-form.tsx | 4 +- .../repeater-single-form.tsx | 4 +- .../form-mdctrl/form-mdctrl.provider.ts | 4 +- .../form-detail/form-mdctrl/form-mdctrl.tsx | 5 +- .../mdctrl-container/mdctrl-container.tsx | 8 +- src/control/form/form/form.tsx | 6 +- src/control/form/search-form/search-form.tsx | 4 +- src/control/list/list-render-util.tsx | 2 +- src/control/list/list/list.tsx | 4 +- src/control/list/md-ctrl/md-ctrl.tsx | 4 +- src/control/toolbar/toolbar.tsx | 6 +- src/control/tree/tree.tsx | 2 +- src/control/wizard-panel/wizard-panel.tsx | 12 ++- .../cascader/ibiz-cascader/ibiz-cascader.tsx | 6 +- .../common/data-mpicker/ibiz-data-mpicker.tsx | 4 +- .../data-picker/picker-editor.controller.ts | 15 ++- .../ibiz-date-picker/ibiz-date-picker.tsx | 18 ++-- .../ibiz-date-range-picker.tsx | 18 ++-- .../ibiz-dropdown/ibiz-dropdown.tsx | 4 +- .../markdown/markdown-editor.controller.ts | 10 +- src/locale/en/index.ts | 97 ++++++++++++++++++- src/locale/zh-CN/index.ts | 93 +++++++++++++++++- 28 files changed, 298 insertions(+), 61 deletions(-) diff --git a/src/control/dashboard/dashboard.tsx b/src/control/dashboard/dashboard.tsx index 7a2abbd93a9..a992f7af7c1 100644 --- a/src/control/dashboard/dashboard.tsx +++ b/src/control/dashboard/dashboard.tsx @@ -36,7 +36,12 @@ function renderPortletByType( }; if (!provider) { - return
暂未支持{model.portletType}
; + return ( +
+ {ibiz.i18n.t('app.noSupport')} + {model.portletType} +
+ ); } const providerComp = resolveComponent( diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index 2032f4883e1..d2ab62a2f2e 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -144,7 +144,7 @@ export const DataViewControl = defineComponent({ c.loadMore()} > {model.groupMode !== 'NONE' ? renderGroup() : renderDefault()} diff --git a/src/control/form/form-detail/form-group-panel/form-group-panel.tsx b/src/control/form/form-detail/form-group-panel/form-group-panel.tsx index e9c73dd2be9..85ffff350c2 100644 --- a/src/control/form/form-detail/form-group-panel/form-group-panel.tsx +++ b/src/control/form/form-detail/form-group-panel/form-group-panel.tsx @@ -123,7 +123,9 @@ export const FormGroupPanel = defineComponent({ state.isShowMore = !state.isShowMore; }} > - {!state.isShowMore ? '显示更多' : '收起'} + {!state.isShowMore + ? ibiz.i18n.t('control.form.formGroupPanel.showMore') + : ibiz.i18n.t('app.retract')} ); diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.tsx index 56935ec42ca..1b9b858ce06 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.tsx @@ -32,7 +32,7 @@ export const FormMDCtrlForm = defineComponent({ ]} onClick={(): void => props.controller.create()} > - 添加 + {ibiz.i18n.t('app.add')} ); }; @@ -59,7 +59,11 @@ export const FormMDCtrlForm = defineComponent({ {{ item: ({ data }: { data: IData }) => { if (!formProvider) { - return
未找到表单的适配器
; + return ( +
+ {ibiz.i18n.t('control.form.formMDctrlForm.noFindProvider')} +
+ ); } const formComponent = h(resolveComponent(formProvider.component), { class: this.ns.be('item', 'form'), diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.tsx index 9075281505c..74388778204 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-md/form-mdctrl-md.tsx @@ -85,7 +85,7 @@ export const FormMDCtrlMD = defineComponent({ type='primary' onClick={(): void => this.controller.create()} > - 添加 + {ibiz.i18n.t('app.add')} )} {this.controller.enableDelete && ( @@ -99,7 +99,7 @@ export const FormMDCtrlMD = defineComponent({ ]} onClick={(): void => this.controller.remove()} > - 删除 + {ibiz.i18n.t('app.delete')} )} diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater.tsx index af5cf6d8577..59b936b9e05 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater.tsx @@ -42,7 +42,9 @@ export const FormMDCtrlRepeater = defineComponent({ default: return (
- 暂未支持重复器样式{this.controller.repeaterStyle} + {ibiz.i18n.t('control.form.formMDctrlRepeater.noSupportStyle', { + repeaterStyle: this.controller.repeaterStyle, + })}
); } diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-multi-form/repeater-multi-form.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-multi-form/repeater-multi-form.tsx index 6ac30d93246..26d53ce8f73 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-multi-form/repeater-multi-form.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-multi-form/repeater-multi-form.tsx @@ -25,8 +25,8 @@ export const RepeaterMultiForm = defineComponent({ const removeClick = async (index: number) => { const confirm = await ibiz.modal.confirm({ - title: '删除提醒', - desc: '是否删除选中项?', + title: ibiz.i18n.t('control.form.repeaterMultiForm.confirmTitle'), + desc: ibiz.i18n.t('control.form.repeaterMultiForm.confirmDesc'), }); if (confirm) { props.controller.remove(index); diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-single-form/repeater-single-form.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-single-form/repeater-single-form.tsx index 6cb4e026ea6..e0ab4e68b34 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-single-form/repeater-single-form.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-single-form/repeater-single-form.tsx @@ -48,7 +48,9 @@ export const RepeaterSingleForm = defineComponent({ }, render() { if (!this.controller.repeatedForm) { - throw new RuntimeError('没有repeatedForm'); + throw new RuntimeError( + ibiz.i18n.t('control.form.repeaterSingleForm.errorMessage'), + ); } return ( ; break; default: -
{model.contentType}暂未支持
; +
+ {model.contentType} + {ibiz.i18n.t('app.noSupport')} +
; break; } diff --git a/src/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.tsx b/src/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.tsx index d481f5b1a44..af0caf8fd1b 100644 --- a/src/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.tsx +++ b/src/control/form/form-detail/form-mdctrl/mdctrl-container/mdctrl-container.tsx @@ -47,7 +47,7 @@ export const MDCtrlContainer = defineComponent({ } > {showButton && } - 添加 + {ibiz.i18n.t('app.add')} ); }; @@ -65,7 +65,7 @@ export const MDCtrlContainer = defineComponent({ emit('removeClick', item, index); }} > - 删除 + {ibiz.i18n.t('app.delete')} ); } @@ -78,7 +78,7 @@ export const MDCtrlContainer = defineComponent({ emit('removeClick', item, index); }} > - 删除 + {ibiz.i18n.t('app.delete')} ); }; @@ -96,7 +96,7 @@ export const MDCtrlContainer = defineComponent({ const formComponent = this.$slots.item ? ( this.$slots.item({ data: item, index }) ) : ( -
未提供item插槽
+
{ibiz.i18n.t('control.form.mdCtrlContainer.noSlot')}
); return (
diff --git a/src/control/form/form/form.tsx b/src/control/form/form/form.tsx index 970727429fe..39f0cfeb86f 100644 --- a/src/control/form/form/form.tsx +++ b/src/control/form/form/form.tsx @@ -78,7 +78,11 @@ export const FormControl = defineComponent({ const provider = c.providers[detailId]; if (!provider) { return ( -
暂未支持的表单项类型: {detail.detailType}或找不到对应适配器
+
+ {ibiz.i18n.t('control.form.noSupportDetailType', { + detailType: detail.detailType, + })} +
); } const component = resolveComponent(provider.component) as string; diff --git a/src/control/form/search-form/search-form.tsx b/src/control/form/search-form/search-form.tsx index 5b17c3d94c2..ae99beaa5c5 100644 --- a/src/control/form/search-form/search-form.tsx +++ b/src/control/form/search-form/search-form.tsx @@ -51,13 +51,13 @@ export const SearchFormControl = defineComponent({ class={this.ns.be('buttons', 'search')} onClick={() => this.c.onSearchButtonClick()} > - 查询 + {ibiz.i18n.t('control.form.searchForm.search')} this.c.reset()} > - 重置 + {ibiz.i18n.t('control.form.searchForm.reset')}
); diff --git a/src/control/list/list-render-util.tsx b/src/control/list/list-render-util.tsx index 42c9935b3ce..d89304751c5 100644 --- a/src/control/list/list-render-util.tsx +++ b/src/control/list/list-render-util.tsx @@ -113,7 +113,7 @@ export function useListRender( } return (
c.loadMore()}> - 加载更多 + {ibiz.i18n.t('control.common.loadMore')}
); }; diff --git a/src/control/list/list/list.tsx b/src/control/list/list/list.tsx index 8231def2b9e..2ba0d4edd45 100644 --- a/src/control/list/list/list.tsx +++ b/src/control/list/list/list.tsx @@ -110,7 +110,7 @@ export const ListControl = defineComponent({ const itemClass = [ns.b('item'), ns.b('item-expand')]; return (
- 展开 + {ibiz.i18n.t('control.list.expand')}
); }; @@ -147,7 +147,7 @@ export const ListControl = defineComponent({ >
-
选中数据
+
{ibiz.i18n.t('control.list.selectedData')}
{renderReViewListContent()}
diff --git a/src/control/list/md-ctrl/md-ctrl.tsx b/src/control/list/md-ctrl/md-ctrl.tsx index f623245c475..bd8db913d27 100644 --- a/src/control/list/md-ctrl/md-ctrl.tsx +++ b/src/control/list/md-ctrl/md-ctrl.tsx @@ -125,7 +125,9 @@ export const MDCtrlControl = defineComponent({ 1 && '我已经到底啦~' + props.loadMode === 'auto' && + c.state.curPage > 1 && + ibiz.i18n.t('control.list.end') } onLoad={props.loadMode === 'auto' ? () => c.loadMore() : undefined} > diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx index 8530aa88aac..e214c7faa16 100644 --- a/src/control/toolbar/toolbar.tsx +++ b/src/control/toolbar/toolbar.tsx @@ -97,7 +97,11 @@ export const ToolbarControl = defineComponent({ const renderToolbarItem = (item: IDEToolbarItem) => { const itemId = item.id!; if (['SEPERATOR', 'RAWITEM'].includes(item.itemType!)) { - ibiz.log.error(`工具栏项类型：${item.itemType}暂不支持`); + ibiz.log.error( + ibiz.i18n.t('control.toolbar.noSupportType', { + itemType: item.itemType, + }), + ); return null; } if (item.itemType === 'ITEMS') { diff --git a/src/control/tree/tree.tsx b/src/control/tree/tree.tsx index a4c8a77fd8a..23a8107be45 100644 --- a/src/control/tree/tree.tsx +++ b/src/control/tree/tree.tsx @@ -128,7 +128,7 @@ export const TreeControl = defineComponent({ const { originData } = opts; if (!originData._leaf) { return h('div', { - text: '下级', + text: ibiz.i18n.t('control.tree.subordinate'), className: 'tree-button', click: (e: Event, _opts: IData) => { _opts.store.breadcrumb.list.push(_opts); diff --git a/src/control/wizard-panel/wizard-panel.tsx b/src/control/wizard-panel/wizard-panel.tsx index 48be7e92400..be7c0bbc831 100644 --- a/src/control/wizard-panel/wizard-panel.tsx +++ b/src/control/wizard-panel/wizard-panel.tsx @@ -71,7 +71,9 @@ export const WizardPanelControl = defineComponent({ this.c.onPrevClick(); }} > - {dewizard.prevCaption ? dewizard.prevCaption : '上一步'} + {dewizard.prevCaption + ? dewizard.prevCaption + : ibiz.i18n.t('control.wizardPanel.prev')} )} {supportActions.includes('NEXT') && ( @@ -82,7 +84,9 @@ export const WizardPanelControl = defineComponent({ this.c.onNextClick(); }} > - {dewizard.nextCaption ? dewizard.nextCaption : '下一步'} + {dewizard.nextCaption + ? dewizard.nextCaption + : ibiz.i18n.t('control.wizardPanel.next')} )} {supportActions.includes('FINISH') && ( @@ -93,7 +97,9 @@ export const WizardPanelControl = defineComponent({ this.c.onFinishClick(); }} > - {dewizard.finishCaption ? dewizard.finishCaption : '完成'} + {dewizard.finishCaption + ? dewizard.finishCaption + : ibiz.i18n.t('control.wizardPanel.finish')} )} diff --git a/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx b/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx index f90e6cca166..b941107b5a3 100644 --- a/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx +++ b/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx @@ -179,7 +179,11 @@ export const IBizCascader = defineComponent({ (item: IData, index: number) => ({ ...item, value: item.srfkey, - text: item.srfmajortext ? item.srfmajortext : `标题${index}`, + text: item.srfmajortext + ? item.srfmajortext + : ibiz.i18n.t('editor.cascader.ibizCascader.title', { + index, + }), nodekey: `${value ? `${value}_${item.srfkey}` : item.srfkey}`, children: tabIndex === valueItems.value.length - 1 ? undefined : [], diff --git a/src/editor/common/data-mpicker/ibiz-data-mpicker.tsx b/src/editor/common/data-mpicker/ibiz-data-mpicker.tsx index 1890818337e..3632d188f33 100644 --- a/src/editor/common/data-mpicker/ibiz-data-mpicker.tsx +++ b/src/editor/common/data-mpicker/ibiz-data-mpicker.tsx @@ -96,7 +96,7 @@ export const IBizDataMPicker = defineComponent({ this.onCancel(e); }} > - 取消 + {ibiz.i18n.t('editor.common.cancel')} ); diff --git a/src/editor/data-picker/picker-editor.controller.ts b/src/editor/data-picker/picker-editor.controller.ts index 2a4f7ab0c15..d30728e3573 100644 --- a/src/editor/data-picker/picker-editor.controller.ts +++ b/src/editor/data-picker/picker-editor.controller.ts @@ -217,7 +217,10 @@ export class PickerEditorController extends EditorController { ); return res as IHttpResponse; } - throw new RuntimeModelError(this.model, '请配置实体和实体数据集'); + throw new RuntimeModelError( + this.model, + ibiz.i18n.t('editor.common.entityConfigErr'), + ); } /** @@ -242,7 +245,10 @@ export class PickerEditorController extends EditorController { params.selectedData = selectedData; } if (!this.pickupView) { - throw new RuntimeModelError(this.model, '请配置数据选择视图'); + throw new RuntimeModelError( + this.model, + ibiz.i18n.t('editor.common.selectViewConfigErr'), + ); } // 模态打开视图 const res = await ibiz.commands.execute( @@ -274,7 +280,10 @@ export class PickerEditorController extends EditorController { const { linkAppViewId } = this.model; if (!linkAppViewId) { - throw new RuntimeModelError(this.model, '请配置数据链接视图'); + throw new RuntimeModelError( + this.model, + ibiz.i18n.t('editor.common.linkViewConfigErr'), + ); } return ibiz.commands.execute( OpenAppViewCommand.TAG, diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx index a860f055432..2c91ffa05a3 100644 --- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx +++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx @@ -38,15 +38,15 @@ export const IBizDatePicker = defineComponent({ // 时间选择器文本 const lang = { - title: '选择日期', - cancel: '取消', - confirm: '确认', - year: '年', - month: '月', - day: '日', - hour: '时', - min: '分', - sec: '秒', + title: ibiz.i18n.t('editor.datePicker.title'), + cancel: ibiz.i18n.t('editor.datePicker.cancel'), + confirm: ibiz.i18n.t('editor.datePicker.confirm'), + year: ibiz.i18n.t('editor.datePicker.year'), + month: ibiz.i18n.t('editor.datePicker.month'), + day: ibiz.i18n.t('editor.datePicker.day'), + hour: ibiz.i18n.t('editor.datePicker.hour'), + min: ibiz.i18n.t('editor.datePicker.min'), + sec: ibiz.i18n.t('editor.datePicker.sec'), }; // 编辑器dom diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx index 1a024021278..dda1132120b 100644 --- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx +++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx @@ -35,15 +35,15 @@ export const IBizDateRangePicker = defineComponent({ const items: string[] = []; // 时间选择器文本 const lang = { - title: '选择日期', - cancel: '取消', - confirm: '确认', - year: '年', - month: '月', - day: '日', - hour: '时', - min: '分', - sec: '秒', + title: ibiz.i18n.t('editor.datePicker.title'), + cancel: ibiz.i18n.t('editor.datePicker.cancel'), + confirm: ibiz.i18n.t('editor.datePicker.confirm'), + year: ibiz.i18n.t('editor.datePicker.year'), + month: ibiz.i18n.t('editor.datePicker.month'), + day: ibiz.i18n.t('editor.datePicker.day'), + hour: ibiz.i18n.t('editor.datePicker.hour'), + min: ibiz.i18n.t('editor.datePicker.min'), + sec: ibiz.i18n.t('editor.datePicker.sec'), }; // 值分割符 let valueSeparator = ';'; diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx index 5a8300facc7..86d9de836ab 100644 --- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx +++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx @@ -137,7 +137,7 @@ export const IBizDropdown = defineComponent({ render() { // 编辑态内容 const editContent = this.hasChildren - ? '暂未支持树形下拉选择' + ? ibiz.i18n.t('editor.dropdownList.noSupportTreePicker') : [ { this.showPicker = false; }} diff --git a/src/editor/markdown/markdown-editor.controller.ts b/src/editor/markdown/markdown-editor.controller.ts index d6e61896010..9e8c361067f 100644 --- a/src/editor/markdown/markdown-editor.controller.ts +++ b/src/editor/markdown/markdown-editor.controller.ts @@ -37,7 +37,7 @@ export class MarkDownEditorController extends EditorController { } catch (error) { throw new RuntimeModelError( uploadparams, - `配置uploadparams没有按标准JSON格式`, + ibiz.i18n.t('editor.markdown.uploadJsonFormatErr'), ); } } @@ -47,7 +47,7 @@ export class MarkDownEditorController extends EditorController { } catch (error) { throw new RuntimeModelError( exportparams, - `配置exportparams没有按标准JSON格式`, + ibiz.i18n.t('editor.markdown.exportJsonFormatErr'), ); } } @@ -109,11 +109,13 @@ export class MarkDownEditorController extends EditorController { }) .then((response: IData) => { if (response.status !== 200) { - throw new RuntimeError('下载文件失败'); + throw new RuntimeError( + ibiz.i18n.t('editor.markdown.downloadFailedErr'), + ); } // 请求成功，后台返回的是一个文件流 if (!response.data) { - throw new RuntimeError('文件流数据不存在'); + throw new RuntimeError(ibiz.i18n.t('editor.markdown.noExistentErr')); } else { // 获取文件名 const fileName = file.name; diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 8ceaf166c6f..49cd643b199 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -4,6 +4,13 @@ import { en as modelHelperEn } from '@ibiz-template/model-helper'; import { en as coreEn } from '@ibiz-template/core'; export default { + // 应用级 + app: { + noSupport: 'Not supported currently', + add: 'Add', + delete: 'Delete', + retract: 'Retract', + }, // 组件 component: { actionToolbar: { @@ -15,11 +22,99 @@ export default { }, }, // 部件 - control: {}, + control: { + common: { + loadMore: 'Load more', + }, + dataView: { end: 'The end~' }, + form: { + noSupportDetailType: + 'Form detail type not supported: {detailType} or corresponding provider cannot be found', + formGroupPanel: { + showMore: 'Show More', + }, + formMDctrlForm: { + noFindProvider: 'Provider not found for form', + }, + repeaterMultiForm: { + confirmTitle: 'Tips for deletion', + confirmDesc: 'Do you want to delete the selection?', + }, + repeaterSingleForm: { + errorMessage: 'No repeatedForm', + }, + formMDctrlRepeater: { + noSupportStyle: + 'Repeater style {repeaterStyle} is currently not supported', + }, + mdCtrlContainer: { + noSlot: 'Item slot not provided', + }, + formMDctrl: { + errorMessage: + 'The content type is currently not supported as {contentType}', + }, + searchForm: { + search: 'Search', + reset: 'Reset', + }, + }, + list: { + expand: 'Expand', + selectedData: 'Selected data', + end: 'The end~', + }, + toolbar: { + noSupportType: 'Toolbar item type: {itemType} is not supported', + }, + tree: { + subordinate: 'Subordinate', + }, + wizardPanel: { + prev: 'Previous', + next: 'Next', + finish: 'Finish', + }, + }, // 编辑器 editor: { common: { + entityConfigErr: 'Please configure entities and entity datasets', + selectViewConfigErr: 'Please configure the data selection view', linkViewConfigErr: 'Please configure the data link view', + cancel: 'Cancel', + confirm: 'Confirm', + }, + cascader: { + ibizCascader: { + title: 'Title {index}', + }, + }, + datePicker: { + title: 'Select a date', + cancel: 'Cancel', + confirm: 'Confirm', + year: 'Year', + month: 'Month', + day: 'Day', + hour: 'Hour', + min: 'Minute', + sec: 'Second', + }, + dropdownList: { + noSupportTreePicker: 'Drop-down tree selection is not supported', + confirm: 'confirm', + }, + markdown: { + uploadJsonFormatErr: + 'The configuration of uploadparams did not follow the standard JSON format', + exportJsonFormatErr: + 'The configuration of exportparams did not follow the standard JSON format', + downloadFailedErr: 'Download file failed', + noExistentErr: 'The file stream data does not exist', + }, + notSupportedEditor: { + unsupportedType: 'Unsupported editor types - {editorType}', }, stepper: { pleaseEnter: 'Please enter', diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index 3114b04f171..580beb3bc67 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -4,6 +4,13 @@ import { zhCn as modelHelperZhCN } from '@ibiz-template/model-helper'; import { zhCn as coreZhCN } from '@ibiz-template/core'; export default { + // 应用级 + app: { + noSupport: '暂未支持', + add: '添加', + delete: '删除', + retract: '收起', + }, // 组件 component: { actionToolbar: { @@ -15,11 +22,95 @@ export default { }, }, // 部件 - control: {}, + control: { + common: { + loadMore: '加载更多', + }, + dataView: { end: '我已经到底啦~' }, + form: { + noSupportDetailType: + '暂未支持的表单项类型: {detailType} 或找不到对应适配器', + formGroupPanel: { + showMore: '显示更多', + }, + formMDctrlForm: { + noFindProvider: '未找到表单的适配器', + }, + repeaterMultiForm: { + confirmTitle: '删除提醒', + confirmDesc: '是否删除选中项?', + }, + repeaterSingleForm: { + errorMessage: '没有repeatedForm', + }, + formMDctrlRepeater: { + noSupportStyle: '暂未支持重复器样式{repeaterStyle}', + }, + mdCtrlContainer: { + noSlot: '未提供item插槽', + }, + formMDctrl: { + errorMessage: '暂未支持内容类型为{contentType}', + }, + searchForm: { + search: '查询', + reset: '重置', + }, + }, + list: { + expand: '展开', + selectedData: '选中数据', + end: '我已经到底啦~', + }, + toolbar: { + noSupportType: '工具栏项类型：{itemType}暂不支持', + }, + tree: { + subordinate: '下级', + }, + wizardPanel: { + prev: '上一步', + next: '下一步', + finish: '完成', + }, + }, // 编辑器 editor: { common: { + entityConfigErr: '请配置实体和实体数据集', + selectViewConfigErr: '请配置数据选择视图', linkViewConfigErr: '请配置数据链接视图', + cancel: '取消', + confirm: '确定', + }, + cascader: { + ibizCascader: { + title: '标题{index}', + }, + }, + datePicker: { + title: '选择日期', + cancel: '取消', + confirm: '确认', + year: '年', + month: '月', + day: '日', + hour: '时', + min: '分', + sec: '秒', + }, + dropdownList: { + noSupportTreePicker: '暂未支持树形下拉选择', + confirm: '确定', + }, + markdown: { + uploadJsonFormatErr: '配置uploadparams没有按标准JSON格式', + exportJsonFormatErr: '配置exportparams没有按标准JSON格式', + downloadFailedErr: '下载文件失败', + noExistentErr: '文件流数据不存在', + }, + notSupportedEditor: { + unsupportedType: '未支持的编辑器类型 - {type}', }, stepper: { pleaseEnter: '请输入', -- Gitee From 8420ef1599c30bc038fb585e354f506b1eac4d6f Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Tue, 6 Aug 2024 16:47:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=9C=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../date-picker/ibiz-date-picker/ibiz-date-picker.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss index 34d4799feed..35a54098975 100644 --- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss +++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss @@ -23,4 +23,12 @@ @include m(readonly) { color: getCssVar('form-item', 'readonly-color'); } +} + +.rolldate-container .rolldate-mask.rolldate-mask { + z-index: 9998; +} + +.rolldate-container .rolldate-panel.rolldate-panel { + z-index: 9999; } \ No newline at end of file -- Gitee From c5ab0ccf5f10d69c083fbbe263e83f40423e2ac3 Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Tue, 6 Aug 2024 16:48:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=BA=A7=E5=8A=9F=E8=83=BD=E5=B7=A5=E5=85=B7=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mob-app/main.ts | 2 + src/util/app-util/app-util.ts | 188 ++++++++++++++++++++++++++++++++++ src/util/index.ts | 1 + 3 files changed, 191 insertions(+) create mode 100644 src/util/app-util/app-util.ts diff --git a/src/mob-app/main.ts b/src/mob-app/main.ts index cf53e7e9870..e47765f1941 100644 --- a/src/mob-app/main.ts +++ b/src/mob-app/main.ts @@ -16,6 +16,7 @@ import { createVueApp } from './create-vue-app'; import { AppRouter } from './router'; import { UnauthorizedHandler } from './util'; import { + AppUtil, ConfirmUtil, LoadingUtil, MessageUtil, @@ -73,6 +74,7 @@ export async function runApp(plugins?: Plugin[]): Promise { app.use(router); + ibiz.appUtil = new AppUtil(router); ibiz.openView = new OpenViewUtil(router); ibiz.message = new MessageUtil(); ibiz.modal = new ModalUtil(); diff --git a/src/util/app-util/app-util.ts b/src/util/app-util/app-util.ts new file mode 100644 index 00000000000..57fb284add9 --- /dev/null +++ b/src/util/app-util/app-util.ts @@ -0,0 +1,188 @@ +/* eslint-disable no-unused-vars */ +/* eslint-disable @typescript-eslint/no-unused-vars */ +import { Router } from 'vue-router'; +import { IAppUtil, IAuthResult } from '@ibiz-template/runtime'; + +export class AppUtil implements IAppUtil { + /** + * Creates an instance of AppUtil. + * @author tony001 + * @date 2024-05-14 17:05:00 + * @param {Router} router + */ + constructor(protected router: Router) {} + + /** + * 登录 + * + * @author tony001 + * @date 2024-05-14 16:05:41 + * @param {string} loginName + * @param {string} password + * @param {(boolean | undefined)} [remember] + * @param {(IData | undefined)} [headers] + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + async login( + loginName: string, + password: string, + remember?: boolean | undefined, + headers?: IData | undefined, + opts?: IData | undefined, + ): Promise { + const bol = await ibiz.auth.login(loginName, password, remember, headers); + if (bol === true) { + window.location.hash = + (this.router.currentRoute.value.query.ru as string) || '/'; + // 重置会话记录state,防止直接返回到登录页 + window.history.pushState({}, ''); + window.location.reload(); + } + return bol; + } + + /** + * 登出 + * + * @author tony001 + * @date 2024-05-14 16:05:02 + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + async logout(opts?: IData | undefined): Promise { + const bol = await ibiz.auth.logout(); + if (bol) { + const path = window.location; + if (path.search.indexOf('isAnonymous=true') !== -1) { + const href = `${path.origin}${path.pathname}${path.hash}`; + window.history.replaceState({}, '', href); + } + await this.router.push( + // `/login?ru=${encodeURIComponent( + // window.location.hash.replace('#/', '/'), + // )}`, + '/login', + ); + ibiz.util.showAppLoading(); + window.location.reload(); + } + return bol; + } + + /** + * 变更密码 + * + * @author tony001 + * @date 2024-05-14 16:05:11 + * @param {string} oldPwd + * @param {string} newPwd + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + async changePwd( + oldPwd: string, + newPwd: string, + opts?: IData | undefined, + ): Promise { + if (this.validatePwd(oldPwd, newPwd, opts)) { + const result = await ibiz.auth.changePwd(oldPwd, newPwd); + return result; + } + return { ok: false, result: {} }; + } + + /** + * 切换组织 + * + * @author tony001 + * @date 2024-05-14 16:05:20 + * @param {string} oldOrgId + * @param {string} newOrgId + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + switchOrg( + oldOrgId: string, + newOrgId: string, + opts?: IData | undefined, + ): Promise { + throw new Error('Method not implemented.'); + } + + /** + * 切换主题 + * + * @author tony001 + * @date 2024-05-14 16:05:30 + * @param {string} oldTheme + * @param {string} newTheme + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + switchTheme( + oldTheme: string, + newTheme: string, + opts?: IData | undefined, + ): Promise { + throw new Error('Method not implemented.'); + } + + /** + * 切换语言 + * + * @author tony001 + * @date 2024-05-14 16:05:42 + * @param {string} oldLanguage + * @param {string} newLanguage + * @param {(IData | undefined)} [opts] + * @return {*} {Promise} + */ + switchLanguage( + oldLanguage: string, + newLanguage: string, + opts?: IData | undefined, + ): Promise { + throw new Error('Method not implemented.'); + } + + /** + * 校验密码 + * + * @author tony001 + * @date 2024-05-14 17:05:31 + * @protected + * @param {string} oldPwd + * @param {string} newPwd + * @param {IData} [opts={}] + * @return {*} {boolean} + */ + protected validatePwd( + oldPwd: string, + newPwd: string, + opts: IData = {}, + ): boolean { + const { surePwd } = opts; + if (!oldPwd) { + ibiz.message.error('原密码不能为空'); + return false; + } + if (!newPwd) { + ibiz.message.error('新密码不能为空'); + return false; + } + if (!surePwd) { + ibiz.message.error('确认密码不能为空'); + return false; + } + if (oldPwd === newPwd) { + ibiz.message.error('新密码不能与旧密码一致'); + return false; + } + if (newPwd !== surePwd) { + ibiz.message.error('两次密码不一致'); + return false; + } + return true; + } +} diff --git a/src/util/index.ts b/src/util/index.ts index 0f8af4c0730..6acfe1e93a7 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -6,4 +6,5 @@ export { OpenViewUtil } from './open-view-util/open-view-util'; export { OverlayController } from './overlay-controller/overlay-controller'; export { loadingDirective } from './directive/loading'; export { ConfirmUtil } from './confirm-util/confirm-util'; +export { AppUtil } from './app-util/app-util'; export * from './store'; -- Gitee