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

Merge branch '1.x' into 1.x-dev

pull/495/head
Karson 2025-05-06 16:03:02 +08:00
parent bcdf824368 6361d9228f
commit d49d8be1e7
3 changed files with 318 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/config.php
View File

@ -320,7 +320,7 @@ return [
//允许跨域的域名,多个以,分隔 //允许跨域的域名,多个以,分隔
'cors_request_domain' => 'localhost,127.0.0.1', 'cors_request_domain' => 'localhost,127.0.0.1',
//版本号 //版本号
'version' => '1.6.0.20250331', 'version' => '1.6.1.20250430',
//API接口地址 //API接口地址
'api_url' => 'https://api.fastadmin.net', 'api_url' => 'https://api.fastadmin.net',
], ],

383
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fastadmin", "name": "fastadmin",
"version": "1.6.0", "version": "1.6.1",
"description": "FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。", "description": "FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。",
"scripts": { "scripts": {
"build": "grunt" "build": "grunt"
@ -15,12 +15,11 @@
"bootstrap-select": "^1.13.18", "bootstrap-select": "^1.13.18",
"bootstrap-slider": "^11.0.2", "bootstrap-slider": "^11.0.2",
"eonasdan-bootstrap-datetimepicker": "^4.17.49", "eonasdan-bootstrap-datetimepicker": "^4.17.49",
"cxselect": "^1.4.0",
"fastadmin-addtabs": "^1.0.8", "fastadmin-addtabs": "^1.0.8",
"fastadmin-arttemplate": "^3.1.4", "fastadmin-arttemplate": "^3.1.4",
"fastadmin-bootstraptable": "^1.11.12", "fastadmin-bootstraptable": "^1.11.12",
"fastadmin-citypicker": "^1.3.6", "fastadmin-citypicker": "^1.3.6",
"fastadmin-cxselect": "npm:cxselect@^1.4.0", "fastadmin-cxselect": "^1.4.0",
"fastadmin-dragsort": "^1.0.5", "fastadmin-dragsort": "^1.0.5",
"fastadmin-layer": "^3.5.6", "fastadmin-layer": "^3.5.6",
"fastadmin-selectpage": "^1.1.1", "fastadmin-selectpage": "^1.1.1",