njk-tool 0.0.24 → 0.0.25

package/dist/bundle/app.min.js

@@ -13464,51 +13464,19 @@ font-size: 0.9rem;
 /* END-Text.css */
 /* Title.css */
 .title-base {
---align: left;
---text-color: #606266;
---font-weight: 800;
---font-size: 18px;
-color: var(--text-color);
-text-align: var(--align);
-font-weight: var(--font-weight);
-font-size: var(--font-size);
-padding: 8px 30px;
+text-align: center;
+font-weight: bolder;
 }
 .njk-title-h1 {
-font-size: 26px;
-font-weight: bolder;
---align: left;
---text-color: #606266;
---margin: 20px 0 10px;
 position: relative;
 padding: 0 0 4.8px;
-margin: var(--margin);
-color: var(--text-color);
-text-align: var(--align);
 }
 .njk-title-h2 {
-font-size: 24px;
-font-weight: bolder;
---align: left;
---text-color: #606266;
---margin: 20px 0 10px;
 position: relative;
-padding: 0 0 4.8px;
-margin: var(--margin);
-color: var(--text-color);
-text-align: var(--align);
 }
-.njk-title-h3{
-font-size: 20px;
---align: left;
---text-color: #606266;
-font-weight: bolder;
---margin: 20px 0 10px;
+.njk-title-h3 {
 position: relative;
-padding: 0 0 4.8px;
-margin: var(--margin);
-color: var(--text-color);
-text-align: var(--align);
+margin-bottom: 10px;
 }
 /* .njk-title-h2::before,
 .njk-title-h1::before {
@@ -13527,21 +13495,6 @@ left: -18px;
 .njk-title-h2:hover::before {
 display: inline-block;
 } */
-.title-main {
---align: left;
---text-color: black;
---font-weight: 800;
---font-size: 28px;
-color: var(--text-color);
-text-align: var(--align);
-font-weight: var(--font-weight);
-font-size: var(--font-size);
-padding: 8px 30px;
-margin-bottom: 20px;
-}
-.title-center {
-text-align: center;
-}
 /* END-Title.css */
 /* Notice.css */
 /* Notice */
@@ -13577,25 +13530,41 @@ border-left: 4px solid #f5222d;
 /* END-Notice.css */
 /* Table.css */
 .my-daframe-default {
-margin: 0;
-width: 80%;
+margin: 0 auto 20px;
 border-collapse: collapse;
-border-radius: 15px;
+border: 2px solid black;
 /* 合并边框 */
 font-family: Arial, Helvetica, sans-serif;
 font-size: 14px;
 color: #444444;
 }
+.my-daframe-default a {
+text-decoration: none !important;
+color: #444444 !important;
+font-family: Arial, Helvetica, sans-serif;
+font-size: 14px;
+}
 .thead-light th {
 white-space: nowrap;
-background-color: #f5f7fa;
+background-color: #e0e3e8;
+/* background-color: #f5f7fa; */
 color: #333333;
 font-weight: 600;
 padding: 12px 16px;
 text-align: left;
-border: 1px solid #e1e4e8;
+border-right: 1px solid rgba(19, 18, 18, 0.6);
+border-bottom: 2px solid black;
 font-size: 16px;
 }
+.my-daframe-default tr {
+border-bottom: 1px solid black;
+}
+.my-daframe-default td {
+border-right: 1px solid rgba(19, 18, 18, 0.6);
+/* color: #333333; */
+/* font-weight: 600; */
+/* text-align: left; */
+}
 .default-row {
 border: 1px solid #eee;
 background-color: #fff;
@@ -13606,7 +13575,7 @@ color: rebeccapurple;
 }
 .default-cell {
 padding: 10px 16px;
-border: 1px solid #e1e4e8;
+/* border: 1px solid #e1e4e8; */
 font-weight: 400;
 font-size: 14px;
 color: #444;
@@ -13637,6 +13606,12 @@ overflow-x: auto;
 }
 /* END-Block.css */
 /* Date.css */
+.center-info-box {
+margin-top: -20px;
+margin-bottom: 20px;
+text-align: center;
+color: black;
+}
 /* END-Date.css */
 /* Tab.css */
 /* Tab 容器 */
@@ -13697,10 +13672,11 @@ min-width: 1000px;
 padding: 0 5rem;
 }
 :root {
---njk-title-color: #606266;
---njk-title-align: left;
+--njk-title-color: black;
+--njk-title-align: center;
 --njk-title-position: relative;
 --njk-title-margin: 36px 0 20px;
+--njk-table-margin: 0 auto 20px;
 }
 /* END-Base.css */
 </style>`;
@@ -13723,6 +13699,16 @@ const templateText = `<!-- Head.njk -->
 {% endfor %}
 {% endif %}
 {% endmacro %}
+{% macro use_comp_start(ctx) %}
+<table style="width: 100%;table-layout: auto">
+<tr>
+<td>
+{% endmacro %}
+{% macro use_comp_end(ctx) %}
+</td>
+</tr>
+</table>
+{% endmacro %}
 <!-- /Head.njk -->
 <!-- TOC.njk -->
 {% macro use_toc(ctx) %}
@@ -13805,28 +13791,37 @@ padding: 6px 16px;
 {% endmacro %}
 <!-- /Tag.njk -->
 <!-- Title.njk -->
+{% macro use_table_wrapper(macro) %}
+<table style="width: 100%;table-layout: auto">
+<th>
+<td>{{ macro }}</td>
+</th>
+</table>
+{% endmacro %}
 {% macro title_default(ctx) %}
-<h1 style="text-align: center">{{ ctx.text }}</h1>
+<h1 class="title-base">{{ ctx.text }}</h1>
 {% endmacro %}
 {% macro title_h1(ctx) %}
-<div class="njk-title-h1" id="{{ ctx.text }}" style="{{ ctx.style }}">
+<h1 class="title-base njk-title-h1" id="{{ ctx.text }}" style="{{ ctx.style }}">
 {{ ctx.text }}
-</div>
+</h1>
 {% endmacro %}
 {% macro title_h2(ctx) %}
-<div class="njk-title-h2" id="{{ ctx.text }}" class="" style="{{ ctx.style }}">
+<h2 class="title-base njk-title-h2" id="{{ ctx.text }}" class="" style="{{ ctx.style }}">
 {{ ctx.text }}
-</div>
+</h2>
 {% endmacro %}
 {% macro title_h3(ctx) %}
-<div class="njk-title-h3" id="{{ ctx.text }}" class="" style="{{ ctx.style }}">
+<h3 class="title-base njk-title-h3" id="{{ ctx.text }}" class="" style="{{ ctx.style }}">
 {{ ctx.text }}
-</div>
+</h3>
 {% endmacro %}
 {% macro title_table_default(ctx) %}
-<div class="njk-title-h3" id="{{ ctx.text }}">
+{{ use_comp_start() }}
+<h3 class="title-base njk-title-h3" id="{{ ctx.text }}">
 {{ ctx.text }}
-</div>
+</h3>
+{{ use_comp_end() }}
 {% endmacro %}
 {% macro use_title(ctx) %}
 {% if ctx.type == "h1" %}
@@ -13862,10 +13857,10 @@ padding: 6px 16px;
 <!-- /Block.njk -->
 <!-- Date.njk -->
 {% macro use_date(ctx) %}
-<div class="center-info-box"><span style="font-weight:bolder;color:#606266;">Date：</span>{{ ctx.text}}</div>
+<div class="center-info-box" style="text-align: center;"><span style="font-weight:bolder;">Date：</span>{{ ctx.text}}</div>
 {% endmacro %}
 {% macro use_checker(ctx) %}
-<div class="center-info-box"><span style="font-weight:bolder;color:#606266;">Checker：</span>{{ ctx.text}}</div>
+<div class="center-info-box" style="text-align: center;"><span style="font-weight:bolder;">Checker：</span>{{ ctx.text}}</div>
 {% endmacro %}
 <!-- /Date.njk -->
 <!-- Table.njk -->
@@ -13892,7 +13887,9 @@ padding: 6px 16px;
 {% endif %}
 {% if ctx.title %}
 {% set title = {text:ctx.title} %}
+{{ use_comp_start() }}
 {{ title_h2(title) }}
+{{ use_comp_end() }}
 {% endif %}
 <table class="my-daframe-default">
 <thead class="thead-light">
@@ -13921,7 +13918,6 @@ padding: 6px 16px;
 {% endmacro %}
 {% macro use_table(ctx) %}
 {% if ctx.title %}
-{{ title_table_default(ctx.title) }}
 {{ table_default(ctx) }}
 {% else %}
 {{ table_default(ctx) }}
@@ -14054,16 +14050,22 @@ display: block;
 {% endmacro %}
 {% macro use_component(ctx) %}
 {% if ctx.tag %}
+{{ use_comp_start() }}
 {{ pick_component(ctx) }}
+{{ use_comp_end() }}
 {% else %}
 {% for i in ctx %}
+{% if i.tag != 'table' %}
+{{ use_comp_start() }}
+{{ pick_component(i) }}
+{{ use_comp_end() }}
+{% else %}
 {{ pick_component(i) }}
+{% endif %}
 {% endfor %}
 {% endif %}
 {% endmacro %}
-<div style="margin: 0; padding: 0 8px 0 0;">
-{{ use_component(ctx) }}
-</div>
+{{ use_component(ctx) }}</tr>
 <!-- /Component.njk -->
 <!-- Text.njk -->
 {% macro text_default(ctx) %}