@boteteam/utils 0.0.30 → 0.0.32

package/dist/cjs/watermark.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/watermark.ts"],
+  "sourcesContent": ["/**\n * 水印工具函数\n */\n\nimport type { CSSProperties } from 'react';\n\nexport interface WatermarkStyles {\n  color: string;\n  opacity: number;\n  fontSize: number;\n  angle: number;\n}\n\nexport interface WatermarkLayout {\n  density: string;\n  horizontalSpacing: number;\n  verticalSpacing: number;\n  arrangement: string;\n}\n\n/**\n * 水印行配置\n */\nexport interface WatermarkRow {\n  enabled: boolean;\n  variable?: string;\n  text?: string;\n}\n\nexport interface WatermarkConfig {\n  content: string;\n  styles: WatermarkStyles;\n  layout: WatermarkLayout;\n  rows?: WatermarkRow[]; // 可选，用于向后兼容\n}\n\n/**\n * 上下文变量类型\n */\nexport interface ContextVariable {\n  code: string;\n  name: string;\n}\n\n/**\n * 会话信息类型\n */\nexport interface SessionInfo {\n  userId?: string;\n  userName?: string;\n  realName?: string;\n}\n\n/**\n * XML 转义\n */\nexport function escapeXml(str: string): string {\n  return str\n    .replace(/&/g, '&amp;')\n    .replace(/</g, '&lt;')\n    .replace(/>/g, '&gt;')\n    .replace(/\"/g, '&quot;')\n    .replace(/'/g, '&apos;');\n}\n\n/**\n * 根据 key 获取变量的真实值\n * @param key 变量 key，支持格式：${system.now}、${system.today}、${system.ip}、${session.userId}、${session.userName}、${session.realName}、${contextParams.xxx}\n */\nexport function getVariableRealValue(\n  key: string,\n): string {\n  // 从 sessionStorage 获取用户信息\n  const sessionInfo = getUserInfoFromStorage();\n  \n  // 从 storage 获取 contextParams\n  const contextParams = getContextParamsFromStorage();\n   \n  // 获取客户端 IP（从缓存读取，如果没有则返回默认值）\n  const clientIp = getClientIp();\n\n  const now = new Date();\n\n  // 处理 ${system.xxx} 格式\n  const systemMatch = key.match(/^\\$\\{system\\.(\\w+)\\}$/);\n  if (systemMatch) {\n    const systemKey = systemMatch[1];\n    switch (systemKey) {\n      case 'now': {\n        // 当前时间：格式为 YYYY-MM-DD HH:mm:ss\n        const year = now.getFullYear();\n        const month = String(now.getMonth() + 1).padStart(2, '0');\n        const day = String(now.getDate()).padStart(2, '0');\n        const hours = String(now.getHours()).padStart(2, '0');\n        const minutes = String(now.getMinutes()).padStart(2, '0');\n        const seconds = String(now.getSeconds()).padStart(2, '0');\n        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;\n      }\n      case 'today': {\n        // 当前日期：格式为 YYYY-MM-DD\n        const year = now.getFullYear();\n        const month = String(now.getMonth() + 1).padStart(2, '0');\n        const day = String(now.getDate()).padStart(2, '0');\n        return `${year}-${month}-${day}`;\n      }\n      case 'ip':\n        return clientIp;\n      default:\n        return '';\n    }\n  }\n\n  // 处理 ${session.xxx} 格式\n  const sessionMatch = key.match(/^\\$\\{session\\.(\\w+)\\}$/);\n  if (sessionMatch) {\n    const sessionKey = sessionMatch[1];\n    switch (sessionKey) {\n      case 'userId':\n        return sessionInfo.userId || '';\n      case 'userName':\n        return sessionInfo.userName || '';\n      case 'realName':\n        return sessionInfo.realName || '';\n      default:\n        return '';\n    }\n  }\n\n  // 处理 ${contextParams.xxx} 格式\n  const contextParamsMatch = key.match(/^\\$\\{contextParams\\.(\\w+)\\}$/);\n  if (contextParamsMatch) {\n    const contextParamsKey = contextParamsMatch[1];\n    if (contextParams && typeof contextParams === 'object') {\n      const value = contextParams[contextParamsKey];\n      // 如果值是 null 或 undefined，返回空字符串；否则转换为字符串\n      return value != null ? String(value) : '';\n    }\n    return '';\n  }\n  return '';\n}\n\n/**\n * 生成水印样式对象\n * @param styles 样式配置\n */\nexport function generateWatermarkStyle(styles: WatermarkStyles): CSSProperties {\n  return {\n    color: styles.color,\n    fontSize: `${styles.fontSize}px`,\n    opacity: styles.opacity / 100,\n    transform: `rotate(${styles.angle}deg)`,\n    whiteSpace: 'nowrap' as const,\n    lineHeight: 1.2,\n  };\n}\n\n/**\n * 从 storage 获取用户信息（优先从 sessionStorage，其次从 localStorage）\n */\nfunction getUserInfoFromStorage(): SessionInfo {\n  try {\n    if (typeof window === 'undefined') {\n      return {};\n    }\n\n    // 优先从 sessionStorage 读取，如果没有则从 localStorage 读取\n    let userStoresStr = null;\n    if (window.sessionStorage) {\n      userStoresStr = window.sessionStorage.getItem('userStores');\n    }\n    if (!userStoresStr && window.localStorage) {\n      userStoresStr = window.localStorage.getItem('userStores');\n    }\n\n    if (!userStoresStr) {\n      return {};\n    }\n\n    const userStores = JSON.parse(userStoresStr);\n    const userInfo = userStores?.state?.userInfo;\n    if (!userInfo) {\n      return {};\n    }\n    return {\n      userId: userInfo.userId || '',\n      userName: userInfo.userName || '',\n      realName: userInfo.realName || '',\n    };\n  } catch (e) {\n    console.warn('Failed to get user info from storage:', e);\n    return {};\n  }\n}\n\n/**\n * 从 storage 获取 contextParams（优先从 sessionStorage，其次从 localStorage）\n */\nfunction getContextParamsFromStorage(): { [key: string]: any } | null {\n  try {\n    if (typeof window === 'undefined') {\n      return null;\n    }\n\n    // 优先从 sessionStorage 读取，如果没有则从 localStorage 读取\n    let contextParamsStr = null;\n    if (window.sessionStorage) {\n      contextParamsStr = window.sessionStorage.getItem('contextParams');\n    }\n    if (!contextParamsStr && window.localStorage) {\n      contextParamsStr = window.localStorage.getItem('contextParams');\n    }\n\n    if (!contextParamsStr) {\n      return null;\n    }\n\n    return JSON.parse(contextParamsStr) || null;\n  } catch (e) {\n    console.warn('Failed to get contextParams from storage:', e);\n    return null;\n  }\n}\n\n/**\n * 从 storage 获取缓存的客户端 IP\n */\nfunction getClientIpFromStorage(): string | null {\n  try {\n    if (typeof window === 'undefined') {\n      return null;\n    }\n\n    // 优先从 sessionStorage 读取，如果没有则从 localStorage 读取\n    let cachedIp = null;\n    if (window.sessionStorage) {\n      cachedIp = window.sessionStorage.getItem('clientIp');\n    }\n    if (!cachedIp && window.localStorage) {\n      cachedIp = window.localStorage.getItem('clientIp');\n    }\n\n    return cachedIp;\n  } catch (e) {\n    console.warn('Failed to get client IP from storage:', e);\n    return null;\n  }\n}\n\n/**\n * 缓存客户端 IP 到 storage\n */\nfunction setClientIpToStorage(ip: string): void {\n  try {\n    if (typeof window === 'undefined') {\n      return;\n    }\n\n    // 优先保存到 sessionStorage，同时保存到 localStorage 作为备份\n    if (window.sessionStorage) {\n      window.sessionStorage.setItem('clientIp', ip);\n    }\n    if (window.localStorage) {\n      window.localStorage.setItem('clientIp', ip);\n    }\n  } catch (e) {\n    console.warn('Failed to save client IP to storage:', e);\n  }\n}\n\n/**\n * 异步获取客户端 IP（通过第三方 API）\n * @returns Promise<string> 返回客户端 IP 地址\n */\nexport async function fetchClientIp(): Promise<string> {\n  // 先检查缓存\n  const cachedIp = getClientIpFromStorage();\n  if (cachedIp) {\n    return cachedIp;\n  }\n\n  // 尝试多个 IP 查询服务（按优先级）\n  const ipServices = [\n    'https://api.ipify.org?format=json',\n    'https://api.ip.sb/ip',\n    'https://api.ipify.org',\n  ];\n\n  for (const serviceUrl of ipServices) {\n    try {\n      const response = await fetch(serviceUrl, {\n        method: 'GET',\n        headers: {\n          Accept: 'application/json',\n        },\n      });\n\n      if (response.ok) {\n        let ip: string;\n        const contentType = response.headers.get('content-type');\n        \n        if (contentType && contentType.includes('application/json')) {\n          const data = await response.json();\n          ip = data.ip || data.query || data.origin || '';\n        } else {\n          ip = (await response.text()).trim();\n        }\n\n        // 验证 IP 格式\n        if (ip && /^(\\d{1,3}\\.){3}\\d{1,3}$/.test(ip)) {\n          // 缓存 IP\n          setClientIpToStorage(ip);\n          return ip;\n        }\n      }\n    } catch (e) {\n      // 继续尝试下一个服务（静默失败）\n    }\n  }\n\n  // 所有服务都失败，返回默认值\n  const defaultIp = '127.0.0.1';\n  console.warn('Failed to fetch client IP, using default:', defaultIp);\n  return defaultIp;\n}\n\n/**\n * 获取客户端 IP（同步方法，从缓存读取）\n * @returns string 返回客户端 IP 地址，如果缓存中没有则返回默认值 '127.0.0.1'\n */\nexport function getClientIp(): string {\n  const cachedIp = getClientIpFromStorage();\n  if (cachedIp) {\n    return cachedIp;\n  }\n\n  // 如果没有缓存，尝试异步获取（不阻塞当前调用）\n  // 下次调用时会使用缓存的 IP\n  if (typeof window !== 'undefined') {\n    fetchClientIp().catch(() => {\n      // 静默失败，不影响当前调用\n    });\n  }\n\n  return '127.0.0.1';\n}\n\n/**\n * 解析 content 中的所有变量并替换为真实值\n * @param content 原始内容，可能包含变量如 ${system.now}、${session.userId}、${contextParams.userName} 等\n */\nexport function parseContentVariables(\n  content: string,\n): string {\n  // 匹配所有变量：${system.xxx}、${session.xxx} 或 ${contextParams.xxx}\n  const variableRegex = /\\$\\{(system|session|contextParams)\\.(\\w+)\\}/g;\n  \n  // 缓存 storage 读取结果，避免在解析多个变量时重复读取\n  let cachedSessionInfo: SessionInfo | null = null;\n  let cachedContextParams: { [key: string]: any } | null = null;\n  let contextParamsRead = false; // 标记是否已读取 contextParams\n  \n  return content.replace(variableRegex, (match, type, key) => {\n    const variableKey = `\\${${type}.${key}}`;\n    \n    // 对于需要 storage 数据的变量类型，使用缓存\n    if (type === 'session' && cachedSessionInfo === null) {\n      cachedSessionInfo = getUserInfoFromStorage();\n    }\n    if (type === 'contextParams' && !contextParamsRead) {\n      cachedContextParams = getContextParamsFromStorage();\n      contextParamsRead = true;\n    }\n    \n    // 如果变量需要 session 或 contextParams，使用缓存的版本\n    if (type === 'session' || type === 'contextParams') {\n      return getVariableRealValueWithCache(variableKey, cachedSessionInfo, cachedContextParams);\n    }\n    \n    // 其他类型（system）直接调用\n    return getVariableRealValue(variableKey);\n  });\n}\n\n/**\n * 带缓存的变量值获取（内部使用）\n */\nfunction getVariableRealValueWithCache(\n  key: string,\n  sessionInfo: SessionInfo | null,\n  contextParams: { [key: string]: any } | null\n): string {\n  // 获取客户端 IP（从缓存读取，如果没有则返回默认值）\n  const clientIp = getClientIp();\n  const now = new Date();\n\n  // 处理 ${system.xxx} 格式\n  const systemMatch = key.match(/^\\$\\{system\\.(\\w+)\\}$/);\n  if (systemMatch) {\n    const systemKey = systemMatch[1];\n    switch (systemKey) {\n      case 'now': {\n        const year = now.getFullYear();\n        const month = String(now.getMonth() + 1).padStart(2, '0');\n        const day = String(now.getDate()).padStart(2, '0');\n        const hours = String(now.getHours()).padStart(2, '0');\n        const minutes = String(now.getMinutes()).padStart(2, '0');\n        const seconds = String(now.getSeconds()).padStart(2, '0');\n        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;\n      }\n      case 'today': {\n        const year = now.getFullYear();\n        const month = String(now.getMonth() + 1).padStart(2, '0');\n        const day = String(now.getDate()).padStart(2, '0');\n        return `${year}-${month}-${day}`;\n      }\n      case 'ip':\n        return clientIp;\n      default:\n        return '';\n    }\n  }\n\n  // 处理 ${session.xxx} 格式\n  const sessionMatch = key.match(/^\\$\\{session\\.(\\w+)\\}$/);\n  if (sessionMatch) {\n    const sessionKey = sessionMatch[1];\n    if (sessionInfo) {\n      switch (sessionKey) {\n        case 'userId':\n          return sessionInfo.userId || '';\n        case 'userName':\n          return sessionInfo.userName || '';\n        case 'realName':\n          return sessionInfo.realName || '';\n        default:\n          return '';\n      }\n    }\n    return '';\n  }\n\n  // 处理 ${contextParams.xxx} 格式\n  const contextParamsMatch = key.match(/^\\$\\{contextParams\\.(\\w+)\\}$/);\n  if (contextParamsMatch) {\n    const contextParamsKey = contextParamsMatch[1];\n    if (contextParams && typeof contextParams === 'object') {\n      const value = contextParams[contextParamsKey];\n      return value != null ? String(value) : '';\n    }\n    return '';\n  }\n  return '';\n}\n\n/**\n * 生成水印的 base64 数据 URL\n * 当前环境localStore中存有数据 ：key=userStores value={\"state\":{\"userInfo\":{\"token\":\"16fe343c-78ae-4fd8-93eb-410256dd483b\",\"userId\":\"1\",\"userName\":\"admin\",\"phoneNo\":\"13800138002\",\"email\":\"admin@localhost.com\",\"realName\":\"admin2\",\"defaultTenantId\":\"0\",\"avatar\":\"./images/avatar/img-user-avatar-10.png\",\"userIcon\":\"./images/avatar/img-user-avatar-10.png\"},\"currentTenantId\":\"1273556018761138176\",\"userSelectedBotOrder\":[\"1211941633166168064\",\"1212229286675095552\"],\"activeSession\":null},\"version\":0}\n * config参考： {\"enabled\":true,\"content\":\"测试水印 ${session.userId}\",\"styles\":{\"color\":\"#999999\",\"opacity\":20,\"fontSize\":16,\"angle\":-15},\"layout\":{\"density\":\"medium\",\"horizontalSpacing\":100,\"verticalSpacing\":100,\"arrangement\":\"tile\"}}\n */\nexport function generateWatermarkBase64(\n  config: WatermarkConfig,\n): string {\n  const { styles: styleConfig, layout, content } = config;\n\n  // 解析 content 中的所有变量并替换为真实值\n  const realContent = parseContentVariables(content || '');\n  \n  // 处理多行文本（按换行符分割，保留非空行）\n  const textLines = realContent.split('\\n').filter(line => line.trim() !== '');\n  \n  // 如果没有有效文本，使用空字符串\n  if (textLines.length === 0) {\n    return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(`<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"${layout.horizontalSpacing}\" height=\"${layout.verticalSpacing}\"></svg>`)}`;\n  }\n  \n  const escapedColor = escapeXml(styleConfig.color);\n  const lineHeight = styleConfig.fontSize * 1.2; // 行高为字体大小的1.2倍\n  \n  // 计算文本总高度\n  const textHeight = textLines.length * lineHeight;\n  // 垂直居中：从垂直间距的中心位置开始，向上偏移文本高度的一半\n  const startY = layout.verticalSpacing / 2 - textHeight / 2 + lineHeight;\n\n  // 使用 tspan 来显示多行文本\n  const tspanElements = textLines.map((line: string, index: number) => {\n    const escapedLine = escapeXml(line);\n    const y = startY + index * lineHeight;\n    return `<tspan x=\"10\" y=\"${y}\">${escapedLine}</tspan>`;\n  }).join('');\n\n  const svgContent = `\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"${layout.horizontalSpacing}\" height=\"${layout.verticalSpacing}\">\n      <text\n        font-size=\"${styleConfig.fontSize}\"\n        fill=\"${escapedColor}\"\n        fill-opacity=\"${styleConfig.opacity / 100}\"\n        transform=\"rotate(${styleConfig.angle} ${layout.horizontalSpacing / 2} ${layout.verticalSpacing / 2})\"\n      >\n        ${tspanElements}\n      </text>\n    </svg>\n  `.replace(/\\s+/g, ' ');\n\n  // 使用 encodeURIComponent 而不是 btoa，以支持中文字符\n  return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgContent)}`;\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/esm/file.js

@@ -6,10 +6,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import security from '@lingxiteam/security';
 import { argsToString, getSearchObj } from "./pathArgsUtils";
+import { request } from "./http";
 
 // 暂时放到utils中，后续考虑独立在@boteteam/service包
 
-var DEFAULT_PREFIX = "".concat(process.env.REACT_APP_REQ_PREFIX, "/bote");
+// const DEFAULT_PREFIX = `${process.env.REACT_APP_REQ_PREFIX}/bote`;
 
 /**
  * 根据文件ID生成文件URL地址
@@ -27,7 +28,7 @@ export var getFileUrlById = function getFileUrlById(fileId) {
     _ref$isSecurity = _ref.isSecurity,
     isSecurity = _ref$isSecurity === void 0 ? true : _ref$isSecurity,
     params = _ref.params;
-  var baseUrl = prefix ? prefix.replace(/\/$/, '') : DEFAULT_PREFIX;
+  var baseUrl = prefix ? prefix.replace(/\/$/, '') : request.getBaseUrl();
   // 如果url中存在token，则把token添加到query参数中
   var token = ((_getSearchObj = getSearchObj()) === null || _getSearchObj === void 0 ? void 0 : _getSearchObj.token) || '';
   var queryParams = _objectSpread({
@@ -56,7 +57,7 @@ export var getFileUrlByFileInfoId = function getFileUrlByFileInfoId(fileInfoId)
     _ref2$isSecurity = _ref2.isSecurity,
     isSecurity = _ref2$isSecurity === void 0 ? true : _ref2$isSecurity,
     params = _ref2.params;
-  var baseUrl = prefix ? prefix.replace(/\/$/, '') : DEFAULT_PREFIX;
+  var baseUrl = prefix ? prefix.replace(/\/$/, '') : request.getBaseUrl();
   // 如果url中存在token，则把token添加到query参数中
   var _ref3 = getSearchObj() || {},
     token = _ref3.token,
@@ -81,7 +82,7 @@ var getRemoteComponentUrl = function getRemoteComponentUrl() {
     isSecurity = _ref4$isSecurity === void 0 ? true : _ref4$isSecurity,
     _ref4$params = _ref4.params,
     params = _ref4$params === void 0 ? {} : _ref4$params;
-  var baseUrl = prefix ? prefix.replace(/\/$/, '') : DEFAULT_PREFIX;
+  var baseUrl = prefix ? prefix.replace(/\/$/, '') : request.getBaseUrl();
   var query = argsToString(params);
   var url = "".concat(baseUrl, "/manager/skill/page/getRemoteComponent?").concat(query);
   return isSecurity ? security.autoSecurityWithUrl(url) : url;

package/dist/esm/file.js.map

@@ -1 +1 @@
-{"version":3,"names":["security","argsToString","getSearchObj","DEFAULT_PREFIX","concat","process","env","REACT_APP_REQ_PREFIX","getFileUrlById","fileId","_getSearchObj","_ref","arguments","length","undefined","prefix","_ref$isSecurity","isSecurity","params","baseUrl","replace","token","queryParams","_objectSpread","query","url","autoSecurityWithUrl","getFileUrlByFileInfoId","fileInfoId","_ref2","_ref2$isSecurity","_ref3","tenantId","getRemoteComponentUrl","_ref4","_ref4$isSecurity","_ref4$params","getRemoteComponentUrlByCode","pageCode","options","botePageCode","getRemoteComponentUrlById"],"sources":["../../src/file.ts"],"sourcesContent":["import security from '@lingxiteam/security';\nimport { argsToString, getSearchObj } from './pathArgsUtils';\n\n// 暂时放到utils中，后续考虑独立在@boteteam/service包\n\nconst DEFAULT_PREFIX = `${process.env.REACT_APP_REQ_PREFIX}/bote`;\n\n/**\n * 根据文件ID生成文件URL地址\n * @param fileId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getFileUrlById = (\n  fileId: string,\n  {\n    prefix,\n    isSecurity = true,\n    params,\n  }: {\n    prefix?: string;\n    isSecurity?: boolean;\n    params?: Record<string, any>;\n  } = {},\n) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : DEFAULT_PREFIX;\n  // 如果url中存在token，则把token添加到query参数中\n  const token = getSearchObj()?.token || '';\n  const queryParams:{[key:string]:any} = {\n    fileId,\n    ...params,\n  };\n  if (token) {\n    queryParams.token = token;\n  }\n  const query = argsToString(queryParams);\n  const url = `${baseUrl}/file/download?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\n/**\n * 根据文件ID生成文件URL地址\n * @param fileId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getFileUrlByFileInfoId = (\n  fileInfoId: string,\n  {\n    prefix,\n    isSecurity = true,\n    params,\n  }: {\n    prefix?: string;\n    isSecurity?: boolean;\n    params?: Record<string, any>;\n  } = {},\n) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : DEFAULT_PREFIX;\n  // 如果url中存在token，则把token添加到query参数中\n  const { token, tenantId } = getSearchObj() || {};\n  const queryParams:{[key:string]:any} = {\n    fileInfoId,\n    ...params,\n  };\n  if (token) {\n    queryParams.token = token;\n  }\n  if (tenantId) {\n    queryParams.tenantId = tenantId;\n  }\n  const query = argsToString(queryParams);\n  const url = `${baseUrl}/file/downloadByFileInfoId?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\nconst getRemoteComponentUrl = ({\n  prefix,\n  isSecurity = true,\n  params = {},\n}: {\n  prefix?: string;\n  isSecurity?: boolean;\n  params?: Record<string, any>;\n} = {}) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : DEFAULT_PREFIX;\n  const query = argsToString(params);\n  const url = `${baseUrl}/manager/skill/page/getRemoteComponent?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\n/**\n * 根据页面编码生成远程组件URL地址\n * @param pageCode 页面编码\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getRemoteComponentUrlByCode = (\n  pageCode: string,\n  options: Parameters<typeof getRemoteComponentUrl>[0],\n) => {\n  return getRemoteComponentUrl({\n    ...options,\n    params: { botePageCode: pageCode, ...options?.params },\n  });\n};\n\n/**\n * 根据文件ID生成远程组件URL地址\n * @param fileInfoId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getRemoteComponentUrlById = (\n  fileInfoId: string,\n  options: Parameters<typeof getRemoteComponentUrl>[0],\n) => {\n  return getRemoteComponentUrl({\n    ...options,\n    params: { fileInfoId, ...options?.params },\n  });\n};\n"],"mappings":"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"}
+{"version":3,"names":["security","argsToString","getSearchObj","request","getFileUrlById","fileId","_getSearchObj","_ref","arguments","length","undefined","prefix","_ref$isSecurity","isSecurity","params","baseUrl","replace","getBaseUrl","token","queryParams","_objectSpread","query","url","concat","autoSecurityWithUrl","getFileUrlByFileInfoId","fileInfoId","_ref2","_ref2$isSecurity","_ref3","tenantId","getRemoteComponentUrl","_ref4","_ref4$isSecurity","_ref4$params","getRemoteComponentUrlByCode","pageCode","options","botePageCode","getRemoteComponentUrlById"],"sources":["../../src/file.ts"],"sourcesContent":["import security from '@lingxiteam/security';\nimport { argsToString, getSearchObj } from './pathArgsUtils';\nimport { request } from './http';\n\n// 暂时放到utils中，后续考虑独立在@boteteam/service包\n\n// const DEFAULT_PREFIX = `${process.env.REACT_APP_REQ_PREFIX}/bote`;\n\n/**\n * 根据文件ID生成文件URL地址\n * @param fileId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getFileUrlById = (\n  fileId: string,\n  {\n    prefix,\n    isSecurity = true,\n    params,\n  }: {\n    prefix?: string;\n    isSecurity?: boolean;\n    params?: Record<string, any>;\n  } = {},\n) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : request.getBaseUrl();\n  // 如果url中存在token，则把token添加到query参数中\n  const token = getSearchObj()?.token || '';\n  const queryParams:{[key:string]:any} = {\n    fileId,\n    ...params,\n  };\n  if (token) {\n    queryParams.token = token;\n  }\n  const query = argsToString(queryParams);\n  const url = `${baseUrl}/file/download?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\n/**\n * 根据文件ID生成文件URL地址\n * @param fileId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getFileUrlByFileInfoId = (\n  fileInfoId: string,\n  {\n    prefix,\n    isSecurity = true,\n    params,\n  }: {\n    prefix?: string;\n    isSecurity?: boolean;\n    params?: Record<string, any>;\n  } = {},\n) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : request.getBaseUrl();\n  // 如果url中存在token，则把token添加到query参数中\n  const { token, tenantId } = getSearchObj() || {};\n  const queryParams:{[key:string]:any} = {\n    fileInfoId,\n    ...params,\n  };\n  if (token) {\n    queryParams.token = token;\n  }\n  if (tenantId) {\n    queryParams.tenantId = tenantId;\n  }\n  const query = argsToString(queryParams);\n  const url = `${baseUrl}/file/downloadByFileInfoId?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\nconst getRemoteComponentUrl = ({\n  prefix,\n  isSecurity = true,\n  params = {},\n}: {\n  prefix?: string;\n  isSecurity?: boolean;\n  params?: Record<string, any>;\n} = {}) => {\n  const baseUrl = prefix ? prefix.replace(/\\/$/, '') : request.getBaseUrl();\n  const query = argsToString(params);\n  const url = `${baseUrl}/manager/skill/page/getRemoteComponent?${query}`;\n  return isSecurity ? security.autoSecurityWithUrl(url) : url;\n};\n\n/**\n * 根据页面编码生成远程组件URL地址\n * @param pageCode 页面编码\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getRemoteComponentUrlByCode = (\n  pageCode: string,\n  options: Parameters<typeof getRemoteComponentUrl>[0],\n) => {\n  return getRemoteComponentUrl({\n    ...options,\n    params: { botePageCode: pageCode, ...options?.params },\n  });\n};\n\n/**\n * 根据文件ID生成远程组件URL地址\n * @param fileInfoId 文件ID\n * @param options 配置选项\n * @param options.prefix 自定义请求前缀（默认使用环境变量配置）\n * @param options.isSecurity 是否启用安全处理（默认true）, 将对url地址参数加密或加签\n * @param options.params 自定义参数，将添加到query参数中\n * @returns 文件URL地址\n */\nexport const getRemoteComponentUrlById = (\n  fileInfoId: string,\n  options: Parameters<typeof getRemoteComponentUrl>[0],\n) => {\n  return getRemoteComponentUrl({\n    ...options,\n    params: { fileInfoId, ...options?.params },\n  });\n};\n"],"mappings":"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"}

package/dist/esm/formatModule/formatModuleData.d.ts

@@ -11,12 +11,14 @@ type formatModuleProps = {
     } | null;
     parameters?: any;
     loopItemData?: any;
+    loopIndex?: number;
+    parentNodeData?: any;
     staticCodeList?: {
         [key: string]: any;
     } | null;
     disabled?: boolean;
 };
-declare const formatModuleData: ({ moduleData, parentModuleData, parameters, loopItemData, staticCodeList, disabled, pageData, }: formatModuleProps) => {
+declare const formatModuleData: ({ moduleData, parentModuleData, parameters, loopItemData, loopIndex, parentNodeData, staticCodeList, disabled, pageData, }: formatModuleProps) => {
     [key: string]: any;
 } | null;
 export default formatModuleData;

package/dist/esm/formatModule/formatModuleData.js

@@ -1,4 +1,4 @@
-var _excluded = ["itemLabel", "itemContent", "itemDescribe", "dataSource", "columns", "tableBodyHeight", "fileProps", "attrs", "rowSelection", "hasSelectAll", "rowKey", "fieldName", "column", "articleContent", "eventFlag", "events"];
+var _excluded = ["itemLabel", "itemContent", "itemDescribe", "dataSource", "columns", "tableBodyHeight", "fileProps", "attrs", "rowSelection", "hasSelectAll", "rowKey", "fieldName", "column", "articleContent", "eventFlag", "events", "itemControlBtnsStyle"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -10,19 +10,24 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import 'ses';
 import { cloneDeep } from 'lodash';
 import { getDataArr } from "../treeUtils";
-import { urlPrefix, formatListProps, formatTableProps, formatPanelProps, formatCarouselProps, formatImageProps, formatFormProps, formatHighCodeProps, formatDescriptionsProps, formatLoopProps, formatStyleProps, formatEchartLineProps, formatEchartPieProps, formatChartsProps, formatStepsProps, formatIconProps, formatControlBtn, staticCodeAssemble, stringPramarsValTransition, stringScriptExecution } from "./helpers";
+import { urlPrefix, formatListProps, formatTableProps, formatPanelProps, formatCarouselProps, formatImageProps, formatFormProps, formatHighCodeProps, formatDescriptionsProps, formatLoopProps, formatStyleProps, formatEchartLineProps, formatEchartPieProps, formatChartsProps, formatStepsProps, formatIconProps, formatControlBtn, formatTabsProps, formatVideoProps, formatDataProps, staticCodeAssemble, stringPramarsValTransition, checkDataSourceOfFn, stringScriptExecution } from "./helpers";
+import { getStylePainter } from "./helpers/formatStyleProps";
 var formatModuleData = function formatModuleData(_ref) {
   var moduleData = _ref.moduleData,
     parentModuleData = _ref.parentModuleData,
     parameters = _ref.parameters,
     loopItemData = _ref.loopItemData,
+    loopIndex = _ref.loopIndex,
+    parentNodeData = _ref.parentNodeData,
     staticCodeList = _ref.staticCodeList,
     disabled = _ref.disabled,
     pageData = _ref.pageData;
   var moduleDataRes = {};
   var allParametrs = _objectSpread(_objectSpread({}, cloneDeep(parameters || {})), {}, {
+    loopIndex: loopIndex,
     pageData: cloneDeep(pageData || {}),
-    loopItem: cloneDeep(loopItemData || {})
+    loopItem: cloneDeep(loopItemData || {}),
+    __parentNodeData__: cloneDeep(parentNodeData || {})
   }); // 把页面数据与入参组装到一起
   var _staticCodeAssemble = staticCodeAssemble(staticCodeList),
     staticCodeMap = _staticCodeAssemble.staticCodeMap,
@@ -35,7 +40,9 @@ var formatModuleData = function formatModuleData(_ref) {
       moduleTitle = moduleData.moduleTitle,
       moduleTitleIcon = moduleData.moduleTitleIcon,
       moduleDescribe = moduleData.moduleDescribe,
+      loopItemProps = moduleData.loopItemProps,
       moduleControlBtns = moduleData.controlBtns,
+      moduleControlBtnsStyle = moduleData.controlBtnsStyle,
       id = moduleData.id;
     // 组装静态数据映射
     moduleDataRes = _objectSpread(_objectSpread({}, moduleData), {}, {
@@ -62,10 +69,16 @@ var formatModuleData = function formatModuleData(_ref) {
       articleContent = _ref2.articleContent,
       eventFlag = _ref2.eventFlag,
       events = _ref2.events,
+      itemControlBtnsStyle = _ref2.itemControlBtnsStyle,
       otherCompProps = _objectWithoutProperties(_ref2, _excluded);
     if (moduleTitle) {
       moduleDataRes.moduleTitle = stringPramarsValTransition(moduleTitle, allParametrs);
     }
+    if (moduleControlBtnsStyle) {
+      moduleDataRes.controlBtnsStyle = getStylePainter(_objectSpread({
+        'flex-direction': 'row'
+      }, moduleControlBtnsStyle));
+    }
     if (moduleTitleIcon) {
       moduleDataRes.moduleTitleIcon = null;
       if ((moduleTitleIcon === null || moduleTitleIcon === void 0 ? void 0 : moduleTitleIcon.type) === 'icon') {
@@ -141,13 +154,15 @@ var formatModuleData = function formatModuleData(_ref) {
         };
       }
     }
-    if (['panel', 'div', 'page'].indexOf(compType) >= 0) {
+    if (['page', 'panel', 'div', 'tabs', 'tabPanel', 'data'].indexOf(compType) >= 0) {
       var childs = Array.isArray(children) && children.length > 0 ? children.map(function (item) {
         return formatModuleData({
           moduleData: item,
           parentModuleData: moduleData,
+          parentNodeData: parentNodeData,
           parameters: parameters,
           loopItemData: loopItemData,
+          loopIndex: loopIndex,
           staticCodeList: staticCodeList,
           disabled: disabled,
           pageData: pageData
@@ -162,6 +177,37 @@ var formatModuleData = function formatModuleData(_ref) {
           parameters: allParametrs
         });
       }
+      if (compType === 'tabs') {
+        moduleDataRes.compProps = formatTabsProps({
+          key: id,
+          compProps: otherCompProps,
+          parameters: allParametrs
+        });
+      }
+      if (compType === 'data') {
+        var _moduleDataRes;
+        var dataProps = formatDataProps({
+          options: {
+            dataSource: compDataSource
+          },
+          parameters: allParametrs,
+          staticCodeMap: staticCodeMap
+        });
+        moduleDataRes.compProps = _objectSpread(_objectSpread(_objectSpread({}, ((_moduleDataRes = moduleDataRes) === null || _moduleDataRes === void 0 ? void 0 : _moduleDataRes.compProps) || {}), dataProps), {}, {
+          children: Array.isArray(children) && children.length > 0 ? children.map(function (item) {
+            var childInfo = formatModuleData({
+              moduleData: item,
+              parentModuleData: moduleData,
+              parentNodeData: _objectSpread(_objectSpread({}, parentNodeData), {}, _defineProperty({}, moduleData === null || moduleData === void 0 ? void 0 : moduleData.id, dataProps === null || dataProps === void 0 ? void 0 : dataProps.dataResult)),
+              parameters: parameters,
+              staticCodeList: staticCodeList,
+              disabled: disabled,
+              pageData: pageData
+            });
+            return childInfo;
+          }) : []
+        });
+      }
     } else {
       var _Object$keys;
       if (otherCompProps && (Object === null || Object === void 0 || (_Object$keys = Object.keys(otherCompProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0) {
@@ -186,7 +232,6 @@ var formatModuleData = function formatModuleData(_ref) {
       }
       if (compType === 'typography') {
         if (articleContent) {
-          console.log('articleContent', articleContent, allParametrs);
           moduleDataRes.compProps.articleContent = stringPramarsValTransition(articleContent, allParametrs);
         }
       }
@@ -194,53 +239,53 @@ var formatModuleData = function formatModuleData(_ref) {
         moduleDataRes.compProps.url = stringPramarsValTransition(otherCompProps === null || otherCompProps === void 0 ? void 0 : otherCompProps.url, allParametrs);
       }
       if (compType === 'carousel' && compDataSource && compDataSource !== null && compDataSource !== void 0 && compDataSource.dataType) {
-        var _moduleDataRes;
+        var _moduleDataRes2;
         var carouselProps = formatCarouselProps({
           options: {
             dataSource: compDataSource
           },
           parameters: allParametrs
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes = moduleDataRes) === null || _moduleDataRes === void 0 ? void 0 : _moduleDataRes.compProps) || {}), carouselProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes2 = moduleDataRes) === null || _moduleDataRes2 === void 0 ? void 0 : _moduleDataRes2.compProps) || {}), carouselProps);
       }
       if (compType === 'icon') {
-        var _moduleDataRes2;
+        var _moduleDataRes3;
         var _iconProps = formatIconProps({
           icon: compProps === null || compProps === void 0 ? void 0 : compProps.icon,
           parameters: allParametrs
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes2 = moduleDataRes) === null || _moduleDataRes2 === void 0 ? void 0 : _moduleDataRes2.compProps) || {}), {}, {
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes3 = moduleDataRes) === null || _moduleDataRes3 === void 0 ? void 0 : _moduleDataRes3.compProps) || {}), {}, {
           icon: _iconProps
         });
       }
       if (compType === 'txt') {
-        var _moduleDataRes3;
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes3 = moduleDataRes) === null || _moduleDataRes3 === void 0 ? void 0 : _moduleDataRes3.compProps) || {}), {}, {
-          content: stringPramarsValTransition(compProps === null || compProps === void 0 ? void 0 : compProps.content, allParametrs)
+        var _moduleDataRes4;
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes4 = moduleDataRes) === null || _moduleDataRes4 === void 0 ? void 0 : _moduleDataRes4.compProps) || {}), {}, {
+          content: checkDataSourceOfFn(compProps === null || compProps === void 0 ? void 0 : compProps.content) ? stringScriptExecution(compProps === null || compProps === void 0 ? void 0 : compProps.content, allParametrs) : stringPramarsValTransition(compProps === null || compProps === void 0 ? void 0 : compProps.content, allParametrs)
         });
       }
       if (compType === 'image' && compDataSource && compDataSource !== null && compDataSource !== void 0 && compDataSource.dataType) {
-        var _moduleDataRes4;
+        var _moduleDataRes5;
         var _imageProps = formatImageProps({
           options: {
             dataSource: compDataSource
           },
           parameters: allParametrs
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes4 = moduleDataRes) === null || _moduleDataRes4 === void 0 ? void 0 : _moduleDataRes4.compProps) || {}), _imageProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes5 = moduleDataRes) === null || _moduleDataRes5 === void 0 ? void 0 : _moduleDataRes5.compProps) || {}), _imageProps);
       }
       if (compType === 'highCodeComp') {
-        var _moduleDataRes5;
+        var _moduleDataRes6;
         var highCodeCompProps = formatHighCodeProps({
           options: {
             fileProps: fileProps
           },
           parameters: allParametrs
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes5 = moduleDataRes) === null || _moduleDataRes5 === void 0 ? void 0 : _moduleDataRes5.compProps) || {}), highCodeCompProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes6 = moduleDataRes) === null || _moduleDataRes6 === void 0 ? void 0 : _moduleDataRes6.compProps) || {}), highCodeCompProps);
       }
       if (compType === 'table') {
-        var _moduleDataRes6;
+        var _moduleDataRes7;
         var tableProps = formatTableProps({
           options: _objectSpread(_objectSpread({}, otherCompProps), {}, {
             columns: compColumns,
@@ -249,12 +294,13 @@ var formatModuleData = function formatModuleData(_ref) {
             tableBodyHeight: tableBodyHeight
           }),
           staticCodeMap: staticCodeMap,
+          staticOptionsMap: staticOptionsMap,
           parameters: allParametrs
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes6 = moduleDataRes) === null || _moduleDataRes6 === void 0 ? void 0 : _moduleDataRes6.compProps) || {}), tableProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes7 = moduleDataRes) === null || _moduleDataRes7 === void 0 ? void 0 : _moduleDataRes7.compProps) || {}), tableProps);
       }
       if (compType === 'form') {
-        var _moduleDataRes7;
+        var _moduleDataRes8;
         var formProps = formatFormProps({
           options: {
             column: column,
@@ -264,10 +310,10 @@ var formatModuleData = function formatModuleData(_ref) {
           staticCodeMap: staticCodeMap,
           staticOptionsMap: staticOptionsMap
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes7 = moduleDataRes) === null || _moduleDataRes7 === void 0 ? void 0 : _moduleDataRes7.compProps) || {}), formProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes8 = moduleDataRes) === null || _moduleDataRes8 === void 0 ? void 0 : _moduleDataRes8.compProps) || {}), formProps);
       }
       if (compType === 'descriptions') {
-        var _moduleDataRes8;
+        var _moduleDataRes9;
         var descriptionsProps = formatDescriptionsProps({
           options: {
             column: column,
@@ -276,10 +322,10 @@ var formatModuleData = function formatModuleData(_ref) {
           parameters: allParametrs,
           staticCodeMap: staticCodeMap
         });
-        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes8 = moduleDataRes) === null || _moduleDataRes8 === void 0 ? void 0 : _moduleDataRes8.compProps) || {}), descriptionsProps);
+        moduleDataRes.compProps = _objectSpread(_objectSpread({}, ((_moduleDataRes9 = moduleDataRes) === null || _moduleDataRes9 === void 0 ? void 0 : _moduleDataRes9.compProps) || {}), descriptionsProps);
       }
       if (compType === 'loop') {
-        var _loopProps$dataSource, _moduleDataRes12;
+        var _loopProps$dataSource, _moduleDataRes13;
         var loopProps = formatLoopProps({
           options: {
             dataSource: compDataSource,
@@ -288,24 +334,34 @@ var formatModuleData = function formatModuleData(_ref) {
           parameters: allParametrs,
           staticCodeMap: staticCodeMap
         });
+        var loopItemStyle = getStylePainter((loopItemProps === null || loopItemProps === void 0 ? void 0 : loopItemProps.style) || {});
         var loopChilds = [];
         if (Array.isArray(loopProps === null || loopProps === void 0 ? void 0 : loopProps.dataSource) && (loopProps === null || loopProps === void 0 || (_loopProps$dataSource = loopProps.dataSource) === null || _loopProps$dataSource === void 0 ? void 0 : _loopProps$dataSource.length) > 0 && Array.isArray(children) && children.length > 0) {
-          loopProps === null || loopProps === void 0 || loopProps.dataSource.forEach(function (dataItem) {
-            var _moduleDataRes9, _moduleDataRes10, _moduleDataRes11;
-            var dataItemKey = (_moduleDataRes9 = moduleDataRes) !== null && _moduleDataRes9 !== void 0 && (_moduleDataRes9 = _moduleDataRes9.compProps) !== null && _moduleDataRes9 !== void 0 && _moduleDataRes9.rowKey && dataItem !== null && dataItem !== void 0 && dataItem[(_moduleDataRes10 = moduleDataRes) === null || _moduleDataRes10 === void 0 || (_moduleDataRes10 = _moduleDataRes10.compProps) === null || _moduleDataRes10 === void 0 ? void 0 : _moduleDataRes10.rowKey] ? dataItem === null || dataItem === void 0 ? void 0 : dataItem[(_moduleDataRes11 = moduleDataRes) === null || _moduleDataRes11 === void 0 || (_moduleDataRes11 = _moduleDataRes11.compProps) === null || _moduleDataRes11 === void 0 ? void 0 : _moduleDataRes11.rowKey] : '';
-            loopChilds.push({
-              id: dataItemKey,
-              key: dataItemKey,
+          loopProps === null || loopProps === void 0 || loopProps.dataSource.forEach(function (dataItem, index) {
+            var _moduleDataRes10, _moduleDataRes11, _moduleDataRes12;
+            var dataItemIdxKey = "bubble_loop_item_".concat(index);
+            var rawKey = (_moduleDataRes10 = moduleDataRes) !== null && _moduleDataRes10 !== void 0 && (_moduleDataRes10 = _moduleDataRes10.compProps) !== null && _moduleDataRes10 !== void 0 && _moduleDataRes10.rowKey && dataItem !== null && dataItem !== void 0 && dataItem[(_moduleDataRes11 = moduleDataRes) === null || _moduleDataRes11 === void 0 || (_moduleDataRes11 = _moduleDataRes11.compProps) === null || _moduleDataRes11 === void 0 ? void 0 : _moduleDataRes11.rowKey] ? String(dataItem === null || dataItem === void 0 ? void 0 : dataItem[(_moduleDataRes12 = moduleDataRes) === null || _moduleDataRes12 === void 0 || (_moduleDataRes12 = _moduleDataRes12.compProps) === null || _moduleDataRes12 === void 0 ? void 0 : _moduleDataRes12.rowKey]) : '';
+            // 移除中文和空格
+            var itemKey = rawKey.replace(/[\u4e00-\u9fa5\s]/g, '') || dataItemIdxKey;
+            var loopItemData = {
+              id: itemKey,
+              key: itemKey,
               compType: 'loopItem',
-              compProps: {},
-              originItem: dataItem,
+              compProps: _objectSpread(_objectSpread({}, loopItemProps), {}, {
+                style: loopItemStyle
+              }),
+              originItem: dataItem
+            };
+            loopChilds.push(_objectSpread(_objectSpread({}, loopItemData), {}, {
               children: children.map(function (item) {
                 var loopChildInfo = formatModuleData({
                   moduleData: item,
-                  parentModuleData: moduleData,
+                  parentModuleData: loopItemData,
                   loopItemData: _typeof(dataItem) === 'object' ? dataItem : {
                     item: dataItem
                   },
+                  loopIndex: index,
+                  parentNodeData: parentNodeData,
                   parameters: parameters,
                   staticCodeList: staticCodeList,
                   disabled: disabled,
@@ -313,20 +369,26 @@ var formatModuleData = function formatModuleData(_ref) {
                 });
                 return loopChildInfo;
               })
-            });
+            }));
           });
         } else if (Array.isArray(children) && children.length > 0) {
-          loopChilds.push({
+          var _loopItemData = {
             id: '1',
             key: '1',
             compType: 'loopItem',
-            compProps: {},
-            originItem: {},
+            compProps: _objectSpread(_objectSpread({}, loopItemProps), {}, {
+              style: loopItemStyle
+            }),
+            originItem: {}
+          };
+          loopChilds.push(_objectSpread(_objectSpread({}, _loopItemData), {}, {
             children: children.map(function (item) {
               var loopChildInfo = formatModuleData({
                 moduleData: item,
-                parentModuleData: moduleData,
+                parentModuleData: _loopItemData,
                 loopItemData: {},
+                loopIndex: 0,
+                parentNodeData: parentNodeData,
                 parameters: parameters,
                 staticCodeList: staticCodeList,
                 disabled: disabled,
@@ -334,12 +396,15 @@ var formatModuleData = function formatModuleData(_ref) {
               });
               return loopChildInfo;
             })
-          });
+          }));
         }
-        moduleDataRes.compProps = _objectSpread(_objectSpread(_objectSpread({}, ((_moduleDataRes12 = moduleDataRes) === null || _moduleDataRes12 === void 0 ? void 0 : _moduleDataRes12.compProps) || {}), loopProps), {}, {
+        moduleDataRes.compProps = _objectSpread(_objectSpread(_objectSpread({}, ((_moduleDataRes13 = moduleDataRes) === null || _moduleDataRes13 === void 0 ? void 0 : _moduleDataRes13.compProps) || {}), loopProps), {}, {
           column: column,
           children: loopChilds
         });
+        moduleDataRes.loopItemProps = _objectSpread(_objectSpread({}, loopItemProps), {}, {
+          style: loopItemStyle
+        });
       }
       if (['list', 'card', 'recommendList'].includes(compType)) {
         var resProps = formatListProps({
@@ -396,6 +461,13 @@ var formatModuleData = function formatModuleData(_ref) {
       });
       moduleDataRes.compProps = _objectSpread(_objectSpread({}, moduleDataRes.compProps || {}), stepsProps);
     }
+    if (compType === 'video') {
+      var videoProps = formatVideoProps({
+        options: compProps,
+        parameters: allParametrs
+      });
+      moduleDataRes.compProps = _objectSpread(_objectSpread({}, moduleDataRes.compProps || {}), videoProps);
+    }
     if (Array.isArray(moduleControlBtns) && moduleControlBtns.length > 0) {
       moduleDataRes.controlBtns = moduleControlBtns.map(function (btn) {
         return formatControlBtn({
@@ -404,7 +476,16 @@ var formatModuleData = function formatModuleData(_ref) {
         });
       });
     }
-    moduleDataRes.compProps.style = formatStyleProps(moduleData, parentModuleData);
+    moduleDataRes.compProps.style = formatStyleProps({
+      moduleData: moduleData || {},
+      parentModuleData: parentModuleData || {},
+      parameters: allParametrs
+    });
+    if (itemControlBtnsStyle) {
+      moduleDataRes.compProps.itemControlBtnsStyle = getStylePainter(_objectSpread({
+        'flex-direction': 'row'
+      }, itemControlBtnsStyle));
+    }
     // 所有的模版 拼一个组装数据的key值
     if (moduleData !== null && moduleData !== void 0 && moduleData.compProps && fieldName) {
       moduleDataRes.compProps.fieldName = fieldName;