task-1285 系统通用接口数据处理调整

src/business/platform/form/utils/custom/joinCURD.js

@@ -1,49 +1,24 @@
 import request from '@/utils/request'
-import md5 from 'js-md5';
-import { processCreate, processEdit } from './process'
+import md5 from 'js-md5'
 import { requestType, requestPath } from './requestType'
+import { mapValues } from 'lodash'
 
 // 请求方式默认POST
 const post = (method, data, type = 'post', loading = false) => {
-    let path = requestType[method]
+    const path = requestType[method]
     let requestData = ''
     let requestParams = null
     // 部分接口保留参数，用于后续接口传参
-    let retainData = null
+    const retainData = null
 
-    const processType = {
-        createProcess: processCreate,
-        setProcess: processEdit
-    }
-    let isProcess = Object.keys(processType).includes(method)
-
-    // 原有逻辑,根据 data 值判断
-    // if (data && data.slice(2, 1) == "l") {
-    //     // 往主管表提交数据
-    //     data = '{"str":"' + data + '"}'
-    //     requestData = dealData(data)
-    // } else if (data && data.slice(0, 1) == "s") {
-    //     // 判断是{}的参数，还是纯sql字符串的参数 , 纯sql补全。
-    //     data = '{"sql":"' + data + '"}'
-    //     requestData = dealData(data)
-    // } else { //对象转字符串
-    //     requestData = dealData(data)
-    // }
-
-    // 改为根据 method 判断是否对数据做特殊处理
     if (type === 'get') {
         requestParams = data
-    } else if (isProcess) {
-        // 创建流程及编辑流程时数据特殊处理
-        requestData = processType[method](data)
-        retainData = requestData.customParams
-        // console.log(requestData)
-    } else { //对象转字符串
+    } else { // 对象转字符串
         requestData = dealData(method, data)
     }
 
-    let isSpecial = Object.keys(requestPath).includes(method)
-    let requestUrl = isSpecial ? requestPath[method] : `business/v3/sys/universal/${ path }`
+    const isSpecial = Object.keys(requestPath).includes(method)
+    const requestUrl = isSpecial ? requestPath[method] : `business/v3/sys/universal/${path}`
     return request({
         url: requestUrl,
         method: type,
@@ -57,24 +32,46 @@ const post = (method, data, type = 'post', loading = false) => {
 
 /* 直接传入sql的签名算法   MD5加密*/
 const sig = sql => {
-    let rul = (sql.length + 9) * 12 * 3 + 168
-    let salt = 'JinYuanXinTong'
+    const rul = (sql.length + 9) * 12 * 3 + 168
+    const salt = 'JinYuanXinTong'
     return md5(rul + '' + salt)
 }
 
+// 替换对象中的空数据
+const replaceNullWithEmpty = obj => {
+    function replaceValue (value) {
+        if (value === null) {
+            return ''
+        } else if (typeof value === 'object') {
+            if (Array.isArray(value)) {
+                return value.map(item => replaceValue(item))
+            } else {
+                return mapValues(value, v => replaceValue(v))
+            }
+        } else {
+            return value
+        }
+    }
+    return replaceValue(obj)
+}
+
 const dealData = (method, data) => {
-    // 序列化
-    if (typeof data == 'object') {
-        data = JSON.stringify(data)
+    const strType = ['sql']
+    // 查询方法直接拼接字符串
+    if (strType.includes(method)) {
+        data = `{"${method}":"${data}"}`
+    } else {
+        // 其余方法先处理数据
+        if (typeof data === 'object') {
+            data = JSON.stringify(replaceNullWithEmpty(data))
+        } else {
+            data = JSON.stringify(replaceNullWithEmpty(JSON.parse(data)))
+        }
     }
-    // 对需要拼接key值的方法做处理
-    let strType = ['sql']
-    let isStr = strType.includes(method)
-    data = isStr ? `{"${method}":"${data}"}` : data
-    //加密，获取md5密文
-    let md5 = sig(data)
+    // 加密，获取md5密文
+    const md5 = sig(data)
     // 结果拼接
     return `${data.slice(0, 1)}"sig":"${md5}",${data.slice(1)}`
 }
 
-export default post
+export default post