Merge remote-tracking branch 'origin/master'

one_stop_public/Base16/index.jsx

@@ -84,10 +84,21 @@ const encryptApiList = [
     api: 'DataObjApi/getFormDataList',
     key: ['custom'],
   },
+  {
+    api: 'DataObjApi/exportWord',
+    key: ['params'],
+  },
   {
     api: 'DataObjApi/getFormDataPage',
     key: ['sql', 'custom'],
     filterEmpty: ['sql', 'custom'],
+    yinShe: {
+      sql: 's',
+      query: 'chaxun',
+      querys: 'chaxuns',
+      sorter: 'paixu',
+      orders: 'paixus',
+    },
   },
   {
     api: 'UserApi/getPage',
@@ -159,24 +170,36 @@ export async function giveBase16EnCode(datas, url) { // 全局加解密函数.
     for (let item of encryptApiList) {
       if (url.indexOf(item.api) > -1) {
         for (let g of item.key) {
-          if(datas[g] && item.filterEmpty && item.filterEmpty.includes(g)){
-            // console.log(datas[g]);
-            // console.log('%c加密数据压缩前字段' +  g + '= ', 'color: red;');
-            // console.log('%c'+ datas[g] , 'color: red;');
+          if (datas[g] && item.filterEmpty && item.filterEmpty.includes(g)) {
             // 压缩代码功能暂时屏蔽
-            // datas[g] = datas[g].replace(/\r/g, ' ').replace(/\t/g, ' ').replace(/\n/g, ' ').replace(/\s\s+/g, ' ');
-            // console.log('%c加密数据压缩后字段' +  g + '= ', 'color: orange;');
-            // console.log('%c'+ datas[g] , 'color: orange;');
+            /***
+             // console.log(datas[g]);
+             // console.log('%c加密数据压缩前字段' +  g + '= ', 'color: red;');
+             // console.log('%c'+ datas[g] , 'color: red;');
+             // datas[g] = datas[g].replace(/\r/g, ' ').replace(/\t/g, ' ').replace(/\n/g, ' ').replace(/\s\s+/g, ' ');
+             // console.log('%c加密数据压缩后字段' +  g + '= ', 'color: orange;');
+             // console.log('%c'+ datas[g] , 'color: orange;');
+             ***/
           }
 
           if (g === 'allValues' && typeof datas[g] !== 'undefined') {
             datas = await countAllValues(datas, item); // 循环中 不要写await
             datas = giveKey('allValues', datas);
           } else {
-
+            console.log(g, datas);
             datas = giveKey(g, datas);
           }
+        }
 
+        if(item.yinShe){ // 映射参数字段.
+          datas.isBase = true;
+          for(let oldKey in item.yinShe){
+            let newKey = item.yinShe[oldKey];
+            // if(typeof datas[oldKey] !== 'undefined'){
+              datas[newKey] = datas[oldKey];
+              delete datas[oldKey];
+            // }
+          }
         }
         return datas;
       }