@jx3box/jx3box-ui 2.0.4 → 2.0.6

package/src/single/PostHeader.vue

@@ -3,7 +3,7 @@
         <!-- 标题 -->
         <div class="m-single-title">
             <span class="u-title u-sub-block" :href="url" :title="title">
-                <i class="u-original" v-if="isOriginal">原创</i>
+                <i class="u-original" v-if="isOriginal">{{ $jx3boxT("jx3boxUi.postHeader.original", "原创") }}</i>
                 <i class="u-private" v-if="post.post_status != 'publish' || !!~~post.visible">
                     <el-icon
                         v-if="post.post_status == 'draft' || post.post_status == 'pending' || !!~~post.visible"
@@ -16,7 +16,7 @@
                 <template v-if="titleExtra">
                     <span class="u-client" :class="'i-client-' + client">{{ showClientLabel(client) }}</span>
                     <span class="u-client u-zlp" v-if="zlp">{{ zlp }}</span>
-                    <span class="u-client i-client-wujie" v-if="is_wujie">无界</span>
+                    <span class="u-client i-client-wujie" v-if="is_wujie">{{ $jx3boxT("jx3boxUi.postHeader.wujie", "无界") }}</span>
                 </template>
             </span>
         </div>
@@ -29,7 +29,7 @@
                     <img svg-inline src="../../assets/img/single/author.svg" />
                 </i>
                 <a class="u-name" :href="author_link" v-if="!anonymous">{{ author_name }}</a>
-                <span class="u-name u-anonymous" v-else>神秘侠士</span>
+                <span class="u-name u-anonymous" v-else>{{ $jx3boxT("jx3boxUi.postHeader.mysterious", "神秘侠士") }}</span>
             </div>
 
             <!-- 自定义字段 -->
@@ -43,13 +43,16 @@
 
             <!-- 客户端 -->
             <div class="u-meta u-sub-block">
-                <em class="u-label">适用客户端</em>
+                <em class="u-label">{{ $jx3boxT("jx3boxUi.postHeader.client", "适用客户端") }}</em>
                 <span class="u-value u-client" :class="client">{{ showClientLabel(client) }}</span>
-                <span class="u-value u-client wujie" v-if="is_wujie">无界</span>
+                <span class="u-value u-client wujie" v-if="is_wujie">{{ $jx3boxT("jx3boxUi.postHeader.wujie", "无界") }}</span>
             </div>
 
             <!-- 发布日期 -->
-            <span class="u-podate u-sub-block" :title="'发布日期:' + post_time">
+            <span
+                class="u-podate u-sub-block"
+                :title="$jx3boxT('jx3boxUi.postHeader.publishDateTitle', '发布日期:{time}', { time: post_time })"
+            >
                 <i class="u-icon-podate">
                     <img svg-inline src="../../assets/img/single/podate.svg" />
                 </i>
@@ -57,7 +60,10 @@
             </span>
 
             <!-- 最后更新 -->
-            <span class="u-modate u-sub-block" :title="'最后更新:' + update_time">
+            <span
+                class="u-modate u-sub-block"
+                :title="$jx3boxT('jx3boxUi.postHeader.updateDateTitle', '最后更新:{time}', { time: update_time })"
+            >
                 <i class="u-icon-modate">
                     <img svg-inline src="../../assets/img/single/modate.svg" />
                 </i>
@@ -70,7 +76,11 @@
                 {{ views }}
             </span>
 
-            <span class="u-word-count u-sub-block" v-if="wordCount" title="累计字数">
+            <span
+                class="u-word-count u-sub-block"
+                v-if="wordCount"
+                :title="$jx3boxT('jx3boxUi.postHeader.wordCount', '累计字数')"
+            >
                 <el-icon :size="15"><Sunny /></el-icon>
                 {{ wordCount }}
             </span>
@@ -78,7 +88,7 @@
             <!-- 编辑 -->
             <a class="u-edit u-sub-block" :href="edit_link" v-if="canEdit && !anonymous">
                 <el-icon class="u-icon-edit" :size="16"><Edit /></el-icon>
-                <span>编辑</span>
+                <span>{{ $jx3boxT("jx3boxUi.postHeader.edit", "编辑") }}</span>
             </a>
         </div>
     </header>
@@ -90,10 +100,12 @@ import { showDate, showTime } from "@jx3box/jx3box-common/js/moment";
 import { editLink, authorLink } from "@jx3box/jx3box-common/js/utils.js";
 import User from "@jx3box/jx3box-common/js/user.js";
 import $ from "jquery";
+import i18nMixin from "../../i18n/mixin";
 const { __clients } = JX3BOX;
 
 export default {
     name: "PostHeader",
+    mixins: [i18nMixin],
     props: {
         post: {
             type: Object,
@@ -125,13 +137,13 @@ export default {
             return !!~~this.post?.original;
         },
         title: function () {
-            return this.post?.post_title || "无标题";
+            return this.post?.post_title || this.$jx3boxT("jx3boxUi.postHeader.noTitle", "无标题");
         },
         author_link: function () {
             return authorLink(this.post?.post_author);
         },
         author_name: function () {
-            return this.post?.author_info?.display_name || "匿名";
+            return this.post?.author_info?.display_name || this.$jx3boxT("jx3boxUi.postHeader.anonymous", "匿名");
         },
         post_date: function () {
             return showDate(new Date(this.post?.post_date));
@@ -218,8 +230,8 @@ export default {
     // padding-right: 280px;
     .pr;
     .u-sub-block {
-        .dbi;
-        .y(top);
+        .flex;
+        align-items: center;
     }
 }
 @media screen and (max-width: @phone) {
@@ -244,7 +256,7 @@ export default {
         // }
         letter-spacing: 0.5px;
         font-weight: 300;
-        .db;
+        // .db;
         .nobreak;
     }
     .u-author {
@@ -263,9 +275,11 @@ export default {
     }
 
     .u-private {
-        .y(-4px);
+        // .y(-4px);
         margin-right: 5px;
         color: #111;
+        top:2px;
+        .pr;
     }
 }
 @media screen and (max-width: @phone) {
@@ -285,15 +299,20 @@ export default {
 }
 
 .m-single-info {
+
+
     margin-top: 10px;
     .clearfix;
     .fz(12px, 20px);
     color: #666;
+    .flex;
+    align-items: center;
 
     @origin: #0eb7ce;
     @std: #f0b400;
     @all: #a26ef7;
     @wujie: #fc79bf;
+    --el-color-primary: @primary;
 
     .u-client {
         // .fl;
@@ -343,8 +362,11 @@ export default {
     }
 
     .u-author {
+        a {
+            color: var(--el-color-primary);
+        }
         a:hover {
-            box-shadow: 0 1px 0 @color-link;
+            .underline(var(--el-color-primary));
         }
         i {
             .pr;
@@ -373,9 +395,9 @@ export default {
                 font-size: 16px;
             }
             .pr;
-            top: 4px;
             .mr(1px);
         }
+        color: var(--el-color-primary);
         &:hover {
             box-shadow: 0 1px 0 @color-link;
         }

package/src/single/PostTopic.vue

@@ -80,14 +80,14 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 .c-post-topic {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
 }
 .c-post-topic__banner {
     position: relative;
     margin-bottom: 10px;
-    padding: 10px 10px 0 10px;
+    //padding: 10px 10px 0 10px;
     .c-topic-text {
         font-size: 12px;
         font-weight: 700;

package/src/single/PostVersion.vue

@@ -0,0 +1,219 @@
+<template>
+    <div class="c-post-version" v-if="list && list.length">
+        <div class="m-title">
+            <div class="u-title">
+                <el-icon class="u-icon"><Clock /></el-icon>历史版本
+            </div>
+            <div class="u-op" @click="toggle">
+                <el-icon><DCaret></DCaret></el-icon> 折叠
+            </div>
+        </div>
+        <transition name="collapse">
+            <ul v-show="show" class="u-list">
+                <li v-for="(item, i) in list" class="u-item" :key="i" @click="handleContrast(item)">
+                    <div class="u-version">
+                        <span>{{ item.version }}</span> - <span>{{ item.created_at }}</span>
+                    </div>
+                    <el-button class="u-compare" size="small" type="primary" link
+                        ><el-icon class="u-icon"><Sort></Sort></el-icon>对比</el-button
+                    >
+                </li>
+            </ul>
+        </transition>
+        <version-dialog
+            v-model="visible"
+            :link_content_meta_id="link_content_meta_id"
+            :title="title"
+            :content="content"
+            :commit_hash="commit_hash"
+            :versions="list"
+        ></version-dialog>
+    </div>
+</template>
+
+<script>
+import { getCommitHistories, commitHistory } from "../../service/commit-history";
+import VersionDialog from "./VersionDialog.vue";
+export default {
+    name: "PostVersion",
+    props: ["post"],
+    components: { VersionDialog },
+    data() {
+        return {
+            loading: false,
+            index: 1,
+            pageSize: 10, // 取最新的10个版本即可
+            total: 0,
+            list: [],
+            show: true,
+            visible: false,
+            commit_hash: "",
+            isMobile: window.innerWidth < 768,
+        };
+    },
+    computed: {
+        link_content_meta_id() {
+            return this.post?.link_content_meta_id || 0;
+        },
+        content() {
+            return this.post?.post_content || "";
+        },
+        title() {
+            return this.post?.post_title || "";
+        },
+        pageParams() {
+            return {
+                index: this.index,
+                pageSize: this.pageSize,
+            };
+        },
+    },
+    watch: {
+        link_content_meta_id: {
+            immediate: true,
+            handler: function (val) {
+                !!val && this.load();
+            },
+        },
+        page() {
+            this.load();
+        },
+    },
+    methods: {
+        onAdd() {
+            commitHistory(this.link_content_meta_id, {
+                commit: "提交测试4",
+                content: `每日机缘4`,
+            })
+                .then((res) => {
+                    this.$message.success("创建成功");
+                    this.load();
+                })
+                .catch((err) => {
+                    this.$message.error(err.message);
+                });
+        },
+        handleContrast(item) {
+            if (this.isMobile) {
+                return;
+            }
+            this.commit_hash = item.commit_hash;
+            this.visible = true;
+        },
+        load() {
+            this.loading = true;
+            getCommitHistories(this.link_content_meta_id, this.pageParams)
+                .then((res) => {
+                    const list = res.data?.data?.list || [];
+                    if (list.length) {
+                        this.list = list.map((item, i) => {
+                            return {
+                                ...item,
+                                version: "v" + (list.length - i),
+                            };
+                        });
+                        this.total = res.data?.data?.page?.total || 0;
+                    }
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
+        },
+        toggle() {
+            this.show = !this.show;
+        },
+    },
+};
+</script>
+<style lang="less">
+.c-post-version {
+    .m-title {
+        .flex;
+        justify-content: space-between;
+        align-items: center;
+        //margin-bottom: 5px;
+        line-height: 24px;
+        .u-op {
+            font-size: 13px;
+            font-weight: 500;
+            line-height: 18px;
+            //float: right;
+            padding: 0 5px;
+            color: #cdd1db;
+            cursor: pointer;
+            .flex(y);
+            &:hover {
+                color: #a1a9bb;
+            }
+        }
+    }
+    .u-title {
+        //font-weight: 400;
+        font-weight: normal;
+        font-size: 16px;
+        line-height: 18px;
+        color: #333;
+        .flex;
+        align-items: center;
+        gap: 5px;
+        .u-icon {
+            font-size: 18px;
+        }
+    }
+    .u-list {
+        list-style: none;
+        padding: 10px;
+        margin: 0;
+        overflow: hidden;
+        li {
+            padding: 0 10px;
+            .fz(13px, 36px);
+            .flex;
+            justify-content: space-between;
+            align-items: center;
+            transition: 0.15s ease-in-out;
+            .nobreak;
+            &:hover {
+                background-color: #fcfcfc;
+                .r(4px);
+
+                .u-compare {
+                    .db;
+                    @media screen and (max-width: @phone) {
+                        .none;
+                    }
+                }
+            }
+            .pointer;
+        }
+
+        .u-compare {
+            .none;
+
+            .u-icon {
+                transform: rotate(90deg);
+                margin-right: 3px;
+            }
+        }
+    }
+
+    .collapse-enter-active,
+    .collapse-leave-active {
+        transition: max-height 0.25s ease, opacity 0.2s ease, padding 0.25s ease;
+    }
+
+    .collapse-enter-from,
+    .collapse-leave-to {
+        max-height: 0;
+        opacity: 0;
+        padding-top: 0;
+        padding-bottom: 0;
+    }
+
+    .collapse-enter-to,
+    .collapse-leave-from {
+        max-height: 480px;
+        opacity: 1;
+    }
+}
+</style>

package/src/single/RightAffix.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="c-right-affix" :class="{ 'is-close': !isOpen }">
+        <div class="item">
+            <fav :postId="postId" :postType="postType" :postTitle="postTitle" :hiddenNum="true" :isOld="true"></fav>
+        </div>
+        <el-tooltip v-if="showCommentBtn && showComment" effect="dark" content="去评论" placement="left">
+            <div class="u-item" @click="toComment">
+                <el-icon class="u-icon"><ChatDotSquare></ChatDotSquare></el-icon>
+            </div>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="回到顶部" placement="bottom">
+            <div class="u-item" v-show="scrollBtnShow" @click="goTop">
+                <div class="u-to-top"></div>
+            </div>
+        </el-tooltip>
+    </div>
+</template>
+
+<script>
+import Fav from "../interact/Fav.vue";
+import Bus from "../../utils/bus";
+export default {
+    name: "RightAffix",
+    props: {
+        postId: {
+            type: [String, Number],
+            default: "",
+        },
+        postType: {
+            type: String,
+            default: "",
+        },
+        postTitle: {
+            type: String,
+            default: "",
+        },
+        showComment: {
+            type: [Boolean, Number],
+            default: false,
+        },
+    },
+    data() {
+        return {
+            scrollToptimer: null,
+            scrollBtnShow: false,
+            showCommentBtn: false, // 等待img等元素加载完毕再显示评论按钮
+
+            isOpen: true,
+        };
+    },
+    components: {
+        Fav,
+    },
+    methods: {
+        goTop() {
+            window.scrollTo({
+                top: 0,
+                behavior: "smooth",
+            });
+        },
+        toComment() {
+            this.$emit("toComment");
+        },
+    },
+    mounted() {
+        //获取页面可视区高度
+        var clientHeight = document.documentElement.clientHeight;
+        const self = this;
+        window.addEventListener("scroll", function () {
+            //显示回到顶部按钮
+            var osTop = document.documentElement.scrollTop || document.body.scrollTop;
+            if (osTop >= clientHeight) {
+                self.scrollBtnShow = true;
+            } else {
+                self.scrollBtnShow = false;
+            }
+        });
+
+        setTimeout(() => {
+            this.showCommentBtn = true;
+        }, 1000);
+
+        Bus.on("toggleRightSide", (data) => {
+            this.isOpen = data;
+        });
+    },
+    beforeUnmount() {
+        Bus.off("toggleRightSide");
+    },
+};
+</script>
+
+<style lang="less">
+.closeLeftSidebar() {
+    transition: 0.2s ease-in-out;
+    transform: translateX(100%);
+}
+
+.openLeftSidebar() {
+    transition: 0.2s ease-in-out;
+    transform: translateX(0);
+}
+
+.c-right-affix {
+    .openLeftSidebar();
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    right: @aside-right;
+    top: @header-height + @bread-height + 100px;
+    background-color: #fafbfc;
+    padding: 8px 5px;
+    z-index: 200;
+    border-top-left-radius: 6px;
+    border-bottom-left-radius: 6px;
+    .u-item {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 32px;
+        height: 32px;
+        cursor: pointer;
+        &:hover {
+            background-color: #f6fcff;
+        }
+        .w-fav2 svg {
+            .size(26px);
+        }
+    }
+    .u-to-top {
+        width: 0;
+        height: 0;
+        border-left: 10px solid transparent;
+        border-right: 10px solid transparent;
+        border-bottom: 16px solid #87ceeb;
+    }
+
+    &.is-close {
+        .closeLeftSidebar();
+        right: 42px;
+    }
+
+    .u-icon {
+        font-size: 20px;
+        color: #3871e0;
+    }
+}
+@media screen and (max-width: @smallpc) {
+    .c-right-affix {
+        right: 0;
+    }
+}
+@media screen and (max-width: @phone) {
+    .c-right-affix {
+        .none;
+    }
+}
+</style>

package/src/single/SimpleThx.vue

@@ -29,7 +29,7 @@
                 @updateRecord="updateRecord"
                 :client="client"
             />
-            <el-tooltip effect="dark" content="打赏记录" placement="top-start">
+            <el-tooltip effect="dark" :content="$jx3boxT('jx3boxUi.simpleThx.record', '打赏记录')" placement="top-start">
                 <!-- <div class="w-boxcoin-block"> -->
                 <img
                     src="../../assets/img/widget/records.svg"
@@ -42,7 +42,7 @@
             </el-tooltip>
         </div>
 
-        <el-drawer v-model="showDrawer" title="打赏记录" append-to-body>
+        <el-drawer v-model="showDrawer" :title="$jx3boxT('jx3boxUi.simpleThx.record', '打赏记录')" append-to-body>
             <BoxcoinRecords
                 :postId="postId"
                 :postType="postType"
@@ -63,9 +63,11 @@ import BoxcoinUser from "../interact/BoxcoinUser.vue";
 import BoxcoinRecords from "../interact/BoxcoinRecords.vue";
 import User from "@jx3box/jx3box-common/js/user";
 import { getBoxcoinStatus, getPostBoxcoinConfig } from "../../service/thx";
+import i18nMixin from "../../i18n/mixin";
 
 export default {
     name: "SimpleThx",
+    mixins: [i18nMixin],
     components: {
         Like,
         Fav,

package/src/single/Thx.vue

@@ -57,8 +57,18 @@
         </div>
         <div class="w-thx-copyright">
             &copy;
-            所有原创作品，著作权归作者所有，所有未经授权的非署名转载或抄袭将有权追究法律责任，所有法律事务由专聘律师代理。<br />
-            签约作者独家特约稿件，及所有魔盒官方评分作品用户一经兑现则视为有偿付费稿件，所有商业稿件的转载引用需同时征得魔盒平台授权。
+            {{
+                $jx3boxT(
+                    "jx3boxUi.thx.copyright1",
+                    "所有原创作品，著作权归作者所有，所有未经授权的非署名转载或抄袭将有权追究法律责任，所有法律事务由专聘律师代理。"
+                )
+            }}<br />
+            {{
+                $jx3boxT(
+                    "jx3boxUi.thx.copyright2",
+                    "签约作者独家特约稿件，及所有魔盒官方评分作品用户一经兑现则视为有偿付费稿件，所有商业稿件的转载引用需同时征得魔盒平台授权。"
+                )
+            }}
         </div>
     </div>
 </template>
@@ -76,9 +86,11 @@ import Rss from "../interact/Rss.vue";
 import User from "@jx3box/jx3box-common/js/user";
 import { getBoxcoinStatus, getPostBoxcoinConfig } from "../../service/thx";
 import { getConfig, getUserPermission } from "../../service/cms";
+import i18nMixin from "../../i18n/mixin";
 
 export default {
     name: "ThxComp",
+    mixins: [i18nMixin],
     components: {
         Like,
         Fav,