@jx3box/jx3box-common-ui 8.2.3 → 8.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "8.2.3",
+  "version": "8.2.5",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "@jx3box/jx3box-comment-ui": "^1.8.7",
     "@jx3box/jx3box-common": "^8.2.4",
     "@jx3box/jx3box-data": "^3.5.6",
-    "@jx3box/jx3box-editor": "^2.1.6",
+    "@jx3box/jx3box-editor": "^2.1.7",
     "@jx3box/reporter": "^0.0.4",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",

package/service/cms.js

@@ -18,6 +18,10 @@ function getDecorationJson() {
     let url = __imgPath + "decoration/index.json";
     return axios.get(url);
 }
+function getHonorJson() {
+    let url = __imgPath + "decoration/honor.json";
+    return axios.get(url);
+}
 // 通用上传
 function upload(formData) {
     return $cms().post(`/api/cms/upload`, formData);
@@ -73,5 +77,5 @@ function setUserMeta(key,data) {
     return $cms().post(`/api/cms/user/my/meta?key=${key}`, data);
 }
 
-export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember,
+export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, getHonorJson, checkTeamMember,
     getSliders, getCollection, getTopicBucket, getConfig, getUserMeta, setUserMeta };

package/src/App.vue

@@ -15,9 +15,9 @@
             bread info
         </Breadcrumb>
 
-        <LeftSidebar :open="true" :uid="1005">
+        <LeftSidebar :open="true" :uid="8">
             <LeftSideToggle :mobileOnly="true" />
-            <Author :author="author" :uid="1005" />
+            <Author :author="author" :uid="8" />
         </LeftSidebar>
 
         <Main :withoutLeft="false" :withoutRight="false">

package/src/author/AuthorHonor.vue

@@ -1,11 +1,13 @@
 <template>
     <div class="c-author-honor" :style="{ backgroundImage: `url(${imgUrl()})` }" v-if="honor">
-        <span v-if="!isJdt" :style="{ color: honor.color }">{{ honorName }}</span>
+        <span v-if="!isJdt" :style="{ color: honor.color }">{{ honor.honor }}</span>
     </div>
 </template>
 <script>
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
+import { getHonorJson } from "../../service/cms";
 import { getUserHonors } from "../../service/author";
+import { inRange } from "lodash";
 const HONOR_IMG_KEY = "honor_img";
 export default {
     props: ["uid"],
@@ -24,16 +26,16 @@ export default {
     },
     computed: {
         isJdt() {
-            return this.honor?.val?.toLowerCase()?.includes('jdt')
+            return this.honor?.val?.toLowerCase()?.includes("jdt");
         },
-        honorName({ honor }) {
-            return `${honor.year}${honor.prefix}${honor.suffix}`
-        }
     },
     methods: {
         imgUrl: function () {
             let item = this.honor;
             if (!item) return;
+            if (item.isImgIndex) {
+                return __imgPath + `decoration/honor/${item.img}/${item.img}_${item.imgIndex}.${item.img_ext}`;
+            }
             return __imgPath + `decoration/honor/${item.img}/${item.img}.${item.img_ext}`;
         },
         getHonor() {
@@ -46,7 +48,7 @@ export default {
                 this.honor = JSON.parse(honor_local);
             } catch (err) {
                 getUserHonors(user_id).then((data) => {
-                    let res = data?.filter(item => item.using);
+                    let res = data?.filter((item) => item.using);
                     if (res.length == 0) {
                         //空 则为无主题，不再加载接口，界面设No
                         sessionStorage.setItem(HONOR_IMG_KEY + user_id, "no");
@@ -58,10 +60,56 @@ export default {
             }
         },
         //有称号后，获取样式配置
-        getHonorStyle(data) {
-            data = data.honor;
-            sessionStorage.setItem(HONOR_IMG_KEY + this.uid, JSON.stringify(data));
-            this.honor = data;
+        getHonorStyle(honor) {
+            const data = honor?.honor || {};
+            getHonorJson().then((res) => {
+                let honorList = res.data;
+                let honorConfig = honorList[data.img];
+                let only = honorConfig.only;
+                let prefix = honorConfig.prefix;
+                let regPrefix = honorConfig.prefix.match(/\{([^{}]+?)\}/g);
+                let ranking = honorConfig.ranking;
+                let honorStr = honorConfig.year || "";
+                if (!only) {
+                    if (regPrefix) {
+                        honorStr = honorStr + (data[regPrefix[0].slice(1, -1)] || "");
+                    } else {
+                        honorStr = honorStr + prefix;
+                    }
+                } else {
+                    honorStr = prefix;
+                }
+                if (ranking.length > 0) {
+                    data.imgIndex = 0;
+                    for (let i = 0; i < ranking.length; i++) {
+                        if (
+                            honor.ranking !== undefined &&
+                            inRange(Number(honor.ranking), ranking[i][0], ranking[i][1])
+                        ) {
+                            data.imgIndex = i;
+                            let str = ranking[i][2];
+                            let regStr = str.match(/\{([^{}]+?)\}/g);
+                            if (regStr) {
+                                honorStr =
+                                    honorStr +
+                                    str.replace(/\{([^{}]+?)\}/g, function (match, p1) {
+                                        return data[p1] || "";
+                                    });
+                            } else {
+                                honorStr = honorStr + str;
+                            }
+                            break;
+                        }
+                    }
+                }
+                data.honor = honorStr + honorConfig.suffix;
+                data.color = honorConfig.color;
+                data.ext = honorConfig.ext;
+                data.isHave = true;
+                data.isImgIndex = ranking.length > 0;
+                sessionStorage.setItem(HONOR_IMG_KEY + this.uid, JSON.stringify(data));
+                this.honor = data;
+            });
         },
     },
 };