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

优化资源目录

pull/463/MERGE
Karson 2024-04-01 22:04:05 +08:00
parent 8caeeb8a78
commit 1b9c035daf
13 changed files with 5931 additions and 5699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/index/controller/User.php
View File

@ -196,7 +196,7 @@ class User extends Frontend
*/
public function mobilelogin()
{
$url = $this->request->request('url', '', 'trim,xss_clean');
$url = $this->request->request('url', '', 'url_clean');
if ($this->request->isPost()) {
$mobile = $this->request->post('mobile');
$captcha = $this->request->post('captcha');

13
package.json
View File

@ -1,6 +1,6 @@
{
"name": "fastadmin",
"version": "1.4.0",
"version": "1.6.0",
"description": "FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
@ -15,22 +15,21 @@
"bootstrap-daterangepicker": "~2.1.25",
"bootstrap-select": "^1.13.18",
"bootstrap-slider": "^11.0.2",
"coloris": "npm:@melloware/coloris@^0.16.1",
"eonasdan-bootstrap-datetimepicker": "^4.17.49",
"fastadmin-addtabs": "karsonzhang/jquery-addtabs#semver:~1.0.7",
"fastadmin-bootstraptable": "karsonzhang/fastadmin-bootstraptable",
"fastadmin-citypicker": "karsonzhang/fastadmin-citypicker#semver:~1.3.2",
"fastadmin-cxselect": "karsonzhang/fastadmin-cxselect#semver:~1.4.0",
"fastadmin-dragsort": "karsonzhang/fastadmin-dragsort#semver:~1.0.1",
"fastadmin-layer": "karsonzhang/fastadmin-layer#semver:~3.5.2",
"fastadmin-selectpage": "karsonzhang/fastadmin-selectpage#semver:~1.0.11",
"bootstrap-table": "karsonzhang/fastadmin-bootstraptable",
"nice-validator": "karsonzhang/fastadmin-nicevalidator#semver:~1.1.6",
"font-awesome": "^4.6.1",
"jquery": "^3.6.1",
"jquery": "^3.7.0",
"jquery-slimscroll": "~1.3.8",
"jquery.cookie": "~1.4.1",
"jstree": "~3.3.2",
"moment": "^2.10",
"nice-validator": "~1.1.1",
"require-css": "~0.1.8",
"sortablejs": "^1.12.0",
"tableexport.jquery.plugin": "^1.26.0",
@ -68,12 +67,13 @@
],
"eonasdan-bootstrap-datetimepicker": "build/**",
"fastadmin-addtabs": "*.js",
"fastadmin-bootstraptable": "dist/**",
"fastadmin-citypicker": "dist/**",
"fastadmin-cxselect": "js/**",
"fastadmin-dragsort": "*.js",
"fastadmin-layer": "dist/**",
"fastadmin-selectpage": "*",
"bootstrap-table": "dist/**",
"nice-validator": "dist/**",
"font-awesome": [
"css/**",
"fonts/**"
@ -86,7 +86,6 @@
"moment.js",
"locale/**"
],
"nice-validator": "dist/**",
"require-css": "*.js",
"sortablejs": "*.js",
"tableexport.jquery.plugin": "tableExport.min.js",

2
public/assets/css/backend.css
View File

@ -5,7 +5,7 @@
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/build/toastr.min.css");
@import url("../libs/fastadmin-layer/dist/theme/default/layer.css");
@import url("../libs/fastadmin-bootstraptable/dist/bootstrap-table.min.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@import url("../libs/nice-validator/dist/jquery.validator.css");

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/css/frontend.css
View File

@ -4,7 +4,7 @@
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/build/toastr.min.css");
@import url("../libs/fastadmin-layer/dist/theme/default/layer.css");
@import url("../libs/fastadmin-bootstraptable/dist/bootstrap-table.min.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@import url("../libs/nice-validator/dist/jquery.validator.css");

2
public/assets/css/frontend.min.css vendored
View File

File diff suppressed because one or more lines are too long

75
public/assets/js/backend/addon.js
View File

@ -380,12 +380,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie']
Layer.open({
content: Template.render(tpldata, userinfo),
area: area,
title: __('Login FastAdmin'),
title: __('Userinfo'),
resize: false,
btn: [__('Login')],
yes: function (index, layero) {
var data = $("form", layero).serializeArray();
data.push({name: "faversion", value: Config.faversion});
btn: [__('Logout'), __('Close')],
yes: function () {
Fast.api.ajax({
url: Config.api_url + '/user/logout',
data: {
@ -395,71 +393,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie']
sid: Controller.api.sid()
}
}, function (data, ret) {
Controller.api.userinfo.set(data);
Controller.api.userinfo.set(null);
Layer.closeAll();
Layer.alert(ret.msg, {title: __('Warning'), icon: 1});
return false;
Layer.alert(ret.msg, {title: __('Warning'), icon: 0});
}, function (data, ret) {
Controller.api.userinfo.set(null);
Layer.closeAll();
Layer.alert(ret.msg, {title: __('Warning'), icon: 0});
});
},
success: function (layero, index) {
this.checkEnterKey = function (event) {
if (event.keyCode === 13) {
$(".layui-layer-btn0").trigger("click");
return false;
}
};
$(document).on('keydown', this.checkEnterKey);
},
end: function () {
$(document).off('keydown', this.checkEnterKey);
}
});
return false;
});
} else {
Fast.api.ajax({
url: Config.api_url + '/user/userinfotpl',
type: 'post',
data: {
version: Config.faversion
}
}, function (tpldata, ret) {
Fast.api.ajax({
url: Config.api_url + '/user/index',
data: {
uid: userinfo.id,
token: userinfo.token,
version: Config.faversion,
}
}, function (data) {
Layer.open({
content: Template.render(tpldata, userinfo),
area: area,
title: __('Userinfo'),
resize: false,
btn: [__('Logout'), __('Close')],
yes: function () {
Fast.api.ajax({
url: Config.api_url + '/user/logout',
data: {uid: userinfo.id, token: userinfo.token, version: Config.faversion}
}, function (data, ret) {
Controller.api.userinfo.set(null);
Layer.closeAll();
Layer.alert(ret.msg, {title: __('Warning'), icon: 0});
}, function (data, ret) {
Controller.api.userinfo.set(null);
Layer.closeAll();
Layer.alert(ret.msg, {title: __('Warning'), icon: 0});
});
}
});
return false;
}, function (data) {
Controller.api.userinfo.set(null);
$(that).trigger('click');
return false;
});
}, function (data) {
Controller.api.userinfo.set(null);
$(that).trigger('click');
return false;
});
}

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

@ -6,7 +6,7 @@ require.config({
main: 'moment'
}],
//在打包压缩时将会把include中的模块合并到主文件中
include: ['css', 'layer', 'toastr', 'fast', 'backend', 'backend-init', 'table', 'form', 'dragsort', 'drag', 'drop', 'addtabs', 'selectpage', 'bootstrap-daterangepicker'],
include: ['css', 'layer', 'toastr', 'fast', 'backend', 'backend-init', 'table', 'form', 'dragsort', 'addtabs', 'selectpage', 'bootstrap-daterangepicker'],
paths: {
'lang': "empty:",
'form': 'require-form',
@ -25,12 +25,12 @@ require.config({
'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker',
'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min',
'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN',
'bootstrap-table': '../libs/fastadmin-bootstraptable/dist/bootstrap-table.min',
'bootstrap-table-export': '../libs/fastadmin-bootstraptable/dist/extensions/export/bootstrap-table-export',
'bootstrap-table-fixed-columns': '../libs/fastadmin-bootstraptable/dist/extensions/fixed-columns/bootstrap-table-fixed-columns',
'bootstrap-table-mobile': '../libs/fastadmin-bootstraptable/dist/extensions/mobile/bootstrap-table-mobile.min',
'bootstrap-table-lang': '../libs/fastadmin-bootstraptable/dist/locale/bootstrap-table-zh-CN',
'bootstrap-table-jumpto': '../libs/fastadmin-bootstraptable/dist/extensions/page-jumpto/bootstrap-table-jumpto',
'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table.min',
'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export',
'bootstrap-table-fixed-columns': '../libs/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns',
'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.min',
'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',
'bootstrap-table-jumpto': '../libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto',
'bootstrap-slider': '../libs/bootstrap-slider/dist/bootstrap-slider.min',
'tableexport': '../libs/tableexport.jquery.plugin/tableExport.min',
'dragsort': '../libs/fastadmin-dragsort/jquery.dragsort',
@ -46,7 +46,6 @@ require.config({
'cxselect': '../libs/fastadmin-cxselect/js/jquery.cxselect',
'template': '../libs/art-template/dist/template-native',
'selectpage': '../libs/fastadmin-selectpage/selectpage',
'coloris': '../libs/coloris/dist/umd/coloris.min',
'citypicker': '../libs/fastadmin-citypicker/dist/js/city-picker.min',
'citypicker-data': '../libs/fastadmin-citypicker/dist/js/city-picker.data',
},
@ -120,7 +119,6 @@ require.config({
},
'jstree': ['css!../libs/jstree/dist/themes/default/style.css'],
'validator-lang': ['validator'],
'coloris': ['css!../libs/coloris/dist/coloris.min.css'],
'citypicker': ['citypicker-data', 'css!../libs/fastadmin-citypicker/dist/css/city-picker.css']
},
baseUrl: requirejs.s.contexts._.config.config.site.cdnurl + '/assets/js/', //资源基础路径

5791
public/assets/js/require-backend.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -25,12 +25,12 @@ require.config({
'bootstrap-daterangepicker': '../libs/bootstrap-daterangepicker/daterangepicker',
'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min',
'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN',
'bootstrap-table': '../libs/fastadmin-bootstraptable/dist/bootstrap-table.min',
'bootstrap-table-export': '../libs/fastadmin-bootstraptable/dist/extensions/export/bootstrap-table-export.min',
'bootstrap-table-fixed-columns': '../libs/fastadmin-bootstraptable/dist/extensions/fixed-columns/bootstrap-table-fixed-columns',
'bootstrap-table-mobile': '../libs/fastadmin-bootstraptable/dist/extensions/mobile/bootstrap-table-mobile.min',
'bootstrap-table-lang': '../libs/fastadmin-bootstraptable/dist/locale/bootstrap-table-zh-CN',
'bootstrap-table-jumpto': '../libs/fastadmin-bootstraptable/dist/extensions/page-jumpto/bootstrap-table-jumpto',
'bootstrap-table': '../libs/bootstrap-table/dist/bootstrap-table.min',
'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
'bootstrap-table-fixed-columns': '../libs/bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-columns',
'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.min',
'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',
'bootstrap-table-jumpto': '../libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto',
'bootstrap-slider': '../libs/bootstrap-slider/dist/bootstrap-slider.min',
'tableexport': '../libs/tableexport.jquery.plugin/tableExport.min',
'dragsort': '../libs/fastadmin-dragsort/jquery.dragsort',

5709
public/assets/js/require-frontend.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/less/backend.less
View File

@ -10,7 +10,7 @@
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/build/toastr.min.css");
@import url("../libs/fastadmin-layer/dist/theme/default/layer.css");
@import url("../libs/fastadmin-bootstraptable/dist/bootstrap-table.min.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@import url("../libs/nice-validator/dist/jquery.validator.css");

2
public/assets/less/frontend.less
View File

@ -7,7 +7,7 @@
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/build/toastr.min.css");
@import url("../libs/fastadmin-layer/dist/theme/default/layer.css");
@import url("../libs/fastadmin-bootstraptable/dist/bootstrap-table.min.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@import url("../libs/nice-validator/dist/jquery.validator.css");