bump version 0.1.0-beta

client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fairyla",
-    "version": "0.1.0",
+    "version": "0.1.0-beta",
     "license": "Apache-2.0",
     "private": true,
     "scripts": {

client/src/App.vue

@@ -44,20 +44,10 @@ export default {
                 try {
                     let data = JSON.parse(event.data)
                     this.handleEvent(data)
-                    //es.close()
                 } catch (e) {
                     console.error(e)
                 }
             })
-            es.addEventListener('error', (event) => {
-                if (event.readyState == EventSource.CLOSED) {
-                    console.log('event was closed')
-                }
-            })
-            es.addEventListener('close', (event) => {
-                console.log(event.type)
-                es.close()
-            })
         },
         handleEvent(data) {
             if (!Array.isArray(data) || data.length === 0) {
@@ -121,10 +111,9 @@ export default {
             })
         },
         deleteEvent(id) {
-            console.log('delete', id)
             this.$http.delete(`/user/event/${id}`).then(() => {
                 this.$message.success({
-                    message: '事件已读，已经删除！',
+                    message: '事件已标识为已读',
                     customClass: 'el-message--slim'
                 })
             })

client/src/components/Backtop.vue

@@ -100,8 +100,8 @@ export default {
 .back_to_top {
     position: fixed;
     z-index: 99999;
-    bottom: 2rem;
-    right: 1.5rem;
+    bottom: 2.5rem;
+    right: 1.8rem;
     background-color: #fff;
     color: #409eff;
     border-radius: 50%;

client/src/components/Fairy.vue

@@ -8,18 +8,12 @@
                 <div class="post-info">
                     &nbsp;&nbsp; 所属：{{ album.owner }}
                 </div>
-                <div class="post-info" v-if="btns.length > 0">
-                    <el-button
-                        v-for="(btn, index) in btns"
+                <div class="post-info" v-if="Object.keys(btns).length > 0">
+                    <fairy-btn
+                        v-for="(btn, index) in Object.values(btns)"
                         :key="index"
-                        size="mini"
-                        :type="btn.type || 'primary'"
-                        :plain="btn.plain"
-                        :disabled="btn.disabled"
-                        :icon="btn.icon"
-                        @click="btn.click"
-                        >{{ btn.name }}</el-button
-                    >
+                        :btn="btn"
+                    ></fairy-btn>
                 </div>
                 <div class="post-main" v-for="f in fairies" :key="f.id">
                     <video
@@ -79,6 +73,7 @@
 import { defineProps } from 'vue'
 import { isObject } from '@/libs/util.js'
 import Backtop from './Backtop.vue'
+import FairyBtn from './FairyBtn.vue'
 
 defineProps({
     album: {
@@ -101,10 +96,10 @@ defineProps({
     },
     urls: Array,
     btns: {
-        type: Array,
+        type: Object,
         validator: (value) => {
-            if (!Array.isArray(value)) return false
-            for (let v of value) {
+            if (!isObject(value)) return false
+            for (let v of Object.values(value)) {
                 if (!isObject(v)) return false
             }
             return true

client/src/components/FairyBtn.vue

@@ -0,0 +1,51 @@
+<template>
+    <el-badge
+        class="func-btn"
+        :is-dot="btn.badge.dot"
+        :value="btn.badge.value"
+        :type="btn.badge.type"
+        v-if="btn.badge"
+    >
+        <el-button
+            size="mini"
+            :type="btn.type"
+            :plain="btn.plain"
+            :disabled="btn.disabled"
+            :icon="btn.icon"
+            @click="btn.click"
+            >{{ btn.name }}</el-button
+        >
+    </el-badge>
+    <el-button
+        v-else
+        size="mini"
+        :type="btn.type"
+        :plain="btn.plain"
+        :disabled="btn.disabled"
+        :icon="btn.icon"
+        @click="btn.click"
+        >{{ btn.name }}</el-button
+    >
+</template>
+
+<script setup>
+import { defineProps } from 'vue'
+import { isObject } from '@/libs/util.js'
+
+defineProps({
+    btn: {
+        type: Object,
+        validator: (value) => {
+            if (!isObject(value)) return false
+            if (!value.hasOwnProperty('name')) return false
+            return true
+        }
+    }
+})
+</script>
+
+<style scoped>
+.func-btn {
+    margin-right: 10px;
+}
+</style>

client/src/main.js

@@ -22,6 +22,7 @@ import { http } from './libs/util.js'
 
 import {
     ElAvatar,
+    ElBadge,
     ElButton,
     ElButtonGroup,
     ElCol,
@@ -57,6 +58,7 @@ import {
 
 const components = [
     ElAvatar,
+    ElBadge,
     ElButton,
     ElButtonGroup,
     ElCol,
@@ -104,5 +106,5 @@ app.config.globalProperties.$http = http
 app.config.globalProperties.$store = store
 app.config.globalProperties.$ELEMENT = { size: 'mini' }
 let vm = app.mount('#app')
-window.app = app
-window.vm = vm
+//window.app = app
+//window.vm = vm