src/wuttaweb/templates/form.mako

@@ -17,15 +17,11 @@
 <%def name="page_content()">
   % if form is not Undefined:
       <div class="wutta-form-wrapper">
-        ${self.render_form_tag()}
+        ${form.render_vue_tag()}
       </div>
   % endif
 </%def>
 
-<%def name="render_form_tag()">
-  ${form.render_vue_tag()}
-</%def>
-
 <%def name="tool_panels_wrapper()">
   <div class="tool-panels-wrapper">
     ${self.tool_panels()}

src/wuttaweb/templates/grids/table_element.mako

@@ -2,20 +2,18 @@
 <${b}-table :data="gridContext['${grid.key}'].data">
 
   % for column in grid.get_vue_columns():
-      % if not column['hidden']:
+      <${b}-table-column field="${column['field']}"
-          <${b}-table-column field="${column['field']}"
+                         label="${column['label']}"
-                             label="${column['label']}"
+                         v-slot="props"
-                             v-slot="props"
+                        :sortable="${json.dumps(column.get('sortable', False))|n}"
-                            :sortable="${json.dumps(column.get('sortable', False))|n}"
+                         cell-class="c_${column['field']}">
-                             cell-class="c_${column['field']}">
+        % if grid.is_linked(column['field']):
-            % if grid.is_linked(column['field']):
+            <a :href="props.row._action_url_view"
-                <a :href="props.row._action_url_view"
+               v-html="props.row.${column['field']}" />
-                   v-html="props.row.${column['field']}" />
+        % else:
-            % else:
+            <span v-html="props.row.${column['field']}"></span>
-                <span v-html="props.row.${column['field']}"></span>
+        % endif
-            % endif
+      </${b}-table-column>
-          </${b}-table-column>
-      % endif
   % endfor
 
   % if grid.actions:
@@ -25,9 +23,6 @@
         % for action in grid.actions:
             <a v-if="props.row._action_url_${action.key}"
                :href="props.row._action_url_${action.key}"
-               % if action.click_handler:
-                   @click.prevent="${action.click_handler}"
-               % endif
                class="${action.link_class}">
               ${action.render_icon_and_label()}
             </a>