diff --git a/README.md b/README.md index 68a0a7a..862f64a 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,16 @@ php think run ## 项目特性 +* 兼容PHP8.1 + * 最低版本PHP7.4 * 支持移动端表格转卡片 +* 支持多款皮肤 + * 标准 + * 原型 + * 科幻 + * GTK + * 像素 + * WIN7 * 快速CURD命令行 * 一键生成控制器、模型、视图、JS文件 * 支持关联查询、字段设置等等 diff --git a/app/Request.php b/app/Request.php index 31ac8b3..470a583 100644 --- a/app/Request.php +++ b/app/Request.php @@ -5,6 +5,6 @@ namespace app; class Request extends \think\Request { - protected $filter = ['htmlspecialchars']; + protected $filter = ['ua_htmlspecialchars']; } diff --git a/app/common.php b/app/common.php index ffbceef..3001929 100644 --- a/app/common.php +++ b/app/common.php @@ -222,6 +222,18 @@ if (!function_exists('unparse_url')) { } } +if (!function_exists('ua_htmlspecialchars')) { + function ua_htmlspecialchars($string) + { + + if (is_null($string)) { + $string = ''; + } + + return htmlspecialchars($string); + } +} + function build_upload_url($url, $upload_type = null) { diff --git a/public/static/common/css/theme/_gtk.scss b/public/static/common/css/theme/_gtk.scss index 3a0f5eb..0006639 100644 --- a/public/static/common/css/theme/_gtk.scss +++ b/public/static/common/css/theme/_gtk.scss @@ -34,7 +34,8 @@ } .layui-table { - color: #2e3436; + color : #2e3436; + background: transparent; } .layui-table-view .layui-table[lay-size="sm"] .layui-table-cell { @@ -307,7 +308,7 @@ transition : none; padding : 3px 12px; min-height : 30px; - min-width : 30px; + min-width : 65px; display : flex; justify-content : center; align-items : center; @@ -666,10 +667,22 @@ padding : 0 10px; } -.layuimini-container .layui-form-select dl dd.layui-this{ +.layuimini-container .layui-form-select dl dd.layui-this { background-color: #3c88e5 !important; } .layui-table-header .layui-table { margin-bottom: 0; +} + +.layui-header .layui-nav .layui-nav-child dd.layui-this a, +.layui-header .layui-nav-child dd.layui-this, +.layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a { + background-color: #3c88e5 !important; +} + +.layuimini-mobile-show { + .layui-nav-more { + top: 4px; + } } \ No newline at end of file diff --git a/public/static/common/css/theme/_sicfi.scss b/public/static/common/css/theme/_sicfi.scss index c54872e..848193e 100644 --- a/public/static/common/css/theme/_sicfi.scss +++ b/public/static/common/css/theme/_sicfi.scss @@ -740,4 +740,10 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, .layui-iconpicker .layui-iconpicker-list { background-color: $black-color; +} + +.layui-header .layui-nav .layui-nav-child dd.layui-this a, +.layui-header .layui-nav-child dd.layui-this, +.layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a { + background-color: $active-color !important; } \ No newline at end of file diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index 84fb78e..e913737 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -624,6 +624,11 @@ .elem-style-sicfi .layui-iconpicker .layui-iconpicker-list { background-color: rgb(2, 17, 20); } +.elem-style-sicfi .layui-header .layui-nav .layui-nav-child dd.layui-this a, +.elem-style-sicfi .layui-header .layui-nav-child dd.layui-this, +.elem-style-sicfi .layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a { + background-color: rgba(62, 251, 251, 0.5) !important; +} .elem-style-gtk { background-color: #f6f5f4; @@ -651,6 +656,7 @@ } .elem-style-gtk .layui-table { color: #2e3436; + background: transparent; } .elem-style-gtk .layui-table-view .layui-table[lay-size=sm] .layui-table-cell { line-height: 30px; @@ -881,7 +887,7 @@ transition: none; padding: 3px 12px; min-height: 30px; - min-width: 30px; + min-width: 65px; display: flex; justify-content: center; align-items: center; @@ -1168,6 +1174,14 @@ .elem-style-gtk .layui-table-header .layui-table { margin-bottom: 0; } +.elem-style-gtk .layui-header .layui-nav .layui-nav-child dd.layui-this a, +.elem-style-gtk .layui-header .layui-nav-child dd.layui-this, +.elem-style-gtk .layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a { + background-color: #3c88e5 !important; +} +.elem-style-gtk .layuimini-mobile-show .layui-nav-more { + top: 4px; +} .elem-style-nes a, .elem-style-nes button {