@bit-sun/business-component 3.1.10-alpha.1 → 3.1.10-alpha.11

package/src/components/Solution/RuleComponent/CustomPlugin/CustomSelector/function.js

@@ -1,255 +1,255 @@
-import { request } from 'umi';
-import _ from 'lodash';
-import { handleRequestHeader } from '../../../../../utils/requestUtils';
-import { handleConvertResponse, judgeIsEmpty } from '../../../../../utils/utils';
-import { formatListName } from './helps';
-/**
- * 删掉查询条件的qp- 和 -eq等
- * @param {object} data
- * @return {object}
- * */
-export function deleteQuerySymbol(data) {
-  const result = {};
-
-  Object.keys(data).map((item) => {
-    const newKey = deleteQuerySymbolSingle(item);
-    result[newKey] = data[item];
-  });
-
-  return result;
-}
-
-export function deleteQuerySymbolSingle(key) {
-  return key.replace(/(qp-|-\w+)/g, '');
-}
-
-// 把{G1001F1001:123} 换成 {G1001:{F1001: 123}}
-export function convertToMapByKey(data) {
-  const result = {};
-
-  Object.keys(data).map((item) => {
-    const groupCode = item.match(/G\d+/);
-    const fieldCode = item.match(/F\d+/);
-    if (groupCode?.length > 0 && fieldCode?.length > 0) {
-      if (result[groupCode]) {
-        result[groupCode][fieldCode] = data[item];
-      } else if (!result[groupCode]) {
-        result[groupCode] = {
-          [fieldCode]: data[item],
-        };
-      }
-    }
-  });
-  return result;
-}
-
-/**
- * 去掉查询表格的qp- -eq -in，与普通表格一样的格式
- * @param{string} prop 键
- * @param{boolean} flag 是不是查询表格
- * */
-export function convertProp(prop, flag) {
-  return flag
-    ? prop
-        ?.replace(/(G\d+)/, '')
-        ?.replace('qp-', '')
-        ?.replace('-eq', '')
-        ?.replace('-in', '')
-        ?.replace('-like', '')
-    : prop;
-}
-// 获取元数据，是表格中列的数据来源
-export async function getMetaData(id) {
-  return new Promise((resolve, reject) => {
-    request('/basic/entityProperty/listNoPage', {
-      params: {
-        'qp-entityId-eq': id,
-      },
-    })
-      .then((res) => {
-        resolve(res.data);
-      })
-      .catch((error) => {
-        console.log(error, 'error');
-        reject([]);
-      });
-  });
-}
-
-// 获取数据
-export const remoteFetch = (requestConfig,coloumns) => {
-  return {
-    url: '/basic/function/sendRequest',
-    method: 'post',
-    convertParams({ params }) {
-      const { sorter, ...paramsTemp } = params;
-
-      const queryParams = {
-        ...requestConfig.params,
-        ...requestConfig.body,
-        ..._.omit(paramsTemp, ['filters', 'current']),
-        ...(paramsTemp?.filters || {}),
-        ...{ currentPage: paramsTemp?.currentPage || paramsTemp.current || 1 },
-      };
-
-      // 清除值为空的
-      Object.keys(queryParams).forEach((itemKey) => {
-        if (judgeIsEmpty(queryParams[itemKey])) {
-          delete queryParams[itemKey];
-        }
-      });
-
-      return {
-        path: requestConfig.url,
-        httpMethod: requestConfig?.method?.toUpperCase(),
-        serviceName: requestConfig.serviceName,
-        requestBody: JSON.stringify(queryParams),
-        header: handleRequestHeader().headers,
-      };
-    },
-    converter({ data }) {
-      return {
-        ...handleConvertResponse(handleList(data,coloumns), handleListToTal(data)),
-      };
-    },
-  };
-};
-
-// 值类型
-export function handleValueType(value, valueType) {
-  if (valueType === 20) {
-    return Number(value);
-  } else {
-    return value + '';
-  }
-}
-
-export function handleList(data, coloumns) {
-  const resultList =  Array.isArray(data)? data: Array.isArray(data?.list)
-  ? data.list : Array.isArray(data?.items) ? data.items: []
-  return formatListName(resultList,coloumns);
-}
-export function handleListToTal(data) {
-  return Array.isArray(data) ? data.length : data.total || data.totalCount;
-}
-
-// 路径
-export function convertPath(path, formData) {
-  const matchedGF = path.match(/G\d+F\d+/g);
-  const matchedJavaCode = path.match(/{\w+\.\w+}/g);
-  let url = path;
-  if (!matchedGF && !matchedJavaCode) return url;
-  if (matchedGF?.length) {
-    matchedGF.map((item) => {
-      const group = item.match(/G\d+/);
-      const field = item.match(/F\d+/);
-      const replaceValue = formData?.[group]?.[field] || formData?.[field];
-      url = url.replace(item, replaceValue);
-    });
-  } else if (matchedJavaCode?.length) {
-    matchedJavaCode.map((item) => {
-      let group, field;
-      try {
-        const val = item.replace(/[{}]/g, '').split('.');
-        group = val[0];
-        field = val[1];
-      } catch (e) {}
-      if (group && field) {
-        const replaceValue = formData?.[group]?.[field] || formData?.[field];
-        url = url.replace(item, replaceValue);
-      }
-    });
-  }
-  return url;
-}
-
-// 组装数据接口请求
-export function assembleRequest(
-  customSelectorConfig,
-  { isSearchForm, newestFormData, searchFormData },
-) {
-  const functionInfo =
-    customSelectorConfig?.businessFunction?.functionInfo?.actionList?.[0];
-  const requestTemplate = functionInfo?.requestTemplate;
-  if (!functionInfo || !requestTemplate) {
-    return false;
-  }
-  const isGet = requestTemplate.method.toLowerCase() === 'get';
-  const requestBodyName = isGet ? 'params' : 'data';
-  let params = requestTemplate.param;
-  try {
-    params = JSON.parse(requestTemplate.param);
-  } catch (e) {}
-  let path = requestTemplate.path;
-
-  let requestBody = isGet ? params : requestTemplate.requestBody;
-
-  if (!isSearchForm) {
-    // 非查询表格，普通表格的数据组装
-    path = convertPath(requestTemplate.path, newestFormData);
-    requestBody = convertBody(requestBody, newestFormData);
-  } else if (isSearchForm) {
-    // 查询表格数据组装，key会带有qp-  和 -eq，并且转换成map的数据格式
-    const newSearchFormData = convertToMapByKey(
-      deleteQuerySymbol(searchFormData),
-    );
-    path = convertPath(requestTemplate.path, newSearchFormData);
-    requestBody = convertBody(requestBody, newSearchFormData);
-  }
-  const requestConfig = {
-    url: path,
-    method: requestTemplate.method,
-    headers: requestTemplate.header,
-    [requestBodyName]: requestBody,
-    serviceName: functionInfo.serviceName || requestTemplate?.serviceName,
-  };
-  return requestConfig;
-}
-
-// 请求体
-function convertBody(param, formData) {
-  const keys = Object.keys(param || {});
-  if (!keys.length) return {};
-  const result = {};
-  keys.map((key) => {
-    const matchedGF = param[key].match(/G\d+F\d+/)?.[0];
-    const matchedJavaCode = param[key].match(/{\w+\.\w+}/)?.[0];
-    if (matchedGF) {
-      const group = matchedGF.match(/G\d+/);
-      const field = matchedGF.match(/F\d+/);
-      // 有值才赋值 【当formData中的值key是GxxxFxxx形式时】
-      if (formData?.[group]?.[field] && formData[group][field] !== '') {
-        if (Array.isArray(formData[group][field])) {
-          result[key] = formData[group][field].join(',');
-        } else {
-          result[key] = formData[group][field];
-        }
-      }
-      // 有值才赋值 【当formData中的值key是Fxxx形式时】
-      if (formData?.[field] && formData[field] !== '') {
-        if (Array.isArray(formData[field])) {
-          result[key] = formData[field].join(',');
-        } else {
-          result[key] = formData[field];
-        }
-      }
-    } else if (matchedJavaCode) {
-      let group, field;
-      try {
-        [group, field] = matchedJavaCode.replace(/[{}]/g).split('.');
-      } catch (e) {}
-      if (formData?.[group]?.[field] && formData[group][field] !== '') {
-        if (Array.isArray(formData[group][field])) {
-          result[key] = formData[group][field].join(',');
-        } else {
-          result[key] = formData[group][field];
-        }
-      }
-    } else {
-      if (param[key] !== '') {
-        result[key] = param[key];
-      }
-    }
-  });
-  return result;
-}
+import { request } from 'umi';
+import _ from 'lodash';
+import { handleRequestHeader } from '../../../../../utils/requestUtils';
+import { handleConvertResponse, judgeIsEmpty } from '../../../../../utils/utils';
+import { formatListName } from './helps';
+/**
+ * 删掉查询条件的qp- 和 -eq等
+ * @param {object} data
+ * @return {object}
+ * */
+export function deleteQuerySymbol(data) {
+  const result = {};
+
+  Object.keys(data).map((item) => {
+    const newKey = deleteQuerySymbolSingle(item);
+    result[newKey] = data[item];
+  });
+
+  return result;
+}
+
+export function deleteQuerySymbolSingle(key) {
+  return key.replace(/(qp-|-\w+)/g, '');
+}
+
+// 把{G1001F1001:123} 换成 {G1001:{F1001: 123}}
+export function convertToMapByKey(data) {
+  const result = {};
+
+  Object.keys(data).map((item) => {
+    const groupCode = item.match(/G\d+/);
+    const fieldCode = item.match(/F\d+/);
+    if (groupCode?.length > 0 && fieldCode?.length > 0) {
+      if (result[groupCode]) {
+        result[groupCode][fieldCode] = data[item];
+      } else if (!result[groupCode]) {
+        result[groupCode] = {
+          [fieldCode]: data[item],
+        };
+      }
+    }
+  });
+  return result;
+}
+
+/**
+ * 去掉查询表格的qp- -eq -in，与普通表格一样的格式
+ * @param{string} prop 键
+ * @param{boolean} flag 是不是查询表格
+ * */
+export function convertProp(prop, flag) {
+  return flag
+    ? prop
+        ?.replace(/(G\d+)/, '')
+        ?.replace('qp-', '')
+        ?.replace('-eq', '')
+        ?.replace('-in', '')
+        ?.replace('-like', '')
+    : prop;
+}
+// 获取元数据，是表格中列的数据来源
+export async function getMetaData(id) {
+  return new Promise((resolve, reject) => {
+    request('/basic/entityProperty/listNoPage', {
+      params: {
+        'qp-entityId-eq': id,
+      },
+    })
+      .then((res) => {
+        resolve(res.data);
+      })
+      .catch((error) => {
+        console.log(error, 'error');
+        reject([]);
+      });
+  });
+}
+
+// 获取数据
+export const remoteFetch = (requestConfig,coloumns) => {
+  return {
+    url: '/basic/function/sendRequest',
+    method: 'post',
+    convertParams({ params }) {
+      const { sorter, ...paramsTemp } = params;
+
+      const queryParams = {
+        ...requestConfig.params,
+        ...requestConfig.body,
+        ..._.omit(paramsTemp, ['filters', 'current']),
+        ...(paramsTemp?.filters || {}),
+        ...{ currentPage: paramsTemp?.currentPage || paramsTemp.current || 1 },
+      };
+
+      // 清除值为空的
+      Object.keys(queryParams).forEach((itemKey) => {
+        if (judgeIsEmpty(queryParams[itemKey])) {
+          delete queryParams[itemKey];
+        }
+      });
+
+      return {
+        path: requestConfig.url,
+        httpMethod: requestConfig?.method?.toUpperCase(),
+        serviceName: requestConfig.serviceName,
+        requestBody: JSON.stringify(queryParams),
+        header: handleRequestHeader().headers,
+      };
+    },
+    converter({ data }) {
+      return {
+        ...handleConvertResponse(handleList(data,coloumns), handleListToTal(data)),
+      };
+    },
+  };
+};
+
+// 值类型
+export function handleValueType(value, valueType) {
+  if (valueType === 20) {
+    return Number(value);
+  } else {
+    return value + '';
+  }
+}
+
+export function handleList(data, coloumns) {
+  const resultList =  Array.isArray(data)? data: Array.isArray(data?.list)
+  ? data.list : Array.isArray(data?.items) ? data.items: []
+  return formatListName(resultList,coloumns);
+}
+export function handleListToTal(data) {
+  return Array.isArray(data) ? data.length : data.total || data.totalCount;
+}
+
+// 路径
+export function convertPath(path, formData) {
+  const matchedGF = path.match(/G\d+F\d+/g);
+  const matchedJavaCode = path.match(/{\w+\.\w+}/g);
+  let url = path;
+  if (!matchedGF && !matchedJavaCode) return url;
+  if (matchedGF?.length) {
+    matchedGF.map((item) => {
+      const group = item.match(/G\d+/);
+      const field = item.match(/F\d+/);
+      const replaceValue = formData?.[group]?.[field] || formData?.[field];
+      url = url.replace(item, replaceValue);
+    });
+  } else if (matchedJavaCode?.length) {
+    matchedJavaCode.map((item) => {
+      let group, field;
+      try {
+        const val = item.replace(/[{}]/g, '').split('.');
+        group = val[0];
+        field = val[1];
+      } catch (e) {}
+      if (group && field) {
+        const replaceValue = formData?.[group]?.[field] || formData?.[field];
+        url = url.replace(item, replaceValue);
+      }
+    });
+  }
+  return url;
+}
+
+// 组装数据接口请求
+export function assembleRequest(
+  customSelectorConfig,
+  { isSearchForm, newestFormData, searchFormData },
+) {
+  const functionInfo =
+    customSelectorConfig?.businessFunction?.functionInfo?.actionList?.[0];
+  const requestTemplate = functionInfo?.requestTemplate;
+  if (!functionInfo || !requestTemplate) {
+    return false;
+  }
+  const isGet = requestTemplate.method.toLowerCase() === 'get';
+  const requestBodyName = isGet ? 'params' : 'data';
+  let params = requestTemplate.param;
+  try {
+    params = JSON.parse(requestTemplate.param);
+  } catch (e) {}
+  let path = requestTemplate.path;
+
+  let requestBody = isGet ? params : requestTemplate.requestBody;
+
+  if (!isSearchForm) {
+    // 非查询表格，普通表格的数据组装
+    path = convertPath(requestTemplate.path, newestFormData);
+    requestBody = convertBody(requestBody, newestFormData);
+  } else if (isSearchForm) {
+    // 查询表格数据组装，key会带有qp-  和 -eq，并且转换成map的数据格式
+    const newSearchFormData = convertToMapByKey(
+      deleteQuerySymbol(searchFormData),
+    );
+    path = convertPath(requestTemplate.path, newSearchFormData);
+    requestBody = convertBody(requestBody, newSearchFormData);
+  }
+  const requestConfig = {
+    url: path,
+    method: requestTemplate.method,
+    headers: requestTemplate.header,
+    [requestBodyName]: requestBody,
+    serviceName: functionInfo.serviceName || requestTemplate?.serviceName,
+  };
+  return requestConfig;
+}
+
+// 请求体
+function convertBody(param, formData) {
+  const keys = Object.keys(param || {});
+  if (!keys.length) return {};
+  const result = {};
+  keys.map((key) => {
+    const matchedGF = param[key].match(/G\d+F\d+/)?.[0];
+    const matchedJavaCode = param[key].match(/{\w+\.\w+}/)?.[0];
+    if (matchedGF) {
+      const group = matchedGF.match(/G\d+/);
+      const field = matchedGF.match(/F\d+/);
+      // 有值才赋值 【当formData中的值key是GxxxFxxx形式时】
+      if (formData?.[group]?.[field] && formData[group][field] !== '') {
+        if (Array.isArray(formData[group][field])) {
+          result[key] = formData[group][field].join(',');
+        } else {
+          result[key] = formData[group][field];
+        }
+      }
+      // 有值才赋值 【当formData中的值key是Fxxx形式时】
+      if (formData?.[field] && formData[field] !== '') {
+        if (Array.isArray(formData[field])) {
+          result[key] = formData[field].join(',');
+        } else {
+          result[key] = formData[field];
+        }
+      }
+    } else if (matchedJavaCode) {
+      let group, field;
+      try {
+        [group, field] = matchedJavaCode.replace(/[{}]/g).split('.');
+      } catch (e) {}
+      if (formData?.[group]?.[field] && formData[group][field] !== '') {
+        if (Array.isArray(formData[group][field])) {
+          result[key] = formData[group][field].join(',');
+        } else {
+          result[key] = formData[group][field];
+        }
+      }
+    } else {
+      if (param[key] !== '') {
+        result[key] = param[key];
+      }
+    }
+  });
+  return result;
+}

package/src/components/Solution/RuleComponent/CustomPlugin/CustomSelector/helps.tsx

@@ -1,58 +1,58 @@
-import { getDictionarySource } from '../../../../../utils/utils';
-
-// 处理表头
-export const getColumnItem= ({item}: any) => {
-    const ites: any = {
-        title: item.name,
-        key: item.code,
-        render: ({text, record}: any) => {
-          const showText = record?.[`${item.code}_Name`] || text
-          return showText;
-        }
-      }
-
-    // 处理列展示类型基础数据
-    if(item.choiceType == 20) {
-        // 数据字典
-        let dictionaryCode;
-        try {
-            if (JSON.parse(item.info||'{}').dictionaryCode) {
-            dictionaryCode = JSON.parse(item.info||'{}').dictionaryCode;
-            }
-        } catch (e) {
-            console.log('error', e);
-        }
-        ites.sourceList = dictionaryCode && getDictionarySource(dictionaryCode)||[]
-    }
-    if(item.choiceType == 10) {
-        // 自定义枚举值
-        let enumeration: any;
-        try {
-            if (JSON.parse(item.info||'{}').enumeration) {
-                enumeration = JSON.parse(item.info||'{}').enumeration;
-            }
-        } catch (e) {
-            console.log('error', e);
-        }
-        ites.sourceList = enumeration && Object.keys(enumeration).map((key) => ({ value: key, text: enumeration[key] }))||[]
-    }
-
-    return ites
-}
-
-export const formatListName = (list: any, columns: any) => {
-    if(!list?.length) return [];
-    if(!columns?.length) return list; // 下拉框无需格式化
-
-    return list.map((item: any) => {
-        let resultItem = {...item};
-        // 弹窗table编码展示名称
-        const column = columns.filter((col: any) => Object.keys(item)?.includes(col.key) && col?.sourceList?.length)||[];
-        Array.isArray(column) && column?.length && column.forEach(element => {
-            if(element?.sourceList) {
-                resultItem[`${element.key}_Name`] = element?.sourceList.find((source: any) => source.value == item[element.key])?.text;
-            }
-        });
-        return resultItem
-    })
+import { getDictionarySource } from '../../../../../utils/utils';
+
+// 处理表头
+export const getColumnItem= ({item}: any) => {
+    const ites: any = {
+        title: item.name,
+        key: item.code,
+        render: ({text, record}: any) => {
+          const showText = record?.[`${item.code}_Name`] || text
+          return showText;
+        }
+      }
+
+    // 处理列展示类型基础数据
+    if(item.choiceType == 20) {
+        // 数据字典
+        let dictionaryCode;
+        try {
+            if (JSON.parse(item.info||'{}').dictionaryCode) {
+            dictionaryCode = JSON.parse(item.info||'{}').dictionaryCode;
+            }
+        } catch (e) {
+            console.log('error', e);
+        }
+        ites.sourceList = dictionaryCode && getDictionarySource(dictionaryCode)||[]
+    }
+    if(item.choiceType == 10) {
+        // 自定义枚举值
+        let enumeration: any;
+        try {
+            if (JSON.parse(item.info||'{}').enumeration) {
+                enumeration = JSON.parse(item.info||'{}').enumeration;
+            }
+        } catch (e) {
+            console.log('error', e);
+        }
+        ites.sourceList = enumeration && Object.keys(enumeration).map((key) => ({ value: key, text: enumeration[key] }))||[]
+    }
+
+    return ites
+}
+
+export const formatListName = (list: any, columns: any) => {
+    if(!list?.length) return [];
+    if(!columns?.length) return list; // 下拉框无需格式化
+
+    return list.map((item: any) => {
+        let resultItem = {...item};
+        // 弹窗table编码展示名称
+        const column = columns.filter((col: any) => Object.keys(item)?.includes(col.key) && col?.sourceList?.length)||[];
+        Array.isArray(column) && column?.length && column.forEach(element => {
+            if(element?.sourceList) {
+                resultItem[`${element.key}_Name`] = element?.sourceList.find((source: any) => source.value == item[element.key])?.text;
+            }
+        });
+        return resultItem
+    })
 }