@jx3box/jx3box-vue3-ui 0.7.2 → 0.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-vue3-ui",
-    "version": "0.7.2",
+    "version": "0.7.4",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {
@@ -26,9 +26,9 @@
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.1.0",
-        "@jx3box/jx3box-common": "^8.2.9",
+        "@jx3box/jx3box-common": "^8.2.17",
         "@jx3box/jx3box-data": "^3.5.8",
-        "@jx3box/jx3box-emotion": "^1.2.6",
+        "@jx3box/jx3box-emotion": "^1.2.7",
         "@jx3box/jx3box-macro": "^1.0.1",
         "@jx3box/jx3box-talent": "^1.2.7",
         "@jx3box/reporter": "^0.0.4",
@@ -44,7 +44,7 @@
         "js-base64": "^3.7.5",
         "katex": "^0.16.9",
         "lodash": "^4.17.21",
-        "mitt": "^3.0.0",
+        "mitt": "^3.0.1",
         "qrcode.vue": "^3.3.4",
         "sortablejs": "^1.15.0",
         "url": "^0.11.3",

package/service/cms.js

@@ -5,24 +5,6 @@ function getPostAuthors(post_id) {
     return $cms({ mute: true }).get(`/api/cms/post/${post_id}/authors`);
 }
 
-function uploadFile(data) {
-    return $cms().post(`/api/cms/upload`, data);
-}
-
-// 获取用户列表
-function loadAuthors(params) {
-    return $cms().get(`/api/cms/user/list`, {
-        params: params,
-    });
-}
-
-// 获取表情列表
-function loadEmotions(params) {
-    return $cms().get(`/api/cms/post/emotions`, {
-        params: params,
-    });
-}
-
 function uploadImage(formData) {
     return $cms().post(`/api/cms/upload/avatar`, formData);
 }
@@ -36,26 +18,22 @@ function getDecorationJson() {
     let url = JX3BOX.__imgPath + "decoration/index.json";
     return axios.get(url);
 }
-function getHonorJson() {
-    let url = JX3BOX.__imgPath + "decoration/honor.json";
-    return axios.get(url);
-}
 // 通用上传
 function upload(formData) {
     return $cms().post(`/api/cms/upload`, formData);
 }
 
-function getUserHonor(uid) {
-    return $cms({ mute: true })
-        .get(`/api/cms/user/honor/${uid}/using`)
+// 检测当前用户是否为团队成员
+function checkTeamMember() {
+    return $cms().get(`/api/cms/config/teammates/check`);
 }
 
-function getSliders(source_type, source_ids, client='std') {
+function getSliders(source_type, source_ids, client="std") {
     let _params = {
         type: "slider",
         source_type,
         per: 10,
-        client
+        client,
     };
 
     if (source_ids) {
@@ -71,4 +49,29 @@ function getCollection(id) {
     return $cms({ mute: true }).get(`/api/cms/post/collection/${id}`);
 }
 
-export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, getHonorJson, getSliders, loadAuthors, loadEmotions, uploadFile, getCollection, getUserHonor };
+// 获取自定义主题
+function getTopicBucket(params) {
+    return $cms().get(`/api/cms/topic/bucket`, { params });
+}
+
+// 获取config
+function getConfig(params) {
+    return $cms().get(`/api/cms/config`, { params }).then((res) => {
+        return res.data.data;
+    });
+}
+
+// 获取用户meta
+function getUserMeta(params) {
+    return $cms().get(`/api/cms/user/my/meta`, { params }).then((res) => {
+        return res.data.data;
+    });
+}
+
+// 设置用户meta
+function setUserMeta(key,data) {
+    return $cms().post(`/api/cms/user/my/meta?key=${key}`, data);
+}
+
+export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember,
+    getSliders, getCollection, getTopicBucket, getConfig, getUserMeta, setUserMeta };

package/service/design.js

@@ -0,0 +1,13 @@
+import { $cms } from "@jx3box/jx3box-common/js/https_v2";
+
+export const createDesignTask = (data) => {
+    return $cms().post(`/api/cms/design/task`, data);
+}
+
+export const getDesignTask = (params) => {
+    return $cms().get(`/api/cms/design/task/log`, { params });
+}
+
+export const getConfigBannerTypes = (params) => {
+    return $cms().get(`/api/cms/config/banner/types`, { params });
+}

package/src/App.vue

@@ -15,7 +15,7 @@
             </template>
             <template #op-prepend>
 
-                <AdminDirectMessage :user-id="8" :sourceId="19382" sourceType="macro"></AdminDirectMessage>
+                <!-- <AdminDirectMessage :user-id="8" :sourceId="19382" sourceType="macro"></AdminDirectMessage> -->
             </template>
         </breadcrumb>
         <LeftSidebar :open="true" :uid="7">
@@ -91,7 +91,7 @@ import PostTopic from "./single/PostTopic.vue";
 import axios from "axios";
 import post_topics from "@jx3box/jx3box-common/data/post_topics.json";
 import { get_item } from "../service/item";
-import AdminDirectMessage from "./bread/AdminDirectMessage.vue";
+// import AdminDirectMessage from "./bread/AdminDirectMessage.vue";
 // import Admin from "@/bread/Admin.vue";
 export default {
     name: "App",
@@ -103,7 +103,7 @@ export default {
         // PostHeader,
         PostTopic,
         UploadAlum,
-        AdminDirectMessage,
+        // AdminDirectMessage,
         singlebox,
         // Admin,
     },

package/src/Breadcrumb.vue

@@ -34,8 +34,9 @@
                 <el-icon><InfoFilled /></el-icon>
                 <span>反馈</span>
             </a>
-            <AdminButton v-if="adminEnable" class="u-admin" />
-            <Admin v-if="adminEnable" />
+            <!-- <AdminButton v-if="adminEnable" class="u-admin" /> -->
+            <Admin v-if="adminEnable" :marksOptions="adminMarks" :show-extend="showExtend" :app="slug" :subtypeMap="subtypeMap" />
+            <!-- <AdminDrop v-if="adminEnable" /> -->
             <slot name="op-prepend"></slot>
         </div>
     </div>
@@ -47,7 +48,8 @@ import { publishLink, getAppIcon } from "@jx3box/jx3box-common/js/utils";
 import User from "@jx3box/jx3box-common/js/user";
 import Admin from "./bread/Admin";
 import Crumb from "./bread/Crumb";
-import AdminButton from "./bread/AdminButton";
+// import AdminButton from "./bread/AdminButton";
+// import AdminDrop from "./bread/AdminDrop";
 
 import { isApp } from "../assets/js/app.js";
 import Bus from "../utils/bus";
@@ -55,15 +57,20 @@ import Bus from "../utils/bus";
 export default {
     name: "CommonBreadcrumb",
     props: [
-        "name",
+    "name",
         "slug",
         "root",
         "publishEnable",
         "adminEnable",
+        "topicEnable",
         "feedbackEnable",
         "overlayEnable",
         "crumbEnable",
         "withoutLeft",
+        "adminMarks",
+        "icon",
+        "subtypeMap",
+        "showExtend"
     ],
     data: function () {
         return {
@@ -126,7 +133,8 @@ export default {
     components: {
         Admin,
         Crumb,
-        AdminButton,
+        // AdminButton,
+        // AdminDrop
     },
 };
 </script>

package/src/bread/Admin.vue

@@ -112,12 +112,17 @@ import { getRewrite } from "@jx3box/jx3box-common/js/utils";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import { getSetting, postSetting } from "../../service/admin";
 import User from "@jx3box/jx3box-common/js/user";
-import MARK from "@jx3box/jx3box-common/data/mark.json";
+import { cms as marks } from "@jx3box/jx3box-common/data/mark.json";
+import { getTopicBucket } from "../../service/cms";
 // import { onClickOutside } from "@vueuse/core";
 export default {
     name: "BreadAdmin",
     emits: ["update"],
     props: {
+        marksOptions: {
+            type: Object,
+            default: () => {},
+        },
         // 入口是否是后台管理/list
         fromList: {
             type: Boolean,
@@ -136,6 +141,18 @@ export default {
             type: Boolean,
             default: false,
         },
+        showExtend: {
+            type: Boolean,
+            default: false,
+        },
+        subtypeMap: {
+            type: Object,
+            default: () => {},
+        },
+        app: {
+            type: String,
+            default: "",
+        },
     },
     data() {
         return {
@@ -164,7 +181,6 @@ export default {
 
             // 角标
             mark: [],
-            mark_options: MARK.cms,
 
             // 高亮
             isHighlight: false,
@@ -181,6 +197,7 @@ export default {
             // 置顶
             isSticky: false,
             sticky: 0,
+            isStar: 0,
 
             // 海报
             uploadurl: JX3BOX.__cms + "api/cms/upload",
@@ -190,6 +207,9 @@ export default {
             // 类型
             post_type: "",
             type_options: [],
+            post_subtype: "",
+            topics: [],
+            tags: [],
 
             // 作者
             post_author: "",
@@ -207,11 +227,19 @@ export default {
                 color: this.isHighlight ? this.color : "",
                 mark: this.mark || [],
                 sticky: this.isSticky ? Date.now() : null,
+                star: this.isStar,
+                topics: this.topics,
+                post_subtype: this.post_subtype,
             };
         },
         isAdmin: function () {
             return User.isAdmin();
         },
+        mark_options: function () {
+            return this.marksOptions && Object.keys(this.marksOptions)
+                ? Object.assign({}, marks, this.marksOptions)
+                : marks;
+        },
     },
     methods: {
         // 是否有权限
@@ -259,7 +287,7 @@ export default {
         // 拉
         pull: function () {
             getSetting(this.pid).then((data) => {
-                let { ID, color, mark, post_status, post_author, sticky, post_banner, post_type, visible } = 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;
@@ -272,6 +300,10 @@ export default {
                 this.sticky = sticky || 0;
                 if (this.sticky) this.isSticky = true;
 
+                this.isStar = star || 0;
+                this.topics = topics?.map(item => item.topic) || [];
+                this.post_subtype = post_subtype || "";
+
                 // 设置加载完成标识
                 this.pulled = true;
             });
@@ -299,6 +331,13 @@ export default {
                     this.close();
                 });
         },
+        // 获取topic标签
+        loadTopic() {
+            getTopicBucket({ type: "bbs" }).then((res) => {
+                const data = res.data.data?.map((item) => item.name) || [];
+                this.tags = data;
+            });
+        },
     },
     watch: {
         "$route.params.id": function () {
@@ -336,12 +375,11 @@ export default {
             if (this.pid && this.hasRight) {
                 this.pull();
             }
-        });
 
-        // 点击外部关闭
-        // onClickOutside(this.$refs.adminDrawer, () => {
-        //     this.close();
-        // });
+            if (this.showExtend && this.app && this.dialog_visible) {
+                this.loadTopic();
+            }
+        });
     },
 };
 </script>

package/src/bread/AdminDirectMessage.vue

@@ -17,7 +17,7 @@ export default {
     props: {
         size: {
             type: String,
-            default: "medium",
+            default: "default",
         },
         sourceId: {
             type: Number,

package/src/bread/AdminDrop.vue

@@ -0,0 +1,123 @@
+<template>
+    <div class="c-admin-drop">
+        <el-dropdown trigger="click" @command="handleCommand">
+            <el-button type="primary" class="c-admin-button c-admin-drop__button" :size="buttonSize" icon="Setting"
+                > 管理 <el-icon style="margin-left: 5px;"><ArrowDown></ArrowDown></el-icon>
+            </el-button>
+            <template #dropdown>
+                <el-dropdown-menu>
+                    <el-dropdown-item v-if="isEditor" command="toggleAdminPanel" icon="Setting">
+                        <span>设置</span>
+                    </el-dropdown-item>
+                    <el-dropdown-item v-if="isEditor" command="directMessage" icon="Message">
+                        <span>私信</span>
+                    </el-dropdown-item>
+                    <el-dropdown-item icon="UploadFilled" command="designTask" v-if="hasPermission('push_banner')">
+                        <span>推送</span>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+        </el-dropdown>
+
+        <design-task v-model="showDesignTask" :post="post"></design-task>
+    </div>
+</template>
+
+<script>
+import Bus from "../../utils/bus";
+import User from "@jx3box/jx3box-common/js/user";
+import DesignTask from "./DesignTask.vue";
+import { sendMessage } from "../../service/admin";
+export default {
+    name: "AdminDrop",
+    components: {
+        DesignTask
+    },
+    props: {
+        buttonSize: {
+            type: String,
+            default: "default",
+        },
+        post: {
+            type: Object,
+            default: () => {},
+        },
+        userId: {
+            type: Number,
+            default: 0,
+        },
+    },
+    data() {
+        return {
+            showDesignTask: false,
+        }
+    },
+    computed: {
+        isEditor() {
+            return User.isEditor();
+        },
+        sourceId() {
+            return this.post?.ID
+        },
+        sourceType() {
+            return this.post?.post_type
+        },
+    },
+    methods: {
+        handleCommand(command) {
+            this[command]();
+        },
+        toggleAdminPanel() {
+            Bus.emit("toggleAdminPanel");
+        },
+        directMessage() {
+            this.$prompt("请输入私信内容", "管理私信", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                inputPlaceholder: "请输入私信内容",
+                inputValidator: (value) => {
+                    if (!value) {
+                        return "请输入私信内容";
+                    }
+                },
+                beforeClose: (action, instance, done) => {
+                    if (action === "confirm") {
+                        const data = {
+                            source_id: String(this.sourceId),
+                            source_type: this.sourceType,
+                            user_id: this.userId,
+                            content: "运营通知：" + instance.inputValue,
+                            type: "system",
+                            subtype: "admin_message"
+                        };
+                        sendMessage(data).then(() => {
+                            this.$message.success("私信成功");
+                            done();
+                        })
+                    } else {
+                        done();
+                    }
+                }
+            }).catch(() => {})
+        },
+        designTask() {
+            this.showDesignTask = true;
+        },
+        hasPermission(permission) {
+            return User.hasPermission(permission);
+        }
+    }
+};
+</script>
+
+<style lang="less">
+.c-admin-drop {
+    float: right;
+    margin-top: -2px;
+    margin-right: 10px;
+}
+.c-admin-drop__button {
+    padding: 8px 18px !important;
+    align-items: center;
+}
+</style>

package/src/bread/DesignTask.vue

@@ -0,0 +1,194 @@
+<template>
+    <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-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-group>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+            </el-form-item>
+            <el-form-item label="星级" class="m-star-line">
+                <el-rate v-model="form.star" :colors="colors"></el-rate>
+            </el-form-item>
+        </el-form>
+
+        <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}">
+                        {{ 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}">
+                        <el-rate v-model="row.star" disabled :colors="colors"></el-rate>
+                    </template>
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" align="center"></el-table-column>
+            </el-table>
+        </template>
+        <el-alert v-else title="当前文章暂无历史推送" type="info" show-icon :closable="false"></el-alert>
+        <template #footer>
+            <el-button @click="close">取 消</el-button>
+            <el-button type="primary" @click="onConfirm">确 定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import { createDesignTask, getDesignTask, getConfigBannerTypes } from "../../service/design";
+import {pick} from "lodash";
+import dayjs from "dayjs";
+import User from "@jx3box/jx3box-common/js/user";
+export default {
+    name: "DesignTask",
+    props: {
+        modelValue: {
+            type: Boolean,
+            default: false
+        },
+        post: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    model: {
+        prop: "modelValue",
+        event: "update:modelValue"
+    },
+    emits: ["update:modelValue"],
+    data() {
+        return {
+            form: {
+                title: "",
+                remark: "",
+                star: 0,
+                subtype: "",
+                version: "std"
+            },
+            colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
+
+            logs: [],
+            config: [],
+
+            isPhone: window.innerWidth < 768,
+            isEditor: User.isEditor(),
+
+            versions: {
+                "std": "旗舰",
+                "origin": "缘起",
+                "wujie": "无界",
+                "test": "体服"
+            }
+        }
+    },
+    watch: {
+        modelValue(val) {
+            if (val) {
+                if (this.post) {
+                    this.form.title = this.post.post_title;
+                }
+                this.loadLogs();
+
+                if (User.isTeammate()) {
+                    this.loadConfig();
+                }
+            }
+        }
+    },
+    methods: {
+        close(){
+            this.$emit("update:modelValue",false)
+        },
+        clearForm() {
+            this.form = {
+                title: "",
+                remark: "",
+                star: 0,
+                subtype: "",
+                version: "std",
+            }
+
+            this.$refs?.form?.clearValidate();
+        },
+        onConfirm() {
+            if (!this.post?.ID) return;
+            const data = pick(this.post, ["client", "author"]);
+            data.title = this.form.title;
+            data.remark = this.form.remark;
+            data.star = this.form.star;
+            data.subtype = this.form.type;
+            data.version = this.form.version;
+
+            data.source_type = this.post?.post_type;
+            data.source_id = String(this.post?.ID);
+            data.link = `/${this.post?.post_type}/${this.post?.ID}`;
+            data.flow = 0;
+
+            createDesignTask(data).then(() => {
+                this.$message.success("提交成功");
+                this.close();
+            })
+        },
+        onCancel() {
+            this.close();
+            this.clearForm();
+        },
+        loadLogs() {
+            if (!this.post?.ID) return;
+            getDesignTask({ source_id: this.post?.ID }).then(res => {
+                this.logs = res.data.data || [];
+            })
+        },
+        loadConfig() {
+            getConfigBannerTypes({ _no_page: 1 }).then(res => {
+                this.config = res.data.data || [];
+                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;
+}
+    .m-star-line {
+        .el-form-item__content {
+            top: 10px;
+        }
+    }
+    .u-time {
+        color: #c0c4cc;
+    }
+}
+
+@media screen and (max-width: @phone) {
+    .m-design-task {
+        .m-star-line {
+            .el-form-item__content {
+                top: 0;
+            }
+        }
+    }
+}
+</style>

package/src/comment/CommentContent.vue

@@ -19,7 +19,7 @@
                 <el-button
                     class="u-admin"
                     v-if="!currentUserHadLike"
-                    type="text"
+                    link
                     size="small"
                     @click="doLike(true)"
                     ><img
@@ -30,7 +30,7 @@
                 >
                 <el-button
                     class="u-admin"
-                    type="text"
+                    link
                     size="small"
                     v-if="currentUserHadLike"
                     @click="doLike(false)"
@@ -63,7 +63,7 @@
                 >
                 <el-button
                     class="u-admin"
-                    type="text"
+                    link
                     size="small"
                     icon="Delete"
                     v-if="canHide"
@@ -120,7 +120,7 @@
                 <el-button
                     class="u-admin u-filter"
                     v-if="canAddWhite"
-                    type="text"
+                    link
                     size="small"
                     @click="setWhiteComment(true)"
                 >
@@ -134,7 +134,7 @@
                 <el-button
                     class="u-admin u-filter"
                     v-if="canRemoveWhite"
-                    type="text"
+                    link
                     size="small"
                     @click="setWhiteComment(false)"
                     ><img

package/src/comment/CommentContentSimple.vue

@@ -25,7 +25,7 @@
             <el-button
                 class="u-admin"
                 v-if="!currentUserHadLike"
-                type="text"
+                link
                 size="mini"
                 @click="doLike(true)"
                 ><img
@@ -38,7 +38,7 @@
             >
             <el-button
                 class="u-admin"
-                type="text"
+                link
                 size="mini"
                 v-if="currentUserHadLike"
                 @click="doLike(false)"
@@ -72,7 +72,7 @@
             >
             <el-button
                 class="u-admin"
-                type="text"
+                link
                 size="mini"
                 icon="Delete"
                 v-if="canHide"

package/src/header/UserInfo.vue

@@ -195,6 +195,9 @@ export default {
                 this.user = data;
                 this.isSuperAuthor = !!data.sign;
                 this.isTeammate = this.user?.is_teammate;
+                localStorage.setItem("is_teammate", this.isTeammate);
+                const permissions = this.user?.permission?.map(item => item.action)?.join(",");
+                localStorage.setItem("jx3box_permission", permissions);
                 this.$emit("update", this.user);
                 if (this.user.deleted) {
                     this.logout(true);