@builder6/tables 0.8.3 → 0.9.1

package/README.md

@@ -17,4 +17,28 @@ objects:
       "url": "mongodb://127.0.0.1:27017/tables"
     }
   },
-```
+```
+
+## DevExtreme DataGrid
+
+http://localhost:5100/b6/tables/grid/test/test
+
+## Ag-Grid
+
+http://localhost:5100/b6/tables/ag-grid/test/test
+
+## 数据校验
+
+先校验字段值有效性，校验合法的各种字段类型值，再校验用户配置的校验规则，最终把所有校验错误信息合并提示给用户。
+
+### 字段类型校验
+
+各种字段类型校验规则：
+
+- number: 合法number，小数位数
+- date: 合法的日期格式，YYYY-MM-DD、YYYY/MM/DD，兼容前导0省略情况，另外兼容了 YYYY-MM-DDTHH:MM:SS.SSSZ 这种服务端返回的格式（复制其它字段列保存时，是保存整行数据，日期列会自动取这种格式提交）
+- select: 数据类型只支持字符串，且必须是字段定义过的选项范围内值
+- boolean: true/false TRUE/FALSE
+
+其它逻辑：每种字段类型校验失败都不会去主动变更转换字段值，以原始值交给ag-grid显示以明显告知用户数据不合法。
+

package/dist/tables/app.controller.d.ts

@@ -1,6 +1,15 @@
 import { Response } from 'express';
+import { LiquidService } from './liquid.service';
 export declare class TablesAppController {
+    private readonly liquidService;
+    constructor(liquidService: LiquidService);
     Hello(): Promise<string>;
-    getDemo(baseId: string, tableId: string, res: Response): Promise<void>;
-    AgGrid(baseId: string, tableId: string, res: Response): Promise<void>;
+    getDemo(baseId: string, tableId: string, res: Response): Promise<{
+        error: string;
+        details: any;
+    }>;
+    AgGrid(baseId: string, tableId: string, res: Response): Promise<{
+        error: string;
+        details: any;
+    }>;
 }

package/dist/tables/app.controller.js

@@ -15,24 +15,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TablesAppController = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@builder6/core");
-const path = require("path");
+const core_2 = require("@builder6/core");
+const liquid_service_1 = require("./liquid.service");
 let TablesAppController = class TablesAppController {
+    constructor(liquidService) {
+        this.liquidService = liquidService;
+    }
     async Hello() {
         return 'Welcome to Builder6 Tables!';
     }
     async getDemo(baseId, tableId, res) {
-        const absolutePath = path.resolve(__dirname, '../../views/devextreme/datagrid.hbs');
-        res.render(absolutePath, {
-            baseId,
-            tableId,
-        });
+        const config = (0, core_2.getConfigs)();
+        try {
+            const rendered = await this.liquidService.render('grid', {
+                baseId,
+                tableId,
+                config,
+            });
+            res.status(200).send(rendered);
+        }
+        catch (error) {
+            console.log(error);
+            return { error: 'Template rendering failed', details: error.message };
+        }
     }
     async AgGrid(baseId, tableId, res) {
-        const absolutePath = path.resolve(__dirname, '../../views/ag-grid/ag-grid.hbs');
-        res.render(absolutePath, {
-            baseId,
-            tableId,
-        });
+        const config = (0, core_2.getConfigs)();
+        try {
+            const rendered = await this.liquidService.render('ag-grid', {
+                baseId,
+                tableId,
+                config,
+            });
+            res.status(200).send(rendered);
+        }
+        catch (error) {
+            console.log(error);
+            return { error: 'Template rendering failed', details: error.message };
+        }
     }
 };
 exports.TablesAppController = TablesAppController;
@@ -43,7 +63,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], TablesAppController.prototype, "Hello", null);
 __decorate([
-    (0, common_1.Get)('devextreme/datagrid/:baseId/:tableId'),
+    (0, common_1.Get)('grid/:baseId/:tableId'),
     __param(0, (0, common_1.Param)('baseId')),
     __param(1, (0, common_1.Param)('tableId')),
     __param(2, (0, common_1.Res)()),
@@ -52,7 +72,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], TablesAppController.prototype, "getDemo", null);
 __decorate([
-    (0, common_1.Get)('ag-grid/ag-grid/:baseId/:tableId'),
+    (0, common_1.Get)('ag-grid/:baseId/:tableId'),
     __param(0, (0, common_1.Param)('baseId')),
     __param(1, (0, common_1.Param)('tableId')),
     __param(2, (0, common_1.Res)()),
@@ -62,6 +82,7 @@ __decorate([
 ], TablesAppController.prototype, "AgGrid", null);
 exports.TablesAppController = TablesAppController = __decorate([
     (0, common_1.Controller)('b6/tables/'),
-    (0, common_1.UseGuards)(core_1.AuthGuard)
+    (0, common_1.UseGuards)(core_1.AuthGuard),
+    __metadata("design:paramtypes", [liquid_service_1.LiquidService])
 ], TablesAppController);
 //# sourceMappingURL=app.controller.js.map

package/dist/tables/app.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/tables/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAewB;AAUxB,yCAA2C;AAE3C,6BAA6B;AAKtB,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAGxB,AAAN,KAAK,CAAC,KAAK;QACT,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACM,MAAc,EACb,OAAe,EAC1B,GAAa;QAEpB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,qCAAqC,CAAC,CAAC;QAEpF,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE;YACvB,MAAM;YACN,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACO,MAAc,EACb,OAAe,EAC1B,GAAa;QAEpB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;QAEhF,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE;YACvB,MAAM;YACN,OAAO;SACR,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAlCY,kDAAmB;AAGxB;IADL,IAAA,YAAG,EAAC,EAAE,CAAC;;;;gDAGP;AAGK;IADL,IAAA,YAAG,EAAC,sCAAsC,CAAC;IAEzC,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;kDAQP;AAGK;IADL,IAAA,YAAG,EAAC,kCAAkC,CAAC;IAErC,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAQP;8BAjCU,mBAAmB;IAF/B,IAAA,mBAAU,EAAC,YAAY,CAAC;IACxB,IAAA,kBAAS,EAAC,gBAAS,CAAC;GACR,mBAAmB,CAkC/B"}
+{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/tables/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAewB;AAUxB,yCAA2C;AAG3C,yCAA4C;AAC5C,qDAAiD;AAK1C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAE9B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAGvD,AAAN,KAAK,CAAC,KAAK;QACT,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACM,MAAc,EACb,OAAe,EAC1B,GAAa;QAEpB,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,MAAM;gBACN,OAAO;gBACP,MAAM;aACP,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACxE,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACO,MAAc,EACb,OAAe,EAC1B,GAAa;QAGpB,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE;gBAC1D,MAAM;gBACN,OAAO;gBACP,MAAM;aACP,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACxE,CAAC;IACH,CAAC;CACF,CAAA;AAnDY,kDAAmB;AAKxB;IADL,IAAA,YAAG,EAAC,EAAE,CAAC;;;;gDAGP;AAGK;IADL,IAAA,YAAG,EAAC,uBAAuB,CAAC;IAE1B,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;kDAeP;AAGK;IADL,IAAA,YAAG,EAAC,0BAA0B,CAAC;IAE7B,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAgBP;8BAlDU,mBAAmB;IAF/B,IAAA,mBAAU,EAAC,YAAY,CAAC;IACxB,IAAA,kBAAS,EAAC,gBAAS,CAAC;qCAGyB,8BAAa;GAF9C,mBAAmB,CAmD/B"}

package/dist/tables/liquid.service.d.ts

@@ -0,0 +1,5 @@
+export declare class LiquidService {
+    private engine;
+    constructor();
+    render(template: string, data: Record<string, any>): Promise<string>;
+}

package/dist/tables/liquid.service.js

@@ -0,0 +1,32 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LiquidService = void 0;
+const common_1 = require("@nestjs/common");
+const path = require("path");
+const liquidjs_1 = require("liquidjs");
+let LiquidService = class LiquidService {
+    constructor() {
+        this.engine = new liquidjs_1.Liquid({
+            root: path.resolve(__dirname, '../../views'),
+            extname: '.liquid',
+        });
+    }
+    async render(template, data) {
+        return this.engine.renderFile(template, data);
+    }
+};
+exports.LiquidService = LiquidService;
+exports.LiquidService = LiquidService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], LiquidService);
+//# sourceMappingURL=liquid.service.js.map

package/dist/tables/liquid.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"liquid.service.js","sourceRoot":"","sources":["../../src/tables/liquid.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6BAA6B;AAC7B,uCAAkC;AAG3B,IAAM,aAAa,GAAnB,MAAM,aAAa;IAIxB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;YAC5C,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,IAAyB;QACtD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAdY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;;GACA,aAAa,CAczB"}

package/dist/tables/tables.module.js

@@ -15,6 +15,7 @@ const core_1 = require("@builder6/core");
 const core_2 = require("@builder6/core");
 const tables_moleculer_1 = require("./tables.moleculer");
 const app_controller_1 = require("./app.controller");
+const liquid_service_1 = require("./liquid.service");
 let TablesModule = class TablesModule {
 };
 exports.TablesModule = TablesModule;
@@ -22,7 +23,7 @@ exports.TablesModule = TablesModule = __decorate([
     (0, common_1.Module)({
         imports: [core_2.AuthModule, core_1.MongodbModule],
         controllers: [tables_controller_1.TablesController, app_controller_1.TablesAppController],
-        providers: [meta_service_1.MetaService, tables_service_1.TablesService, tables_moleculer_1.TablesMoleculer],
+        providers: [meta_service_1.MetaService, tables_service_1.TablesService, tables_moleculer_1.TablesMoleculer, liquid_service_1.LiquidService],
     })
 ], TablesModule);
 //# sourceMappingURL=tables.module.js.map

package/dist/tables/tables.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"tables.module.js","sourceRoot":"","sources":["../../src/tables/tables.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2DAAuD;AACvD,qDAAiD;AACjD,iDAA6C;AAC7C,yCAA+C;AAC/C,yCAA4C;AAC5C,yDAAqD;AACrD,qDAAuD;AAOhD,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IALxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,WAAW,EAAE,CAAC,oCAAgB,EAAE,oCAAmB,CAAC;QACpD,SAAS,EAAE,CAAC,0BAAW,EAAE,8BAAa,EAAE,kCAAe,CAAC;KACzD,CAAC;GACW,YAAY,CAAG"}
+{"version":3,"file":"tables.module.js","sourceRoot":"","sources":["../../src/tables/tables.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2DAAuD;AACvD,qDAAiD;AACjD,iDAA6C;AAC7C,yCAA+C;AAC/C,yCAA4C;AAC5C,yDAAqD;AACrD,qDAAuD;AACvD,qDAAiD;AAO1C,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IALxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,WAAW,EAAE,CAAC,oCAAgB,EAAE,oCAAmB,CAAC;QACpD,SAAS,EAAE,CAAC,0BAAW,EAAE,8BAAa,EAAE,kCAAe,EAAE,8BAAa,CAAC;KACxE,CAAC;GACW,YAAY,CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/tables",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "main": "dist/plugin.module.js",
   "license": "MIT",
   "files": [
@@ -12,11 +12,12 @@
     "build:watch": "rm -rf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "^0.8.3",
-    "dataloader": "^2.2.3"
+    "@builder6/core": "^0.9.1",
+    "dataloader": "^2.2.3",
+    "liquidjs": "^10.19.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "05dbb6187252b71eb1bf6af3d3c566773f7a75ef"
+  "gitHead": "a20e7b82c563a95d55d5afe6ea066f7d80fa4312"
 }

package/views/{ag-grid/ag-grid.hbs → ag-grid.liquid}

@@ -77,7 +77,7 @@
 </body>
 <script>
 
-    const B6_TABLES_API = '/api/tables/v2';
+    const B6_TABLES_API = '/api/v6/tables';
     const baseId = '{{ baseId }}';
     const tableId = '{{ tableId }}';
 
@@ -1094,6 +1094,5 @@
     });
 </script>
 
-</body>
 
 </html>

package/views/ag-grid/README.md

@@ -1,15 +0,0 @@
-## 数据校验
-
-先校验字段值有效性，校验合法的各种字段类型值，再校验用户配置的校验规则，最终把所有校验错误信息合并提示给用户。
-
-### 字段类型校验
-
-各种字段类型校验规则：
-
-- number: 合法number，小数位数
-- date: 合法的日期格式，YYYY-MM-DD、YYYY/MM/DD，兼容前导0省略情况，另外兼容了 YYYY-MM-DDTHH:MM:SS.SSSZ 这种服务端返回的格式（复制其它字段列保存时，是保存整行数据，日期列会自动取这种格式提交）
-- select: 数据类型只支持字符串，且必须是字段定义过的选项范围内值
-- boolean: true/false TRUE/FALSE
-
-其它逻辑：每种字段类型校验失败都不会去主动变更转换字段值，以原始值交给ag-grid显示以明显告知用户数据不合法。
-