doomiwork 3.7.11 → 4.0.0

package/utilities/transferutility.js

@@ -1,137 +1,105 @@
-const { commonHelper, stringHelper } = require('doomi-helper');
-const keyParse = require('./keywordparse');
-///值类型转换
-class ViewHelper {
-    /*
-    * 将结果集转换为视图需要的结果
-    */
-    static transferName2Mapping(originalResult, fieldConfig) {
-        if (originalResult == null) {
-            return { successed: true, data: null };
-        }
-        if (!fieldConfig || fieldConfig.length == 0)  return { successed: true, data: originalResult };//return success({successed:true,data:originalResult});
-        var retResult = [];
-        originalResult.forEach(function (row) {
-            var item = {};
-            fieldConfig.forEach(function (element) {
-                ///如果该字段的序列化仅用于向后保存，则序列化到
-                ///前端页面的时候就不再输出了
-                if (element.direction == "backonly") return;
-                let rawValue = row[element.name];
-                if (!rawValue && element.nullValue) rawValue = element.nullValue;
-                ///格式化输出
-                if (element.format) {
-                    if (stringHelper.startWith(element.format, '{') && stringHelper.endsWith(element.format, '}'))
-                        rawValue = stringHelper.format(element.format, rawValue);
-                    else
-                        rawValue = ViewHelper.specialFormatValue(element.format, rawValue);
-                }
-                if (!element.mapping)
-                    item[element.name] = rawValue;
-                else
-                    item[element.mapping] = rawValue;
-            });
-            retResult.push(item);
-        });
-        return { successed: true, data: retResult };
+const { parseKeyValue, formatValue, validatorParamsType } = require('./keywordparse');
+/**
+* 将结果转化为Mapping对应的键值输出
+* @param {*} originalResult 
+* @param {*} fieldConfig 
+* @returns transferName2Mapping
+*/
+module.exports.Data2View = (originalResult, fieldConfig) => {
+    if (!originalResult) return { successed: true, data: null };
+    if (!fieldConfig || fieldConfig.length == 0) return { successed: true, data: originalResult };//return success({successed:true,data:originalResult});
 
+    let retResult = [];
+    for (const row of originalResult) {
+        let item = {};
+        for (const element of fieldConfig) {
+            ///如果该字段的序列化仅用于向后保存，则序列化到
+            ///前端页面的时候就不再输出了
+            if (element.direction == "backonly") continue;
+            let rawValue = row[element.name];
+            if (!rawValue && element.nullValue) rawValue = element.nullValue;
+            ///格式化输出
+            if (element.format) {
+                rawValue = formatValue(rawValue, element.format)
+            }
+            item[element.mapping || element.name] = rawValue;
+        }
+        retResult.push(item);
     }
-    /*
-    * 从请求上下文中获取数值，用于新增或修改
-    */
-    static transferMapping2Name(req, fieldConfig, doWhat) {
-        let model = {};
-        let tmpModel = {};
-        // var ingoreKey = req.query.ingoreNullKey != null && req.query.ingoreNullKey == 'true';
-        if (fieldConfig && Array.isArray(fieldConfig)) {
-            for (const element of fieldConfig){
-                ///如果该字段的序列化仅用于向前端输出，保存时忽略
-                if (element.direction == "frontonly") continue;
-                if (element.action && element.action.indexOf(doWhat) < 0) continue;
-                let bodyKey = element.mapping || element.name;
-                let postValue = req.body[bodyKey];
-                ////body中没有这个属性
-                //&& element.ignoreundefined == true
-                if (postValue === undefined ){
-                    if ((doWhat == 'update' && !element.required) || 
-                        (doWhat == 'create' && !element.required && !element.default && !element.nullValue)) 
-                        continue;
-                }
-                ///去除两边的空格,默认是去掉空格
-                if (typeof (postValue) === 'string'){
-                    if ((element.trim == null || element.trim == true)) postValue.trim();
-                    if (element.maxlength && postValue.length > element.maxlength ){
-                        return { successed: false, errcode: 6, errmsg: '输入的长度超出,最大允许' + element.maxlength, name: element.mapping }
-                    }
-                }
-                
-                //if (commonHelper.isNullOrEmpty(postValue) && ingoreKey) return;
-                ///如果提交的值为空
-                if (commonHelper.isNullOrEmpty(postValue)) {
-                    if (element.nullValue)
-                        postValue = keyParse.parseKeyValue(req, element.nullValue);
-                    else
-                        postValue = null;
-                }
-                if (!postValue && element.default) postValue = element.default;
-                ///不允许为空值
-                if (element.required === true && !postValue) {
-                    return { successed: false, errcode: 5, errmsg: '请填写必填字段内容', name: element.mapping }
-                }
-                //空值则不替换或不设置该字段
-                if (!postValue && element.ignorenull===true){
+    return { successed: true, data: retResult };
+
+}
+/**
+ * 数据准备保存到数据库中，从视图提交的数据中进行转换
+ * @param {*} req 
+ * @param {*} fieldConfig 
+ * @param {*} doWhat 
+ * @returns transferMapping2Name
+ */
+module.exports.View2Data = (req, fieldConfig, doWhat) => {
+    let model = {}, tmpModel = {};
+    // var ingoreKey = req.query.ingoreNullKey != null && req.query.ingoreNullKey == 'true';
+    if (Array.isArray(fieldConfig)) {
+        for (const element of fieldConfig) {
+            ///如果该字段的序列化仅用于向前端输出，保存时忽略
+            if (element.direction == "frontonly") continue;
+            if (element.action && element.action.indexOf(doWhat) < 0) continue;
+            let bodyKey = element.mapping || element.name;
+            let postValue = req.body[bodyKey];
+            ////body中没有这个属性
+            //&& element.ignoreundefined == true
+            if (postValue === undefined) {
+                if ((doWhat == 'update' && !element.required) ||
+                    (doWhat == 'create' && !element.required && !element.default && !element.nullValue))
                     continue;
+            }
+            ///去除两边的空格,默认是去掉空格
+            if (typeof (postValue) === 'string') {
+                if ((!element.trim || element.trim == true)) postValue.trim();
+                if (element.maxlength && postValue.length > element.maxlength) {
+                    return { successed: false, errcode: 6, errmsg: '输入的长度超出,最大允许' + element.maxlength, name: element.mapping }
                 }
-                //验证值的类型是否正确，主要验证是否数字
-                if (element.type && postValue){
-                    switch (element.type.toLowerCase()){
-                        case 'number':  ///验证是否是数字 
-                            if (isNaN(postValue)) return { successed: false, errcode: 4, errmsg: '字段类型错误(Number)', name: element.mapping }
-                        break;
-                        case 'date':
-                            if (!(isNaN(postValue) && !isNaN(Date.parse(postValue)))) return { successed: false, errcode: 4, errmsg: '字段类型错误(Date)', name: element.mapping }
-                        break;
-                    }
-                }
-                ///格式化结果
-                if (postValue && element.format) {
-                    if (stringHelper.startWith(element.format, '{') && stringHelper.endsWith(element.format, '}'))
-                        postValue = stringHelper.format(element.format, postValue);
-                    else {
-                        postValue = ViewHelper.specialFormatValue(element.format, postValue, false);
-                    }
-                }
-                ////这个字段是否需要放在其他对象中
-                if (element.model) {
-                    let modelitem = tmpModel[element.model] || {};
-                    modelitem[element.name] = postValue;
-                    tmpModel[element.model] = modelitem;
-                }
-                else
-                    model[element.name] = postValue;
             }
 
+            ///如果提交的值为空
+            if (!postValue) { // if (commonHelper.isNullOrEmpty(postValue)) {
+                if (element.nullValue)
+                    postValue = parseKeyValue(req, element.nullValue);
+                else
+                    postValue = null;
+            }
+            if (!postValue && element.default) postValue = element.default;
+            ///不允许为空值
+            if (element.required === true && !postValue) return { successed: false, errcode: 5, errmsg: '请填写必填字段内容', name: bodyKey }
+            // //空值则不替换或不设置该字段
+            // if (!postValue && element.ignorenull===true){
+            //     continue;
+            // }
+            //验证值的类型是否正确，主要验证是否数字
+            if (element.type && postValue && !validatorParamsType(postValue, element.type)) {
+                return { successed: false, errcode: 4, errmsg: `提交的值与要求的类型不匹配:(${bodyKey},${element.type})`, name: bodyKey }
+            }
+            ///格式化结果 : 这个可以用，暂时先去掉
+            // if (postValue && element.format) {
+            //     if (stringHelper.startWith(element.format, '{') && stringHelper.endsWith(element.format, '}'))
+            //         postValue = stringHelper.format(element.format, postValue);
+            //     else {
+            //         postValue = ViewHelper.specialFormatValue(element.format, postValue, false);
+            //     }
+            // }
+            ////这个字段是否需要放在其他对象中
+            if (element.model) {
+                let modelitem = tmpModel[element.model] || {};
+                modelitem[element.name] = postValue;
+                tmpModel[element.model] = modelitem;
+            }
+            else
+                model[element.name] = postValue;
         }
-        else
-            model = req.body;
-        req.modellist = tmpModel;
-        return { successed: true, data: model };
-    }
 
-    static specialFormatValue(format, value, toView = true) {
-        let formatItem = format.split('|');
-        let coll = {};
-        let keyIndex = toView ? 0 : 1
-        formatItem.forEach(item => {
-            if (item == '') return;
-            var itemValues = item.split(':');
-            if (itemValues.length != 2) return;
-            coll[itemValues[keyIndex]] = itemValues[1 - keyIndex];
-        })
-        //let jsonFormat =JSON.parse('{'+format+'}');
-        return coll[value];
     }
-
-}
-
-exports = module.exports = ViewHelper;
+    else
+        model = req.body;
+    req.modellist = tmpModel;
+    return { successed: true, data: model };
+}

package/core/Interceptor.js

@@ -1,14 +0,0 @@
-/**
- * 默认的拦截，其实不做任何处理，简单的把
- * 客户端Header 中的信息设置到Request中
- */
-class Interceptor{
-    /**
-     * 是否允许请求
-     */
-    static handleRequest(req,res,next){
-        req.user = req.headers;
-        return next();
-    }
-}
-exports = module.exports = Interceptor;