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() } },