@jx3box/jx3box-ui 2.0.5 → 2.0.7

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,

package/src/single/VersionDialog.vue

@@ -0,0 +1,238 @@
+<template>
+    <el-dialog
+        class="m-version-contrast-dialog"
+        :title="`版本比对 - ${title}`"
+        v-model="visible"
+        append-to-body
+        width="90%"
+        @close="close"
+    >
+        <div class="m-version-container" v-loading="loading">
+            <div class="m-toolbar">
+                <el-radio-group v-model="type">
+                    <el-radio-button :value="item.value" v-for="item in types" :key="item.value">{{
+                        item.label
+                    }}</el-radio-button>
+                </el-radio-group>
+                <div class="m-select">
+                    <el-select
+                        class="u-select"
+                        v-model="version1"
+                        placeholder="请选择"
+                        @change="versionChange($event, 1)"
+                    >
+                        <el-option
+                            v-for="item in versions"
+                            :key="item.id"
+                            :label="item.version"
+                            :value="item.commit_hash"
+                        ></el-option>
+                        <template v-slot:prefix>
+                            <span class="u-label">版本1</span>
+                        </template>
+                    </el-select>
+                    <el-select
+                        class="u-select"
+                        v-model="version2"
+                        placeholder="请选择"
+                        @change="versionChange($event, 2)"
+                    >
+                        <el-option
+                            v-for="item in versions"
+                            :key="item.id"
+                            :label="item.version"
+                            :value="item.commit_hash"
+                        ></el-option>
+                        <template v-slot:prefix> <span class="u-label">版本2</span> </template>
+                    </el-select>
+                </div>
+            </div>
+            <div v-if="type === 'view'" class="m-content-container">
+                <div class="u-content">
+                    <Article :content="content1" />
+                </div>
+                <div class="u-content">
+                    <Article :content="content2" />
+                </div>
+            </div>
+            <div v-if="type === 'code'" class="m-content-container">
+                <code-diff
+                    class="m-content-view"
+                    :old-string="content1"
+                    :new-string="content2"
+                    :context="1024"
+                    output-format="side-by-side"
+                    maxHeight="520px"
+                    :filename="`${content1Len}字`"
+                    :newFilename="`${content2Len}字`"
+                    ignoreMatchingLines="data:image/png;base64,"
+                ></code-diff>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getCommitByHash } from "../../service/commit-history";
+import Article from "@jx3box/jx3box-editor/src/Article.vue";
+import { CodeDiff } from "v-code-diff";
+export default {
+    name: "VersionDialog",
+    components: {
+        CodeDiff,
+        Article,
+    },
+    props: {
+        modelValue: {
+            type: Boolean,
+            default: false,
+        },
+        title: {
+            type: String,
+            default: "",
+        },
+        content: {
+            type: String,
+            default: "",
+        },
+        commit_hash: {
+            type: String,
+            default: "",
+        },
+        link_content_meta_id: {
+            type: [Number, String],
+            default: 0,
+        },
+        versions: {
+            type: Array,
+            default: () => [],
+        },
+    },
+    emits: ["update:modelValue"],
+    data() {
+        return {
+            loading: false,
+            type: "view",
+            types: [
+                { label: "可视化", value: "view" },
+                { label: "源码", value: "code" },
+            ],
+            version1: "", // 版本1 默认最新，下拉可指定
+            version2: "", // 版本2 默认点击的版本，下拉可指定
+            content1: "",
+            content2: "",
+
+            visible: false,
+        };
+    },
+    computed: {
+        content1Len() {
+            const content = this.content1 || "";
+            return content
+                .replace(/(<([^>]+)>)/gi, "")
+                .replace(/\n/g, "")
+                .replace(/\s/g, "")
+                .replaceAll("&nbsp;", "").length;
+        },
+        content2Len() {
+            const content = this.content2 || "";
+            return content
+                .replace(/(<([^>]+)>)/gi, "")
+                .replace(/\n/g, "")
+                .replace(/\s/g, "")
+                .replaceAll("&nbsp;", "").length;
+        },
+    },
+    watch: {
+        modelValue: {
+            immediate: true,
+            handler(val) {
+                this.visible = val;
+                if (val) {
+                    this.content1 = this.content;
+                    this.version2 = this.commit_hash;
+                    if (this.version2) {
+                        this.load(this.version2, "content2");
+                    }
+                }
+            },
+        },
+        visible(val) {
+            this.$emit("update:modelValue", val);
+        },
+    },
+    methods: {
+        close() {
+            this.visible = false;
+        },
+        versionChange(val, i) {
+            if (val) {
+                this[`version${i}`] = val;
+                const key = `content${i}`;
+                this.load(val, key);
+            }
+        },
+        load(hash, key) {
+            if (!this.link_content_meta_id) return;
+            this.loading = true;
+            getCommitByHash(this.link_content_meta_id, hash)
+                .then((res) => {
+                    this[key] = res.data?.data?.content;
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
+        },
+    },
+};
+</script>
+
+<style lang="less">
+.m-version-contrast-dialog {
+    .el-dialog__body {
+        padding: 0 20px 20px;
+    }
+    .m-toolbar {
+        display: flex;
+        gap: 10px;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        .m-select {
+            display: flex;
+            gap: 20px;
+            width: 100%;
+            .u-select {
+                flex: 1;
+            }
+            .el-input--prefix .el-input__inner {
+                padding-left: 55px;
+            }
+            .el-input__prefix {
+                left: 10px;
+                top: 10px;
+            }
+        }
+    }
+    .m-content-container {
+        display: flex;
+        gap: 20px;
+        margin-top: 20px;
+        max-height: 520px;
+        overflow-x: hidden;
+        overflow-y: auto;
+        .u-content {
+            flex: 1;
+            border: 1px solid #ebeef5;
+            padding: 20px;
+            box-sizing: border-box;
+            .r(5px);
+            height: 100%;
+            overflow: hidden;
+        }
+        .m-content-view {
+            margin: 0;
+        }
+    }
+}
+</style>