This commit is contained in:
zhongjin 2023-05-02 21:01:55 +08:00
parent 48371499f9
commit e8f4ce5884
21 changed files with 83 additions and 127 deletions

View File

@ -36,19 +36,19 @@ use Twig\Loader\FilesystemLoader;
abstract class AbstractInstallerVueController extends AbstractInstallerController
{
public const WELCOME_SCREEN = "Welcome";
public const DATABASE_INFO_SCREEN = "Database Information";
public const SYSTEM_CHECK_SCREEN = "System Check";
public const WELCOME_SCREEN = "开始";
public const DATABASE_INFO_SCREEN = "数据库配置";
public const SYSTEM_CHECK_SCREEN = "检测运行环境";
public const VERSION_DETAILS_SCREEN = "Version Details";
public const UPGRADE_SCREEN = "Upgrade";
public const UPGRADE_SCREEN = "升级";
public const UPGRADER_COMPLETE_SCREEN = "Completion";
public const LICENCE_ACCEPTANCE_SCREEN = "License Acceptance";
public const DATABASE_CONFIG_SCREEN = "Database Configuration";
public const INSTANCE_CREATION_SCREEN = "Instance Creation";
public const ADMIN_USER_CREATION_SCREEN = "Admin User Creation";
public const CONFIRMATION_SCREEN = "Confirmation";
public const INSTALLATION_SCREEN = "Installation";
public const INSTALLATION_COMPLETE_SCREEN = "Installation Complete";
public const LICENCE_ACCEPTANCE_SCREEN = "许可协议";
public const DATABASE_CONFIG_SCREEN = "数据库配置";
public const INSTANCE_CREATION_SCREEN = "创建实例";
public const ADMIN_USER_CREATION_SCREEN = "创建管理员";
public const CONFIRMATION_SCREEN = "确认";
public const INSTALLATION_SCREEN = "安装";
public const INSTALLATION_COMPLETE_SCREEN = "安装完成";
public const INSTALLER_SCREENS = [
self::WELCOME_SCREEN,

View File

@ -1 +1 @@
1682848022906
1683032484474

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -24,12 +24,11 @@
@submit-valid="onSubmit"
>
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Admin User Creation
创建管理员账号
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
Select the name, email address, username and password to create the admin
user for your OrangeHRM Instance
选择名称电子邮件地址用户名和密码以创建管理员
</oxd-text>
<br />
<oxd-grid :cols="4" class="orangehrm-full-width-grid">
@ -37,19 +36,11 @@
<oxd-input-field
v-model="adminUser.firstName"
:rules="rules.firstName"
placeholder="First Name"
label="Employee Name"
placeholder="输入名称"
label="名称"
required
/>
</oxd-grid-item>
<oxd-grid-item>
<oxd-input-field
v-model="adminUser.lastName"
:rules="rules.lastName"
placeholder="Last Name"
label="&nbsp;"
/>
</oxd-grid-item>
<oxd-grid-item class="--offset-row-2 --span-column-2">
<oxd-input-field
v-model="adminUser.email"
@ -94,34 +85,18 @@
</oxd-grid>
<br />
<oxd-form-row class="orangehrm-register-consent">
<oxd-input-field
v-model="adminUser.registrationConsent"
type="checkbox"
option-label="Register your system with OrangeHRM. By registering, You will be eligible for free support via emails, receive security alerts and news letters from OrangeHRM."
/>
<div class="orangehrm-register-notice">
<oxd-icon class="orangehrm-register-notice-icon" name="info-circle" />
<oxd-text class="orangehrm-register-notice-text" tag="p">
Users who seek access to their data, or who seek to correct, amend, or
delete the given information should direct their requests to
data@orangehrm.com
</oxd-text>
</div>
</oxd-form-row>
<oxd-form-actions class="orangehrm-installer-page-action">
<required-text />
<oxd-button
display-type="ghost"
label="Back"
label="上一步"
type="button"
@click="navigateUrl"
/>
<oxd-button
class="orangehrm-left-space"
display-type="secondary"
label="Next"
label="下一步"
type="submit"
/>
</oxd-form-actions>
@ -143,9 +118,6 @@ import Icon from '@ohrm/oxd/core/components/Icon/Icon.vue';
export default {
name: 'AdminUserCreation',
components: {
'oxd-icon': Icon,
},
setup() {
const http = new APIService(
window.appGlobal.baseUrl,
@ -166,11 +138,10 @@ export default {
username: null,
password: '',
confirmPassword: '',
registrationConsent: true,
registrationConsent: false,
},
rules: {
firstName: [required, shouldNotExceedCharLength(30)],
lastName: [required, shouldNotExceedCharLength(30)],
email: [required, shouldNotExceedCharLength(50), validEmailFormat],
contact: [shouldNotExceedCharLength(25), validPhoneNumberFormat],
username: [
@ -202,12 +173,12 @@ export default {
this.http
.create({
firstName: this.adminUser.firstName,
lastName: this.adminUser.lastName,
lastName: this.adminUser.firstName,
email: this.adminUser.email,
contact: this.adminUser.contact,
username: this.adminUser.username,
password: this.adminUser.password,
registrationConsent: this.adminUser.registrationConsent,
registrationConsent: false,
})
.then(() => {
navigate('/installer/confirmation');

View File

@ -21,17 +21,13 @@
:loading="isLoading"
@submit-valid="onSubmit"
>
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Confirmation
</oxd-text>
<oxd-text tag="h5" class="orangehrm-installer-page-title"> 确认 </oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
All the information required for OrangeHRM installation collected in the
earlier steps are given below. On confirmation the installer will create
the database, database users, configuration file, etc
所需的所有信息都收集在下面 确认安装将创建数据库数据库用户配置文件等
</oxd-text>
<br />
<oxd-text class="confirmation-text-header">Details</oxd-text>
<oxd-text class="confirmation-text-header"> 详细信息 </oxd-text>
<br />
<oxd-text class="confirmation-text-section"> Host Name </oxd-text>
<oxd-text class="confirmation-text-info">{{ database.dbHost }}</oxd-text>
@ -73,19 +69,19 @@
<br />
<br />
<oxd-text class="orangehrm-installer-page-content">
Click <b>Install</b> to continue
点击 <b>开始安装</b> 继续
</oxd-text>
<oxd-form-actions class="orangehrm-installer-page-action">
<oxd-button
display-type="ghost"
label="Back"
label="上一步"
type="button"
@click="navigateUrl"
/>
<oxd-button
class="orangehrm-left-space"
display-type="secondary"
label="Install"
label="开始安装"
type="submit"
/>
</oxd-form-actions>

View File

@ -24,12 +24,12 @@
@submit-valid="onSubmit"
>
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Database Configuration
数据库配置
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
Please enter your database configuration information below. If you are
unsure of what to fill in, we suggest that you use the default values.
请在下面输入您的数据库配置信息如果您不确定
要填写什么我们建议您使用默认值
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
@ -39,12 +39,12 @@
<oxd-radio-input
v-model="database.dbType"
value="new"
option-label="New Database"
option-label="新建数据库"
/>
<oxd-radio-input
v-model="database.dbType"
value="existing"
option-label="Existing Empty Database"
option-label="已有数据库 (Docker 运行)"
/>
</oxd-form-row>
<br />
@ -53,7 +53,7 @@
<oxd-grid-item>
<oxd-input-field
v-model="database.dbHost"
label="Database Host Name"
label="主机名"
:rules="rules.dbHost"
required
/>
@ -61,7 +61,7 @@
<oxd-grid-item class="orangehrm-database-info-port">
<oxd-input-field
v-model="database.dbPort"
label="Database Host Port"
label="主机端口"
:rules="rules.dbPort"
required
/>
@ -138,12 +138,12 @@
v-model="database.enableDataEncryption"
label="&nbsp;"
type="checkbox"
option-label="Enable Data Encryption"
option-label="使用数据库加密"
/>
</oxd-grid-item>
</oxd-grid>
<oxd-text class="orangehrm-installer-page-content">
Click <b>Next</b> to continue
点击 <b>下一步</b> 继续
</oxd-text>
<br />
<oxd-text
@ -157,14 +157,14 @@
<required-text />
<oxd-button
display-type="ghost"
label="Back"
label="上一步"
type="button"
@click="navigateUrl"
/>
<oxd-button
class="orangehrm-left-space"
display-type="secondary"
label="Next"
label="下一步"
type="submit"
/>
</oxd-form-actions>

View File

@ -19,9 +19,7 @@
-->
<template>
<div class="orangehrm-installer-page">
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Installation
</oxd-text>
<oxd-text tag="h5" class="orangehrm-installer-page-title"> 安装 </oxd-text>
<br />
<installer-tasks :tasks="tasks"></installer-tasks>
<br />
@ -57,13 +55,13 @@
<oxd-form-actions class="orangehrm-installer-page-action">
<oxd-button
v-show="progress === 100"
label="Next"
label="下一步"
display-type="secondary"
@click="onClickNext"
/>
<oxd-button
v-show="taskFailed"
label="Clean up Install"
label="清除并重新安装"
display-type="secondary"
@click="onClickCleanup"
/>
@ -160,7 +158,7 @@ export default {
});
const progressNotice = computed(() => {
if (!taskFailed.value) return 'Please Wait. Installation in Progress';
if (!taskFailed.value) return '请等待. 安装正在进行';
return `${
errorText.value ? errorText.value : 'Installation has failed'
}. For more details check the error log in /src/log/installer.log file`;

View File

@ -20,19 +20,18 @@
<template>
<div class="orangehrm-installer-page">
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Installation Complete
安装完成
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
OrangeHRM Starter Version {{ productversion }} has been successfully
installed.
JingweiHRM-{{ productversion }}已经安装成功.
</oxd-text>
<br />
<br />
<oxd-button
class="orangehrm-installer-complete-button"
display-type="secondary"
label="Launch OrangeHRM"
label="打开 JingweiHRM"
@click="launch"
/>
</div>

View File

@ -24,19 +24,18 @@
@submit-valid="onSubmit"
>
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Instance Creation
创建实例
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
Fill in your organization details here. Details entered in this section
will be captured to create your OrangeHRM Instance
在此处填写您的组织详细信息
</oxd-text>
<br />
<oxd-grid :cols="2" class="orangehrm-full-width-grid">
<oxd-grid-item>
<oxd-input-field
v-model="instance.organizationName"
label="Organization Name"
label="组织名称"
required
:rules="rules.organizationName"
/>
@ -44,7 +43,7 @@
<oxd-grid-item class="--offset-row-2">
<oxd-input-field
v-model="instance.countryCode"
label="Country"
label="国家或地区"
required
type="select"
:options="countryList"
@ -54,7 +53,7 @@
<oxd-grid-item class="--offset-row-3">
<oxd-input-field
v-model="instance.langCode"
label="Language"
label="语言"
type="select"
:options="languageList"
/>
@ -62,7 +61,7 @@
<oxd-grid-item class="--offset-row-4">
<oxd-input-field
v-model="instance.timezone"
label="Timezone"
label="时区"
type="select"
:options="timezoneList"
/>
@ -73,14 +72,14 @@
<required-text />
<oxd-button
display-type="ghost"
label="Back"
label="上一步"
type="button"
@click="navigateUrl"
/>
<oxd-button
class="orangehrm-left-space"
display-type="secondary"
label="Next"
label="下一步"
type="submit"
/>
</oxd-form-actions>

View File

@ -24,11 +24,11 @@
@submit-valid="onSubmit"
>
<oxd-text tag="h5" class="orangehrm-installer-page-title">
License Acceptance
许可协议
</oxd-text>
<br />
<oxd-text class="orangehrm-installer-page-content">
Please review the license terms before installing OrangeHRM Starter.
请在安装 JingweiHRM 之前查看许可条款.
</oxd-text>
<br />
@ -38,9 +38,7 @@
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
If you accept the terms of the agreement, select the first option below.
You must accept the agreement to install OrangeHRM. Click <b>Next</b> to
continue
点击 <b>下一步</b> 继续
</oxd-text>
<br />
@ -48,17 +46,17 @@
<oxd-input-field
v-model="userConsent"
type="checkbox"
option-label="I accept the terms in the License Agreement"
option-label="我接受上述协议条款"
/>
</oxd-form-row>
<oxd-form-actions class="orangehrm-installer-page-action">
<oxd-button display-type="ghost" label="Back" @click="onClickBack" />
<oxd-button display-type="ghost" label="上一步" @click="onClickBack" />
<oxd-button
:disabled="!userConsent"
class="orangehrm-left-space"
display-type="secondary"
label="Next"
label="下一步"
type="submit"
/>
</oxd-form-actions>

View File

@ -21,13 +21,12 @@
<oxd-form :loading="isLoading">
<div class="orangehrm-installer-page">
<oxd-text tag="h5" class="orangehrm-installer-page-title">
System Check
检测运行环境
</oxd-text>
<br />
<oxd-text class="orangehrm-installer-page-content">
In order for your OrangeHRM installation to function properly, please
ensure that all of the system check items listed below are green. If any
are red, please take the necessary steps to fix them.
为了让您的 JingweiHRM 安装正常运行请确保下面列出的所有系统检查项目
都是绿色的 如果有红色的请采取必要的步骤来修复它们
</oxd-text>
<br />
<flex-table
@ -37,11 +36,11 @@
:title-name="item.category"
></flex-table>
<oxd-form-actions class="orangehrm-installer-page-action">
<oxd-button display-type="ghost" label="Back" @click="navigateUrl" />
<oxd-button display-type="ghost" label="上一步" @click="navigateUrl" />
<oxd-button
class="orangehrm-left-space"
display-type="ghost"
label="Re-Check"
label="重新检查"
type="submit"
@click="reCheck"
/>
@ -49,7 +48,7 @@
class="orangehrm-left-space"
display-type="secondary"
:disabled="isInterrupted"
label="Next"
label="下一步"
@click="goToScreen()"
/>
</oxd-form-actions>

View File

@ -20,27 +20,25 @@
<template>
<oxd-form class="orangehrm-installer-page" @submit="toggleModal">
<oxd-text tag="h5" class="orangehrm-installer-page-title">
Welcome to OrangeHRM Starter Version {{ productversion }} Setup Wizard
欢迎使用经纬航通 HRM{{ productversion }} 安装程序
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
This setup wizard will guide through the steps necessary to install/
upgrade OrangeHRM Starter components and their dependencies.
此设置向导将指导完成安装/升级 JingweiHRM 组件及其依赖项所需的步骤
</oxd-text>
<br />
<oxd-text tag="p" class="orangehrm-installer-page-content">
Select an installation type;
选择安装类型;
</oxd-text>
<br />
<oxd-form-row class="orangehrm-installer-page-row">
<oxd-radio-input
v-model="selected"
value="install"
option-label="Fresh Installation"
option-label="全新安装"
/>
<oxd-text tag="p" class="orangehrm-installer-page-content --label">
Choose this option if you are installing OrangeHRM Starter for the first
time
如果您是第一次安装 OrangeHRM Starter请选择此选项
</oxd-text>
</oxd-form-row>
@ -48,21 +46,20 @@
<oxd-radio-input
v-model="selected"
value="upgrade"
option-label="Upgrading an Existing Installation"
option-label="升级现有版本"
/>
<oxd-text tag="p" class="orangehrm-installer-page-content --label">
Choose this option if you are already using a prior version of OrangeHRM
Starter (version 4.0 onwards) and would like to upgrade to
<b>version {{ productversion }}</b>
如果您已经在使用 JingweiHRM 的早期版本请选择此选项升级到
<b>{{ productversion }}</b>
</oxd-text>
</oxd-form-row>
<oxd-text tag="p" class="orangehrm-installer-page-content">
Click <b>Next</b> to continue
点击 <b>下一步</b> 继续
</oxd-text>
<oxd-form-actions class="orangehrm-installer-page-action">
<oxd-button display-type="secondary" label="Next" type="submit" />
<oxd-button display-type="secondary" label="下一步" type="submit" />
</oxd-form-actions>
</oxd-form>
<database-config-dialog

View File

@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>{% block title %}OrangeHRM{% endblock %}</title>
<title>{% block title %}经纬航通HRM{% endblock %}</title>
{% block links %}{% endblock %}
{% block stylesheets %}{% endblock %}
</head>

View File

@ -1,2 +1 @@
<oxd-text tag="p" class="orangehrm-copyright">{{ productName }} {{ productVersion }}</oxd-text>
<oxd-text tag="p" class="orangehrm-copyright">&copy; 2005 - {{ copyrightYear}} <a href="http://www.orangehrm.com" target="_blank">OrangeHRM, Inc</a>. All rights reserved.</oxd-text>
<oxd-text tag="p" class="orangehrm-copyright">&copy; 2015-{{ copyrightYear}} <a href="http://www.jingweiht.com" target="_blank">JingweiHRM</a>. 湖南新空间 经纬航通.</oxd-text>

View File

@ -23,7 +23,7 @@
<div id="app">
<oxd-layout
home-url="https://www.orangehrm.com/"
home-url="https://www.jingweiht.com/"
:sidepanel-menu-items="{{ sidePanelMenuItems | json_encode() }}"
:topbar-menu-items="{{ topMenuItems | json_encode() }}"
:user="{{ user | json_encode() }}"