From 288e265aaaa3e1c2c136cf669e8fee4025cb6dee Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 29 Aug 2023 11:51:46 +0800
Subject: [PATCH] =?UTF-8?q?init=EF=BC=9A1.=20=E6=B7=BB=E5=8A=A0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=20=202.=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd                                           | 24 +++++++++++++++++--
 .../js/components/DrawerOverlay/index.vue     |  4 ++--
 resources/assets/js/components/Minder.vue     |  2 +-
 .../assets/js/pages/manage/messenger.vue      |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/cmd b/cmd
index b7957bc67..a95b27431 100755
--- a/cmd
+++ b/cmd
@@ -162,20 +162,20 @@ run_exec() {
 
 run_mysql() {
     if [ "$1" = "backup" ]; then
-        # 备份数据库
         database=$(env_get DB_DATABASE)
         username=$(env_get DB_USERNAME)
         password=$(env_get DB_PASSWORD)
+        # 备份数据库
         mkdir -p ${cur_path}/docker/mysql/backup
         filename="${cur_path}/docker/mysql/backup/${database}_$(date "+%Y%m%d%H%M%S").sql.gz"
         run_exec mariadb "exec mysqldump --databases $database -u$username -p$password" | gzip > $filename
         judge "备份数据库"
         [ -f "$filename" ] && echo -e "备份文件：$filename"
     elif [ "$1" = "recovery" ]; then
-        # 还原数据库
         database=$(env_get DB_DATABASE)
         username=$(env_get DB_USERNAME)
         password=$(env_get DB_PASSWORD)
+        # 还原数据库
         mkdir -p ${cur_path}/docker/mysql/backup
         list=`ls -1 "${cur_path}/docker/mysql/backup" | grep ".sql.gz"`
         if [ -z "$list" ]; then
@@ -198,6 +198,24 @@ run_mysql() {
         run_exec mariadb "gunzip < /$inputname | mysql -u$username -p$password $database"
         run_exec php "php artisan migrate"
         judge "还原数据库"
+    elif [ "$1" = "empty" ]; then
+        read -rp "确定要清空数据库吗？(Y/n): " empty
+        [[ -z ${empty} ]] && empty="Y"
+        case $empty in
+        [yY][eE][sS] | [yY])
+            echo -e "${RedBG} 开始清空... ${Font}"
+            ;;
+        *)
+            echo -e "${GreenBG} 终止清空。 ${Font}"
+            exit 2
+            ;;
+        esac
+        ./cmd mysql backup
+        $COMPOSE stop mariadb
+        $COMPOSE rm -f mariadb
+        rm -rf "./docker/mysql/data"
+        $COMPOSE up -d mariadb
+        judge "清空数据库"
     fi
 }
 
@@ -424,6 +442,8 @@ if [ $# -gt 0 ]; then
             run_mysql backup
         elif [ "$1" = "recovery" ]; then
             run_mysql recovery
+        elif [ "$1" = "empty" ]; then
+            run_mysql empty
         else
             e="mysql $@" && run_exec mariadb "$e"
         fi
diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue
index 15ec60f75..825aecda2 100644
--- a/resources/assets/js/components/DrawerOverlay/index.vue
+++ b/resources/assets/js/components/DrawerOverlay/index.vue
@@ -78,7 +78,7 @@ export default {
             this.value !== v && this.$emit("input", v)
         },
         windowWidth(val){
-            this.isFullscreen = val < 500
+            this.isFullscreen = val < 500 && this.placement != 'bottom'
         }
     },
     computed: {
@@ -98,7 +98,7 @@ export default {
         }
     },
     mounted() {
-        this.isFullscreen = this.windowWidth < 515
+        this.isFullscreen = this.windowWidth < 500  && this.placement != 'bottom'
     },
     methods: {
         onClose() {
diff --git a/resources/assets/js/components/Minder.vue b/resources/assets/js/components/Minder.vue
index 276132a59..97db83e09 100644
--- a/resources/assets/js/components/Minder.vue
+++ b/resources/assets/js/components/Minder.vue
@@ -205,7 +205,7 @@
         components: {IFrame},
         props: {
             value: {
-                type: Object,
+                type: undefined,
                 default: function () {
                     return {}
                 }
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index a89cf0abe..c9a8b1434 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -545,7 +545,7 @@ export default {
 
     methods: {
         listTouch() {
-            if (this.$refs.navMenu.visible) {
+            if (this.$refs.navMenu?.visible) {
                 this.$refs.navMenu.hide()
             }
         },