@lingxiteam/ebe-utils 0.3.30 → 0.4.0

package/es/index.d.ts

@@ -41,6 +41,7 @@ interface CodeServices {
     downloadFileByFileCode: (data: any) => Promise<any>;
     selectToolBoxPage: (data: any) => Promise<any>;
     batchQryPageRulesByPageIds: (data: any) => Promise<any>;
+    qryIdAndCodeInfo: (data: any) => Promise<any>;
 }
 export declare const getSafeTypeName: (name: any) => any;
 interface CodeOptions {
@@ -89,6 +90,7 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
         hasExtendsApp: boolean | undefined;
         toolBox: any;
         pageRules: unknown;
+        busiObjectCodeInfo: any;
     };
     cleanedTree: any;
 }>;

package/es/index.js

@@ -23,6 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { generateCode, init as ebeInit, publishers } from '@lingxiteam/ebe';
 import { lingxiDslRules } from "./constants";
 import RequestQueue from "./requestQueue";
+import { renameComponents } from "./renameComponents";
 export * from "./types";
 var isArray = function isArray(arr) {
   if (Array.isArray) {
@@ -153,6 +154,7 @@ export var getPageDsls = function getPageDsls(resultObjects, hasPageRulesPages)
   return resultObjects.filter(Boolean).map(function (i) {
     try {
       var pageData = JSON.parse(i.attrMappingJson);
+      pageData = renameComponents(pageData);
       pageData.pageId = i === null || i === void 0 ? void 0 : i.pageId;
       if (checkHasPageRules(pageData)) {
         hasPageRulesPages.push(i === null || i === void 0 ? void 0 : i.pageId);
@@ -269,7 +271,7 @@ var checkHasPageRules = function checkHasPageRules(pageDsl) {
 export var fetchData = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
     var _ref6, _appInfo$initialAppId, _attrSpecPage;
-    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, hasAppFileResource, hasExtendsApp, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, hasPageRulesPages, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, requestQueue, requests, pages, _yield$services$qryBu, itemLists, BusiCompRequest, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, appFileResource, _services$queryAppFil, _yield$services$query, _yield$services$query2, list, appFileResourceList, _yield$services$selec, toolBoxList, toolBox, pageRules, options, cleanedTree;
+    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, hasAppFileResource, hasExtendsApp, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, hasPageRulesPages, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, requestQueue, requests, pages, _yield$services$qryBu, itemLists, BusiCompRequest, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, appFileResource, _services$queryAppFil, _yield$services$query, _yield$services$query2, list, appFileResourceList, _yield$services$selec, toolBoxList, toolBox, pageRules, busiObjectCodeInfo, convertToBusiObject, options, cleanedTree;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -531,6 +533,8 @@ export var fetchData = /*#__PURE__*/function () {
             var _i$busiCompVersion;
             // 业务组件为空，返回一个 fallback
             var busiData = JSON.parse((i === null || i === void 0 || (_i$busiCompVersion = i.busiCompVersion) === null || _i$busiCompVersion === void 0 ? void 0 : _i$busiCompVersion.sourceCodeJson) || '{"id":"100101","pageContainerType":"BusiComp","pageName":"错误组件","pagePath":"","objType":"app","busiCompCode":"Custom","callbacks":["onChange"],"compState":"","events":[],"actions":[],"pageDynamicFlag":true,"setEvents":[{"dataName":"event","dataId":"798407","path":[],"value":"useEffect","params":[],"children":[]}],"layout":"BaseLayout","searchParams":[{"name":"业务主键","code":"bizId"},{"name":"业务场景","code":"sceneCode"},{"name":"业务数据","code":"bizData"}],"catalogItemId":"-1","platformType":"LowCode","editorVersion":"3.6.1.04251034","createdEditorVersion":"0.2.1130.05051011","busiCompObjectRelDTOList":[],"platform":"pc","appId":"1064722784465846272","components":[{"id":"Icon_2609852","label":"图标","compName":"Icon","type":"Icon","compType":1,"compLib":"@/components","props":{"name":"图标","mode":"normal","rotate":0,"basicStatus":1,"icon":{"theme":"outlined","type":"smile","isIconFont":false},"popoverSetting":{"page":{"pagePath":"/ceshiqipao2781","pageId":"1049616591121936384","pageName":"测试气泡1206","options":[{"name":"业务主键","code":"bizId"},{"name":"业务场景","code":"sceneCode"},{"name":"业务数据","code":"bizData"}],"tipType":"1","trigger":"click"}}},"style":{},"isContainer":false,"isBusiObjContainer":false,"cmdgroup":["basic"],"platform":"pc","icon":"Icon","description":"","image":"","groupsName":"通用","isInlineBlock":true,"setEvents":[],"isLabelDropBoxChild":false,"components":[],"path":["965041"]}],"path":[]}');
+            busiData = renameComponents(busiData);
+
             // 业务组件原始 dsl 里面没有 busiCompId
             busiData.busiCompId = i === null || i === void 0 ? void 0 : i.busiCompId;
             busiData.id = i === null || i === void 0 ? void 0 : i.busiCompId;
@@ -729,7 +733,9 @@ export var fetchData = /*#__PURE__*/function () {
                     fileType: item === null || item === void 0 ? void 0 : item.fileType
                   });
                 }
-              }).catch(reject);
+              }).catch(function () {
+                return resolve('');
+              });
             });
           }));
         case 121:
@@ -751,7 +757,7 @@ export var fetchData = /*#__PURE__*/function () {
             var toolScriptJson = JSON.parse((i === null || i === void 0 ? void 0 : i.toolScriptJson) || '{}');
             var toolScript = toolScriptJson === null || toolScriptJson === void 0 ? void 0 : toolScriptJson.script;
             return "export ".concat(toolScript.replace(/function\s+(\w+)\s*\(/, "function ".concat(i === null || i === void 0 ? void 0 : i.toolCode, "(")));
-          }).join('\n'); // TODO: 新接口，有些环境还没部署，等都部署了，可以去掉这个兜底
+          }).join('\n');
           _context3.next = 130;
           return Promise.race([new Promise(function (resolve, reject) {
             services.batchQryPageRulesByPageIds({
@@ -767,6 +773,28 @@ export var fetchData = /*#__PURE__*/function () {
           })]);
         case 130:
           pageRules = _context3.sent;
+          _context3.next = 133;
+          return Promise.race([new Promise(function (resolve, reject) {
+            services.qryIdAndCodeInfo({
+              appId: appId,
+              pageIds: hasPageRulesPages.join(',')
+            }).then(function (res) {
+              resolve(res);
+            });
+          }), new Promise(function (resolve, reject) {
+            setTimeout(function () {
+              resolve({});
+            }, 5000);
+          })]);
+        case 133:
+          busiObjectCodeInfo = _context3.sent;
+          convertToBusiObject = function convertToBusiObject() {
+            var info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+            return info.reduce(function (acc, item) {
+              acc[item.busiObjectId] = item.busiObjectCode;
+              return acc;
+            }, {});
+          };
           options = {
             platform: getPlatform(platform),
             appId: (_appInfo$initialAppId = appInfo === null || appInfo === void 0 ? void 0 : appInfo.initialAppId) !== null && _appInfo$initialAppId !== void 0 ? _appInfo$initialAppId : appId,
@@ -789,7 +817,14 @@ export var fetchData = /*#__PURE__*/function () {
             appFileResource: appFileResource,
             hasExtendsApp: hasExtendsApp,
             toolBox: toolBox,
-            pageRules: pageRules
+            pageRules: pageRules,
+            busiObjectCodeInfo: _objectSpread({
+              // FIXME: 预置的没有查询，缺的四个补一下，接口后面可能会返回
+              1001: 'lcdp_domain_user',
+              1002: 'lcdp_domain_role',
+              1003: 'lcdp_domain_organization',
+              1004: 'lcdp_app_file_info'
+            }, convertToBusiObject(busiObjectCodeInfo))
           };
           onProgress({
             log: '清理无用数据',
@@ -801,7 +836,7 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 136:
+        case 140:
         case "end":
           return _context3.stop();
       }

package/es/renameComponents.d.ts

@@ -0,0 +1 @@
+export declare function renameComponents(data: any): string;

package/es/renameComponents.js

@@ -0,0 +1,70 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+export function renameComponents(data) {
+  // 读取 JSON 文件
+  //   const data = JSON.parse(jsonContent);
+
+  // 用于存储已使用的名称计数
+  var nameCounters = {};
+  var renameObject = {};
+
+  // 递归处理组件
+  function processComponents(components) {
+    if (!Array.isArray(components)) return;
+    components.forEach(function (component) {
+      // 处理当前组件
+      if (component.id && /^[A-Za-z]+_\d+$/.test(component.id)) {
+        var baseName = component.id.split('_')[0];
+        // 生成新的有意义的名字
+        var newName = generateMeaningfulName(baseName, component.id, nameCounters);
+        component.id = newName;
+      }
+
+      // 递归处理子组件
+      if (component.components) {
+        processComponents(component.components);
+      }
+    });
+  }
+
+  // 生成有意义的名称
+  function generateMeaningfulName(baseName, label, counters) {
+    if (!counters[baseName]) {
+      counters[baseName] = 1;
+    } else {
+      counters[baseName] += 1;
+    }
+    // 从 Form1 开始，防止变量名和组件名相同
+    var rename = "".concat(baseName).concat(counters[baseName]);
+    renameObject[label] = rename;
+    return rename;
+  }
+
+  // 处理所有组件
+  if (data.components) {
+    processComponents(data.components);
+  }
+
+  // 将对象转换为字符串
+  var jsonString = JSON.stringify(data, null, 4);
+
+  // 全局替换所有引用
+  Object.entries(renameObject).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      oldName = _ref2[0],
+      newName = _ref2[1];
+    // 使用正则表达式确保只替换完整的匹配
+    var regex = oldName.trim();
+    // @ts-ignore
+    jsonString = jsonString.replaceAll(regex, newName);
+  });
+  return JSON.parse(jsonString);
+  // 写回文件
+  //   fs.writeFileSync('./Page_ceshi1.json', jsonString, 'utf8');
+  //   console.log('组件重命名完成！');
+  //   console.log('/重命名映射关系：', renameObject);
+}

package/lib/pcpublic/src/components/pcfactory/src/StdUpload/index.tsx

@@ -938,11 +938,11 @@ const StdUpload = LingxiForwardRef<any, MyStdUploadProps>((props, ref) => {
       ...(uploadProps?.data || {}),
     };
     if (restProps?.columns) {
-      const { _source, _serviceId, serviceCode } = restProps?.columns || {};
+      const { _source, serviceCode } = restProps?.columns || {};
       switch (_source) {
         case 'std': {
           data['ORCHESTRATION.appId'] = props.$$componentItem.appId;
-          data['ORCHESTRATION.serviceVersionId'] = _serviceId;
+          // data['ORCHESTRATION.serviceVersionId'] = _serviceId;
           data['ORCHESTRATION.serviceCode'] = serviceCode;
           break;
         }

package/lib/pcpublic/src/components/pcfactory/src/Table/EditComponent/index.tsx

@@ -523,7 +523,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
         // TODO: 设置的 filedName 目前实际没作用，只是为了防止formitem错误告警
         name={fieldName}
         initialValue={initialValue}
-        rules={validateRules as any}
+        rules={validateRules}
       >
         {renderComponent(true)}
       </Form.Item>

package/lib/pcpublic/src/utils/exportCustomData/index.tsx

@@ -616,11 +616,11 @@ const exportCustomData = (exportSheet: any = [], custFileName: any, selectedKeyM
           // 对象类型
           req = engineServices
             .queryBusiObjectRowColumnsList({
-              busiObjectIds: selectedKeyMap[type].join(','),
+              busiObjectCodes: selectedKeyMap[type].join(','),
             })
             .then((res: any) => {
               const m: any = {};
-              (res || []).forEach((c: any) => (m[c.busiObjectId] = c.rowColumns));
+              (res || []).forEach((c: any) => (m[c.busiObjectCode] = c.rowColumns));
               return m;
             });
         }
@@ -629,11 +629,11 @@ const exportCustomData = (exportSheet: any = [], custFileName: any, selectedKeyM
           // @ts-ignore
           req = engineServices
             .queryServiceResponseColumnsList({
-              serviceVersionIds: (selectedKeyMap[type] || []).join(','),
+              serviceCodes: (selectedKeyMap[type] || []).join(','),
             })
             .then((res: any) => {
               const m: any = {};
-              (res || []).forEach((c: any) => (m[c.serviceVersionId] = getResponseAttr(c.response)));
+              (res || []).forEach((c: any) => (m[c.serviceCode] = getResponseAttr(c.response)));
               return m;
             });
         }

package/lib/public/src/components/ImportBusiObjModal/index.tsx

@@ -155,11 +155,11 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
   );
 
   // 获取对象字段
-  const queryBusiObjectRowColumns = async ({ busiObjectId }: any) => {
+  const queryBusiObjectRowColumns = async ({ busiObjectCode }: any) => {
     try {
       setLoading(true);
       const resultList: any = await engineApi.queryBusiObjectRowColumns({
-        busiObjectId,
+        busiObjectCode,
       });
       setCurDataSource(resultList);
       setObjOptions(
@@ -179,11 +179,11 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
     }
   };
 
-  const queryCustBusiObjectRowColumns = async ({ busiObjectId }: any) => {
+  const queryCustBusiObjectRowColumns = async ({ busiObjectCode }: any) => {
     try {
       setLoading(true);
       const resultList: any = await engineApi.queryBusiObjectRowColumns({
-        busiObjectId,
+        busiObjectCode,
       });
       setCurDataSource(resultList);
     } catch (error) {
@@ -212,10 +212,10 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
       return;
     }
     try {
-      const { busiObjectId, fileName, customGroup, templateData = { type: 'default' } } = params || {};
+      const { busiObjectCode, fileName, customGroup,  templateData = { type: 'default' } } = params || {};
       const obj: any = {
         pickRows: selectedRows,
-        busiObjectId,
+        busiObjectCode,
         templateData,
       };
       // 存在配置的表头分组，下载模版时需要传给后端组装多表头模版
@@ -260,8 +260,8 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
     setIsCustom(false);
     setIsCustomService(false);
     setParams(options || {});
-    const { busiObjectId } = options;
-    queryBusiObjectRowColumns({ busiObjectId });
+    const { busiObjectCode } = options;
+    queryBusiObjectRowColumns({ busiObjectCode });
   };
 
   const openWithCustFields = (options: any) => {
@@ -269,8 +269,8 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
     setIsCustom(true);
     setIsCustomService(false);
     setParams(options || {});
-    const { busiObjectId } = options;
-    queryCustBusiObjectRowColumns({ busiObjectId });
+    const { busiObjectCode } = options;
+    queryCustBusiObjectRowColumns({ busiObjectCode });
   };
 
   const openWithCustParams = (options: any) => {
@@ -349,7 +349,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
             JSON.stringify({
               pickRows: selectedRows,
               showOnly: params.showOnly === 'T' ? 'T' : 'F',
-              busiObjectId: params.busiObjectId,
+              busiObjectCode: params.busiObjectCode,
               ...obj,
             }),
           ],
@@ -364,7 +364,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
     if (_source === 'std') {
       // 自定义导出勾选了编排类服务
       // customParams['ORCHESTRATION.appId'] = appId;
-      customParams['ORCHESTRATION.serviceVersionId'] = _serviceId;
+      // customParams['ORCHESTRATION.serviceVersionId'] = _serviceId;
       customParams['ORCHESTRATION.serviceCode'] = serviceCode;
     }
     return customParams;
@@ -590,11 +590,6 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
           xhr.onload = async () => {
             response = JSON.parse(xhr.responseText || xhr.response);
             if (xhr.status === 200) {
-              if (Object.prototype.toString.call(response?.resultObject) === '[object Object]' && response?.resultObject.hasOwnProperty('resultCode') && response?.resultObject?.resultCode !== '0') {
-                response.resultCode = response?.resultObject?.resultCode;
-                response.resultMsg = response?.resultObject?.resultMsg;
-                response.resultObject = undefined;
-              }
               let result = response?.resultObject;
               let isAsyncImport = false;
               if (hasUploadProcess) {

package/lib/public/src/components/common/ExpBusiObjModal/index.tsx

@@ -59,12 +59,12 @@ const ExpBusiObjModal = forwardRef<ExpBusiObjModalHooks, ExpBusiObjModalProps>((
 
   refSelectedRow.current = selectedRows;
 
-  const queryBusiObjectRowColumns = async ({ busiObjectId }: any) => {
+  const queryBusiObjectRowColumns = async ({ busiObjectCode }: any) => {
     try {
       setLoading(true);
       const resultList =
         ((await engineApi.queryBusiObjectRowColumns({
-          busiObjectId,
+          busiObjectCode,
         })) as any[]) || [];
       setCurDataSource(resultList);
       setObjOptions(
@@ -84,20 +84,20 @@ const ExpBusiObjModal = forwardRef<ExpBusiObjModalHooks, ExpBusiObjModalProps>((
     }
   };
 
-  const queryNExportInsts = async ({ busiObjectId, attrs, custFileName, exportType, tempParams, onSuccess, onFail, async }: any) => {
+  const queryNExportInsts = async ({ busiObjectCode, attrs, custFileName, exportType, tempParams, onSuccess, onFail, async }: any) => {
     let hide = () => {};
     try {
       hide = message.loading(getLocale!('export.process.handling', '正在处理中，请稍后...'), 0);
       const resultList =
         ((await engineApi.queryBusiObjectRowColumns({
-          busiObjectId,
+          busiObjectCode,
         })) as any[]) || [];
       setCurDataSource(resultList);
-      const fileName = custFileName ? `${custFileName}.xlsx` : `${busiObjectId}-${new Date().getTime()}.xlsx`;
+      const fileName = custFileName ? `${custFileName}.xlsx` : `${busiObjectCode}-${new Date().getTime()}.xlsx`;
       const downloadIndex = `${fileName}_${Math.random()}`;
       let params = {
         pickRows: refSelectedRow.current,
-        busiObjectId,
+        busiObjectCode,
         attrs: typeof attrs === 'object' ? attrs : {},
       };
       if (exportType === 'temp') {
@@ -139,13 +139,13 @@ const ExpBusiObjModal = forwardRef<ExpBusiObjModalHooks, ExpBusiObjModalProps>((
   const exportInsts = async () => {
     try {
       setConfirmLoading(true);
-      const { busiObjectId, attrs, custFileName } = params || {};
+      const { busiObjectCode, attrs, custFileName } = params || {};
       const requestParams = {
         pickRows: selectedRows,
-        busiObjectId,
+        busiObjectCode,
         attrs: typeof attrs === 'object' ? attrs : {},
       };
-      const fileName = custFileName ? `${custFileName}.xlsx` : `${busiObjectId}-${new Date().getTime()}.xlsx`;
+      const fileName = custFileName ? `${custFileName}.xlsx` : `${busiObjectCode}-${new Date().getTime()}.xlsx`;
       await exportFileShowProgress({
         fileOrigin: 'object',
         fileName,
@@ -182,18 +182,14 @@ const ExpBusiObjModal = forwardRef<ExpBusiObjModalHooks, ExpBusiObjModalProps>((
     queryBusiObjectRowColumns({ ...options });
   };
 
-  // useEffect(() => {
-  //   open({ busiObjectId: '38104', attrs: {} });
-  // }, []);
-
   const openWithCustFields = (options: ExpBusiObjModalCustomOptions) => {
     setVisible(false);
     setIsCustom(true);
     setParams(options || {});
-    const { busiObjectId, attrs, custFileName, onSuccess, onFail } = options;
+    const { busiObjectCode, attrs, custFileName, onSuccess, onFail } = options;
     queryNExportInsts({
       ...options,
-      busiObjectId,
+      busiObjectCode,
       attrs,
       custFileName,
       onSuccess,

package/lib/public/src/hooks/useExportCustomDataFile.ts

@@ -136,7 +136,7 @@ const useExportCustomDataFile = ({ getLocale }: ExportCustomDataFileOptions) =>
         parameters,
         customGroup,
       } = item;
-      const { _source, busiObjectId, _serviceId, serviceCode, serviceVersionId, _capabilityCode, busiApiId, productId } = serviceData;
+      const { _source, busiObjectCode, _serviceId, serviceCode, serviceVersionId, _capabilityCode, busiApiId, productId } = serviceData;
 
       let objValue;
       let parCode = parentCode;
@@ -171,8 +171,8 @@ const useExportCustomDataFile = ({ getLocale }: ExportCustomDataFileOptions) =>
       // 构造批量导出获取字段详情的入参
       switch (_source) {
         case SERVICE_SOURCE.OBJECT: {
-          objValue = busiObjectId;
-          selectedKeyMap[_source].push(busiObjectId);
+          objValue = busiObjectCode;
+          selectedKeyMap[_source].push(busiObjectCode);
           break;
         }
         case SERVICE_SOURCE.INNER:
@@ -182,8 +182,8 @@ const useExportCustomDataFile = ({ getLocale }: ExportCustomDataFileOptions) =>
           break;
         }
         case SERVICE_SOURCE.STD: {
-          objValue = serviceVersionId;
-          selectedKeyMap[_source].push(serviceVersionId);
+          objValue = serviceCode;
+          selectedKeyMap[_source].push(serviceCode);
           break;
         }
         case SERVICE_SOURCE.RHIN: {
@@ -423,12 +423,12 @@ const useExportCustomDataFile = ({ getLocale }: ExportCustomDataFileOptions) =>
         // 对象类型
         req = api
           .queryBusiObjectRowColumnsList({
-            busiObjectIds: selectedKeyMap[type].join(','),
+            busiObjectCodes: selectedKeyMap[type].join(','),
             appId: APPID,
           })
           .then((res: any) => {
             const m: any = {};
-            (res || []).forEach((c: any) => (m[c.busiObjectId] = c.rowColumns));
+            (res || []).forEach((c: any) => (m[c.busiObjectCode] = c.rowColumns));
             return m;
           });
       }
@@ -436,12 +436,12 @@ const useExportCustomDataFile = ({ getLocale }: ExportCustomDataFileOptions) =>
         // 编排类服务
         req = api
           .queryServiceResponseColumnsList({
-            serviceVersionIds: (selectedKeyMap[type] || []).join(','),
+            serviceCodes: (selectedKeyMap[type] || []).join(','),
             appId: APPID,
           })
           .then((res: any) => {
             const m: any = {};
-            (res || []).forEach((c: any) => (m[c.serviceVersionId] = getResponseAttr(c.response)));
+            (res || []).forEach((c: any) => (m[c.serviceCode] = getResponseAttr(c.response)));
             return m;
           });
       }

package/lib/public/src/hooks/useTransSuperObjectParams.ts

@@ -26,33 +26,33 @@ const useTransSuperObjectParams = (params: TransSuperObjectParams) => {
   const { refs, dataSnapshot, data = {}, sceneCode = 'U' } = params;
 
   const transSuperObjectParams = async (
-    busiObjectIdMap: Record<string, { formId?: string; busiObjectId?: string }> = {},
+    busiObjectCodeMap: Record<string, { formId?: string; busiObjectCode?: string }> = {},
     extServices: { sceneCode: string; actionCode: string }[] = []
   ) => {
     const params = {
-      busiObjectIds: Object.values(busiObjectIdMap)
-        .map(item => item.busiObjectId)
+      busiObjectCodes: Object.values(busiObjectCodeMap)
+        .map(item => item.busiObjectCode)
         .filter(Boolean),
       sceneCode,
-      originalInsts: {},
-      insts: {},
+      codeOriginalInsts: {},
+      codeInsts: {},
     } as Record<string, any>;
 
-    const dataSourceNames = Object.keys(busiObjectIdMap);
+    const dataSourceNames = Object.keys(busiObjectCodeMap);
     for (let index = 0; index < dataSourceNames.length; index++) {
       const name = dataSourceNames[index];
-      const { formId, busiObjectId } = busiObjectIdMap[name];
-      if (busiObjectId) {
-        params.originalInsts[busiObjectId] = transInsts(dataSnapshot[name]);
+      const { formId, busiObjectCode } = busiObjectCodeMap[name];
+      if (busiObjectCode) {
+        params.codeOriginalInsts[busiObjectCode] = transInsts(dataSnapshot[name]);
         if (formId) {
           const formDataSoure = await refs[formId]?.validateFormAndScroll();
           // 说明是表单形式作为提交相应的值
           if (formDataSoure) {
-            params.insts[busiObjectId] = transInsts(Object.assign({}, data[name], formDataSoure));
+            params.codeInsts[busiObjectCode] = transInsts(Object.assign({}, data[name], formDataSoure));
           }
         } else {
           // 其它形式，比如数组
-          params.insts[busiObjectId] = transInsts(data[name]);
+          params.codeInsts[busiObjectCode] = transInsts(data[name]);
         }
       }
     }

package/lib/public/src/services/api/engine.ts

@@ -13,7 +13,7 @@ interface ApiType {
   exportMultiServiceResultByAsync: HTTPMehodFn;
   // 导出业务对象（异步）
   exportInstsByAsync: HTTPMehodFn;
-  // 根据 busiObjectId 获取业务对象字段
+  // 根据 busiObjectCode 获取业务对象字段
   queryBusiObjectRowColumns: HTTPMehodFn;
   // 导出失败数据文件
   getFailedWorkBook: HTTPMehodFn;
@@ -25,7 +25,7 @@ interface ApiType {
   getImportExportApply: HTTPMehodFn;
   // 根据 serviceCodes 获取内部服务字段
   getSqlQueryColumnsList: HTTPMehodFn;
-  // 根据 busiObjectIds 获取业务对象字段
+  // 根据 busiObjectCodes 获取业务对象字段
   queryBusiObjectRowColumnsList: HTTPMehodFn;
 }
 
@@ -39,7 +39,7 @@ const api: ApiType = {
   exportMultiServiceResultByAsync: (params, appCtx) => http.post('app/object/exportMultiServiceResultByAsync', appCtx, params),
   // 导出业务对象（异步）
   exportInstsByAsync: (params, appCtx) => http.post('app/object/exportInstsByAsync', appCtx, params),
-  // 根据 busiObjectId 获取业务对象字段
+  // 根据 busiObjectCode 获取业务对象字段
   queryBusiObjectRowColumns: (params, appCtx) => urlHelper.get('app/object/queryBusiObjectRowColumns', params, appCtx),
   // 导出失败数据文件
   getFailedWorkBook: (params, appCtx) => http.post('app/object/getFailedWorkBook', appCtx, params),
@@ -53,7 +53,7 @@ const api: ApiType = {
   getImportExportApply: (params, appCtx) => urlHelper.get('app/object/getImportExportApply', params, appCtx),
   // 根据 serviceCodes 获取内部服务字段
   getSqlQueryColumnsList: (params, appCtx) => urlHelper.get('app/sql/getSqlQueryColumnsList', params, appCtx),
-  // 根据 busiObjectIds 获取业务对象字段
+  // 根据 busiObjectCodes 获取业务对象字段
   queryBusiObjectRowColumnsList: (params, appCtx) => urlHelper.get('app/object/queryBusiObjectRowColumnsList', params, appCtx),
   // 获取服务编排出参字段
   queryServiceResponseColumnsList: (params, appCtx) => urlHelper.get('app/orchestrationService/queryServiceResponseColumnsList', params, appCtx),

package/lib/public/src/types/index.ts

@@ -40,11 +40,11 @@ export interface AccountDivideModalHooks {
 }
 
 export interface ExpBusiObjModalOptions {
-  busiObjectId: string;
+  busiObjectCode: string;
 }
 
 export interface ExpBusiObjModalCustomOptions {
-  busiObjectId: string;
+  busiObjectCode: string;
   attrs: any[];
   custFileName: string;
   exportType?: 'field' | 'temp'; // 导出字段类型：选中字段｜导出模板

package/lib/public/src/utils/dataSource/fetchQuery.ts

@@ -26,7 +26,7 @@ export interface DataSourceFetchQuery {
   sceneCode?: string;
   busiObjectInstId?: number | string;
   actionId?: string | number;
-  busiObjectId?: string;
+  busiObjectCode?: string;
   attrs: any;
 }
 
@@ -47,7 +47,7 @@ export interface DataSourceFetchQueryService {
 /**
  * 查询对象服务
  */
-export const fetchQueryObject = async (url: string, { busiObjectInstId, actionId, method, sceneCode, busiObjectId, attrs }: DataSourceFetchQuery) => {
+export const fetchQueryObject = async (url: string, { busiObjectInstId, actionId, method, sceneCode, busiObjectCode, attrs }: DataSourceFetchQuery) => {
   const requestConfig: any = {
     method,
   };
@@ -55,7 +55,7 @@ export const fetchQueryObject = async (url: string, { busiObjectInstId, actionId
   // 组装对象服务入参
   const params = {
     actionId,
-    busiObjectId,
+    busiObjectCode,
     busiObjectInstId,
     attrs,
     sceneCode: _sceneCode || '',
@@ -71,60 +71,7 @@ export const fetchQueryObject = async (url: string, { busiObjectInstId, actionId
   return http.commonFetch(method, url, params, {});
 };
 
-export const fetchQueryService = async (service: DataSourceFetchQueryService['service'], params: DataSourceFetchQueryService['params']) => {
-  const { _capabilityCode, _apiCode, api, _source, _serviceId, versionCode, serviceCode, serviceMethod } = service;
-  let requestData: any = {};
-  const url = api;
-  let method = 'post' as 'get' | 'post' | 'put' | 'delete';
-  switch (_source) {
-    case SERVICE_SOURCE.RHIN: {
-      requestData = {
-        apiCode: _apiCode,
-        capabilityCode: _capabilityCode,
-        serviceRequest: params,
-      };
-      break;
-    }
-    case SERVICE_SOURCE.STD: {
-      requestData = {
-        serviceCode,
-        version: versionCode,
-        serviceVersionId: _serviceId,
-        parameters: params,
-      };
-      break;
-    }
-    case SERVICE_SOURCE.QUERY: {
-      requestData = {
-        serviceCode,
-        params,
-      };
-      method = serviceMethod || 'post';
-      break;
-    }
-    case SERVICE_SOURCE.INNER:
-    case SERVICE_SOURCE.PLATFORM: {
-      requestData = params;
-      method = serviceMethod || 'post';
-      if (Array.isArray(requestData) || typeof requestData !== 'object') {
-        if (Array.isArray(requestData)) {
-          requestData = requestData.map(c => {
-            if (!Array.isArray(c) || typeof c !== 'object') {
-              return {
-                ...c,
-              };
-            }
-            return c;
-          });
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-  return http.commonFetch(method, url, requestData, {
-    _source,
-    maybeNotStdResp: [SERVICE_SOURCE.INNER, SERVICE_SOURCE.PLATFORM].includes(_source || ''),
-  }) as Promise<any>;
+export const fetchQueryService = async (url: string, requestData: any) => {
+  const { serviceMethod, ...other } = requestData;
+  return http.commonFetch(serviceMethod || 'post', url, other) as Promise<any>;
 };

package/lib/public/src/utils/styleInject.ts

@@ -1,5 +1,4 @@
 export const styleInject = (css: string, id: string = 'id'): void => {
-  // __CustomClass_16482__ id
   if (typeof document === 'undefined') {
     return;
   }
@@ -7,7 +6,7 @@ export const styleInject = (css: string, id: string = 'id'): void => {
   const head = document.head || document.getElementsByTagName('head')[0];
   const style = document.createElement('style') as any;
   style.type = 'text/css';
-  style.id = `__CustomClass_${id}__`;
+  style.id = id;
   head.appendChild(style);
   if (style.styleSheet) {
     style.styleSheet.cssText = css;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.30",
+  "version": "0.4.0",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.30"
+    "@lingxiteam/ebe": "0.4.0"
   },
   "publishConfig": {
     "access": "public"