@jx3box/jx3box-editor 2.1.3 → 2.1.5

package/assets/css/tinymce/fold.less

@@ -59,6 +59,12 @@
         border-top: none;
         display: none;
         line-height: 2.2;
+    }
+
+    pre.e-details{
+        white-space: pre-line;
+    }
+    div.e-details{
         white-space: normal;
     }
 }
@@ -68,6 +74,5 @@
     }
     .e-details {
         display: block;
-        white-space: normal;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-editor",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "JX3BOX Article & Editor",
   "main": "index.js",
   "scripts": {

package/public/css/article.css

@@ -528,6 +528,11 @@
   border-top: none;
   display: none;
   line-height: 2.2;
+}
+.c-article-tinymce pre.e-details {
+  white-space: pre-line;
+}
+.c-article-tinymce div.e-details {
   white-space: normal;
 }
 .c-article-editor .e-summary {
@@ -535,7 +540,6 @@
 }
 .c-article-editor .e-details {
   display: block;
-  white-space: normal;
 }
 .hevue-imgpreview-wrap .he-img-wrap {
   background: rgba(0, 0, 0, 0.8);

package/service/item.js

@@ -1,22 +1,15 @@
-import { $helper } from "@jx3box/jx3box-common/js/https";
+import { $node, $cms } from "@jx3box/jx3box-common/js/https";
 
 // 获取物品
 function get_item(item_id, client) {
     if (!item_id) return;
-    let options = {
-        url: `/api/item/${item_id}`,
-        params : {
-            client
-        }
-    };
-    return $helper({ mute: true })(options);
+
+    return $node().get(`/resource/${client}/item_merged.${5_566}`);
 }
 
 // 获取清单
 function get_plan(plan_id) {
-    return $helper()({
-        url: `api/item_plan/${plan_id}`,
-    });
+    return $cms().get(`/api/cms/app/item-plan/${plan_id}`);
 }
 
 export { get_item, get_plan };

package/src/Equip.vue

@@ -99,7 +99,7 @@ export default {
     mounted: function() {
         if (this.id) {
             get_plan(this.id).then((res) => {
-                this.plan_data = res.data.data.plan;
+                this.plan_data = res.data.data;
             });
         }
     },