@jx3box/jx3box-common-ui 5.5.5 → 5.5.9

package/assets/data/nav.json

@@ -1,290 +1,12 @@
 [
-    {
-        "key": "index",
-        "link": "/index",
-        "label": "首页",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "macro",
-        "link": "/macro",
-        "label": "宏库",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "macroeditor",
-        "link": "/app/macroeditor",
-        "label": "宏编辑器",
-        "client": "all",
-        "status": true,
-        "parentKey": "macro"
-    },
-    {
-        "key": "macro_index",
-        "link": "/macro",
-        "label": "全门派宏",
-        "client": "all",
-        "status": true,
-        "parentKey": "macro"
-    },
-    {
-        "key": "jx3dat",
-        "link": "/jx3dat",
-        "label": "插件",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "jx3dat_index",
-        "link": "/jx3dat",
-        "label": "插件数据",
-        "client": "all",
-        "status": true,
-        "parentKey": "jx3dat"
-    },
-    {
-        "key": "dbm",
-        "link": "/dbm",
-        "label": "在线构建",
-        "client": "all",
-        "status": false,
-        "parentKey": "jx3dat"
-    },
-    {
-        "key": "fb",
-        "link": "/fb",
-        "label": "副本",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "fb_post",
-        "link": "/fb",
-        "label": "副本攻略",
-        "client": "all",
-        "status": true,
-        "parentKey": "fb"
-    },
-    {
-        "key": "fb_drop",
-        "link": "/fb/#/drop",
-        "label": "副本掉落",
-        "client": "all",
-        "status": true,
-        "parentKey": "fb"
-    },
-    {
-        "key": "fb_gem",
-        "link": "/fb/#/gem",
-        "label": "瑰石查询",
-        "client": "all",
-        "status": true,
-        "parentKey": "fb"
-    },
-    {
-        "key": "team",
-        "link": "/team",
-        "label": "团队平台",
-        "client": "all",
-        "status": true,
-        "parentKey": "fb"
-    },
-    {
-        "key": "rank",
-        "link": "/rank",
-        "label": "秘境百强",
-        "client": "all",
-        "status": true,
-        "parentKey": "fb"
-    },
-    {
-        "key": "bps",
-        "link": "/bps",
-        "label": "职业",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "bps_post",
-        "link": "/bps",
-        "label": "门派攻略",
-        "client": "all",
-        "status": true,
-        "parentKey": "bps"
-    },
-    {
-        "key": "pz",
-        "link": "/pz",
-        "label": "在线配装",
-        "client": "all",
-        "status": true,
-        "parentKey": "bps"
-    },
-    {
-        "key": "database",
-        "link": "/app/database",
-        "label": "数据大全",
-        "client": "all",
-        "status": true,
-        "parentKey": "bps"
-    },
-    {
-        "key": "battle",
-        "link": "/battle",
-        "label": "战斗分析",
-        "client": "all",
-        "status": true,
-        "parentKey": "bps"
-    },
-    {
-        "key": "dps",
-        "link": "/app/dps",
-        "label": "伤害模拟",
-        "client": "all",
-        "status": true,
-        "parentKey": "bps"
-    },
-    {
-        "key": "wiki",
-        "link": "/cj",
-        "label": "百科",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "cj",
-        "link": "/cj",
-        "label": "成就百科",
-        "client": "all",
-        "status": true,
-        "parentKey": "wiki"
-    },
-    {
-        "key": "item",
-        "link": "/item",
-        "label": "物品百科",
-        "client": "all",
-        "status": true,
-        "parentKey": "wiki"
-    },
-    {
-        "key": "quest",
-        "link": "/quest",
-        "label": "任务百科",
-        "client": "all",
-        "status": true,
-        "parentKey": "wiki"
-    },
-    {
-        "key": "knowledge",
-        "link": "/knowledge",
-        "label": "通识百科",
-        "client": "all",
-        "status": true,
-        "parentKey": "wiki"
-    },
-    {
-        "key": "pet",
-        "link": "/knowledge/#/pet",
-        "label": "宠物百科",
-        "client": "all",
-        "status": true,
-        "parentKey": "wiki"
-    },
-    {
-        "key": "tool",
-        "link": "/tool",
-        "label": "工具",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "app_index",
-        "link": "/app",
-        "label": "魔盒应用",
-        "client": "all",
-        "status": true,
-        "parentKey": "tool"
-    },
-    {
-        "key": "helper",
-        "link": "/tool",
-        "label": "更多工具",
-        "client": "all",
-        "status": true,
-        "parentKey": "tool"
-    },
-    {
-        "key": "share",
-        "link": "/share",
-        "label": "休闲",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "face",
-        "link": "/share",
-        "label": "捏脸分享",
-        "client": "all",
-        "status": true,
-        "parentKey": "share"
-    },
-    {
-        "key": "house",
-        "link": "https://jx3.xoyo.com/zt/2020/09/24/blueprint/#/",
-        "label": "家园蓝图",
-        "client": "std",
-        "status": true,
-        "parentKey": "share"
-    },
-    {
-        "key": "bbs",
-        "link": "/bbs",
-        "label": "茶馆",
-        "client": "all",
-        "status": true,
-        "parentKey": ""
-    },
-    {
-        "key": "joke",
-        "link": "/bbs/#/joke",
-        "label": "剑三骚话",
-        "client": "all",
-        "status": true,
-        "parentKey": "bbs"
-    },
-    {
-        "key": "emotion",
-        "link": "/bbs/#/emotion",
-        "label": "剑三表情",
-        "client": "all",
-        "status": false,
-        "parentKey": "bbs"
-    },
-    {
-        "key": "namespace",
-        "link": "/bbs/#/namespace",
-        "label": "剑三铭牌",
-        "client": "all",
-        "status": true,
-        "parentKey": "bbs"
-    },
-    {
-        "key": "forum",
-        "link": "/bbs/#/forum",
-        "label": "讨论交流",
-        "client": "all",
-        "status": true,
-        "parentKey": "bbs"
-    }
-]
+    { "key": "index", "link": "/index/", "label": "首页", "client": "all", "status": true, "parentKey": "" },
+    { "key": "macro", "link": "/macro/", "label": "宏库", "client": "all", "status": true, "parentKey": "" },
+    { "key": "jx3dat", "link": "/jx3dat/", "label": "插件", "client": "all", "status": true, "parentKey": "" },
+    { "key": "fb", "link": "/fb/", "label": "副本", "client": "all", "status": true, "parentKey": "" },
+    { "key": "bps", "link": "/bps/", "label": "职业", "client": "all", "status": true, "parentKey": "" },
+    { "key": "wiki", "link": "/cj/", "label": "百科", "client": "all", "status": true, "parentKey": "" },
+    { "key": "pvx", "link": "/share/", "label": "休闲", "client": "all", "status": true, "parentKey": "" },
+    { "key": "pvp", "link": "/pvp/", "label": "竞技", "client": "all", "status": true, "parentKey": "" },
+    { "key": "tool", "link": "/tool/", "label": "工具", "client": "all", "status": true, "parentKey": "" },
+    { "key": "bbs", "link": "/bbs/", "label": "茶馆", "client": "all", "status": true, "parentKey": "" }
+]

package/assets/data/panel.json

@@ -19,11 +19,6 @@
         "link": "/team/role/manage",
         "onlyAdmin":false
     },
-    {
-        "label": "全局设置",
-        "link": "/config",
-        "onlyAdmin":true
-    },
     {
         "label": "后台管理",
         "link": "https://os.jx3box.com/admin",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "5.5.5",
+    "version": "5.5.9",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -31,7 +31,7 @@
     ],
     "dependencies": {
         "@jx3box/jx3box-comment-ui": "^1.6.6",
-        "@jx3box/jx3box-common": "^6.8.2",
+        "@jx3box/jx3box-common": "^7.0.5",
         "@jx3box/jx3box-data": "^1.8.3",
         "@jx3box/jx3box-editor": "^1.2.0",
         "axios": "^0.19.2",

package/service/breadcrumb.js

@@ -1,12 +1,11 @@
-import axios from "axios";
-import { __helperUrl } from "@jx3box/jx3box-common/data/jx3box.json";
+import { $helper } from "@jx3box/jx3box-common/js/https.js";
 
 function getBreadcrumb(name) {
-    return axios.get(__helperUrl + `api/breadcrumb/${name}`);
+    return $helper().get(`/api/breadcrumb/${name}`);
 }
 
 function getBreadcrumbs(params) {
-    return axios.get(__helperUrl + `api/breadcrumbs`, {
+    return $helper().get(`/api/breadcrumbs`, {
         params: params,
     });
 }

package/service/header.js

@@ -1,14 +1,13 @@
 import axios from "axios";
-import { $helper,$cms } from "@jx3box/jx3box-common/js/https.js";
+import { $helper, $cms } from "@jx3box/jx3box-common/js/https.js";
 import { __dataPath } from "@jx3box/jx3box-common/data/jx3box.json";
 
 function getMsg() {
     return $helper({ mute: true }).get("/api/messages/unread_total");
 }
 
-function getNav(client = 'std') {
-    let file =
-        client == "origin" ? "header_nav_origin.json" : "header_nav.json";
+function getNav(client = "std") {
+    let file = client == "origin" ? "header_nav_origin.json" : "header_nav.json";
     return axios.get(__dataPath + `data/box/${file}`);
 }
 
@@ -16,13 +15,13 @@ function getPanel() {
     return axios.get(__dataPath + "data/box/header_panel.json");
 }
 
-function getBox(client = 'std') {
-    let filename = client == 'origin' ? 'box_origin.json' : 'box.json'
+function getBox(client = "std") {
+    let filename = client == "origin" ? "box_origin.json" : "box.json";
     return axios.get(__dataPath + "data/box/" + filename);
 }
 
-function getMenu(key){
-    return $cms().get(`/api/cms/config/menu/${key}`)
+function getMenu(key) {
+    return $cms().get(`/api/cms/config/menu/${key}`);
 }
 
-export { getMsg, getNav, getPanel, getBox,getMenu };
+export { getMsg, getNav, getPanel, getBox, getMenu };

package/service/helper.js

@@ -1,7 +1,7 @@
-import {$helper} from '@jx3box/jx3box-common/js/https'
+import { $helper } from "@jx3box/jx3box-common/js/https";
 
-function getCollection(id){
-    return $helper().get(`/api/post/collection/${id}`)
+function getCollection(id) {
+    return $helper().get(`/api/post/collection/${id}`);
 }
 
-export {getCollection}
+export { getCollection };

package/service/thx.js

@@ -1,4 +1,4 @@
-import { $pay,$cms } from "@jx3box/jx3box-common/js/https";
+import { $pay, $cms } from "@jx3box/jx3box-common/js/https";
 
 function getPostBoxcoinRecords(postType, postId, params) {
     return $pay().get(`/api/inspire/article/${postType}/${postId}/history`, {
@@ -22,12 +22,12 @@ function getPostBoxcoinConfig(postType) {
     return $pay().get(`/api/inspire/article/${postType}/boxcoin/limit`);
 }
 
-function getBoxcoinStatus(){
-    return $cms().get(`/api/cms/config`,{
-        params : {
-            key : 'boxcoin'
-        }
-    })
+function getBoxcoinStatus() {
+    return $cms().get(`/api/cms/config`, {
+        params: {
+            key: "boxcoin",
+        },
+    });
 }
 
-export { getPostBoxcoinRecords, grantBoxcoin, rewardBoxcoin, recoveryBoxcoin, getPostBoxcoinConfig,getBoxcoinStatus };
+export { getPostBoxcoinRecords, grantBoxcoin, rewardBoxcoin, recoveryBoxcoin, getPostBoxcoinConfig, getBoxcoinStatus };

package/src/Author.vue

@@ -8,7 +8,7 @@
                 :size="68"
                 :frame="data.user_avatar_frame"
             />
-            <a class="u-name" :href="id | authorLink">
+            <a class="u-name" :href="authorLink(id)">
                 <span>{{ data.display_name }}</span>
             </a>
             <el-tooltip
@@ -39,7 +39,7 @@
             <a
                 v-if="data.weibo_name"
                 class="u-weibo"
-                :href="data.weibo_id | weiboLink"
+                :href="weiboLink(data.weibo_id)"
                 target="_blank"
             >
                 <img svg-inline src="../assets/img/author/weibo.svg" />
@@ -48,7 +48,7 @@
             <a
                 v-if="data.github_name"
                 class="u-github"
-                :href="data.github_name | githubLink"
+                :href="githubLink(data.github_name)"
                 target="_blank"
             >
                 <img svg-inline src="../assets/img/author/github.svg" />
@@ -78,7 +78,7 @@
             </div>
             <div class="u-medals" v-if="medals && medals.length">
                 <span class="u-medal" v-for="(item, i) in medals" :key="i">
-                    <img :src="item.medal | showMedalIcon" :title="item | showMedalDesc" />
+                    <img :src="showMedalIcon(item.medal)" :title="showMedalDesc(item)" />
                 </span>
             </div>
         </div>
@@ -87,8 +87,8 @@
                 <i class="el-icon-school"></i>
                 <span>所属团队</span>
             </div>
-            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="item.team_id | teamLink" target="_blank">
-                <img class="u-teamlogo" :src="item.team_logo | showTeamLogo" />
+            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
+                <img class="u-teamlogo" :src="showTeamLogo(item.team_logo)" />
                 <span class="u-teamname">{{item.team_name}}@{{item.team_server}}</span>
             </a>
         </div>
@@ -178,27 +178,6 @@ export default {
             return this.isPRO ? "专业版会员" : "高级版会员";
         },
     },
-    filters: {
-        showMedalIcon: function (val) {
-            return __imgPath + "image/medals/user/" + val + ".gif";
-        },
-        showMedalDesc : function (item){
-            return item.medal_desc || medal_map[item.medal]
-        },
-        authorLink,
-        weiboLink: function (val) {
-            return "https://weibo.com/" + val;
-        },
-        githubLink: function (val) {
-            return "https://github.com/" + val;
-        },
-        teamLink: function (id) {
-            return getLink("org", id);
-        },
-        showTeamLogo: function (val) {
-            return getThumbnail(val, 32);
-        },
-    },
     methods: {
         loadData: function () {
             return getUserInfo(this.id)
@@ -245,6 +224,27 @@ export default {
                 this.isVIP = res.data.data.isPRE;
             });
         },
+
+        // filters
+        showMedalIcon: function (val) {
+            return __imgPath + "image/medals/user/" + val + ".gif";
+        },
+        showMedalDesc : function (item){
+            return item.medal_desc || medal_map[item.medal]
+        },
+        authorLink,
+        weiboLink: function (val) {
+            return "https://weibo.com/" + val;
+        },
+        githubLink: function (val) {
+            return "https://github.com/" + val;
+        },
+        teamLink: function (id) {
+            return getLink("org", id);
+        },
+        showTeamLogo: function (val) {
+            return getThumbnail(val, 32);
+        },
     },
     watch: {
         uid: function () {

package/src/Box.vue

@@ -13,8 +13,8 @@
                 </a>
             </li>
             <li v-for="(item,i) in list" :key="i" :class="{'u-app-start':item.lf}">
-                <a class="u-item" :href="item.href" :target="item.href | getTarget">
-                    <img class="u-pic" :src="item.img | getBoxIcon" />
+                <a class="u-item" :href="item.href" :target="getTarget(item.href)">
+                    <img class="u-pic" :src="getBoxIcon(item.img)" />
                     <!-- <img class="u-pic-hover" svg-inline :src="item.hover | getBoxIcon" /> -->
                     <span class="u-txt">{{item.abbr}}</span>
                 </a>
@@ -67,7 +67,17 @@ export default {
         },
         matchedClient : function (client){
             return client == 'all' ? true : client == this.client
-        }
+        },
+        getBoxIcon: function (val) {
+            return __imgPath + "image/box/" + val;
+        },
+        getTarget: function (val) {
+            if (window.innerWidth < 768 || val?.startsWith("/")) {
+                return "_self";
+            } else {
+                return "_blank";
+            }
+        },
     },
     created: function () {
         if (this.overlayEnable) {
@@ -95,18 +105,6 @@ export default {
             Bus.$emit("toggleBox", false);
         });
     },
-    filters: {
-        getBoxIcon: function (val) {
-            return __imgPath + "image/box/" + val;
-        },
-        getTarget: function (val) {
-            if (window.innerWidth < 768 || val?.startsWith("/")) {
-                return "_self";
-            } else {
-                return "_blank";
-            }
-        },
-    },
     components: {
         "header-search": search,
     },

package/src/Breadcrumb.vue

@@ -25,7 +25,7 @@
             <slot name="op-append"></slot>
             <a
                 v-if="publishEnable"
-                :href="slug | publishLink"
+                :href="publishLink(slug)"
                 class="u-publish el-button el-button--primary el-button--medium u-op-public"
             >
                 <i class="el-icon-edit-outline"></i>
@@ -88,14 +88,12 @@ export default {
         };
     },
     computed: {},
-    filters: {
-        publishLink,
-    },
     methods: {
         toggleLeftSide: function () {
             let status = !this.isOpen;
             Bus.$emit("toggleLeftSide", status);
         },
+        publishLink,
     },
     mounted: function () {
         Bus.$on("toggleLeftSide", (data) => {

package/src/Github_REPO.vue

@@ -25,7 +25,7 @@
                         target="_blank"
                     >
                         <img
-                            :src="c.user_avatar | resolveAvatarPath"
+                            :src="resolveAvatarPath(c.user_avatar)"
                             :alt="c.display_name"
                         />
                     </a>
@@ -71,12 +71,10 @@ export default {
             return this.html_url + "/issues";
         },
     },
-    filters: {
+    methods: {
         resolveAvatarPath: function(val) {
             return val ? val.replace(__ossRoot, __ossMirror) : "";
         },
-    },
-    methods: {
         getBasicInfo: function() {
             getRepoInfo(this.REPO).then((res) => {
                 let data = res.data;

package/src/author/Avatar.vue

@@ -1,5 +1,5 @@
 <template>
-    <a class="c-avatar" :href="uid | authorLink">
+    <a class="c-avatar" :href="authorLink(uid)">
         <img :src="showAvatar(avatar)" class="c-avatar-pic" :class="{ isCircle }" />
         <i class="c-avatar-frame" v-if="frameName" :class="style">
             <img :src="frameUrl" />
@@ -68,8 +68,6 @@ export default {
         showAvatar: function (val) {
             return showAvatar(val, this.size);
         },
-    },
-    filters: {
         authorLink,
     },
     created: function () {

package/src/author/UserPop.vue

@@ -13,7 +13,7 @@
             <el-input v-model.number="uid" placeholder="请输入UID（数字）"></el-input>
         </div>
         <div class="u-preview">
-            <img class="u-avatar" :src="userdata.user_avatar | showAvatar" />
+            <img class="u-avatar" :src="showAvatar(userdata.user_avatar)" />
             <span class="u-name">{{ userdata.display_name || "-" }}</span>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -66,11 +66,6 @@ export default {
             this.$emit("switchUserPop", newval);
         },
     },
-    filters: {
-        showAvatar: function (val) {
-            return showAvatar(val, "l");
-        },
-    },
     computed: {},
     methods: {
         confirm: function () {
@@ -83,6 +78,9 @@ export default {
                 });
             }
         },
+        showAvatar: function (val) {
+            return showAvatar(val, "l");
+        },
     },
     mounted: function () {},
     components: {},