@less-is-more/less-js 1.2.1 → 1.2.5

package/package.json

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

package/src/db.js

@@ -84,13 +84,15 @@ module.exports = class Db {
    * @param {*} oldData 旧数据
    * @param {*} keyColumn 比对列
    * @param {*} needDelete 是否需要删除多余的
+   * @param {*} compareColumn 比较列有没有变化
    */
   static async fullUpdate(
     model,
     newData = [],
     oldData = [],
     keyColumn,
-    needDelete = false
+    needDelete = false,
+    compareColumn = []
   ) {
     for (let nNewData of newData) {
       let nOldIndex = oldData.findIndex(
@@ -99,10 +101,24 @@ module.exports = class Db {
       if (nOldIndex === -1) {
         await this.add(model, nNewData);
       } else {
-        let where = {};
-        where[keyColumn] = nNewData[keyColumn];
-        await this.update(model, nNewData, where);
-        oldData.splice(nOldIndex, 1);
+        let needUpdate = false;
+        if ( compareColumn.length > 0) {
+          const nOldData = oldData[nOldIndex];
+          for (let nColumn of compareColumn) {
+            if (nOldData[nColumn] !== nNewData[nColumn]) {
+              needUpdate = true;
+              break;
+            }
+          }
+        } else {
+          needUpdate = true;
+        }
+        if (needUpdate) {
+          let where = {};
+          where[keyColumn] = nNewData[keyColumn];
+          await this.update(model, nNewData, where);
+          oldData.splice(nOldIndex, 1);
+        }
       }
     }
     // 删除旧剩余的

package/src/gen.js

@@ -5,7 +5,6 @@ const ejs = require("ejs");
 const fs = require("fs");
 const inquirer = require("inquirer");
 const fse = require("fs-extra");
-const { dirname } = require("path");
 
 const modelNames = fs
   .readdirSync(path.join(process.cwd(), "/src/models"))

package/src/router.js

@@ -31,10 +31,18 @@ module.exports = class Router {
             "queries:",
             req.queries ? JSON.stringify(req.queries) : ""
           );
+          const isFile = JSON.stringify(req.headers).includes(
+            "multipart/form-data"
+          );
+          console.log("multipart:", isFile);
           if (req.method == "POST") {
             let data = await promisify(body)(req);
-            console.log("body: " + decodeURIComponent(data));
-            req.body = querystring.parse(decodeURIComponent(data));
+            if (isFile) {
+              req.body = data.toString();
+            } else {
+              console.log("body: " + decodeURIComponent(data));
+              req.body = querystring.parse(decodeURIComponent(data));
+            }
           }
           req.params = {};
           if (!Param.isBlank(req.queries)) {
@@ -42,7 +50,7 @@ module.exports = class Router {
               (n) => (req.params[n] = req.queries[n])
             );
           }
-          if (!Param.isBlank(req.body)) {
+          if (!Param.isBlank(req.body) && !isFile) {
             Object.keys(req.body).forEach((n) => (req.params[n] = req.body[n]));
           }
           // before