@jx3box/jx3box-common-ui 8.9.29 → 9.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "8.9.29",
+    "version": "9.0.0",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -31,9 +31,9 @@
     ],
     "dependencies": {
         "@jx3box/jx3box-comment-ui": "^1.9.9",
-        "@jx3box/jx3box-common": "^8.4.1",
+        "@jx3box/jx3box-common": "^8.4.7",
         "@jx3box/jx3box-data": "^3.6.9",
-        "@jx3box/jx3box-editor": "^2.2.15",
+        "@jx3box/jx3box-editor": "^2.2.16",
         "@jx3box/reporter": "^0.0.4",
         "axios": "^0.26.1",
         "dayjs": "^1.11.0",

package/service/fav.js

@@ -1,47 +1,3 @@
-// import qs from "qs";
-// import { $helper } from "@jx3box/jx3box-common/js/https.js";
-
-// function hasFav(post_type, post_id) {
-//     if (post_type && post_id) {
-//         return $helper({ popType: "notify" }).get(
-//             `/api/post/favorite/favorited`,
-//             {
-//                 params: {
-//                     post_type: post_type,
-//                     post_id: post_id,
-//                 },
-//             }
-//         );
-//     } else return null;
-// }
-
-// function addFav(post_type, post_id) {
-//     if (post_type && post_id) {
-//         return $helper({ popType: "notify" }).post(
-//             `/api/post/favorite`,
-//             qs.stringify({
-//                 post_type: post_type,
-//                 post_id: post_id,
-//                 cancel: 0,
-//             })
-//         );
-//     } else return null;
-// }
-
-// function delFav(post_type, post_id) {
-//     if (post_type && post_id) {
-//         return $helper({ popType: "notify" }).post(
-//             `/api/post/favorite`,
-//             qs.stringify({
-//                 post_type: post_type,
-//                 post_id: post_id,
-//                 cancel: 1,
-//             })
-//         );
-//     } else return null;
-// }
-
-// export { hasFav, addFav, delFav };
 import { $next } from "@jx3box/jx3box-common/js/https.js";
 const $n = $next();
 
@@ -58,4 +14,15 @@ function addFav(post_type, post_id, post_title) {
 function delFav(id) {
     return $n.delete(`api/article/favorites/my/${id}`);
 }
-export { hasFav, addFav, delFav };
+
+
+// 稍后再看
+function addWatchLater(data) {
+    return $n.post(`api/next2/userdata/favorite/item`, data)
+}
+
+function delWatchLater(params) {
+    return $n.delete(`api/next2/userdata/favorite/item`, { params })
+}
+
+export { hasFav, addFav, delFav, addWatchLater, delWatchLater };

package/src/App.vue

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

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/interact/watchLater.vue

@@ -0,0 +1,93 @@
+<template>
+    <div class="w-watch-later" @click="onWatchLaterClick">
+        <el-tooltip effect="dark" :content="favContent" placement="top-start">
+            <div>
+                <img v-if="favorite" class="u-icon" svg-inline :src="rmSrc" />
+                <img v-else class="u-icon" svg-inline :src="addSrc" />
+            </div>
+        </el-tooltip>
+    </div>
+</template>
+
+<script>
+import User from "@jx3box/jx3box-common/js/user";
+import { __cdn } from "@jx3box/jx3box-common/data/jx3box.json";
+import { addWatchLater, delWatchLater } from "../../service/fav";
+import { omit } from "lodash";
+export default {
+    name: "WatchLater",
+    props: {
+        category: {
+            type: String,
+            default: "article",
+        },
+        title: {
+            type: String,
+            default: "",
+        },
+    },
+    data: function () {
+        return {
+            login: User.isLogin(),
+            favorite: false,
+        };
+    },
+    computed: {
+        favContent() {
+            return this.favorite ? "已添加稍后在看" : "添加至稍后再看";
+        },
+        addSrc() {
+            return __cdn + "design/vector/icon/time.svg"
+        },
+        rmSrc() {
+            return __cdn + "design/vector/icon/time1.svg"
+        },
+        data() {
+            return {
+                category: this.category,
+                link: location.href,
+                title: this.title,
+            }
+        }
+    },
+    methods: {
+        onWatchLaterClick: function () {
+            if (this.login) {
+                this.favorite ? this.rmWatchLater() : this.addWatchLater();
+            } else {
+                User.toLogin();
+            }
+        },
+        addWatchLater: function () {
+            // add watch later
+            addWatchLater(this.data).then((res) => {
+                this.favorite = true;
+            });
+        },
+        rmWatchLater: function () {
+            // remove watch later
+            delWatchLater(omit(this.data, ['title'])).then(() => {
+                this.favorite = false;
+            });
+        },
+    }
+}
+</script>
+
+<style lang="less">
+.w-watch-later {
+    .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,6 +52,7 @@
                     :category="category"
                     @updateRecord="updateRecord"
                 />
+                <watch-later :category="postType" :title="postTitle"></watch-later>
                 <Share :postId="postId" :postType="postType" :client="client" />
             </div>
             <div class="w-thx-records">
@@ -79,6 +81,9 @@ import BatchReward from "../interact/batchReward.vue";
 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";
 export default {
@@ -131,6 +136,10 @@ export default {
         category: {
             default: undefined,
         },
+        showRss: {
+            type: Boolean,
+            default: false,
+        },
     },
     components: {
         Like,
@@ -140,6 +149,8 @@ export default {
         "boxcoin-records": BoxcoinRecords,
         "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
             />
 
             <!-- 评论 -->