@less-is-more/less-js 1.4.6 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/db.js

@@ -95,15 +95,15 @@ module.exports = class Db {
     compareColumn = []
   ) {
     for (let nNewData of newData) {
-      let nOldIndex = oldData.findIndex(
+      const nOldIndex = oldData.findIndex(
         (nOld) => nOld[keyColumn] == nNewData[keyColumn]
       );
-      if (nOldIndex === -1) {
+      if (nOldIndex == -1) {
         await this.add(model, nNewData);
       } else {
+        const nOldData = oldData[nOldIndex];
         let needUpdate = false;
         if (compareColumn.length > 0) {
-          const nOldData = oldData[nOldIndex];
           for (let nColumn of compareColumn) {
             if (nOldData[nColumn] !== nNewData[nColumn]) {
               console.log("Diff", nOldData[nColumn], nNewData[nColumn]);
@@ -116,15 +116,21 @@ module.exports = class Db {
         }
         if (needUpdate) {
           let where = {};
-          where[keyColumn] = nNewData[keyColumn];
+          // 有主键的话，使用主键
+          if (nOldData.id) {
+            where.id = nOldData.id;
+          } else {
+            where[keyColumn] = nNewData[keyColumn];
+          }
           // 只更新指定的字段
           let setValues = {};
           for (let nColumn of compareColumn) {
             setValues[nColumn] = nNewData[nColumn];
           }
           await this.update(model, setValues, where);
-          oldData.splice(nOldIndex, 1);
         }
+        // 剔除已经处理的
+        oldData.splice(nOldIndex, 1);
       }
     }
     // 删除旧剩余的

package/src/param.js

@@ -37,7 +37,7 @@ module.exports = class Param {
             }
           }
           if (!result) {
-            throw new Error(nCheck[3]);
+            throw new Error("参数：" + nCheck[3]);
           }
         });
       }

package/src/router.js

@@ -157,7 +157,13 @@ module.exports = class Router {
   static _sendError(message, res) {
     console.log("error:", message);
     if (this.#defaultFormat) {
-      res.send(new Ret(false, message, Ret.CODE_SYSTEM).toString());
+      res.send(
+        new Ret(
+          false,
+          message,
+          message.includes("参数：") ? Ret.CODE_PARAMETER : Ret.CODE_SYSTEM
+        ).toString()
+      );
     }
     return message;
   }

package/test/data/test.js

@@ -22,6 +22,15 @@ module.exports = sequelize => {
       comment: null,
       field: "name"
     },
+    value: {
+      type: DataTypes.STRING(50),
+      allowNull: true,
+      defaultValue: null,
+      primaryKey: false,
+      autoIncrement: false,
+      comment: null,
+      field: "value"
+    },
   };
   const options = {
     tableName: "test",

package/test/test-db.js

@@ -7,7 +7,7 @@ const Test = require("./data/test.js");
 describe("db.js", () => {
   before(() => {
     console.log("init");
-    Db.init("127.0.0.1", "card-test", "dev", "^wXj&CJQfiPP");
+    Db.init("127.0.0.1", "sheng-test", "dev", "^wXj&CJQfiPP");
   });
   describe("getInstance()", () => {
     it("connect", async () => {
@@ -167,12 +167,15 @@ describe("db.js", () => {
     it("success", async () => {
       let newData = [
         {
-          name: 23,
+          name: "23",
+          value: "3",
         },
       ];
       let oldData = await Db.find(Test);
       try {
-        await Db.fullUpdate(Test, newData, oldData.rows, "name", true);
+        await Db.fullUpdate(Test, newData, oldData.rows, "name", true, [
+          "value",
+        ]);
       } catch (e) {
         console.error(e);
         assert(false);

package/test/test-router.js

@@ -47,22 +47,22 @@ describe("router.js", () => {
       };
       Router.route(targets, req, res);
     });
-    it("error", () => {
+    it("error", async () => {
       let targets = {
         "/": {
           add: function (req, res) {
-            throw new Error("出错啦");
+            throw new Error("参数：出错啦");
           },
         },
       };
-      let req = { path: "/add" };
+      let req = { path: "/add", headers: [] };
       let res = {
         send: function (data) {
           console.log("send: " + data);
           assert(JSON.parse(data).success == false);
         },
       };
-      Router.route(targets, req, res);
+      await Router.route(targets, req, res);
     });
     it("multi controllers", () => {
       let targets = {