@jx3box/jx3box-common-ui 8.9.30 → 9.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "8.9.30",
+    "version": "9.0.1",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -31,7 +31,7 @@
     ],
     "dependencies": {
         "@jx3box/jx3box-comment-ui": "^1.9.9",
-        "@jx3box/jx3box-common": "^8.4.2",
+        "@jx3box/jx3box-common": "^8.4.7",
         "@jx3box/jx3box-data": "^3.6.9",
         "@jx3box/jx3box-editor": "^2.2.16",
         "@jx3box/reporter": "^0.0.4",

package/src/App.vue

@@ -265,7 +265,7 @@ export default {
     },
     data: function () {
         return {
-            tab: "widget",
+            tab: "post",
 
             post: {},
             post_id: "79820",

package/src/Author.vue

@@ -3,7 +3,8 @@
         <AuthorInfo :uid="uid" @ready="installModules" />
         <template v-if="data">
             <div class="u-interact">
-                <AuthorFollow style="margin-right: 8px" :uid="uid" />
+                <!-- <AuthorFollow style="margin-right: 8px" :uid="uid" /> -->
+                <AuthorRss style="margin-right: 8px" :uid="uid" />
                 <!-- <AuthorGift :uid="uid" /> -->
                 <el-button icon="el-icon-message" class="u-btn" size="mini" @click="onMessage">私信</el-button>
             </div>
@@ -21,13 +22,14 @@
 <script>
 import AuthorInfo from "./author/AuthorInfo.vue";
 import AuthorLink from "./author/AuthorLink.vue";
-import AuthorFollow from "./author/AuthorFollow.vue";
+// import AuthorFollow from "./author/AuthorFollow.vue";
 // import AuthorMsg from "./author/AuthorMsg.vue";
 // import AuthorGift from "./author/AuthorGift.vue";
 // import AuthorFans from "./author/AuthorFans.vue";
 import AuthorMedals from "./author/AuthorMedals.vue";
 import AuthorTeams from "./author/AuthorTeams.vue";
 import AuthorPosts from "./author/AuthorPosts.vue";
+import AuthorRss from "./author/AuthorRss.vue";
 export default {
     name: "Author",
     props: ["uid"],
@@ -47,13 +49,14 @@ export default {
     components: {
         AuthorInfo,
         AuthorLink,
-        AuthorFollow,
+        // AuthorFollow,
         // AuthorMsg,
         // AuthorGift,
         AuthorMedals,
         AuthorTeams,
         AuthorPosts,
         // AuthorFans,
+        AuthorRss,
     },
 };
 </script>

package/src/author/AuthorFollow.vue

@@ -157,9 +157,9 @@ export default {
         cursor: default;
         &:hover {
             cursor: pointer;
-            background-color: @light-pink ;
-            color: #fff ;
-            border-color: darken(@light-pink, 2%) ;
+            background-color: @light-pink;
+            color: #fff;
+            border-color: darken(@light-pink, 2%);
         }
     }
 

package/src/author/AuthorRss.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="c-author-rss">
+        <el-button
+            class="u-btn"
+            size="mini"
+            @click="subscribe"
+            :loading="loading"
+            :disabled="isSelf"
+        >
+            <img class="u-icon" svg-inline :src="src" />
+            {{ btnText }}</el-button
+        >
+    </div>
+</template>
+
+<script>
+import { getAuthorRss, subscribeAuthor, unsubscribeAuthor } from "@jx3box/jx3box-common/js/rss";
+import User from "@jx3box/jx3box-common/js/user";
+import { __cdn } from "@jx3box/jx3box-common/data/jx3box.json";
+export default {
+    name: "AuthorRss",
+    props: {
+        uid: {
+            type: Number,
+            default: 0,
+        },
+    },
+    data() {
+        return {
+            subscribed: false,
+            fansNum: 0,
+            loading: false,
+        };
+    },
+    computed: {
+        btnText() {
+            return this.subscribed ? "已订阅" : "订阅";
+        },
+        btnType() {
+            return !this.subscribed ? "info" : "warning";
+        },
+        isSelf() {
+            return this.uid == this.user.uid;
+        },
+        user() {
+            return User.getInfo();
+        },
+        isLogin: function () {
+            return User.isLogin();
+        },
+        src() {
+            return __cdn + "design/vector/icon/rss_origin.svg";
+        }
+    },
+    watch: {
+        uid: {
+            immediate: true,
+            handler(val) {
+                val && this.loadRss();
+            },
+        },
+    },
+    methods: {
+        // 格式化粉丝数
+        formatFansNum(num) {
+            if (num < 10000) {
+                return num === 0 ? "" : num;
+            } else {
+                return (num / 10000).toFixed(1) + "万";
+            }
+        },
+        // 关注
+        subscribe() {
+            if (!this.isLogin) {
+                User.toLogin();
+                return;
+            }
+            if (this.subscribed) {
+                this.unsubscribe({ id: this.uid });
+            } else {
+                subscribeAuthor({ id: this.uid })
+                    .then((res) => {
+                        this.subscribed = true;
+                    })
+                    .catch((err) => {
+                        console.log(err);
+                    });
+            }
+        },
+        // 取消订阅
+        unsubscribe() {
+            // this.$confirm("是否取消订阅", "提示", {
+            //     confirmButtonText: "确定",
+            //     cancelButtonText: "取消",
+            //     type: "warning",
+            // }).then(() => {
+                unsubscribeAuthor({ id: this.uid })
+                    .then((res) => {
+                        this.$message.success("操作成功");
+                        this.subscribed = false;
+                    })
+                    .catch((err) => {
+                        console.log(err);
+                    });
+            // });
+        },
+        loadRss() {
+            this.loading = true;
+            getAuthorRss({ id: this.uid })
+                .then((res) => {
+                    this.fansNum = res.data.data.total || 0;
+                    this.subscribed = res.data.data.subscribed;
+                })
+                .catch((err) => {
+                    console.log(err);
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
+        },
+    },
+};
+</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(30%) sepia(87%) saturate(1486%) hue-rotate(194deg) brightness(87%) contrast(107%);
+            }
+        }
+    }
+    .u-icon {
+        .size(12px);
+    }
+}
+
+@media screen and (max-width: @phone) {
+    .el-message-box {
+        max-width: 60%;
+    }
+}
+</style>

package/src/interact/Rss.vue

@@ -0,0 +1,157 @@
+<template>
+    <div class="w-rss" @click="onRssClick">
+        <el-tooltip effect="dark" :content="tooltipContent" placement="top-start">
+            <div>
+                <img v-if="subscribed" class="u-icon" svg-inline :src="rmSrc" />
+                <img v-else class="u-icon" svg-inline :src="addSrc" />
+                <span class="u-count" v-if="!hiddenNum && total > 0">{{ total }}</span>
+            </div>
+        </el-tooltip>
+    </div>
+</template>
+
+<script>
+import User from "@jx3box/jx3box-common/js/user";
+import { __cdn } from "@jx3box/jx3box-common/data/jx3box.json";
+import {
+    getCommunityRss,
+    getWikiRss,
+    getPostRss,
+    subscribeCommunity,
+    subscribePost,
+    subscribeWiki,
+    unsubscribeWiki,
+    unsubscribeCommunity,
+    unsubscribePost,
+} from "@jx3box/jx3box-common/js/rss";
+import { omit } from "lodash";
+import { __postType, __wikiType } from "@jx3box/jx3box-common/data/jx3box.json";
+
+export default {
+    name: "Rss",
+    props: {
+        type: {
+            type: String,
+            default: "", // community, cj, bps,
+        },
+        id: {
+            type: [String, Number],
+            default: "",
+        },
+        hiddenNum: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    data() {
+        return {
+            subscribed: false,
+            total: 0,
+        };
+    },
+    computed: {
+        tooltipContent() {
+            return this.subscribed ? "已订阅" : "加入订阅";
+        },
+        addSrc() {
+            return __cdn + "design/vector/icon/rss.svg";
+        },
+        rmSrc() {
+            return __cdn + "design/vector/icon/unrss.svg";
+        },
+        category({ type }) {
+            if (type.includes("community")) return "community";
+            if (__postType[type]) return "posts";
+            if (__wikiType[type]) return "wiki";
+            return "";
+        },
+        getRssFn({ category }) {
+            if (category === "community") return getCommunityRss;
+            if (category === "posts") return getPostRss;
+            if (category === "wiki") return getWikiRss;
+            return null;
+        },
+        subscribeFn({ category }) {
+            if (category === "community") return subscribeCommunity;
+            if (category === "posts") return subscribePost;
+            if (category === "wiki") return subscribeWiki;
+            return null;
+        },
+        unsubscribeFn({ category }) {
+            if (category === "community") return unsubscribeCommunity;
+            if (category === "posts") return unsubscribePost;
+            if (category === "wiki") return unsubscribeWiki;
+            return null;
+        },
+        params() {
+            return {
+                type: this.type,
+                id: this.id,
+            }
+        },
+        isLogin() {
+            return User.isLogin();
+        },
+    },
+    watch: {
+        params: {
+            deep: true,
+            immediate: true,
+            handler(val) {
+                if (this.isLogin && val?.id) {
+                    this.checkSubscribed();
+                }
+            }
+        }
+    },
+    methods: {
+        onRssClick() {
+            if (!this.isLogin) {
+                User.toLogin();
+                return;
+            }
+            if (this.subscribed) {
+                this.unsubscribe();
+            } else {
+                this.subscribe();
+            }
+        },
+        checkSubscribed() {
+            this.getRssFn && this.getRssFn(this.params).then((res) => {
+                this.subscribed = res.data.data.subscribed;
+                this.total = res.data.data.total;
+            });
+        },
+        subscribe() {
+            this.subscribeFn && this.subscribeFn(this.params).then((res) => {
+                this.subscribed = true;
+                this.total++;
+            });
+        },
+        unsubscribe() {
+            this.unsubscribeFn && this.unsubscribeFn(this.params).then((res) => {
+                this.subscribed = false;
+                this.total--;
+            });
+        },
+    },
+};
+</script>
+
+<style lang="less">
+.w-rss {
+    .pointer;
+    .dbi;
+    .u-icon {
+        .size(26px);
+        .y;
+        .pr;
+    }
+    .u-count {
+        color: #888;
+        .ml(10px);
+        top: 4px;
+        .pr;
+    }
+}
+</style>

package/src/single/Thx.vue

@@ -38,6 +38,7 @@
                 />
                 <Like :postId="postId" :postType="postType"></Like>
                 <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
+                <Rss v-if="showRss" :type="postType" :id="postId"></Rss>
                 <boxcoin-user
                     v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
                     :postId="postId"
@@ -51,8 +52,8 @@
                     :category="category"
                     @updateRecord="updateRecord"
                 />
-                <Share :postId="postId" :postType="postType" :client="client" />
                 <watch-later :category="postType" :title="postTitle"></watch-later>
+                <Share :postId="postId" :postType="postType" :client="client" />
             </div>
             <div class="w-thx-records">
                 <boxcoin-records
@@ -81,6 +82,7 @@ import BoxcoinRecords from "../interact/boxcoin_records.vue";
 import BoxcoinAdmin from "../interact/boxcoin_admin.vue";
 import BoxcoinUser from "../interact/boxcoin_user.vue";
 import WatchLater from "../interact/watchLater.vue";
+import Rss from "../interact/Rss.vue";
 
 import User from "@jx3box/jx3box-common/js/user";
 import { getPostBoxcoinConfig, getBoxcoinStatus } from "../../service/thx";
@@ -134,6 +136,10 @@ export default {
         category: {
             default: undefined,
         },
+        showRss: {
+            type: Boolean,
+            default: false,
+        },
     },
     components: {
         Like,
@@ -144,6 +150,7 @@ export default {
         "boxcoin-admin": BoxcoinAdmin,
         "boxcoin-user": BoxcoinUser,
         WatchLater,
+        Rss,
     },
     data: function () {
         return {

package/src/single/cms-single.vue

@@ -47,6 +47,7 @@
                 :userBoxcoinEnable="true"
                 :authors="authors"
                 :client="post_client"
+                showRss
             />
 
             <!-- 评论 -->