快乐的梦鱼 1 неделя назад
Родитель
Сommit
d4b6c438c2

+ 6 - 1
src/components/display/parse/ParseNodeRender.vue

@@ -101,8 +101,13 @@ const props = withDefaults(defineProps<{
 
 const tagStyle = inject<Ref<Record<string, string>>>('tagStyle', ref({}));
 const style = computed(() => 
-  [(props.node.attrs?.style || ''), (tagStyle.value[props.node.tag] || '')].join(';'),
+  [
+    (props.node.attrs?.style || ''), 
+    (tagStyle.value[props.node.tag] || ''),
+    isInline.value ? 'display:inline;' : '',
+  ].join(';'),
 );
+const isInline = computed(() => ['span','a','large','small'].includes(props.node.tag));
 
 // 链接点击事件
 const linkTap = (e: any) => {

+ 26 - 1
src/pages/article/data/DefaultCategory.json

@@ -194,7 +194,7 @@
                   },
                   "dataSolve": [ "common", "ich" ],
                   "detailsPage": "/pages/introduction/character/details",
-                  "morePage": "/pages/introduction/character/list",
+                  "morePage": ["/pages/article/data/list", { "pageConfigName": "character" }],
                   "type": ""
                 },
                 {
@@ -776,6 +776,31 @@
       }
     },
     {
+      "name": "character",
+      "title": "历史人物",
+      "content": {
+        "type": "CommonList",
+        "props": {
+          "showTab": false,
+          "tabs": [
+            {
+              "text": "历史人物",
+              "type": "list",
+              "data": {
+                "type": "serializedApi",
+                "name": "CharacterContent"
+              },
+              "dataSolve": [ "common", "ich" ],
+              "detailsPage": "/pages/inhert/inheritor/details",
+              "itemType": "article-common",
+              "showTotal": true,
+              "dropdownDefines": []
+            }
+          ]
+        }
+      }
+    },
+    {
       "name": "inhert",
       "title": "遗产报你知",
       "content": {

+ 4 - 4
src/pages/inhert/inheritor/details.vue

@@ -89,6 +89,10 @@
         small
         :descItems="[
           {
+            label: '年代',
+            value: content.age,
+          },
+          {
             label: '民族',
             value: content.nation,
           },
@@ -109,10 +113,6 @@
             value: content.unit,
           },
           {
-            label: '年代',
-            value: content.age,
-          },
-          {
             label: '传承项目',
             value: content.associationMeList[0]?.title,
           },