doomiwork 4.1.8 → 4.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "4.1.8",
+  "version": "4.1.10",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {

package/utilities/requestparser.js

@@ -106,7 +106,8 @@ module.exports.parseTagForParameterize = (req, filterSetting={}) => {
     ///type=parameter表示参数化方式查询
     ///type=joint 表示拼接sql语句查询
     ///scope=[] 表示需要解析的字段必须在此列表内容中
-    let {pattern:sql,type='parameter',inscope=[],allowEmpty=false} = filterSetting;
+    /// split 进来的替换内容是否需要被split拆分成多个参数
+    let {pattern:sql,type='parameter',inscope=[],allowEmpty=false,split=false,subitem,splitjoint='or',splitchar='|'} = filterSetting;
     if (!sql) return {sql:''};
     ///定义正则准备查找sql中的特定关键字
     const matched = sql.match(/@.*?@/g);
@@ -129,11 +130,21 @@ module.exports.parseTagForParameterize = (req, filterSetting={}) => {
         if (isEmptyValue(keyValue) && !allowEmpty) return {sql:'',params:[]};
         // if (keyValue) {
         if(type.toLowerCase() === 'parameter'){
-            sql = sql.replace(ele, '?');    ///变成参数化查询
-            if (Array.isArray(keyValue))
-                params.push(keyValue)
-            else
-                params.push(matchContent[0].replace(matchContent[1], keyValue));// '%' + keyValue + '%')
+            /// 需要用|拆分成多个参数
+            if(split && subitem){
+                const multiParams = keyValue.split(splitchar),multiItems = [];
+                for(const subitemValue of multiParams){
+                    multiItems.push(subitem);
+                    params.push(matchContent[0].replace(matchContent[1], subitemValue));
+                }
+                sql = sql.replace(ele, multiItems.join(' '+splitjoint+' '));
+            }else{
+                sql = sql.replace(ele, '?');    ///变成参数化查询
+                if (Array.isArray(keyValue))
+                    params.push(keyValue)
+                else
+                    params.push(matchContent[0].replace(matchContent[1], keyValue));// '%' + keyValue + '%')
+            }
         } else if (type.toLowerCase() === 'joint'){ ///拼接sql语句查询
             ///拼接的SQL语句，keyvalue必须在scope列表中，否则不予拼接
             const result = inscope.some(item => item.toLowerCase() === matchValue.toLowerCase());
@@ -207,7 +218,7 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
         if (sqltype==='sql'){
             const mainParameterlizedSql = this.parseTagForParameterize(req, { pattern: sql, allowEmpty:true });
             if (!mainParameterlizedSql.sql) return null;
-            sql = `${mainParameterlizedSql.sql} ${searchCondition.filter ||''} ${sort ? (' order by ' + sort) : ''} ${export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Math.max(Number(page), 1) - 1) * Number(pageSize)};SELECT FOUND_ROWS() AS total`;
+            sql = `${mainParameterlizedSql.sql} ${searchCondition.filter ||''} ${sort ? (' order by ' + sort) : ''} ${export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Math.max(Number(page), 1) - 1) * Number(pageSize)};SELECT FOUND_ROWS() AS total;`;
             SqlParameters = SqlParameters.concat(mainParameterlizedSql.params || [], searchCondition.params);
             /*** 如果存在汇总列的sql，则把SQL放置在最末尾 */
             if (countsql) {