feat(@artusx/plugin-ejs): support pass views options

artusjs · Apr 30, 2024 · 39bb407 · 39bb407
1 parent a5fce1a
commit 39bb407
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/packages/apps/artusx-koa/src/config/config.default.ts b/packages/apps/artusx-koa/src/config/config.default.ts
@@ -100,6 +100,7 @@ export default () => {
 
   const ejs: EjsConfig = {
     root: path.resolve(__dirname, '../view-ejs'),
+    views: [path.resolve(__dirname, '../view-ejs/user')],
     layout: {
       'layout extractScripts': true,
       'layout extractStyles': true,

diff --git a/packages/apps/artusx-koa/src/controller/ejs.ts b/packages/apps/artusx-koa/src/controller/ejs.ts
@@ -33,4 +33,12 @@ export default class EjsController {
       layout: false,
     });
   }
+
+  @GET('/user-show')
+  async userShow(ctx: ArtusXContext) {
+    ctx.body = await this.ejs.render('user/show.ejs', {
+      name: 'hello world',
+      layout: false,
+    });
+  }
 }
diff --git a/packages/apps/artusx-koa/src/view-ejs/user/show.ejs b/packages/apps/artusx-koa/src/view-ejs/user/show.ejs
@@ -1,2 +1,6 @@
+<div>
+  <h2>show</h2>
+  <%= name %>
+</div>
 
-<%= name %>
+<%- include('sub/info') %>
diff --git a/packages/apps/artusx-koa/src/view-ejs/user/sub/info.ejs b/packages/apps/artusx-koa/src/view-ejs/user/sub/info.ejs
@@ -0,0 +1,4 @@
+<div>
+  <h2>info</h2>
+  <%= name %>
+</div>
diff --git a/packages/plugins/ejs/src/client.ts b/packages/plugins/ejs/src/client.ts
@@ -67,6 +67,7 @@ export type EjsContext = Record<string, any>;
 
 export type EjsConfig = {
   root: string | string[];
+  views: string[];
   layout?: Record<string, any>;
   options?: Options;
 };
@@ -87,9 +88,9 @@ export default class EjsClient {
       return;
     }
 
-    const { root, layout, options } = config;
+    const { root, views: defaultViews = [], layout, options } = config;
 
-    let views: string[] = [];
+    let views: string[] = defaultViews;
 
     // root dirs
     if (typeof root === 'string') {
@@ -131,6 +132,7 @@ export default class EjsClient {
     this.layoutConfig = layout;
     this.viewOptions = {
       ...options,
+      root,
       views: Array.from(new Set(views)),
     };
   }