加解密修改.

one_stop_public/Base16/index.jsx

@@ -6,10 +6,15 @@ import { isJSON } from "@/webPublic/zyd_public/utils/utils";
 var BASE16 = "0123456789abcdef";
 var bs16 = baseX(BASE16);
 
-export function Base16Encode(value) {
+function checkOpenBase16(){
   let is_open_base14 = sessionStorage.getItem("is_open_base16")
     ? JSON.parse(sessionStorage.getItem("is_open_base16"))
     : false;
+  return is_open_base14;
+}
+
+export function Base16Encode(value) {
+  let is_open_base14 = checkOpenBase16();
   if (is_open_base14) return value ? bs16.encode(new Buffer(value)) : null;
   return value;
 }
@@ -30,12 +35,11 @@ const encryptApiList = [
   {
     api: "DataColumnApi/getLabels",
     key: ["allValues"],
-    query: true,
-    setNull: true
+    setNull: true,
   },
   {
     api: "DataColumnApi/getSqlOptions",
-    key: ["allValues"],
+    key: ["allValues",],
     query: true
   },
   {
@@ -90,51 +94,62 @@ const encryptApiList = [
   },
   {
     api: "UnifiedAppFormApi/getHandleUser",
-    key: ["content"]
+    key: ["content"],
+  },
+  {
+    api: 'SqlManageEntityApi/findParamsKey',
+    key: ['sqlKey'],
   }
 ];
 
-export function giveBase16EnCode(datas, url) { // 全局加解密函数.
+ const  countAllValues = async (datas, item) => {
+    if (item.setNull) {
+      datas.allValues = JSON.stringify({});
+    } else {
+      if (item.query) {
+        if (datas.sqlKey.length < 13) {
+          const response = await apiRequest("/SqlManageEntityApi/findParamsKey", { sqlKey: datas.sqlKey });
+          if (!response || (Array.isArray(response) && response.length === 0)) {
+            datas.allValues = JSON.stringify({});
+          } else {
+            const x = isJSON(data.allValues) && JSON.parse(data.allValues) || {};
+            const y = {};
+            for (let i of response) {
+              if (x[i]) {
+                y[i] = x[i];
+              }
+              datas.allValues = JSON.stringify(y);
+            }
+          }
+        } else {
+          datas.allValues = JSON.stringify({});
+        }
+      }
+    }
+    return datas;
+}
+
+
+
+export async function giveBase16EnCode(datas, url) { // 全局加解密函数.
+   if(!checkOpenBase16){
+     return datas;
+   }
   if (url && typeof url === "string") {
     for (let item of encryptApiList) {
       if (url.indexOf(item.api) > -1) {
         for (let g of item.key) {
+          if(g === 'allValues'){
+            datas = await countAllValues(datas, item);
+            datas = giveKey('allValues', datas);
+          }else{
             datas = giveKey(g, datas);
+          }
 
-          // if (g === "allValues" && false) {
-          //   if (item.setNull) {
-          //     datas.allValues = "{}";
-          //   } else {
-          //     if (item.query) {
-          //       if (datas.sqlKey.length < 13) {
-          //         const response = await apiRequest("/SqlManageEntityApi/findParamsKey", { sqlKey: datas.sqlKey });
-          //
-          //         if (response.length === 0) {
-          //           datas.allValues = "{}";
-          //         } else {
-          //           const x = isJSON(data.allValues) && JSON.parse(data.allValues) || {};
-          //           const y = {};
-          //           for (let i in response) {
-          //             if (x[i]) {
-          //               y[i] = x[i];
-          //             }
-          //             datas.allValues = JSON.stringify(y);
-          //           }
-          //         }
-          //       } else {
-          //         datas.allValues = "{}";
-          //       }
-          //     }
-          //   }
-          //   // datas = giveKey(g, datas);
-          // } else {
-          //   datas = giveKey(g, datas);
-          // }
         }
         return datas;
       }
     }
   }
-
   return datas;
 }

one_stop_public/utils/request.js

@@ -117,8 +117,14 @@ const loginUmiRequest = extend({
 const getUrl = url => (url.startsWith('/') ? url : '/' + url);
 
 export const request = (url, data, options = {}) => {
-  data = giveBase16EnCode(data, url);
+    return giveBase16EnCode(data, url).then((newData) => {
+      console.log(newData);
+     return requestOrigin(url, newData, options);
+    });
+}
+
 
+export const requestOrigin = (url, data, options = {}) => {
   let version =
     localStorage.getItem('version') && localStorage.getItem('version') !== 'undefined'
       ? JSON.parse(localStorage.getItem('version'))