doomiwork 4.0.5 → 4.0.7

package/core/controller.js

@@ -219,7 +219,7 @@ class controller {
     */
     async getDataById(req, dataKey, sqlCommand) {
         if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据",dataKey)
-        const detailinfo = getDetailInfo(dataKey);
+        const detailinfo = getDetailInfo(req, dataKey);
         if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
         let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), req.params.id, "detail", this);
         ////如果返回Null,则表示不加载数据了
@@ -255,7 +255,7 @@ class controller {
         let detailinfo, resultItem = { successed: true, data: req.body };
         ///是否需要将data中的key-value值到配置文件中进行转换
         if (mapping == true) {
-            detailinfo = getDetailInfo(dataKey);
+            detailinfo = getDetailInfo(req, dataKey);
             if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
             resultItem = View2Data(req, detailinfo.fields, "create");
             ///如果转换的验证过程中出现错误，则返回
@@ -307,7 +307,7 @@ class controller {
         let detailinfo, resultItem = { successed: true, data: req.body };
         ///是否需要将data中的key-value值到配置文件中进行转换
         if (mapping == true) {
-            detailinfo = getDetailInfo(dataKey);
+            detailinfo = getDetailInfo(req, dataKey);
             if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
             ///从Request中获取到用户提交的数据
             resultItem = View2Data(req, detailinfo.fields, "update");

package/package.json

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

package/utilities/requestparser.js

@@ -114,6 +114,7 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
     //req.order =req.sort? utility.ifNull((req.body.order || req.query.order), ""):'';
     const dataConfig = dataconfig.getConfig(dataKey, cfgType);
     if (dataConfig && dataConfig.list) {
+        req.dataConfig = dataConfig
         let { sql, countsql, sqltype = 'sql', field, footer, search, sort: constsort } = dataConfig.list
         /**解析查询条件 */
         const searchCondition = this.getSearchCondition({ request: req, refer: search });
@@ -148,10 +149,11 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
 * 详细页面请求上下文中获取需要的信息
 * 如Page ,PageSize , Sort 等等
 */
-module.exports.getDetailInfo = (dataKey) => {
+module.exports.getDetailInfo = (req,dataKey) => {
     if (dataKey) {
         const dataConfig = dataconfig.getConfig(dataKey);
         if (dataConfig && dataConfig.detail) {
+            req.dataConfig = dataConfig;
             const { primary, field: fields, primaryIsAutoIncrease } = dataConfig.detail;
             return { primary, fields, autoincrease: primaryIsAutoIncrease }
         }