mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化语言包加载和判断

pull/495/head
Karson 2025-04-01 09:06:58 +08:00
parent 18b6e0d672
commit 1fb3ba0d0c
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/assets/js/require-backend.js
View File

@ -19,7 +19,7 @@ require.config({
'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch', 'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch',
'bootstrap-table-template': 'bootstrap-table-template', 'bootstrap-table-template': 'bootstrap-table-template',
// //
// 以下的包从bower的libs目录加载 // 以下的包从libs目录加载
'jquery': '../libs/jquery/dist/jquery.min', 'jquery': '../libs/jquery/dist/jquery.min',
'bootstrap': '../libs/bootstrap/dist/js/bootstrap.min', 'bootstrap': '../libs/bootstrap/dist/js/bootstrap.min',
'bootstrap-datetimepicker': '../libs/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min', 'bootstrap-datetimepicker': '../libs/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
@ -133,6 +133,15 @@ require(['jquery', 'bootstrap'], function ($, undefined) {
paths['lang'] = Config.moduleurl + '/ajax/lang?callback=define&controllername=' + Config.controllername + '&lang=' + Config.language; paths['lang'] = Config.moduleurl + '/ajax/lang?callback=define&controllername=' + Config.controllername + '&lang=' + Config.language;
// 避免目录冲突 // 避免目录冲突
paths['backend/'] = 'backend/'; paths['backend/'] = 'backend/';
// 如果是英文，则移除默认的定义
if (Config.language === 'en') {
$.each(requirejs.s.contexts._.config.paths, function (key, value) {
if (key.match(/\-lang$/)) {
define(key);
}
});
define('moment/locale/zh-cn');
}
require.config({paths: paths}); require.config({paths: paths});
// 初始化 // 初始化

19
public/assets/js/require-frontend.js
View File

@ -19,7 +19,7 @@ require.config({
'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch', 'bootstrap-table-commonsearch': 'bootstrap-table-commonsearch',
'bootstrap-table-template': 'bootstrap-table-template', 'bootstrap-table-template': 'bootstrap-table-template',
// //
// 以下的包从bower的libs目录加载 // 以下的包从libs目录加载
'jquery': '../libs/jquery/dist/jquery.min', 'jquery': '../libs/jquery/dist/jquery.min',
'bootstrap': '../libs/bootstrap/dist/js/bootstrap.min', 'bootstrap': '../libs/bootstrap/dist/js/bootstrap.min',
'bootstrap-datetimepicker': '../libs/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min', 'bootstrap-datetimepicker': '../libs/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
@ -132,6 +132,15 @@ require(['jquery', 'bootstrap'], function ($, undefined) {
paths['lang'] = Config.moduleurl + '/ajax/lang?callback=define&controllername=' + Config.controllername + '&lang=' + Config.language; paths['lang'] = Config.moduleurl + '/ajax/lang?callback=define&controllername=' + Config.controllername + '&lang=' + Config.language;
// 避免目录冲突 // 避免目录冲突
paths['frontend/'] = 'frontend/'; paths['frontend/'] = 'frontend/';
// 如果是英文，则移除默认的定义
if (Config.language === 'en') {
$.each(requirejs.s.contexts._.config.paths, function (key, value) {
if (key.match(/\-lang$/)) {
define(key);
}
});
define('moment/locale/zh-cn');
}
require.config({paths: paths}); require.config({paths: paths});
// 初始化 // 初始化
@ -141,7 +150,13 @@ require(['jquery', 'bootstrap'], function ($, undefined) {
//加载相应模块 //加载相应模块
if (Config.jsname) { if (Config.jsname) {
require([Config.jsname], function (Controller) { require([Config.jsname], function (Controller) {
Controller[Config.actionname] != undefined && Controller[Config.actionname](); if (Controller.hasOwnProperty(Config.actionname)) {
Controller[Config.actionname]();
} else {
if (Controller.hasOwnProperty("_empty")) {
Controller._empty();
}
}
}, function (e) { }, function (e) {
console.error(e); console.error(e);
// 这里可捕获模块加载的错误 // 这里可捕获模块加载的错误

4
public/assets/js/require-table.js
View File

@ -34,7 +34,9 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
singleSelect: false, //是否启用单选 singleSelect: false, //是否启用单选
showRefresh: false, showRefresh: false,
showJumpto: true, showJumpto: true,
locale: Config.language === 'zh-cn' ? 'zh-CN' : 'en-US', locale: Config.language === 'en' ? 'en-US' : Config.language.replace(/\-(\w+)$/, function (value) {
return value.toUpperCase();
}),
showToggle: true, showToggle: true,
showColumns: true, showColumns: true,
pk: 'id', pk: 'id',