@domain.js/main 0.4.18 → 0.4.20

package/dist/deps/rest/utils.js

@@ -298,7 +298,7 @@ function Utils(cnf, deps) {
         }
         // 处理like
         if (_.isString(params[`${name}_like`])) {
-            value = params[`${name}_like`].trim().replace(/\*/g, "%");
+            value = params[`${name}_like`].trim().replace(/\*/g, "%").replace(/_/g, "\\_");
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.like] = value;
@@ -309,13 +309,13 @@ function Utils(cnf, deps) {
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.or] = likes.map((x) => {
-                value = x.trim().replace(/\*/g, "%");
+                value = x.trim().replace(/\*/g, "%").replace(/_/g, "\\_");
                 return { [sequelize_1.Op.like]: value };
             });
         }
         // 处理notLike
         if (_.isString(params[`${name}_notLike`])) {
-            value = params[`${name}_notLike`].trim().replace(/\*/g, "%");
+            value = params[`${name}_notLike`].trim().replace(/\*/g, "%").replace(/_/g, "\\_");
             if (!where[col])
                 where[col] = {};
             where[col][sequelize_1.Op.notLike] = value;
@@ -369,8 +369,11 @@ function Utils(cnf, deps) {
         _.each(Model.filterAttrs || _.keys(Model.rawAttributes), (name) => {
             findOptFilter(params, name, where);
         });
-        if (Model.rawAttributes.isDeleted && !params._showDeleted) {
-            where.isDeleted = "no";
+        if (!params._showDeleted) {
+            if (Model.rawAttributes.isDeleted)
+                where.isDeleted = "no";
+            if (Model.rawAttributes.deletedAt)
+                where.deletedAt = null;
         }
         // 将搜索条件添加到主条件上
         const searchOptRes = searchOpt(Model, params._searchs, params.q);
@@ -385,10 +388,16 @@ function Utils(cnf, deps) {
                 _.each(filterAttrs, (name) => {
                     findOptFilter(params, `${x.as}.${name}`, includeWhere, name);
                 });
-                if (x.model.rawAttributes.isDeleted && !params._showDeleted) {
-                    includeWhere[sequelize_1.Op.or] = [{ isDeleted: "no" }];
-                    if (x.required === false)
-                        includeWhere[sequelize_1.Op.or].push({ id: null });
+                if (!params._showDeleted) {
+                    if (x.model.rawAttributes.isDeleted || x.model.rawAttributes.deletedAt) {
+                        includeWhere[sequelize_1.Op.or] = [];
+                        if (x.model.rawAttributes.isDeleted)
+                            includeWhere[sequelize_1.Op.or].push({ isDeleted: "no" });
+                        if (x.model.rawAttributes.deletedAt)
+                            includeWhere[sequelize_1.Op.or].push({ deletedAt: null });
+                        if (x.required === false)
+                            includeWhere[sequelize_1.Op.or].push({ id: null });
+                    }
                 }
                 // 将搜索条件添加到 include 的 where 条件上
                 const searchOptResII = searchOpt(x.model, params._searchs, params.q, x.as);

package/dist/http/router.d.ts

@@ -15,10 +15,10 @@ declare type Handler = (params: any) => void;
 /** 对执行结构的处理 */
 declare type ResHandler = (results: any, res: restify.Response, params?: any) => void;
 export declare function Router(deps: Deps): {
-    get: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
-    post: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
-    put: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
-    del: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
+    get: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined, resource?: string | undefined) => void;
+    post: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined, resource?: string | undefined) => void;
+    put: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined, resource?: string | undefined) => void;
+    del: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined, resource?: string | undefined) => void;
 } & {
     collection: (res: string, _routePath?: string | undefined) => void;
     model: (res: string, routePath?: string) => void;

package/dist/http/router.js

@@ -141,10 +141,10 @@ function Router(deps) {
         });
     }
     function RouterVerbFn(verb) {
-        return (routePath, ctlAct, code = 200, isList = false, handler, resHandler) => {
-            register(verb, routePath, ctlAct, code, isList, handler, resHandler);
+        return (routePath, ctlAct, code = 200, isList = false, handler, resHandler, resource) => {
+            register(verb, routePath, ctlAct, code, isList, handler, resHandler, resource);
             if (verb === "put") {
-                register("patch", routePath, ctlAct, code, isList, handler, resHandler);
+                register("patch", routePath, ctlAct, code, isList, handler, resHandler, resource);
             }
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {