waibu-db 1.0.17 → 1.0.19

package/bajoTemplate/partial/crud/_addons.html

@@ -0,0 +1,5 @@
+<% for (const ao of addOns) { %>
+<c:div append-to="#sb-addons" margin="bottom-3">
+  <!-- include <%= ao.resource %>|<%= JSON.stringify(ao.data) %> -->
+</c:div>
+<% } %>

package/{waibuMpa → bajoTemplate}/partial/crud/add-handler.html

@@ -1,5 +1,5 @@
 <c:form>
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
   <c:grid-row gutter="2" margin="top-2">
     <c:grid-col col="6-md">
       <c:wdb-btn-back />
@@ -16,4 +16,4 @@
     </c:grid-col>
   </c:grid-row>
 </c:form>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/details-handler.html

@@ -1,5 +1,5 @@
 <c:div id="main-form">
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
 </c:div>
 <c:grid-row gutter="2" margin="top-2">
   <c:grid-col col="6-lg">
@@ -18,4 +18,4 @@
     <c:wdb-btn-delete/>
   </c:grid-col>
 </c:grid-row>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/edit-handler.html

@@ -1,5 +1,5 @@
 <c:form id="main-form">
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
   <c:grid-row gutter="2" margin="top-2">
     <c:grid-col col="6-lg">
       <c:wdb-btn-back />
@@ -16,4 +16,4 @@
     </c:grid-col>
   </c:grid-row>
 </c:form>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/list-handler.html

@@ -15,5 +15,5 @@
   </c:grid-col>
 </c:grid-row>
 <c:wdb-table id="main-table" border body-divider strip responsive />
-<c:include resource="waibuDb.partial:/crud/_list-footer.html" />
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_list-footer.html -->
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/template/crud/add.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Add') %>" />
-<c:include resource="waibuDb.partial:/crud/add-handler.html" />
+<!-- include waibuDb.partial:/crud/add-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/details.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Details') %>" />
-<c:include resource="waibuDb.partial:/crud/details-handler.html" />
+<!-- include waibuDb.partial:/crud/details-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/edit.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Edit') %>" />
-<c:include resource="waibuDb.partial:/crud/edit-handler.html" />
+<!-- include waibuDb.partial:/crud/edit-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/list.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('List') %>" />
-<c:include resource="waibuDb.partial:/crud/list-handler.html" />
+<!-- include waibuDb.partial:/crud/list-handler.html -->

package/lib/crud/helper/add-ons-handler.js

@@ -38,7 +38,7 @@ async function addOnsHandler ({ req, reply, data, schema }) {
   return map(opts, o => {
     return {
       data: { option: o.chartOpts, name: o.name },
-      resource: 'waibuDb.partial:/crud/echarts-window.html'
+      resource: 'waibuDb.partial:/crud/~echarts-window.html'
     }
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/waibuMpa/partial/crud/_addons.html

@@ -1,5 +0,0 @@
-<% for (const ao of addOns) { %>
-<c:div append-to="#sb-addons" margin="bottom-3">
-  <c:include resource="<%= ao.resource %>" <% for (const k in ao.data) { print(k + '="' + ao.data[k] + '" ') } %>/>
-</c:div>
-<% } %>