@jx3box/jx3box-editor 1.9.6 → 1.9.8

package/assets/js/combo.js

@@ -1,22 +1,27 @@
 import $ from "jquery";
 import { iconLink } from "@jx3box/jx3box-common/js/utils";
 
-function renderCombo(selector = ".e-skill-combo .w-skill-combo-item") {
+function renderCombo(selector = ".e-skill-combo") {
     try {
-        let html = ''
-        $(selector).each(function(i, ele) {
+        $(selector).each(function (i, ele) {
             // 获取嵌入源地址
-            let url = $(this).text();
+            let html = ''
 
-            // extend = {gcd: 0}
-            const [id, name, icon, extend] = url.split(",");
-            // 去除左右花括号
+            let children = $(this).children();
 
-            
-            const _extend = extend ? JSON.parse(extend) : null;
+            console.log(children)
 
-            // 渲染
-            let code = `
+            children.each(function (i, ele) {
+                let url = $(this).text();
+
+                // extend = {gcd: 0}
+                const [id, name, icon, extend] = url.split(",");
+                // 去除左右花括号
+
+                const _extend = extend ? JSON.parse(extend) : null;
+
+                // 渲染
+                let code = `
                 <span class="w-skill-combo-item">
                     <img class="u-skill-icon" src="${iconLink(icon)}" alt="${icon}" title="${name}" />
                     <span class="u-skill-name" title="${name}">${name}</span>
@@ -25,14 +30,12 @@ function renderCombo(selector = ".e-skill-combo .w-skill-combo-item") {
                     </i>
                 </span>
             `;
-            html += code;
+                html += code;
+            });
+            // 挂载点
+            $(this).html(html);
         });
-
-        // console.log(html)
-
-        // 挂载点
-        $(selector).parent().html(html);
-    } catch(e) {
+    } catch (e) {
         console.log(e)
     }
 }

package/package.json

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

package/public/tinymce.html

@@ -7,7 +7,7 @@
         <meta name="renderer" content="webkit" />
         <title><%= htmlWebpackPlugin.options.title %></title>
         <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-        <script src="https://oss.jx3box.com/static/tinymce/tinymce.min.js?v=1.8.9"></script>
+        <script src="https://cdn.jx3box.com/static/tinymce/tinymce.min.js?v=1.8.9"></script>
         <!-- TODO: -->
         <!-- <script src="http://localhost:3000/tinymce.min.js"></script> -->
     </head>

package/src/Tinymce.vue

@@ -63,7 +63,7 @@ export default {
 
                 // 样式
                 // TODO:
-                content_css: process.env.VUE_APP_DEV_COMPONENT == 'true' ? '/css/article.css' : `https://oss.jx3box.com/static/jx3box-editor/css/article.css`,
+                content_css: process.env.VUE_APP_DEV_COMPONENT == 'true' ? '/css/article.css' : `https://cdn.jx3box.com/static/jx3box-editor/css/article.css`,
                 // content_css: `http://localhost:3000/skins/content/default/content.min.css`,
                 body_class: "c-article c-article-editor c-article-tinymce",
                 height: this.height || 800,