npm - q-koa - Versions diffs - 13.2.8 → 13.3.0 - Mend

q-koa 13.2.8 → 13.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/core/app.js +24 -8
package/core/file/plugins/model_attributes/config.js +2 -2
package/core/file/plugins/setting/controller.js +4 -0
package/core/file/plugins/system/controller.js +8 -4
package/core/file/plugins/system/service.js +42 -1
package/core/file/services/print.js +2 -1
package/core/file/utils/index.js +61 -2
package/package.json +1 -1

package/core/app.js CHANGED Viewed

@@ -55,6 +55,15 @@ const runVm = (_str) => {
   return nodeVm.runInNewContext(_str)
 }
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
 const memRunVm = _.memoize(runVm)
 const connectDatabase = (database) => (config) => {
   if (!database) throw new Error('请配置数据库名称')
@@ -504,7 +513,15 @@ class APP {
       ) {
         try {
           this.app[appName].appConfig.router(router)(this.app[appName])
-        } catch (e) {}
+        } catch (e) {
+          this.app[appName].service.log &&
+            this.app[appName].service.log.push({
+              app: this.app[appName],
+              appName,
+              message: e.message,
+            })
+          console.log(e.message)
+        }
       }
       if (this.config.defaultRouter) {
@@ -1053,7 +1070,7 @@ class APP {
             }
           }
-          if (fn === 'findAll') {
+          if (['findAll', 'findAndCountAll'].includes(fn)) {
             const disabledFindAllList = _.get(
               app[appName],
               'appConfig.disabledFindAllList',
@@ -1067,7 +1084,7 @@ class APP {
                 (where && !_.isEmpty(where))
               )
             ) {
-              throw new Error(`请使用条件`)
+              throw new Error('请使用条件')
             }
           }
@@ -1229,20 +1246,21 @@ class APP {
             if (
               fn === 'findOne' &&
               attributes &&
+              Array.isArray(attributes) &&
               attributes.length > 0 &&
               attributes.every(
                 (attribute) =>
                   Array.isArray(attribute) &&
                   attribute.length === 2 &&
-                  attribute.some((o) => o.includes('SUM'))
+                  attribute.some((o) => o.startsWith('literal'))
               )
             ) {
               const target = await app[appName].model[controller][fn]({
                 attributes: attributes.map((attribute) => {
                   if (Array.isArray(attribute)) {
                     return attribute.map((att) => {
-                      if (att.startsWith('SUM')) {
-                        return Sequelize.literal(att)
+                      if (att.startsWith('literal')) {
+                        return Sequelize.literal(getLiteral(att))
                       }
                       return att
                     })
@@ -1956,8 +1974,6 @@ class APP {
             (ctx.request[`${appName}-user`] &&
               ((ctx.request[`${appName}-user`].name &&
                 ctx.request[`${appName}-user`].name === 'admin') ||
-                (ctx.request[`${appName}-user`].mobile &&
-                  ctx.request[`${appName}-user`].mobile === '18978909244') ||
                 ctx.request[`${appName}-user`].is_admin ||
                 ctx.request[`${appName}-user`].is_dev))
               ? ['updated_at']

package/core/file/plugins/model_attributes/config.js CHANGED Viewed

@@ -8,5 +8,5 @@ module.exports = {
   defaultOrder: [],
   comment: {},
   reference: [],
-};
+  indexList: [{ fields: ['model_id'] }],
+}

package/core/file/plugins/setting/controller.js CHANGED Viewed

@@ -141,6 +141,10 @@ exports.html = async (ctx) => {
       code,
     },
   })
+  if (!target) {
+    ctx.body = `没有code`
+    return
+  }
   ctx.body = `<!DOCTYPE html>
   <html lang="en">
   <head>

package/core/file/plugins/system/controller.js CHANGED Viewed

@@ -39,9 +39,13 @@ const compareIndex = (tableIndexList, modelIndexList = [], model) => {
     }
   }
-  const flag = tableIndexList.every((i) => {
-    return modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
-  })
+  const flag =
+    tableIndexList.every((i) => {
+      return modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+    }) &&
+    modelIndexList.every((i) => {
+      return tableIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+    })
   const intersection = lodash.intersectionWith(
     tableIndexList,
@@ -145,7 +149,7 @@ exports.initModel = async (ctx) => {
           )
           .then((res) => res.data)
         if (code === 200) {
-          const findList = Object.keys(productionModel).filter((key) => {
+          const findList = Object.keys(productionModel || {}).filter((key) => {
             return (
               !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
               !Object.keys(app.attributes[model]).includes(key)

package/core/file/plugins/system/service.js CHANGED Viewed

@@ -8,7 +8,14 @@ const runVm = (_str) => {
 }
 const memRunVm = lodash.memoize(runVm)
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
   const { version: cacheVersion } = await appConfig.getObject('base')
@@ -211,6 +218,40 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                     }
                   })
               } else {
+                if (data && lodash.isObject(data)) {
+                  if (
+                    fn === 'findOne' &&
+                    'attributes' in data &&
+                    Array.isArray(data.attributes) &&
+                    data.attributes.every((attribute) =>
+                      Array.isArray(attribute)
+                    ) &&
+                    data.attributes.some(
+                      (attribute) =>
+                        Array.isArray(attribute) &&
+                        attribute.some((att) => att.startsWith('literal'))
+                    )
+                  ) {
+                    return app.model[model][fn]({
+                      where: data.where,
+                      attributes: data.attributes.map((attribute) => {
+                        if (Array.isArray(attribute)) {
+                          return attribute.map((att) => {
+                            if (att.startsWith('literal')) {
+                              return Sequelize.literal(getLiteral(att))
+                            }
+                            return att
+                          })
+                        }
+                        return attribute
+                      }),
+                    }).then((res) => {
+                      return {
+                        [item]: res,
+                      }
+                    })
+                  }
+                }
                 const formatData =
                   fn === 'findAll' &&
                   data &&

package/core/file/services/print.js CHANGED Viewed

@@ -145,9 +145,10 @@ module.exports = class Singleton {
     }
   }
-  async getPrintList(machineCode, pageIndex = 1, pageSize = 10) {
+  async getPrintList(_machineCode, pageIndex = 1, pageSize = 10) {
     const app = this.config.app
     const accessToken = await this.getAccessToken()
+    const machineCode = _machineCode || this.config.machine_code
     try {
       const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
       const Print = new yly.Printer(RpcClient)

package/core/file/utils/index.js CHANGED Viewed

@@ -214,14 +214,45 @@ const isDateTime = (str) => {
     /^(\d{4}-\d{2}-\d{2})([T\s](\d{2}:\d{2}(:\d{2}(\.\d+)?)?)([+-]\d{2}:\d{2}|Z)?)?$/
   return dateRegex.test(str)
 }
+const getCol = (str) => {
+  const reg = /col\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
 const $lt = {
   check: (param) => typeof param === 'string',
   result: (param, key) => {
+    if (getCol(param[key])) {
+      return {
+        [key]: Sequelize.col(getCol(param[key])),
+      }
+    }
+    if (getLiteral(param[key])) {
+      return {
+        [key]: Sequelize.literal(getLiteral(param[key])),
+      }
+    }
     if (isDateTime(param[key])) {
       return {
         [key]: param[key],
       }
     }
     return {
       [key]: Sequelize.literal(param[key]),
     }
@@ -230,6 +261,17 @@ const $lt = {
 const $in = {
   check: (param) => typeof param === 'string',
   result: (param, key) => {
+    if (getCol(param[key])) {
+      return {
+        [key]: Sequelize.col(getCol(param[key])),
+      }
+    }
+    if (getLiteral(param[key])) {
+      return {
+        [key]: Sequelize.literal(getLiteral(param[key])),
+      }
+    }
     return {
       [key]: [Sequelize.literal(param[key])],
     }
@@ -237,8 +279,13 @@ const $in = {
 }
 const $between = {
   check: (param) =>
-    Array.isArray(param) && param.every((p) => typeof param === 'string'),
+    Array.isArray(param) && param.every((p) => typeof p === 'string'),
   result: (param, key) => {
+    if (param[key].every((i) => getLiteral(i))) {
+      return {
+        [key]: param[key].map((item) => Sequelize.literal(getLiteral(item))),
+      }
+    }
     if (param[key].every((i) => isDateTime(i))) {
       return {
         [key]: param[key],
@@ -275,7 +322,7 @@ exports.formatLiteralObj = (target) => {
   return target
 }
-exports.filterFunction = (target, data) => {
+const filterFunction = (target, data) => {
   if (!target) {
     return false
   }
@@ -286,6 +333,16 @@ exports.filterFunction = (target, data) => {
     if (typeof target[key] === 'boolean') {
       return Boolean(data[key]) === target[key]
     }
+    if ('$and' in target) {
+      return target.$and.every((item) => {
+        return filterFunction(item, data)
+      })
+    }
+    if ('$or' in target) {
+      return target.$or.some((item) => {
+        return filterFunction(item, data)
+      })
+    }
     if (Array.isArray(target[key])) {
       return target[key].includes(data[key])
     }
@@ -339,3 +396,5 @@ exports.filterFunction = (target, data) => {
     return data[key] === target[key]
   })
 }
+exports.filterFunction = filterFunction

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.2.8",
+  "version": "13.3.0",
   "description": "",
   "main": "index.js",
   "scripts": {