From a174425e70bc1e9451858133457e384fa06af370 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sun, 21 Aug 2022 15:22:08 +0800
Subject: [PATCH] improve preview

---
 README-EN.md                                     |  2 +-
 README.md                                        |  1 +
 app/Filament/Resources/User/ExamUserResource.php |  2 +-
 app/Models/User.php                              |  6 ++++--
 include/constants.php                            |  2 +-
 nexus/Install/settings.default.php               |  5 +++--
 public/js/nexus.js                               | 16 +++++++++-------
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/README-EN.md b/README-EN.md
index 8dfc8afd..a8d258e1 100644
--- a/README-EN.md
+++ b/README-EN.md
@@ -33,7 +33,7 @@ Complete PT website building solution. Based on NexusPHP + Laravel + Filament.
 - Sticky promotion
 - Custom menu
 - Lucky draw
-
+- Custom role permission
 ## System Requirements
 - PHP: 8.0, must have extensions: bcmath, ctype, curl, fileinfo, json, mbstring, openssl, pdo_mysql, tokenizer, xml, mysqli, gd, redis, pcntl, sockets, posix, gmp
 - Mysql: 5.7 latest version or above
diff --git a/README.md b/README.md
index 6265bfb4..9e7b4285 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@
 - 置顶促销
 - 自定义菜单
 - 幸运大转盘
+- 自定义角色权限
 
 ## 系统要求
 - PHP: 8.0，必须扩展：bcmath, ctype, curl, fileinfo, json, mbstring, openssl, pdo_mysql, tokenizer, xml, mysqli, gd, redis, pcntl, sockets, posix, gmp
diff --git a/app/Filament/Resources/User/ExamUserResource.php b/app/Filament/Resources/User/ExamUserResource.php
index c462004b..b1b24dae 100644
--- a/app/Filament/Resources/User/ExamUserResource.php
+++ b/app/Filament/Resources/User/ExamUserResource.php
@@ -62,7 +62,7 @@ class ExamUserResource extends Resource
             ->defaultSort('id', 'desc')
             ->filters([
                 Tables\Filters\SelectFilter::make('status')->options(ExamUser::listStatus(true))->label(__("label.status")),
-                Tables\Filters\SelectFilter::make('is_done')->options(['0' => 'No', '1' => 'yes'])->label(__('label.exam.is_done')),
+                Tables\Filters\SelectFilter::make('is_done')->options(['0' => 'No', '1' => 'yes'])->label(__('label.exam_user.is_done')),
             ])
             ->actions([
                 Tables\Actions\ViewAction::make(),
diff --git a/app/Models/User.php b/app/Models/User.php
index 5541b6e8..4fa1ccd1 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -115,11 +115,13 @@ class User extends Authenticatable implements FilamentUser, HasName
         return $classText;
     }
 
-    public static function listClass(): array
+    public static function listClass($min = self::CLASS_PEASANT, $max = self::CLASS_STAFF_LEADER): array
     {
         $result = [];
         foreach (self::$classes as $class => $info) {
-            $result[$class] = self::getClassText($class);
+            if ($class >= $min && $class <= $max) {
+                $result[$class] = self::getClassText($class);
+            }
         }
         return $result;
     }
diff --git a/include/constants.php b/include/constants.php
index 09fd47be..33bb680c 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.23');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-19');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-21');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/nexus/Install/settings.default.php b/nexus/Install/settings.default.php
index b234d9ce..e3011dff 100644
--- a/nexus/Install/settings.default.php
+++ b/nexus/Install/settings.default.php
@@ -415,7 +415,8 @@ return array (
         'max_uploaded' => 3,
         'not_seed_box_max_speed' => 10240,
     ],
-    'menu' => [
-        'enabled' => 'no',
+    'system' => [
+        'change_username_min_interval_in_days' => '365',
+        'change_username_card_allow_characters_outside_the_alphabets' => 'no',
     ],
 );
diff --git a/public/js/nexus.js b/public/js/nexus.js
index 0e5622e3..61562713 100644
--- a/public/js/nexus.js
+++ b/public/js/nexus.js
@@ -9,13 +9,15 @@ jQuery(document).ready(function () {
     })
 
     var previewEle = jQuery('#nexus-preview')
-    jQuery("body").on("mouseover", ".preview", function (e) {
-        let src = jQuery(this).attr("src")
+    jQuery(".preview").hover(function (e) {
+        let _this = jQuery(this);
+        let src = _this.attr("src")
         if (src) {
-            previewEle.attr("src", src).css({"display": "block", "left": e.pageX + 5, "top": e.pageY + 5})
+            previewEle.attr("src", src).fadeIn("fast");
         }
-    });
-    jQuery("body").on("mouseout", ".preview", function (e) {
-        previewEle.hide()
-    });
+    }, function (e) {
+        previewEle.fadeOut("fast");
+    }).on("mousemove", function (e) {
+        previewEle.css({"left": e.pageX + 10, "top": e.pageY + 10})
+    })
 })