@jx3box/jx3box-common-ui 7.8.0 → 7.8.2

package/assets/img/header/setting.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M18.2838 43.1713C14.9327 42.1736 11.9498 40.3213 9.58787 37.867C10.469 36.8227 11 35.4734 11 34.0001C11 30.6864 8.31371 28.0001 5 28.0001C4.79955 28.0001 4.60139 28.01 4.40599 28.0292C4.13979 26.7277 4 25.3803 4 24.0001C4 21.9095 4.32077 19.8938 4.91579 17.9995C4.94381 17.9999 4.97188 18.0001 5 18.0001C8.31371 18.0001 11 15.3138 11 12.0001C11 11.0488 10.7786 10.1493 10.3846 9.35011C12.6975 7.1995 15.5205 5.59002 18.6521 4.72314C19.6444 6.66819 21.6667 8.00013 24 8.00013C26.3333 8.00013 28.3556 6.66819 29.3479 4.72314C32.4795 5.59002 35.3025 7.1995 37.6154 9.35011C37.2214 10.1493 37 11.0488 37 12.0001C37 15.3138 39.6863 18.0001 43 18.0001C43.0281 18.0001 43.0562 17.9999 43.0842 17.9995C43.6792 19.8938 44 21.9095 44 24.0001C44 25.3803 43.8602 26.7277 43.594 28.0292C43.3986 28.01 43.2005 28.0001 43 28.0001C39.6863 28.0001 37 30.6864 37 34.0001C37 35.4734 37.531 36.8227 38.4121 37.867C36.0502 40.3213 33.0673 42.1736 29.7162 43.1713C28.9428 40.752 26.676 39.0001 24 39.0001C21.324 39.0001 19.0572 40.752 18.2838 43.1713Z" fill="currentColor" stroke="#fff" stroke-width="4" stroke-linejoin="round"/><path d="M24 31C27.866 31 31 27.866 31 24C31 20.134 27.866 17 24 17C20.134 17 17 20.134 17 24C17 27.866 20.134 31 24 31Z" fill="currentColor" stroke="#fff" stroke-width="4" stroke-linejoin="round"/></svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "7.8.0",
+  "version": "7.8.2",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,8 +31,8 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.7.16",
-    "@jx3box/jx3box-common": "^7.9.15",
-    "@jx3box/jx3box-data": "^3.4.2",
+    "@jx3box/jx3box-common": "^8.0.0",
+    "@jx3box/jx3box-data": "^3.5.2",
     "@jx3box/jx3box-editor": "^1.9.9",
     "@jx3box/reporter": "^0.0.4",
     "axios": "^0.26.1",

package/service/admin.js

@@ -2,33 +2,33 @@ import { $cms } from "@jx3box/jx3box-common/js/https.js";
 
 function getSetting(id) {
     return $cms()
-        .get(`/api/cms/post/${id}/query`)
+        .get(`/api/cms/manage/post/${id}`)
         .then((res) => {
             return res.data.data;
         });
 }
 
 function postSetting(data) {
-    return $cms().put(`/api/cms/post/${data.ID}/setting`, data);
+    return $cms().put(`/api/cms/manage/post/${data.ID}`, data);
 }
 
 // 管理员发送私信
-function sendMessage(data){
+function sendMessage(data) {
     return $cms().post(`/api/cms/admin/direct-message`, data);
 }
 
 // 管理员新增自定义主题
-function addTopicBucket(data){
+function addTopicBucket(data) {
     return $cms().post(`/api/cms/post/topic/bucket`, data);
 }
 
 // 管理员删除自定义主题
-function deleteTopicBucket(id){
+function deleteTopicBucket(id) {
     return $cms().delete(`/api/cms/post/topic/bucket/${id}`);
 }
 
 // 管理员修改自定义主题
-function updateTopicBucket(id, data){
+function updateTopicBucket(id, data) {
     return $cms().put(`/api/cms/post/topic/bucket/${id}`, data);
 }
 

package/src/header/manage.vue

@@ -5,16 +5,18 @@
         </span>
         <ul class="u-menu u-pop-content">
             <li v-for="item in userPanel" :key="item.label">
-                <a :href="item.link" :target="item.target || '_self'"
-                    ><i :class="item.icon || 'el-icon-present'"></i> {{ item.label }}</a
-                >
+                <a :href="item.link" :target="item.target || '_self'" class="u-menu-item">
+                    <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon">
+                    {{ item.label }}
+                </a>
             </li>
             <hr v-if="userPanel.length" />
             <template v-if="isEditor">
                 <li v-for="item in adminPanel" :key="item.label">
-                    <a :href="item.link" :target="item.target || '_self'"
-                        ><i :class="item.icon || 'el-icon-present'"></i> {{ item.label }}</a
-                    >
+                    <a :href="item.link" :target="item.target || '_self'" class="u-menu-item">
+                        <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon">
+                        {{ item.label }}
+                    </a>
                 </li>
             </template>
         </ul>
@@ -25,6 +27,7 @@
 import User from "@jx3box/jx3box-common/js/user";
 import panel from "../../assets/data/panel.json";
 import { getMenu } from "../../service/header";
+import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
 export default {
     name: "Manage",
     data() {
@@ -67,6 +70,10 @@ export default {
                 console.log("loadPanel error", e);
             }
         },
+        resolveImg: function (img) {
+            // return __imgPath + "image/header/panel/" + img;
+            return 'https://img.jx3box.com/image/box/pvp.svg'
+        },
     },
 };
 </script>
@@ -75,14 +82,28 @@ export default {
 // 管理菜单
 .c-header-manage {
     height: 100%;
+
     .u-manage {
         padding: 0 10px 0 8px;
         height: 100%;
         .flex;
         align-items: center;
+
         svg {
             .size(19px);
         }
+
+    }
+    .u-menu {
+        .u-menu-item {
+            .flex;
+            align-items: center;
+            gap: 4px;
+        }
+        .u-menu-icon {
+            width: 16px;
+            height: 16px;
+    }
     }
 }
 </style>

package/src/header/userInfo.vue

@@ -13,13 +13,21 @@
                     <li>
                         <a :href="url.publish">发布中心</a>
                     </li>
-                    <hr />
-                    <li v-if="isAdmin">
-                        <a href="/admin">站点配置</a>
-                    </li>
-                    <li v-if="isEditor">
-                        <a href="https://os.jx3box.com/admin">管理平台</a>
+                    <hr>
+                    <li v-for="item in userPanel" :key="item.label">
+                        <a :href="item.link" :target="item.target || '_self'">
+                            <!-- <i :class="item.icon || 'el-icon-present'"></i> -->
+                            {{ item.label }}
+                        </a>
                     </li>
+                    <template v-if="isEditor">
+                        <li v-for="item in adminPanel" :key="item.label">
+                            <a :href="item.link" :target="item.target || '_self'">
+                                <!-- <i :class="item.icon || 'el-icon-present'"></i> -->
+                                {{ item.label }}
+                            </a>
+                        </li>
+                    </template>
                     <li>
                         <a @click="logout">退出登录</a>
                     </li>
@@ -33,26 +41,13 @@
                                 showUserName(user.display_name)
                             }}</a>
                             <a class="u-sign" href="/dashboard/cooperation">
-                                <img
-                                    :src="super_author_icon"
-                                    class="u-superauthor-profile"
-                                    alt="superauthor"
-                                    title="签约作者"
-                                    :class="{ off: !isSuperAuthor }"
-                            /></a>
-                            <a
-                                class="u-vip"
-                                href="/vip/premium?from=header_usermenu"
-                                target="_blank"
-                                title="专业版账号"
-                            >
+                                <img :src="super_author_icon" class="u-superauthor-profile" alt="superauthor" title="签约作者" :class="{ off: !isSuperAuthor }" /></a>
+                            <a class="u-vip" href="/vip/premium?from=header_usermenu" target="_blank" title="专业版账号">
                                 <i class="i-icon-vip" :class="{ on: isPRO }">{{ vipType }}</i>
                             </a>
                         </div>
                         <div class="u-id">
-                            <span
-                                >魔盒UID：<b>{{ user.ID }}</b></span
-                            >
+                            <span>魔盒UID：<b>{{ user.ID }}</b></span>
                             <i class="el-icon-document-copy u-copy" @click.stop="copyText(user.ID)"></i>
                         </div>
                     </div>
@@ -66,8 +61,7 @@
                     <div class="u-other">
                         <a href="/dashboard/fav" class="u-item"><i class="el-icon-star-off"></i>收藏订阅 </a>
                         <a href="/team/role/manage" class="u-item"><i class="el-icon-user"></i>角色管理 </a>
-                        <a href="/dashboard/purchases" class="u-item"
-                            ><i class="el-icon-shopping-cart-2"></i>已购资源
+                        <a href="/dashboard/purchases" class="u-item"><i class="el-icon-shopping-cart-2"></i>已购资源
                         </a>
                         <a href="/dashboard/mall" class="u-item"><i class="el-icon-shopping-bag-1"></i>订单中心 </a>
                         <hr />
@@ -89,6 +83,7 @@ import { showAvatar } from "@jx3box/jx3box-common/js/utils";
 import { getMyInfo } from "../../service/author";
 import { __Links, __Root, __imgPath, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 import { copyText } from "../../assets/js/utils";
+import { getMenu } from "../../service/header";
 export default {
     name: "info",
     props: ["asset"],
@@ -107,6 +102,8 @@ export default {
             },
 
             isSuperAuthor: false,
+
+            panel: [],
         };
     },
     computed: {
@@ -125,17 +122,28 @@ export default {
         isAdmin() {
             return User.isAdmin();
         },
+        userPanel: function () {
+            return this.panel.filter((item) => {
+                return !item.onlyAdmin;
+            });
+        },
+        adminPanel: function () {
+            return this.panel.filter((item) => {
+                return item.onlyAdmin;
+            });
+        },
         isEditor() {
             return User.isEditor();
         },
     },
     mounted() {
         this.loadMyInfo();
+        this.loadPanel();
     },
     methods: {
         copyText,
         showAvatar,
-        logout: function (mute=false) {
+        logout: function (mute = false) {
             User.destroy()
                 .then((res) => {
                     this.$emit("logout");
@@ -157,14 +165,32 @@ export default {
             return val || "匿名";
         },
         loadMyInfo: function () {
-            getMyInfo().then((data) => {
-                this.user = data;
-                this.isSuperAuthor = !!data.sign;
-            }).catch((err) => {
-                if (err?.data.code < -1) {
-                    this.logout(true);
+            getMyInfo()
+                .then((data) => {
+                    this.user = data;
+                    this.isSuperAuthor = !!data.sign;
+                })
+                .catch((err) => {
+                    if (err?.data.code < -1) {
+                        this.logout(true);
+                    }
+                });
+        },
+        loadPanel: function () {
+            try {
+                const panel = JSON.parse(sessionStorage.getItem("panel"));
+                if (panel) {
+                    this.panel = panel;
+                } else {
+                    getMenu("panel").then((res) => {
+                        this.panel = res.data?.data?.val;
+                        sessionStorage.setItem("panel", JSON.stringify(this.panel));
+                    });
                 }
-            });
+            } catch (e) {
+                this.panel = panel;
+                console.log("loadPanel error", e);
+            }
         },
     },
 };