@jx3box/jx3box-ui 2.0.2 → 2.0.4

package/src/author/AuthorRss.vue

@@ -1,18 +1,16 @@
 <template>
-    <div class="c-author-rss">
-        <el-button
-            class="u-btn"
-            :class="{ 'u-fans-box': isSelf }"
-            size="small"
-            plain
-            @click="subscribe"
-            :loading="loading"
-            :disabled="isSelf"
-        >
-            <img class="u-icon" svg-inline :src="src" />
-            {{ btnText }}</el-button
-        >
-    </div>
+    <el-button
+        class="u-btn c-author-rss"
+        :class="{ 'u-fans-box': isSelf, 'is-subscribed': subscribed }"
+        size="small"
+        plain
+        @click="subscribe"
+        :loading="loading"
+        :disabled="isSelf"
+    >
+        <img class="u-icon" svg-inline src="../../assets/img/author/rss.svg" />
+        {{ btnText }}</el-button
+    >
 </template>
 
 <script>
@@ -54,9 +52,6 @@ export default {
         isLogin: function () {
             return User.isLogin();
         },
-        src() {
-            return jx3box.__cdn + "design/vector/icon/rss_author.svg";
-        }
     },
     watch: {
         uid: {
@@ -130,28 +125,27 @@ export default {
 </script>
 
 <style lang="less">
-.c-author-rss {
-    .u-btn.el-button {
-        cursor: default;
-        &:hover {
-            cursor: pointer;
-            background-color: @light-pink;
-            color: #fff;
-            border-color: darken(@light-pink, 2%);
-
-            .u-icon {
-                filter: invert(100%) sepia(0%) saturate(0%) hue-rotate(198deg) brightness(104%) contrast(101%);
-            }
-        }
+.c-author-rss.el-button {
+    cursor: default;
+    &:hover,
+    &.is-plain:hover,
+    &.is-plain:focus {
+        cursor: pointer;
+        background-color: @light-pink;
+        color: #fff;
+        border-color: darken(@light-pink, 2%);
     }
     .u-icon {
-        .size(14px);
-        .pr;
-        top: 1px;
-        filter: invert(40%) sepia(5%) saturate(419%) hue-rotate(182deg) brightness(89%) contrast(84%);
+        .size(10px);
+        fill: currentColor;
+        margin-right: 4px;
     }
 }
 
+.c-author-rss.el-button.is-subscribed {
+    color: #999;
+}
+
 @media screen and (max-width: @phone) {
     .el-message-box {
         max-width: 60%;

package/src/bread/Admin.vue

@@ -13,7 +13,7 @@
             <!-- <template v-if="isAdmin"> -->
             <el-divider content-position="left">状态变更</el-divider>
             <el-radio-group v-model="post_status" class="c-admin-status">
-                <el-radio-button v-for="(option, key) in status_options" :label="key" :key="key">{{
+                <el-radio-button v-for="(option, key) in status_options" :value="key" :key="key">{{
                     option
                 }}</el-radio-button>
             </el-radio-group>
@@ -22,14 +22,14 @@
 
             <el-divider content-position="left">可见性变更</el-divider>
             <el-radio-group v-model="visible" class="c-admin-status">
-                <el-radio-button v-for="(option, key) in visible_options" :label="key" :key="key">{{
+                <el-radio-button v-for="(option, key) in visible_options" :value="key" :key="key">{{
                     option
                 }}</el-radio-button>
             </el-radio-group>
 
             <el-divider content-position="left">推荐角标</el-divider>
             <el-checkbox-group v-model="mark" class="c-admin-mark">
-                <el-checkbox v-for="(option, key) in mark_options" :label="key" :key="key">{{ option }}</el-checkbox>
+                <el-checkbox v-for="(option, key) in mark_options" :value="key" :key="key">{{ option }}</el-checkbox>
             </el-checkbox-group>
 
             <el-divider content-position="left">高亮置顶</el-divider>
@@ -292,7 +292,20 @@ export default {
         // 拉
         pull: function () {
             getSetting(this.pid).then((data) => {
-                let { ID, color, mark, post_status, post_author, sticky, post_banner, post_type, visible, star, post_subtype, topics } = data;
+                let {
+                    ID,
+                    color,
+                    mark,
+                    post_status,
+                    post_author,
+                    sticky,
+                    post_banner,
+                    post_type,
+                    visible,
+                    star,
+                    post_subtype,
+                    topics,
+                } = data;
                 this.pid = ID;
                 this.post_status = post_status;
                 this.visible = visible;
@@ -306,7 +319,7 @@ export default {
                 if (this.sticky) this.isSticky = true;
 
                 this.isStar = star || 0;
-                this.topics = topics?.map(item => item.topic) || [];
+                this.topics = topics?.map((item) => item.topic) || [];
                 this.post_subtype = post_subtype || "";
 
                 // 设置加载完成标识
@@ -348,7 +361,7 @@ export default {
                 type: this.post_type,
                 id: this.pid,
             });
-        }
+        },
     },
     watch: {
         "$route.params.id": function () {

package/src/bread/Crumb.vue

@@ -6,8 +6,13 @@
 import { getBreadcrumb } from "../../service/breadcrumb";
 
 export default {
-    name: "BeardCrumb",
-    props: ["name"],
+    name: "BreadCrumb",
+    props: {
+        name: {
+            type: String,
+            default: "",
+        },
+    },
     data: function () {
         return {
             html: "",

package/src/bread/DesignTask.vue

@@ -1,17 +1,26 @@
 <template>
-    <el-dialog class="m-design-task" :width="isPhone ? '95%' : '600px'" :model-value="modelValue" @close="close" title="快捷推送" append-to-body>
+    <el-dialog
+        class="m-design-task"
+        :width="isPhone ? '95%' : '600px'"
+        :model-value="modelValue"
+        @close="close"
+        title="快捷推送"
+        append-to-body
+    >
         <el-form :model="form" ref="form" :label-position="isPhone ? 'top' : 'left'" label-width="80px">
             <el-form-item label="标题">
                 <el-input v-model="form.title" placeholder="请输入标题"></el-input>
             </el-form-item>
             <el-form-item label="类型">
-                <el-select v-model="form.type" placeholder="请选择类型" style="width:100%;" filterable>
+                <el-select v-model="form.type" placeholder="请选择类型" style="width: 100%" filterable>
                     <el-option v-for="item in config" :key="item.id" :label="item.label" :value="item.name"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="版本">
                 <el-radio-group v-model="form.version">
-                    <el-radio-button v-for="(label, key) in versions" :key="key" :label="key">{{ label }}</el-radio-button>
+                    <el-radio-button v-for="(label, key) in versions" :key="key" :value="key">{{
+                        label
+                    }}</el-radio-button>
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="备注">
@@ -22,19 +31,17 @@
             </el-form-item>
         </el-form>
 
-        <el-divider content-position="left">
-            近期推送
-        </el-divider>
+        <el-divider content-position="left"> 近期推送 </el-divider>
         <template v-if="logs && logs.length">
             <el-table :data="logs" border size="small" max-height="300px">
                 <el-table-column label="推送时间" prop="push_at" align="center">
-                    <template #default="{row}">
+                    <template #default="{ row }">
                         {{ formatTime(row.push_at) }}
                     </template>
                 </el-table-column>
                 <el-table-column label="推送人" prop="pusher.display_name" align="center"></el-table-column>
                 <el-table-column label="星级" prop="star" align="center">
-                    <template #default="{row}">
+                    <template #default="{ row }">
                         <el-rate v-model="row.star" disabled :colors="colors"></el-rate>
                     </template>
                 </el-table-column>
@@ -51,7 +58,7 @@
 
 <script>
 import { createDesignTask, getDesignTask, getConfigBannerTypes } from "../../service/design";
-import {pick} from "lodash";
+import { pick } from "lodash";
 import dayjs from "dayjs";
 import User from "@jx3box/jx3box-common/js/user";
 export default {
@@ -59,16 +66,16 @@ export default {
     props: {
         modelValue: {
             type: Boolean,
-            default: false
+            default: false,
         },
         post: {
             type: Object,
-            default: () => {}
-        }
+            default: () => {},
+        },
     },
     model: {
         prop: "modelValue",
-        event: "update:modelValue"
+        event: "update:modelValue",
     },
     emits: ["update:modelValue"],
     data() {
@@ -78,9 +85,9 @@ export default {
                 remark: "",
                 star: 0,
                 subtype: "",
-                version: "std"
+                version: "std",
             },
-            colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
+            colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
 
             logs: [],
             config: [],
@@ -89,12 +96,12 @@ export default {
             isEditor: User.isEditor(),
 
             versions: {
-                "std": "剑三",
-                "origin": "缘起",
-                "wujie": "无界",
-                "test": "体服"
-            }
-        }
+                std: "剑三",
+                origin: "缘起",
+                wujie: "无界",
+                test: "体服",
+            },
+        };
     },
     watch: {
         modelValue(val) {
@@ -108,11 +115,11 @@ export default {
                     this.loadConfig();
                 }
             }
-        }
+        },
     },
     methods: {
-        close(){
-            this.$emit("update:modelValue",false)
+        close() {
+            this.$emit("update:modelValue", false);
         },
         clearForm() {
             this.form = {
@@ -121,7 +128,7 @@ export default {
                 star: 0,
                 subtype: "",
                 version: "std",
-            }
+            };
 
             this.$refs?.form?.clearValidate();
         },
@@ -142,7 +149,7 @@ export default {
             createDesignTask(data).then(() => {
                 this.$message.success("提交成功");
                 this.close();
-            })
+            });
         },
         onCancel() {
             this.close();
@@ -150,28 +157,28 @@ export default {
         },
         loadLogs() {
             if (!this.post?.ID) return;
-            getDesignTask({ source_id: this.post?.ID }).then(res => {
+            getDesignTask({ source_id: this.post?.ID }).then((res) => {
                 this.logs = res.data.data || [];
-            })
+            });
         },
         loadConfig() {
-            getConfigBannerTypes({ _no_page: 1 }).then(res => {
+            getConfigBannerTypes({ _no_page: 1 }).then((res) => {
                 this.config = res.data.data || [];
-                this.config = this.config.filter(item => item.parent_id == 1);
-            })
+                this.config = this.config.filter((item) => item.parent_id == 1);
+            });
         },
         formatTime(time) {
             return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
-        }
-    }
-}
+        },
+    },
+};
 </script>
 
 <style lang="less">
 .m-design-task {
-.el-form-item {
-    margin-bottom: 12px;
-}
+    .el-form-item {
+        margin-bottom: 12px;
+    }
     .m-star-line {
         .el-form-item__content {
             top: 10px;

package/src/comment/Avatar.vue

@@ -28,14 +28,32 @@ import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 const { __imgPath } = JX3BOX;
 export default {
     name: "CommentAvatar",
-    props: [
-        "avatarSize",
-        "userAvatar",
-        "userHref",
-        "username",
-        "avatarFrame",
-        "withFrame",
-    ],
+    props: {
+        avatarSize: {
+            type: Number,
+            default: 48,
+        },
+        userAvatar: {
+            type: String,
+            default: "",
+        },
+        userHref: {
+            type: String,
+            default: "",
+        },
+        username: {
+            type: String,
+            default: "",
+        },
+        avatarFrame: {
+            type: String,
+            default: "",
+        },
+        withFrame: {
+            type: Boolean,
+            default: false,
+        },
+    },
     data: function() {
         return {};
     },

package/src/comment/CommentContent.vue

@@ -203,23 +203,68 @@ function fillZero(num) {
     return num > 9 ? num : `0${num}`;
 }
 export default {
-    props: [
-    "content",
-        "date",
-        "hasReply",
-        "canDelete",
-        "canSetTop",
-        "canCancelTop",
-        "canHide",
-        "isLike", // 是否已点赞
-        "likes", // 点赞数
-        "canSetStar",
-        "canCancelStar",
-        "attachments",
-        "commentId",
-        "canAddWhite", // 是否可以添加到过滤白名单， 因为对于一般用户，它看不到非白名单的评论，所以“可以添加到白名单”的权限不要在加一次用户层面的权限判定
-        "canRemoveWhite", // 是否可以从过滤白名单移除
-    ],
+    props: {
+        content: {
+            type: String,
+            default: "",
+        },
+        date: {
+            type: [String, Number, Date],
+            default: "",
+        },
+        hasReply: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canDelete: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canSetTop: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canCancelTop: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canHide: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        isLike: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        likes: {
+            type: Number,
+            default: 0,
+        },
+        canSetStar: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canCancelStar: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        attachments: {
+            type: Array,
+            default: () => [],
+        },
+        commentId: {
+            type: [Number, String],
+            default: 0,
+        },
+        canAddWhite: {
+            type: [Boolean, Number],
+            default: false,
+        },
+        canRemoveWhite: {
+            type: [Boolean, Number],
+            default: false,
+        },
+    },
     components: {
         Uploader,
         Emotion,

package/src/comment/CommentContentSimple.vue

@@ -96,21 +96,60 @@ function fillZero(num) {
     return num > 9 ? num : `0${num}`;
 }
 export default {
-    props: [
-    "commentId",
-        "content",
-        "attachments",
-        "date",
-        "hasReply",
-        "canDelete",
-        "canHide",
-        "canReply",
-        "isLike", // 是否已点赞
-        "likes", // 点赞数
-        "userHref",
-        "replyForUsername",
-        "replyForUserId",
-    ],
+    props: {
+        commentId: {
+            type: [Number, String],
+            default: 0,
+        },
+        content: {
+            type: String,
+            default: "",
+        },
+        attachments: {
+            type: Array,
+            default: () => [],
+        },
+        date: {
+            type: [String, Number, Date],
+            default: "",
+        },
+        hasReply: {
+            type: Boolean,
+            default: false,
+        },
+        canDelete: {
+            type: Boolean,
+            default: false,
+        },
+        canHide: {
+            type: Boolean,
+            default: false,
+        },
+        canReply: {
+            type: Boolean,
+            default: false,
+        },
+        isLike: {
+            type: Boolean,
+            default: false,
+        },
+        likes: {
+            type: Number,
+            default: 0,
+        },
+        userHref: {
+            type: String,
+            default: "",
+        },
+        replyForUsername: {
+            type: String,
+            default: "",
+        },
+        replyForUserId: {
+            type: [Number, String],
+            default: 0,
+        },
+    },
     data: function () {
         return {
             showInput: false,

package/src/comment/CommentWithReply.vue

@@ -74,7 +74,28 @@ import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 const { __imgPath } = JX3BOX;
 const DECORATION_KEY = "decoration_comment_";
 export default {
-    props: ["item", "baseApi", "power", "user-href", "username"],
+    props: {
+        item: {
+            type: Object,
+            required: true,
+        },
+        baseApi: {
+            type: String,
+            required: true,
+        },
+        power: {
+            type: Object,
+            required: true,
+        },
+        userHref: {
+            type: String,
+            default: "",
+        },
+        username: {
+            type: String,
+            default: "",
+        },
+    },
     components: {
         CommentContent,
         ReplyList,

package/src/comment/ReplyForReply.vue

@@ -51,7 +51,20 @@
 import Uploader from "./Upload.vue";
 import Emotion from "@jx3box/jx3box-emotion/src/Emotion2.vue";
 export default {
-    props: ["username", "userHref", "currentId"],
+    props: {
+        username: {
+            type: String,
+            default: "",
+        },
+        userHref: {
+            type: String,
+            default: "",
+        },
+        currentId: {
+            type: [Number, String],
+            default: 0,
+        },
+    },
     data: function () {
         return {
             content: "",

package/src/comment/ReplyItem.vue

@@ -46,7 +46,16 @@ import ReplyForReply from "./ReplyForReply.vue";
 import CommentAvatar from "./Avatar.vue";
 
 export default {
-    props: ["reply", "power"],
+    props: {
+        reply: {
+            type: Object,
+            required: true,
+        },
+        power: {
+            type: Object,
+            required: true,
+        },
+    },
     components: {
         CommentAvatar,
         CommentContentSimple,

package/src/comment/ReplyList.vue

@@ -35,7 +35,25 @@
 <script>
 import ReplyItem from "./ReplyItem.vue";
 export default {
-    props: ["data", "power", "pager"],
+    props: {
+        data: {
+            type: Array,
+            default: () => [],
+        },
+        power: {
+            type: Object,
+            default: () => ({}),
+        },
+        pager: {
+            type: Object,
+            default: () => ({
+                index: 1,
+                pageSize: 10,
+                pageTotal: 1,
+                total: 0,
+            }),
+        },
+    },
     components: {
         ReplyItem,
     },

package/src/editor/BoxResource.vue

@@ -10,8 +10,8 @@
             <div class="c-resource-content" v-loading="loading">
                 <div class="m-database-search">
                     <el-radio-group class="u-client" v-model="comboClient" @change="search" v-if="type === 'combo'">
-                        <el-radio-button label="std">剑三</el-radio-button>
-                        <el-radio-button label="origin">缘起</el-radio-button>
+                        <el-radio-button value="std">剑三</el-radio-button>
+                        <el-radio-button value="origin">缘起</el-radio-button>
                     </el-radio-group>
                     <el-input
                         class="u-input"